新系统

src/components/TestPanel.vue

@@ -232,7 +232,7 @@ export default {
           if (!points.length) {
             this.$message.error('该项目没有判分点，请换个项目重试')
             this.projectId = this.projectList[0].projectId
-            this.getProDetail()
+            // this.getProDetail()
           }
           points.map((e, i) => {
             e.code = '' // 后端返回的字段没有code，要手动加上以存储运行的代码

src/config/index.js

@@ -4,13 +4,15 @@ const url = location.host
 const isDev = process.env.NODE_ENV === 'development' //是否本地
 const isHh = url.includes('10.196.131.73') //是否是河海版本
 const isPro = url.includes('occupationlab.com') //是否职站生产
+const isZxy = url.includes('izhixinyun.com') //是否智信云
 
 let host = location.origin + '/'
 let bankPath = `${location.origin}/banksystem` // 银行系统
 // 121.37.12.51 | 192.168.31.151
 if (isDev) {
-  host = 'http://192.168.31.151:9000/'
-  host = 'http://121.37.12.51:9000/'
+  host = 'http://192.168.31.51:9000/'
+  // host = 'http://121.37.12.51:9000/'
+  // host = 'http://192.168.31.116:9000/'
   bankPath = `http://${location.hostname}:8093`
 } else if (isPro) {
   host = 'https://occupationlab.com/'
@@ -34,6 +36,10 @@ export default {
       * @description 是否是职站生产
       */
     isPro,
+    /**
+      * @description 是否智信云
+      */
+    isZxy,
     /**
      * @description 系统主题色
      * 如果有多个systemId，则显示系统7的主题色

src/main.js

@@ -29,6 +29,8 @@ if (systemId.includes(',')) {
     import('@/styles/theme/theme13.scss')
   } else if (systemId == 14) {
     import('@/styles/theme/theme14.scss')
+  } else if (systemId == 15) {
+    import('@/styles/theme/theme13.scss')
   }
 }
 import api from './api';

src/views/Data.vue

@@ -73,7 +73,7 @@
                 <el-main style="padding-top: 0;padding-bottom: 0;">
                     <el-card shadow="hover">
                         <el-input style="width: 250px;margin-bottom: 15px;" placeholder="请输入表名称" v-model="keywordTable" suffix-icon="el-icon-search" clearable size="small"></el-input>
-                        <el-table :data="tables" class="cus-table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange">
+                        <el-table v-loading="tableLoading" :data="tables" class="cus-table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange">
                           <el-table-column width="40" align="center">
                             <template slot-scope="scope">
                               <el-radio class="check-table" v-model="curTable" :label="scope.row.id"></el-radio>
@@ -159,6 +159,8 @@ export default {
           curExpand: '',
           submited: false,
           tables: [],
+          tableLoading: false,
+          deepId: '',
           keywordTable: '',
           pageTable: 1,
           pageSizeTable: 10,
@@ -300,7 +302,13 @@ export default {
           this.importTypeList = data
           this.importLoading = false
           if (data.length) {
+            this.defaultTypeActive = [data[0].id] // 默认展开第一个分类
             this.importVisible = true
+            this.getDeepestId(data)
+            this.$nextTick(() => {
+              this.$refs.typeTree.setCurrentKey(this.deepId) // 默认选中第一个分类下的最深层级
+              this.getTable()
+            })
           } else {
             this.buyVisible = true
             // this.$message.error('当前院校暂未购买该数据库，请购买后再尝试')
@@ -309,9 +317,21 @@ export default {
           this.importLoading = false
         })
       },
+      // 查找第一个分类下最深层级的id
+      getDeepestId(data) {
+        for (const e of data) {
+          if (e.children.length) {
+            this.getDeepestId(e.children)
+          } else if (!this.deepId) {
+            this.deepId = e.id
+            break
+          }
+        }
+      },
       // 分类点击回调
       typeClick() {
         this.keywordTable = ''
+        this.tableLoading = true
         this.getTable()
       },
       // 查询分类下的表
@@ -330,9 +350,12 @@ export default {
                   e.timeRange = e.endTime
               }
           })
+          this.tableLoading = false
           this.tables = list
           this.totalTable = data.total
-        }).catch(res => {})
+        }).catch(res => {
+          this.tableLoading = false
+        })
       },
       // 重置表分页
       initTable() {

src/views/Home.vue

@@ -173,7 +173,7 @@ export default {
         `http://${location.hostname}:8082/#/` :
         `${location.origin}${this.fromManager ?
           '/admin' :
-          this.$config.isPro ?
+          (this.$config.isPro || this.$config.isZxy) ?
             '' :
             '/student'}/#/`
       // 考核