Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

src/App.vue

@@ -149,7 +149,6 @@ export default {
       isRouterAlive: true,
       queryDetailVisible: false,
       urlPath: window.CONFIG.urlPath,
-      paramsList: [],
       showList: [],
       takeoverInfo: ''
     }
@@ -174,8 +173,6 @@ export default {
     this.initWebSocket()
     this.initWebSocket2()
     this.getDateList()
-    let paramsList = JSON.parse(sessionStorage.getItem('paramsList'))
-    this.$store.dispatch('d2admin/paramsList/set', paramsList)
   },
   destroyed: function () {
     this.websocketclose()
@@ -199,7 +196,8 @@ export default {
       let webpath = ''
       //wsuri.substring(0, wsuri.indexOf(':'))
       if (wsuri != null && wsuri.indexOf(':') <= -1) {
-        webpath = 'ws://59.110.43.122:8091/websocket/1001'
+        // webpath = 'ws://59.110.43.122:8091/websocket/1001'
+        webpath = 'ws://10.20.72.31:8091/websocket/1001'
       } else {
         webpath =
           'ws:' +
@@ -230,7 +228,6 @@ export default {
       ) {
         var paramsInfo = JSON.parse(e.data)
         console.log('paramsInfo:', paramsInfo)
-        sessionStorage.setItem('paramsList', JSON.stringify(paramsInfo))
         this.$store.dispatch('d2admin/paramsList/set', paramsInfo)
       }
     },
@@ -256,7 +253,8 @@ export default {
       let webpath = ''
       //wsuri.substring(0, wsuri.indexOf(':'))
       if (wsuri != null && wsuri.indexOf(':') <= -1) {
-        webpath = 'ws://59.110.43.122:8091/websocket/1002'
+        // webpath = 'ws://59.110.43.122:8091/websocket/1002'
+        webpath = 'ws://10.20.72.31:8091/websocket/1002'
       } else {
         webpath =
           'ws:' +
@@ -420,13 +418,8 @@ export default {
           params: this.$http.adornParams({})
         }).then((data) => {
           if (data && data.code === 0) {
-            this.paramsList = data.bean
-            sessionStorage.setItem(
-              'paramsList',
-              JSON.stringify(this.paramsList)
-            )
-            console.log('paramsList:', this.paramsList)
-            this.$store.dispatch('d2admin/paramsList/set', this.paramsList)
+            console.log('paramsList:', data.bean)
+            this.$store.dispatch('d2admin/paramsList/set', data.bean)
           }
         })
       } else {

src/pages/login/page.vue

@@ -137,6 +137,7 @@ export default {
       this.captchaPath = this.$http.adornUrl(
         `/captcha.jpg?uuid=${this.formLogin.uuid}`
       )
+      this.$parent.getDateList()
     },
     /**
      * @description 接收选择一个用户快速登录的事件

src/pages/sys/commandlog/index.vue

@@ -4,7 +4,7 @@
         div(slot='content')
           div.tableCard()
               el-form( :inline="true" :model="dataForm" size="mini" @keyup.enter.native="getDataList()" )
-                  el-form-item( label="关键词:")
+                  el-form-item( label="指令内容:")
                       el-input(  v-model="dataForm.comMark" placeholder="" clearable)
                   el-form-item( label="指令类型:")
                       el-select( v-model="dataForm.comType" placeholder="请选择" clearable)
@@ -22,7 +22,7 @@
               font(v-if='data.scope.comSource == 2') 人工
             template(#comType='data' )
               font(v-if='data.scope.comType == 1') 自动
-              font(v-if='data.scope.comType == 2') 手动
+              font(v-if='data.scope.comType == 2') 人工
             template(#operation="data")
               el-button(type="text"  size="mini" @click="queryHandle(data.scope.id)") 详情
       el-footer.box_footer

src/pages/sys/commandlog/query-detail.vue

@@ -37,7 +37,7 @@
             </el-form-item>
             <el-form-item label='指令类型:' prop='comType'>
               <el-input v-if="dataForm.comType==1" value="自动" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.comType==2" value="手动" size="medium" readonly></el-input>
+              <el-input v-if="dataForm.comType==2" value="人工" size="medium" readonly></el-input>
             </el-form-item>
             <el-form-item label='指令来源:' prop='comSource'>
               <el-input v-if="dataForm.comSource==1" value="算法" size="medium" readonly></el-input>

src/plugin/axios/index.js

@@ -230,6 +230,7 @@ service.interceptors.response.use(
 					sessionStorage.removeItem('token')
 					sessionStorage.removeItem('uuid')
 					if (this) {
+            this.$parent.getDateList()
 						//清空接管提示框
 						this.$store.dispatch('d2admin/takeover/setTakeover', null)
 					}