merge test

Reviewed-on: #167

.env.dev

@@ -16,7 +16,7 @@ VUE_APP_TITLE = MES系统
 
 # VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 
-# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
+VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
@@ -28,7 +28,7 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 
 
-VUE_APP_BASE_API = 'http://100.64.0.23:48082'
+# VUE_APP_BASE_API = 'http://100.64.0.23:48082'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 

.env.stage

@@ -12,7 +12,7 @@ VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://192.168.0.33:8889/'
+PUBLIC_PATH = ''
 
 # 二级部署路径
 # VUE_APP_APP_NAME ='yudao-admin'

src/views/OperationalOverview/AGVBoard.vue

@@ -12,7 +12,7 @@
       lineHeight: 88 + 'px',
       fontSize: 31 + 'px'
     }">
-      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
+      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
       许昌安彩AGV原片周转看板
       <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
       <h3 class="time">{{ times }}</h3>

src/views/OperationalOverview/coldBoard.vue

@@ -12,7 +12,7 @@
       lineHeight: 88 + 'px',
       fontSize: 31 + 'px'
     }">
-      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
+      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
       许昌安彩冷端看板
       <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
       <h3 class="time">{{ times }}</h3>
@@ -30,7 +30,7 @@
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
           <base-container :title="'切割数据'" :title-icon="'eqAlarm'">
-            <base-table1 :page="1" :limit="9" :show-index="false" :table-config="cutProps"
+            <base-table1 :page="page1" :limit="9" :show-index="false" :table-config="cutProps"
               :table-data="cutTableDataList" />
           </base-container>
         </el-col>
@@ -48,7 +48,7 @@
 
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8">
           <base-container :title="'ISRA 缺陷数据'" :title-icon="'eqMonitoring'">
-            <base-table1 :page="1" :limit="9" :show-index="false" :table-config="ISRATableProps"
+            <base-table1 :page="page2" :limit="9" :show-index="false" :table-config="ISRATableProps"
               :table-data="ISRAList" />
           </base-container>
         </el-col>
@@ -84,15 +84,15 @@
             </div> -->
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
             <el-col :span="6">
-              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringPropsFun"
+              <base-table1 :page="page3" :limit="9" :show-index="false" :table-config="EqMonitoringPropsFun"
                 :table-data="funList" />
             </el-col>
             <el-col :span="6">
-              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringPropsFun"
+              <base-table1 :page="page4" :limit="9" :show-index="false" :table-config="EqMonitoringPropsFun"
                 :table-data="annealFunList" />
             </el-col>
             <el-col :span="12" style="float: right;">
-              <base-table1 :page="1" :limit="9" :show-index="false" :table-config="EqMonitoringProps"
+              <base-table1 :page="page5" :limit="9" :show-index="false" :table-config="EqMonitoringProps"
                 :table-data="realEqList" />
             </el-col>
             <!-- <double-y-chart :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList" :height="359"
@@ -127,6 +127,7 @@ import TopRadioGroup from './components/topRadioGroup'
 // import pieChart3 from './components/PieChart'
 // import { mapGetters } from 'vuex'
 import screenfull from 'screenfull'
+import moment from "moment"
 // import BaseVideo from './components/baseVideo.vue'
 import alarmLevel from './components/alarmLevel'
 import pileBarChart from './components/pileBarChart'
@@ -136,7 +137,7 @@ import doubleYChart from './components/doubleYChart '
 // import elementResizeDetectorMaker from 'element-resize-detector';
 // var erd = elementResizeDetectorMaker(); //创建实例
 // let resizeFun = null
-import { parseTime } from '../core/mixins/code-filter';
+import { parseTime } from '../core/mixins/code-filter'
 
 
 import LinearBarChart from './components/linearBarChart'
@@ -163,10 +164,7 @@ const EqMonitoringProps = [
 ]
 const cutProps = [
   { prop: 'lineName', label: '产线', width: 50 },
-  {
-    prop: 'time', label: '时间',
-    filter: parseTime
-  },
+  { prop: 'time', label: '时间' },
   { prop: 'size', label: '规格' },
   { prop: 'productArea', label: '良品面积', width: 80 },
   { prop: 'wasteArea', label: '废片面积', width: 80 },
@@ -234,6 +232,13 @@ const ISRATableProps = [
     label: '占比'
   }
 ]
+
+let pageFun1 = null
+let pageFun2 = null
+let pageFun3 = null
+let pageFun4 = null
+let pageFun5 = null
+
 export default {
   name: 'ProductionMonitoringCockpit',
   components: {
@@ -285,6 +290,20 @@ export default {
         equipmentId: null,
         productionLineId: null,
       },
+      page1: 1,
+      page2: 1,
+      page3: 1,
+      page4: 1,
+      page5: 1,
+      total1: 1,
+      total2: 1,
+      total3: 1,
+      total4: 1,
+      total5: 1,
+      firstContent1: false,
+      firstContent2: false,
+      firstContent3: false,
+      firstContent4: false
     }
   },
   computed: {
@@ -353,11 +372,16 @@ export default {
     //   // var height = element.offsetHeight;
     // });
   },
-  // beforeDestroy() {
-  //   //离开页面删除检测器和所有侦听器
-  //   // erd.uninstall(document); //这里用ref是因为vue离开页面后获取不到dom
-  //   removeEventListener('resize', resizeFun)
-  // },
+  beforeDestroy() {
+    //离开页面删除检测器和所有侦听器
+    // erd.uninstall(document); //这里用ref是因为vue离开页面后获取不到dom
+    // removeEventListener('resize', resizeFun)
+    clearInterval(pageFun1)
+    clearInterval(pageFun2)
+    clearInterval(pageFun3)
+    clearInterval(pageFun4)
+    clearInterval(pageFun5)
+  },
   methods: {
     getList() {
       // this.loading = true;
@@ -379,6 +403,14 @@ export default {
         this.queryParams
       ).then((res) => {
         this.realEqList = res.data.list;
+        this.total5 = Math.ceil(res.data.list.length / 9)
+        setInterval(pageFun3 = () => {
+          if (this.page5 >= this.total5) {
+            this.page5 = 1
+          } else {
+            this.page5 += 1
+          }
+        }, 30000)
         // this.total = response.data.total;
         // this.loading = false;
       });
@@ -486,6 +518,20 @@ export default {
           })
         }
         this.annealFunList = arr
+        this.total4 = Math.ceil(arr.length / 9)
+        if ( this.page4 >= this.total4) {
+          this.page4 = 1
+        }
+        if (!this.firstContent4) {
+          setInterval(pageFun4 = () => {
+            if (this.page4 >= this.total4) {
+              this.page4 = 1
+            } else {
+              this.page4 += 1
+            }
+          }, 30000)
+          this.firstContent4 = true
+        }
       }
       if (this.funWsData.type === 'FanInfo') {
         let arr = []
@@ -496,6 +542,20 @@ export default {
           })
         }
         this.funList = arr
+        this.total3 = Math.ceil(arr.length / 9)
+        if ( this.page3 >= this.total3) {
+          this.page3 = 1
+        }
+        if (!this.firstContent3) {
+          setInterval(pageFun3 = () => {
+            if (this.page3 >= this.total3) {
+              this.page3 = 1
+            } else {
+              this.page3 += 1
+            }
+          }, 30000)
+          this.firstContent3 = true
+        }
       }
     },
     cutWebsocketOnOpen() {
@@ -515,7 +575,7 @@ export default {
           return {
             id: ele.id,
             lineName: ele.lineName,
-            time: ele.time,
+            time: moment(ele.time).format("MM-DD hh") + '时',
             size: ele.size,
             productArea: ele.productArea + '㎡',
             wasteArea: ele.wasteArea + '㎡',
@@ -524,6 +584,20 @@ export default {
           }
           // }
         });
+        this.total1 = Math.ceil(this.cutWsData?.productHourData?.length / 9)
+        if ( this.page1 >= this.total1) {
+          this.page1 = 1
+        }
+        if (!this.firstContent1) {
+          setInterval(pageFun1 = () => {
+            if (this.page1 >= this.total1) {
+              this.page1 = 1
+            } else {
+              this.page1 += 1
+            }
+          }, 30000)
+          this.firstContent1 = true
+        }
       } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
         let nameList = []
         let nameWasteList = []
@@ -572,6 +646,21 @@ export default {
           }
           // }
         });
+        
+        this.total2 = Math.ceil(this.SJGWsData?.detData?.length / 9)
+        if ( this.page2 >= this.total2) {
+          this.page2 = 1
+        }
+        if (!this.firstContent2) {
+          setInterval(pageFun2 = () => {
+            if (this.page2 >= this.total2) {
+              this.page2 = 1
+            } else {
+              this.page2 += 1
+            }
+          }, 30000)
+          this.firstContent2 = true
+        }
       }
     },
     windowWidth(value) {

src/views/OperationalOverview/processingBoard.vue

@@ -12,7 +12,7 @@
       lineHeight: 88 + 'px',
       fontSize: 31 + 'px'
     }">
-      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
+      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
       许昌安彩深加工看板
       <h3 class="unit">单位：河南汇融科技服务有限公司</h3>
       <h3 class="time">{{ times }}</h3>