Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-vis into test

src/views/bpm/vis-page/equipmentOperation.vue

@@ -73,7 +73,7 @@
           <div class="table"> </div>
           <dv-scroll-board
             v-if="isFlag"
-            :config="getSalesFinishList('xdjList')"
+            :config="xdjListConfig"
             style="width: 90%; height: 87%; transform: translate(5%, 1%)"
           />
         </div>
@@ -87,7 +87,7 @@
           <div class="table"> </div>
           <dv-scroll-board
             v-if="isFlag"
-            :config="getSalesFinishList('byList')"
+            :config="byListConfig"
             style="width: 90%; height: 87%; transform: translate(5%, 1%)"
           />
         </div>
@@ -105,7 +105,7 @@
           <div class="table"> </div>
           <dv-scroll-board
             v-if="isFlag"
-            :config="getSalesFinishList('gzwxList')"
+            :config="gzwxListConfig"
             style="width: 90%; height: 87%; transform: translate(5%, 1%)"
           />
         </div>
@@ -121,7 +121,7 @@
           <div class="table"> </div>
           <dv-scroll-board
             v-if="isFlag"
-            :config="getSalesFinishList('jhwxList')"
+            :config="jhwxListConfig"
             style="width: 90%; height: 87%; transform: translate(5%, 1%)"
           />
         </div>
@@ -157,39 +157,35 @@
                 `<div style="color: #0577FF;font-size: 1.3rem;font-weight: bold">${item}</div>`
             ),
             data:
-              this.totalData[key].map((item) => {
+              this.totalData[key]?.map((item) => {
                 let list = [];
                 for (let i in item) {
                   let div = '';
                   if (i === 'workOrderNo') {
-                    div = `<div class="white" style="font-size: 1.3rem;">${item[i]}</div>`;
+                    div = `<div class="white ellipsis" style="font-size: 1.3rem;" title='${item[i]}'>${item[i]}</div>`;
                     list[0] = div;
                   }
-                  if (i === 'repairUserName') {
-                    div = `<div class="white" style="font-size: 1.3rem;">${item[i]}</div>`;
+                  if (i === 'deviceName') {
+                    div = `<div class="white ellipsis" style="font-size: 1.3rem;" title='${item[i]}'>${item[i]}</div>`;
                     list[1] = div;
                   }
-                  if (i === 'delayTime') {
+                  if (i === 'repairUserName') {
                     div = `<div class="white" style="font-size: 1.3rem;">${item[i]}</div>`;
-                    list[3] = div;
+                    list[2] = div;
                   }
                   if (i === 'orderStatusString') {
                     div = `<div class="${this.getColor(
                       item[i]
                     )}" style="font-size: 1.3rem;">${item[i]}</div>`;
-                    list[2] = div;
+                    list[3] = div;
+                  }
+                  if (i === 'delayTime') {
+                    div = `<div class="white" style="font-size: 1.3rem;">${item[i]}</div>`;
+                    list[4] = div;
                   }
                 }
                 return list;
-              }) ?? [],
-            align: ['center', 'center', 'center', 'center', 'center', 'center'],
-            headerBGC: '#031d42',
-            columnWidth: [140, 250, 130, 200],
-            headerHeight: 30,
-            oddRowBGC: '#031d42',
-            evenRowBGC: '#031d42',
-            waitTime: 5000,
-            rowNum: 8
+              }) ?? []
           };
         };
       }
@@ -292,11 +288,26 @@
         WeightStorageTotal: 0,
         salesChart: null,
         outputChart: null,
-        tableHeader: ['工单号', '负责人', '状态', '响应时间']
+        tableHeader: ['工单号', '设备名称', '负责人', '状态', '响应时间'],
+        config: {
+          align: ['center', 'center', 'center', 'center', 'center', 'center'],
+          headerBGC: '#031d42',
+          columnWidth: [220, 250, 150, 100, 200],
+          headerHeight: 30,
+          oddRowBGC: '#031d42',
+          evenRowBGC: '#031d42',
+          waitTime: 5000,
+          rowNum: 8
+        },
+        xdjListConfig: {},
+        byListConfig: {},
+        gzwxListConfig: {},
+        jhwxListConfig: {}
       };
     },
     created() {
       // window.isFullscreen = false
+
       this.updateTimer = setInterval(this.updateTime, 1000);
     },
     mounted() {
@@ -306,7 +317,24 @@
       // }, 3600000);
       screenSubstanceGroupQuery().then((data) => {
         this.totalData = data;
-        // this.getSalesFinishList()
+
+        this.xdjListConfig = {
+          ...this.config,
+          ...this.getSalesFinishList('xdjList')
+        };
+        this.byListConfig = {
+          ...this.config,
+          ...this.getSalesFinishList('byList')
+        };
+        this.gzwxListConfig = {
+          ...this.config,
+          ...this.getSalesFinishList('gzwxList')
+        };
+        this.jhwxListConfig = {
+          ...this.config,
+          ...this.getSalesFinishList('jhwxList')
+        };
+        // { ..., ...config }
       });
     },
     methods: {
@@ -552,4 +580,9 @@
   .row-item {
     margin-bottom: 0.3rem;
   }
+  .ellipsis {
+    white-space: nowrap; /* 禁止换行 */
+    overflow: hidden; /* 隐藏溢出内容 */
+    text-overflow: ellipsis; /* 显示省略号 */
+  }
 </style>

src/views/bpm/vis-page/productionSchedule.vue

@@ -214,7 +214,7 @@
         outputChart: null,
         borderData: [
           {
-            titleName: '工单数量',
+            titleName: '生产总数',
             titleUnit: '',
             value: '0',
           },
@@ -237,7 +237,7 @@
           {
             titleName: '合格率',
             titleUnit: '',
-            value: '0%',
+            value: '100%',
           }
         ],
         monthlySalesVolumeOption: {
@@ -429,14 +429,14 @@
       async getAllAmount() {
         let rest = await count({factoriesId: 0});
         this.borderData.forEach(async (item) => {
-          if (item.titleName === '工单数量') {
-            item.value = rest.inProductCount;
+          if (item.titleName === '生产总数') {
+            item.value = rest.formingNum || 0;
           } else if (item.titleName === '待生产数量') {
-            item.value = rest.planCount;
+            item.value = rest.pendingProductionCount || 0;
           } else if (item.titleName === '已完成数量') {
-            item.value = rest.formedWeight;
+            item.value = rest.formedNum || 0; 
           } else if (item.titleName === '合格率') {
-            item.value = rest.qualifiedRate + '%';
+            item.value = rest.qualifiedRate + '%' || '100%';
           }
         });
         console.log(rest, 'rest');