Merge pull request '更新ERP' (#96) from zwq into develop

Reviewed-on: #96

dist/static/css/chunk-1906682e.a283ee15.css

@@ -1 +0,0 @@
-.app-container[data-v-6d6503bb]{width:100%;height:200px}.waring[data-v-6d6503bb]{padding:5px;border-radius:5px;background-color:#f56c6c;color:#fff}.normal[data-v-6d6503bb]{padding:5px;border-radius:5px;background-color:#67c23a;color:#fff}.btn-container[data-v-2ecdfc10]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:wrap;flex-wrap:wrap}.btndiv[data-v-2ecdfc10]{width:20%;height:100px;margin:auto}.box-card[data-v-2ecdfc10]{background-color:#3e8ef7;margin:10px;color:#fff}

dist/static/css/chunk-6baaba7a.00659001.css

@@ -0,0 +1 @@
+.app-container[data-v-7174c48c]{width:100%;height:200px}.waring[data-v-7174c48c]{padding:5px;border-radius:5px;background-color:#f56c6c;color:#fff}.normal[data-v-7174c48c]{padding:5px;border-radius:5px;background-color:#67c23a;color:#fff}

dist/static/css/chunk-716be8db.a21c6bda.css

@@ -1 +0,0 @@
-.app-container[data-v-6d6503bb]{width:100%;height:200px}.waring[data-v-6d6503bb]{padding:5px;border-radius:5px;background-color:#f56c6c;color:#fff}.normal[data-v-6d6503bb]{padding:5px;border-radius:5px;background-color:#67c23a;color:#fff}

dist/static/css/chunk-bdbfc1f4.71948977.css

@@ -0,0 +1 @@
+.app-container[data-v-7174c48c]{width:100%;height:200px}.waring[data-v-7174c48c]{padding:5px;border-radius:5px;background-color:#f56c6c;color:#fff}.normal[data-v-7174c48c]{padding:5px;border-radius:5px;background-color:#67c23a;color:#fff}.btn-container[data-v-692993ed]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:wrap;flex-wrap:wrap}.btndiv[data-v-692993ed]{width:20%;height:100px;margin:auto}.box-card[data-v-692993ed]{background-color:#3e8ef7;margin:10px;color:#fff}

src/api/00a-spc.js

@@ -228,3 +228,10 @@ export function sendReportLinkedEventAndVid() {
     method: 'post'
   })
 }
+
+export function sendSecsGemSetting() {
+  return request({
+    url: '/cigs-00a/IL1testcontroller/post/sendSecsGemSetting',
+    method: 'post'
+  })
+}

src/views/00a-spc/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-07-21 15:07:28
+ * @LastEditTime: 2022-07-29 09:50:35
  * @Description:
 -->
 <template>
@@ -52,31 +52,31 @@ export default {
   data() {
     return {
       btnList: [
-        'AlarmCleared',
+        'EquipmentOffline',
-        'AlarmDetected',
-        'CompleteProcessFlow',
         'ControlStateLocal',
         'ControlStateRemote',
-        'E10StateChanged',
+        'AlarmDetected',
-        'EmptyCassettereport',
+        'AlarmCleared',
-        'EquipmentOffline',
-        'MaintenancePlan',
-        'MaintenanceRecord',
-        'MaterialReceived',
-        'MaterialRemoved',
-        'OKsubstratereport',
-        'PowerConsumption',
-        'ProcessingCompleted',
-        'ProcessingStarted',
-        'ProcessingStopped',
-        'QCPChange',
-        'RepairRecord',
-        'Scrapsubstratereport',
-        'ShuttleMovementFinished',
-        'ShuttleMovementStart',
         'SpoolTransmitFailure',
         'SpoolingActivated',
-        'SpoolingDeactivated'
+        'SpoolingDeactivated',
+        'ProcessingStarted',
+        'ProcessingCompleted',
+        'ProcessingStopped',
+        'MaterialReceived',
+        'MaterialRemoved',
+        'E10StateChanged',
+        'CompleteProcessFlow',
+        'MaintenancePlan',
+        'MaintenanceRecord',
+        'RepairRecord',
+        'ShuttleMovementStart',
+        'ShuttleMovementFinished',
+        'QCPChange',
+        'PowerConsumption',
+        'OKsubstratereport',
+        'Scrapsubstratereport',
+        'EmptyCassettereport'
       ]
     }
   },

src/views/00a-spc/spcControl.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-07-22 16:34:32
+ * @LastEditTime: 2022-07-29 16:01:24
  * @Description:
 -->
 <template>
@@ -17,16 +17,12 @@
       >
         <el-col :span="4">
           <el-form-item label="communication状态" prop="communicationState" required>
-            <el-switch
+            <span :class="dataForm.communicationState === 0? 'waring' : 'normal'">{{ dataForm.communicationState === 0? 'off' : 'on' }}</span>
-              v-model="dataForm.communicationState"
+            <el-button type="primary" size="mini" @click="switchChange()">控制</el-button>
-              :active-value="1"
-              :inactive-value="0"
-              @change="switchChange()"
-            />
           </el-form-item>
           <div v-show="communicationShow">Result ={{ communicationStatus }}</div>
         </el-col>
-        <el-col :span="6" :offset="1">
+        <el-col v-if="false" :span="6" :offset="1">
           <el-form-item label="eqpState" prop="eqpState">
             <el-select v-model="dataForm.eqpState" placeholder="请选择下拉选择" clearable @change="eqpStateChange">
               <el-option
@@ -49,12 +45,15 @@
                 :value="item.value"
               />
             </el-select>
-            <span :class="dataForm.controllerState === 1? 'waring' : 'normal'">{{ controllerInfo }}</span>
+            <span :class="controllerInfo === 'offline'? 'waring' : 'normal'">{{ controllerInfo }}</span>
             <div v-show="controllerStatusShow">Result ={{ controllerStatus }}</div>
           </el-form-item>
         </el-col>
       </el-form>
-      <el-col :span="3">
+      <el-col :span="3" :offset="2">
+        <el-button type="primary" @click="sendSecsGemSetting()">Setting</el-button>
+      </el-col>
+      <el-col v-if="false" :span="3">
         <el-button type="primary" @click="sendReportLinkedEventAndVid()"> ReportLinkedEventAndVid </el-button>
       </el-col>
     </el-row>
@@ -68,7 +67,8 @@ import {
   getcontrollerState,
   sendEqpState,
   sendControllerState,
-  sendReportLinkedEventAndVid
+  sendReportLinkedEventAndVid,
+  sendSecsGemSetting
 } from '@/api/00a-spc'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -126,8 +126,11 @@ export default {
         'label': 'offline',
         'value': 1
       }, {
-        'label': 'online',
+        'label': 'local',
         'value': 2
+      }, {
+        'label': 'remote',
+        'value': 3
       }],
       websock: '',
       url: '',
@@ -151,7 +154,8 @@ export default {
   methods: {
     switchChange() {
       this.communicationShow = false
-      DisableEnableCommunication(this.dataForm.communicationState).then(response => {
+      const cState = this.dataForm.communicationState ? 0 : 1
+      DisableEnableCommunication(cState).then(response => {
         this.$message({
           message: this.$t('module.basicData.visual.success'),
           type: 'success',
@@ -182,14 +186,16 @@ export default {
     getState() {
       getcontrollerState().then(res => {
         if (res.data.controllerState === 1) {
+          this.dataForm.controllerState = 1
           this.controllerInfo = 'offline'
         } else if (res.data.eqpState === 4) {
+          this.dataForm.controllerState = 2
           this.controllerInfo = 'local'
         } else if (res.data.eqpState === 5) {
+          this.dataForm.controllerState = 3
           this.controllerInfo = 'remote'
         }
         this.dataForm.eqpState = res.data.eqpState
-        this.dataForm.controllerState = res.data.controllerState
       })
     },
     sendReportLinkedEventAndVid() {
@@ -201,9 +207,18 @@ export default {
         })
       })
     },
+    sendSecsGemSetting() {
+      sendSecsGemSetting().then(response => {
+        this.$message({
+          message: this.$t('module.basicData.visual.success'),
+          type: 'success',
+          duration: 1500
+        })
+      })
+    },
     initWebSocket() {
       // 初始化weosocket
-      const path = `ws://${this.url}/opcua/websocket/1`
+      const path = `ws://${this.url}/opcua/websocket/${Math.round(Math.random() * 100)}`
       this.websock = new WebSocket(path)
       this.websock.onmessage = this.websocketonmessage
       this.websock.onopen = this.websocketonopen
@@ -221,24 +236,27 @@ export default {
     websocketonmessage(e) {
       // 数据接收
       this.wbData = JSON.parse(e.data)
-      if (this.wbData.eqpResult) {
+      console.log(this.wbData)
-        this.eqpStatus = this.wbData.eqpResult
+      if (this.wbData.controllerState) {
-        this.dataForm.eqpState = parseInt(this.wbData.eqpState)
-        this.eqpStatusShow = true
-      } else if (this.wbData.vidResult) {
         this.controllerStatus = this.wbData.vidResult
-        this.dataForm.controllerState = parseInt(this.wbData.controllerState)
         if (this.wbData.controllerState === '1') {
+          this.dataForm.controllerState = 1
           this.controllerInfo = 'offline'
         } else if (this.wbData.eqpState === '4') {
+          this.dataForm.controllerState = 2
           this.controllerInfo = 'local'
         } else if (this.wbData.eqpState === '5') {
+          this.dataForm.controllerState = 3
           this.controllerInfo = 'remote'
         }
         this.controllerStatusShow = true
+      } else if (this.wbData.eqpState) {
+        this.eqpStatus = this.wbData.eqpResult
+        this.dataForm.eqpState = parseInt(this.wbData.eqpState)
+        this.eqpStatusShow = true
       } else {
         this.communicationStatus = this.wbData.communicationResult
-        this.dataForm.communicationState = parseInt(this.wbData.communicationState)
+        this.dataForm.communicationState = parseInt(this.wbData.connectState)
         this.communicationShow = true
       }
     },