Merge branch 'master' of https://git.czcyedu.com/huoran/FE_occupationlab_server into master

src/pages/project/list/index.vue

@@ -84,21 +84,21 @@
                         {{ stateKeys[scope.row.state] }}
                     </template>
                 </el-table-column>
-                <el-table-column label="操作">
+                <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="edit(scope.row,'0')">查看</el-button>
                         <el-button v-if="scope.row.founder != 0" type="text" @click="edit(scope.row,'1')">编辑</el-button>
                         <el-button v-if="scope.row.founder != 0" type="text" @click="handleDelete(scope.row.projectId)">删除</el-button>
                         <el-button v-if="auth('复制')" type="text" @click="copyData(scope.row.projectId)">复制</el-button>
-                        <el-switch
+<!--                        <el-switch-->
-                            v-if="auth('禁用')"
+<!--                            v-if="auth('禁用')"-->
-                            v-model="scope.row.isOpen"
+<!--                            v-model="scope.row.isOpen"-->
-                            :active-text="scope.row.isOpen ? '关闭' : '启用'"
+<!--                            :active-text="scope.row.isOpen ? '关闭' : '启用'"-->
-                            :active-value="0"
+<!--                            :active-value="0"-->
-                            :inactive-value="1"
+<!--                            :inactive-value="1"-->
-                            style="margin: 0 10px 0 10px"
+<!--                            style="margin: 0 10px 0 10px"-->
-                            @change="switchOff(scope.row)"
+<!--                            @change="switchOff(scope.row)"-->
-                        ></el-switch>
+<!--                        ></el-switch>-->
                     </template>
                 </el-table-column>
             </el-table>
@@ -135,7 +135,7 @@ export default {
             systemList: [],
             queryData: {
                 platformId: 1, // 平台：职站:1 中台:3
-                founder: 0, // 创建人角色(0:系统 1:老师)
+                founder: 2, // 创建人角色(0:系统 1:老师 2:全部)
                 state: "", // 状态(0:草稿箱 1:已发布)
                 permissions: "" // 项目权限(0:练习 1:考核 2:竞赛)
             },
@@ -174,6 +174,10 @@ export default {
                 {
                     value: 1,
                     label: "老师"
+                },
+                {
+                    value: 2,
+                    label: "全部"
                 }
             ],
             founderKeys: {

src/pages/student/list/index.vue

@@ -994,7 +994,7 @@ export default {
                 }
                 util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
                 this.handleRefresh();
-                util.successMsg(`本次上传有${res.data.failureNum}个失败`);
+                util.successMsg(`本次上传有${res.data.failureNum}个错误信息录入`);
 
                 this.getClassTreeData('','1','')
             } else {

src/setting.js

@@ -27,7 +27,7 @@ if (isHh) {
     title = "职站服务端管理系统";
 } else if (isPro) {
     // 职站生产
-    host = "http://www.occupationlab.com/";
+    host = "http://www.occupationlab.com:9000/";
     title = "职站服务端管理系统";
 } else if (isTest){
     jumpPath = "http://39.108.250.202/judgmentPoint/";
@@ -35,6 +35,7 @@ if (isHh) {
     title = "职站服务端管理系统";
 } else if (isDev) {
     jumpPath = "http://192.168.31.154:8087/";
+    // host = "http://www.occupationlab.com:9000/";//线上
     host = "http://39.108.250.202:9000/"; // 中台测试服
     // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.125:9000/"; // 坤