.env.dev

@@ -13,24 +13,27 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://10.70.2.2:8080'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
+# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
 # VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-# socket地址
-VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+# dcs地址
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
+# socket地址
+# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 
+# VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 

.env.prod

@@ -16,9 +16,6 @@ VUE_APP_BASE_API = '/prod-api'
 
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
-# socket地址
-VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
-VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
 
 # 根据服务器或域名修改

.env.stage

@@ -14,8 +14,6 @@ VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
 
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
-# socket地址
-VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
 
 
 # 根据服务器或域名修改

public/index.html

@@ -8,10 +8,6 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 	<link rel="stylesheet" type="text/css" media="print" href="<%= BASE_URL %>print-lock.css">
 	<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-	<meta http-equiv="Expires" content="0">
-	<meta http-equiv="Pragma" content="no-cache">
-	<meta http-equiv="Cache-control" content="no-cache">
-	<meta http-equiv="Cache" content="no-cache">
 	<title>
 		<%= webpackConfig.name %>
 	</title>

src/layout/components/TagsView/index.vue

@@ -88,26 +88,23 @@ export default {
 		visitedViews(newVal, oldVal){
 			let num = 0
 			newVal && newVal.map(item => {
-				console.log(item)
 				if (item.path === '/databoard/kiln' || item.path === '/databoard/whole-plant' || item.path === '/databoard/deep-processing') {
 					num++
 				}
 			})
-			this.$nextTick(() => {
-				if (num > 0) {
-					if(!this.wsIsOpen) {
-						getDcsMsg()
-						this.wsIsOpen = true
-						console.log('开启websocket==========')
-					}
-				}else{
-					if (this.wsIsOpen) {
-						closeDcsMsg()
-						this.wsIsOpen = false
-						console.log('关闭============')
-					}
+			if (num > 0) {
+				if(!this.wsIsOpen) {
+					getDcsMsg()
+					this.wsIsOpen = true
+					console.log('开启websocket==========')
 				}
-			})
+			}else{
+				if (this.wsIsOpen) {
+					closeDcsMsg()
+					this.wsIsOpen = false
+					console.log('关闭============')
+				}
+			}
 		}
 	},
 	mounted() {

src/views/OperationalOverview/AGVBoard.vue

@@ -757,9 +757,6 @@ export default {
     this.init()
     this.getTimes()
     this.windowWidth(document.documentElement.clientWidth)
-    setTimeout(() => {
-      window.location.reload()
-    }, 86400000)
   },
   mounted() {
     const _this = this;

src/views/OperationalOverview/coldBoard.vue

@@ -394,9 +394,6 @@ export default {
     // this.fetchList('order-process')
     // this.fetchList('line-chart-data')
     this.init()
-    setTimeout(() => {
-      window.location.reload()
-    }, 86400000)
   },
   destroyed() {
     this.funInitWebSocket()

src/views/OperationalOverview/components/doubleYChart .vue

@@ -141,8 +141,7 @@ export default {
               }
             }
           },
-          // data: passRateList
-          data: []
+          data: passRateList
         }
       ]
       // const colors = ['#5470C6', '#91CC75', '#EE6666']

src/views/OperationalOverview/processingBoard.vue

@@ -610,9 +610,6 @@ export default {
     // this.fetchList('order-process')
     // this.fetchList('line-chart-data')
     this.init()
-    setTimeout(() => {
-      window.location.reload()
-    }, 86400000)
   },
   destroyed () {
     this.websocketClose()

src/views/bpm/processInstance/detail.vue

@@ -89,7 +89,7 @@
       <el-form ref="updateAssigneeForm" :model="updateAssignee.form" :rules="updateAssignee.rules" label-width="110px">
         <el-form-item label="新审批人" prop="assigneeUserId">
           <el-select v-model="updateAssignee.form.assigneeUserId" clearable style="width: 100%">
-            <el-option v-for="item in userOptions" :key="item.id" :label="item.nickname" :value="item.id" />
+            <el-option v-for="item in userOptions" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
           </el-select>
         </el-form-item>
       </el-form>

src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue

@@ -41,7 +41,7 @@
         </el-form-item>
         <el-form-item v-if="form.type === 10" label="指定角色" prop="roleIds">
           <el-select v-model="form.roleIds" multiple clearable style="width: 100%">
-            <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in roleOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.type === 20 || form.type === 21" label="指定部门" prop="deptIds">
@@ -50,17 +50,17 @@
         </el-form-item>
         <el-form-item v-if="form.type === 22" label="指定岗位" prop="postIds">
           <el-select v-model="form.postIds" multiple clearable style="width: 100%">
-            <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in postOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.type === 30 || form.type === 31 || form.type === 32" label="指定用户" prop="userIds">
           <el-select v-model="form.userIds" multiple clearable style="width: 100%">
-            <el-option v-for="item in userOptions" :key="item.id" :label="item.nickname" :value="item.id" />
+            <el-option v-for="item in userOptions" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.type === 40" label="指定用户组" prop="userGroupIds">
           <el-select v-model="form.userGroupIds" multiple clearable style="width: 100%">
-            <el-option v-for="item in userGroupOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-option v-for="item in userGroupOptions" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
           </el-select>
         </el-form-item>
         <el-form-item v-if="form.type === 50" label="指定脚本" prop="scripts">

src/views/mp/autoReply/index.vue

@@ -32,7 +32,7 @@ SOFTWARE.
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/draft/index.vue

@@ -33,7 +33,7 @@ SOFTWARE.
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/freePublish/index.vue

@@ -31,7 +31,7 @@ SOFTWARE.
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/material/index.vue

@@ -33,7 +33,7 @@ SOFTWARE.
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/menu/index.vue

@@ -32,7 +32,7 @@ SOFTWARE.
     <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/mp/message/index.vue

@@ -6,7 +6,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <!-- TODO 等待处理 -->

src/views/mp/statistics/index.vue

@@ -6,7 +6,7 @@
     <el-form ref="queryForm" size="small" :inline="true" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="accountId" @change="getSummary">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <el-form-item label="时间范围" prop="date">

src/views/mp/tag/index.vue

@@ -6,7 +6,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <el-form-item label="标签名称" prop="name">

src/views/mp/user/index.vue

@@ -6,7 +6,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公众号" prop="accountId">
         <el-select v-model="queryParams.accountId" placeholder="请选择公众号">
-          <el-option v-for="item in accounts" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in accounts" :key="parseInt(item.id)" :label="item.name" :value="parseInt(item.id)" />
         </el-select>
       </el-form-item>
       <el-form-item label="用户标识" prop="openid">

src/views/system/dept/index.vue

@@ -76,7 +76,7 @@
           <el-col :span="12">
             <el-form-item label="负责人" prop="leaderUserId">
               <el-select v-model="form.leaderUserId" placeholder="请输入负责人" clearable style="width: 100%">
-                <el-option v-for="item in users" :key="item.id" :label="item.nickname" :value="item.id" />
+                <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
               </el-select>
             </el-form-item>
           </el-col>

src/views/system/notify/template/index.vue

@@ -117,7 +117,7 @@
         </el-form-item>
         <el-form-item label="接收人" prop="userId">
           <el-select v-model="sendNotifyForm.userId" placeholder="请输入接收人" clearable style="width: 100%">
-            <el-option v-for="item in users" :key="item.id" :label="item.nickname" :value="item.id" />
+            <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
           </el-select>
         </el-form-item>
         <el-form-item v-for="param in sendNotifyForm.params" :key="param" :label="'参数 {' + param + '}'" :prop="'templateParams.' + param">

src/views/system/user/index.vue

@@ -415,9 +415,9 @@
 						<el-select v-model="form.roleIds" multiple placeholder="请选择">
 							<el-option
 								v-for="item in roleOptions"
-								:key="item.id"
+								:key="parseInt(item.id)"
 								:label="item.name"
-								:value="item.id"></el-option>
+								:value="parseInt(item.id)"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-form>