From 41d8d512260c9977ad41df9dc68d147e412506ea Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Wed, 17 Nov 2021 11:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                     |  1 +
 src/layouts/header/index.vue         |  5 ++-
 src/pages/achievement/list/index.vue |  4 +-
 src/pages/assessment/list/index.vue  | 23 +++++++++--
 src/pages/project/add/index.vue      |  2 +-
 src/pages/project/list/index.vue     |  6 +--
 src/setting.js                       | 57 ++++++++++++++--------------
 7 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 245c3ed..b37ccc9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,6 +1,7 @@
 import Setting from '@/setting'
 // let host = 'http://192.168.31.125:9090'//林
 // let host = 'http://192.168.31.152:9090'//榕
+
 let host = Setting.apiBaseURL
 let uploadURL = Setting.upload.apiURL
 let host1 = 'http://39.108.250.202:8080/'
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 13f2744..f38093c 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -1,8 +1,9 @@
 <template>
     <div class="header">
         <img class="logo hh" v-if="isHh" src="@/assets/img/logo-hh.png" />
-        <img class="logo" v-else src="@/assets/img/logo.png" />
-        <div class="action">
+        <div class='logo'></div>
+<!--        <img class="logo" v-else src="@/assets/img/logo.png" />-->
+        <div class="action" style='float: right'>
             <div class="user" @click="toPersonal">
                 <el-avatar :size="40" :src="avatar"></el-avatar>
                 <span class="m-l-10">{{userName}}</span>
diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue
index 21f1a99..621e5b8 100644
--- a/src/pages/achievement/list/index.vue
+++ b/src/pages/achievement/list/index.vue
@@ -79,7 +79,7 @@ export default {
     name: 'achievement',
     data() {
         return {
-            systemId: '',
+            systemId: 8,
             systemList: Setting.systemList,
             projectPermissions: this.$route.query.per ? Number(this.$route.query.per) : 0,
             keyword: '',
@@ -155,7 +155,7 @@ export default {
         }
     },
     mounted() {
-        this.systemId = this.lastSystemId ? this.lastSystemId : Setting.systemId
+        // this.systemId = this.lastSystemId ? this.lastSystemId : Setting.systemId
         this.getData()
     },
     methods: {
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index fc3ce3d..23b81c6 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -257,7 +257,7 @@ export default {
     },
     mounted() {
         this.getData()
-        this.timer = setInterval(this.getData,1000)
+        // this.timer = setInterval(this.getData,1000)
         this.$once('hook:beforeDestroy',() => {
             clearInterval(this.timer)
         })
@@ -295,10 +295,26 @@ export default {
         show(row){
             this.$router.push(`/achievement/ass?systemId=${this.systemId}&id=${row.id}&projectId=${row.projectId}&name=${row.projectName}&experimentalName=${row.experimentalName}&class=${row.experimentalClassName}`)
         },
+        timestampToTime(timestamp) {
+            var chinaStandard= timestamp;
+            var date = new Date(chinaStandard);
+            var y = date.getFullYear();
+            var m = date.getMonth() + 1;
+            m = m < 10 ? ('0' + m) : m;
+            var d = date.getDate();
+            d = d < 10 ? ('0' + d) : d;
+            var h = date.getHours();
+            var minute = date.getMinutes();
+            minute = minute < 10 ? ('0' + minute) : minute;
+            var second = date.getSeconds();
+            second = second < 10 ? ('0' + second) : second;
+            return y + '-' + m + '-' + d+' '+h+':'+minute+ ':' + second;
+        },
         start(row){
+            let time = new Date()
             let data = {
                 id: row.id,
-                startTime: this.formatDate("yyyy-MM-dd hh:mm:ss",new Date()),
+                startTime: this.timestampToTime(time),
                 status: 2
             }
             this.$post(this.api.expUpdate,data).then(res => {
@@ -313,9 +329,10 @@ export default {
                 type: 'warning'
             })
             .then(() => {
+                let time = new Date()
                 let data = {
                     id: row.id,
-                    stopTime: this.formatDate("yyyy-MM-dd hh:mm:ss",new Date()),
+                    stopTime: this.timestampToTime(time),
                     status: 3
                 }
                 this.$post(this.api.expUpdate,data).then(res => {
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index b0c777d..13bbf24 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -281,7 +281,7 @@ export default {
             systemList: Setting.systemList,
             token: btoa(util.local.get(Setting.tokenKey)),
             userIdEd: this.userId,
-            systemId: this.$store.state.project.lastSystemId,
+            systemId: 8,
             isDetail: Boolean(this.$route.query.show),
             roleIdEd: this.roleId,
             newroleArray: [],
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index aaffeaa..7d5791b 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -113,7 +113,7 @@ export default {
         return {
             showBack: JSON.stringify(this.assFields) == '{}' ? false : true,
             roleIdEd: this.roleId ? 13 : this.roleId,// 管理员的roleId是13，老师的roleId是14，1个用户也可能是两个角色，就是13,14，当一个用户是两个角色的话，就取权重大的一个，就是管理员，即13.管理员>老师
-            systemId: '',
+            systemId: 8,
             systemList: Setting.systemList,
             queryData: {
                 projectPermissions: "",
@@ -202,8 +202,8 @@ export default {
         }
     },
     mounted() {
-        this.systemId = this.lastSystemId ? this.lastSystemId : Setting.systemId
-        console.log(this.systemId,'外面的sysid');
+        // this.systemId = this.lastSystemId ? this.lastSystemId : Setting.systemId
+        // console.log(this.systemId,'外面的sysid');
         this.getData()
     },
     methods: {
diff --git a/src/setting.js b/src/setting.js
index 999e5dc..e1eff1d 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -5,7 +5,7 @@
 const isDev = process.env.NODE_ENV === 'development'
 const url = location.host
 const isHh = url.includes('10.196.131.73') //是否是河海版本
-const isBeta = isDev || url.includes('120.78.198.231') //是否是职站测试(本地亦调用测试服接口)
+const isBeta = isDev || url.includes('124.71.12.62') //是否是巢湖测试(本地亦调用测试服接口)
 
 const Setting = {
     
@@ -13,17 +13,17 @@ const Setting = {
      * 基础配置
      * */
     // 网页标题的后缀
-    titleSuffix: isHh ? '教师管理端' : '职站服务端管理系统',
+    titleSuffix: isHh ? '教师管理端' : '教师管理端',
     // 路由模式，可选值为 history 或 hash
     routerMode: 'hash',
     // 页面切换时，是否显示模拟的进度条
     showProgressBar: true,
     // 接口请求地址
-    apiBaseURL: (isDev || url.includes('120.78.198.231')) ? 'http://120.78.198.231/' : (url.includes('10.196.131.73') ? 'http://10.196.131.73/' : 'http://www.occupationlab.com/'),
+    apiBaseURL: (isDev || url.includes('124.71.12.62')) ? 'http://124.71.12.62/' : (url.includes('10.196.131.73') ? 'http://10.196.131.73/' : 'http://www.occupationlab.com/'),
     // 是否是河海版本
     isHh,
     // 学校id,河海为729,职站为2105
-    schoolId: isHh ? 729 : 2105,
+    schoolId: isHh ? 729 : 1006,
     // 默认系统id
     systemId: 1,
     // 子系统列表.改的时候留意要改的是哪个环境,别影响到了其他环境
@@ -45,8 +45,8 @@ const Setting = {
         id: 8,
         label: '大数据分析实验教学系统'
     }] : (isBeta ? [{
-        id: 1,
-        label: 'Python程序设计教学系统'
+        id: 8,
+        label: '大数据分析实验教学系统'
     }
     // 下面这两个是川大和科大子系统,目前没有在职站开启,只有在科大川大才会开放对应的子系统
     // ,{
@@ -56,28 +56,29 @@ const Setting = {
     //     id: 3,
     //     label: '期权期货系统'
     // }
-    ,{
-        id: 4,
-        label: '经济金融建模实验教学系统'
-    },{
-        id: 5,
-        label: 'Python可视化实验教学系统'
-    },{
-        id: 6,
-        label: '金融随机过程实验教学系统'
-    },{
-        id: 7,
-        label: '量化投资策略建模实验教学系统'
-    },{
-        id: 8,
-        label: '大数据分析实验教学系统'
-    },{
-        id: 9,
-        label: 'Python数据清洗教学实验系统'
-    },{
-        id: 10,
-        label: 'Python数据采集（爬虫）教学实验系统'
-    }] : [{
+    // ,{
+    //     id: 4,
+    //     label: '经济金融建模实验教学系统'
+    // },{
+    //     id: 5,
+    //     label: 'Python可视化实验教学系统'
+    // },{
+    //     id: 6,
+    //     label: '金融随机过程实验教学系统'
+    // },{
+    //     id: 7,
+    //     label: '量化投资策略建模实验教学系统'
+    // },{
+    //     id: 8,
+    //     label: '大数据分析实验教学系统'
+    // },{
+    //     id: 9,
+    //     label: 'Python数据清洗教学实验系统'
+    // },{
+    //     id: 10,
+    //     label: 'Python数据采集（爬虫）教学实验系统'
+    // }
+    ] : [{
         id: 1,
         label: 'Python程序设计教学系统'
     },{