.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-04-03 11:22:19
+ # @LastEditTime: 2024-04-01 08:31:57
- # @LastEditors: DY
+ # @LastEditors: zhp
  # @Description:
 ###
 # 开发环境配置
@@ -18,7 +18,7 @@ VUE_APP_TITLE = MES系统
 # 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.173:9001'
+# VUE_APP_BASE_API = 'http://192.168.4.173:48082'
 # 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.1.62:48082'

src/mixins/lb/tableHeightMixin.js

@@ -5,7 +5,6 @@ export default {
 		};
 	},
 	created() {
-		this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
 		window.addEventListener('resize', this._setTableHeight);
 	},
 	destroyed() {
@@ -13,8 +12,7 @@ export default {
 	},
 	methods: {
 		_setTableHeight() {
-			this.tableH = this?.heightNum ? this.tableHeight(this.heightNum) : this.tableHeight(260);
+			this.tableH = this.tableHeight(260);
-			// this.tableH = this.tableHeight(260);
 		},
 	},
 };

src/views/OperationalOverview/AGVBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-03 10:54:53
+ * @LastEditTime: 2024-03-29 16:49:00
  * @Description:
 -->
 <template>
@@ -34,7 +34,7 @@
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
           <base-container :beilv="1" :size="'eqStatus'" :title="'周转进度'" :title-icon="'order'" :back="'energy'">
             <div class="order" style="width:100%; overflow: hidden scroll;height: 350px;">
-              <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: .5em">
+              <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: 1em">
                 <!-- <p v-if="op.outRate === 1" class="now-secondary-title"
                   style="font-size: 14px; opacity: calc(.6);color:#4679FD">
                   <i class="el-icon-check" />
@@ -42,7 +42,7 @@
                 </p> -->
                 <!-- <p class="now-secondary-title">{{ op.name }}</p> -->
                 <p  class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p>
-                <el-progress style="width: 935px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
+                <el-progress style="width: 910px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
                   define-back-color="rgba(32, 57, 96, 1)" :percentage="op.outRate * 100" class="custom-progress-bar" />
               </el-row>
             </div>
@@ -606,10 +606,8 @@ export default {
   background-image: linear-gradient(to right, #4573fe, #47f8dc);
 }
 ::v-deep .el-progress__text {
-  width: 50px;
   margin-top: -70px;
-  margin-left: 834px;
+  margin-left: 820px;
-  text-align: right;
   // background-color: unset;
   // background-image: linear-gradient(to right, #4573fe, #47f8dc);
 }

src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-04-03 17:10:15
+ * @LastEditTime: 2024-04-02 15:01:40
  * @LastEditors: zhp
  * @Description:
 -->
@@ -41,11 +41,10 @@
             </div> -->
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
             <div v-if="coldDetData" class="myLegend">
-              <div class=" barCircleLegend"></div>
-              <div class=" barCircle"></div>
-              <h4 class="barText">产线良品率</h4>
               <div class="barLegend"></div>
-              <h4 class="barCircleText">产线产量</h4>
+              <h4 class="barText">产线产量</h4>
+              <div class="barCircle"></div>
+              <h4 class="barCircleText">产线良品率</h4>
             </div>
             <double-y-chart ref="productChart" :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList"
               :height="359" :show-legend="true" />
@@ -310,7 +309,6 @@ export default {
       window.location.reload()
     }, 86400000)
     // this.getData()
-    // this.getReaiData()
   },
   destroyed() {
     this.CutWebsocketClose()
@@ -412,7 +410,7 @@ export default {
         topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea + '㎡')
         productList.push(ele.productArea)
         wasteList.push(ele.wastArea)
-        nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
+        nameWasteList.push('缺陷面积:' + ele.wastArea + '㎡')
         // yieldList.push({
         //   name: '良品',
         //   yield:ele.yield
@@ -429,82 +427,39 @@ export default {
         this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
       })
     },
-    // getReaiData() {
+    getData() {
-    //   let detData = [
+      let detData = [
-    //     {
+        {
-    //       name: '1',
+          name: '1',
-    //       run: '运行',
+          run: '运行',
-    //     },
+        },
-    //     {
+        {
-    //       name: '2',
+          name: '2',
-    //       run: '未运行',
+          run: '未运行',
-    //     },
+        },
-    //     {
+        {
-    //       name: '3',
+          name: '3',
-    //       run: '运行',
+          run: '运行',
-    //     },
+        },
-    //     {
+        {
-    //       name: '4',
+          name: '4',
-    //       run: '未运行',
+          run: '未运行',
-    //     },
+        },
-    //     {
+        {
-    //       name: '1',
+          name: '1',
-    //       run: '运行',
+          run: '运行',
-    //     },
+        },
-    //   ]
+      ]
-    //   let arr = []
+      this.realEqList = detData.map((item, index) => [
-    //   let index = 0
+        // console.log(item)
-    //   for (let i in detData) {
+        `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-    //     index++,
+            </span>`,
-    //       arr.push([
+        `<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`,
-    //         `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
+        `<span style="color:rgba(255,255,255,0.5)"><div style="${item.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.run || ''}</span>`,
-    //         </span>`,
+      ])
-    //         // `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
+        this.realEqConfig.data = this.realEqList
-    //         // </span>`,
+        this.$refs['realEqScrollBoard'].updateRows(this.realEqList)
-    //         `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
+    },
-    //         `<span style="color:rgba(255,255,255,0.5)"><div style="${detData[i] == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${detData[i] || ''}</span>`,
-    //       ])
-    //   }
-    //   // this.$nextTick(() => {
-    //     this.annealFunConfig.data = arr
-    //     this.$refs['annealFunScrollBoard'].updateRows(arr)
-    //   // })
-    // },
-    // getData() {
-    //   let detData = [
-    //     {
-    //       name: '1',
-    //       run: '运行',
-    //     },
-    //     {
-    //       name: '2',
-    //       run: '未运行',
-    //     },
-    //     {
-    //       name: '3',
-    //       run: '运行',
-    //     },
-    //     {
-    //       name: '4',
-    //       run: '未运行',
-    //     },
-    //     {
-    //       name: '1',
-    //       run: '运行',
-    //     },
-    //   ]
-    //   this.realEqList = detData.map((item, index) => [
-    //     // console.log(item)
-    //     `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-    //         </span>`,
-    //     `<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`,
-    //     `<span style="color:rgba(255,255,255,0.5)"><div style="${item.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.run || ''}</span>`,
-    //   ])
-    //   // this.$nextTick(() => {
-    //     this.realEqConfig.data = this.realEqList
-    //     this.$refs['realEqScrollBoard'].updateRows(this.realEqList)
-    //   //  })
-    // },
     CutWebsocketClose(e) {
       this.Cutws.ws.onclose = (event) => { console.log(event );}
     },
@@ -617,14 +572,14 @@ export default {
         this.cutWsData = event?.data ? JSON.parse(event?.data) : {}
         if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'table') {
           let cutArr = this.cutWsData.productHourData.map((item, index) => [
-            `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
+            `<span style="color:rgba(255,255,255,0.7)" >${index + 1 || ''}
             </span>`,
-            `<span style="color:rgba(255,255,255,0.5)" >${item.lineName || ''}
+            `<span style="color:rgba(255,255,255,0.7)" >${item.lineName || ''}
             </span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${this.formatTime(item.time) || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.7)">${this.formatTime(item.time) || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${this.getSize(item.size) || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.7)">${this.getSize(item.size) || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.productArea) + '㎡' || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.7)">${item.productArea + '㎡' || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.wasteArea) + '㎡' || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</span>`,
             `<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
            <div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>`
           ])
@@ -649,16 +604,16 @@ export default {
             topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea + '㎡')
             productList.push(ele.productArea)
             wasteList.push(ele.wastArea)
-            nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
+            nameWasteList.push('缺陷面积:' + ele.wastArea + '㎡')
             sumAreaList.push(ele.sumArea)
-            yieldList.push(parseFloat((ele.yield * 100).toFixed(0)))
+            yieldList.push(parseFloat((ele.yield * 100).toFixed(3)))
           })
           this.$nextTick(() => {
             this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
             this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
-            this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
+            this.$refs.thirdPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
-            this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
+            this.$refs.fourthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
-            this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
+            this.$refs.fifthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
             this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
           })
         }
@@ -745,25 +700,6 @@ export default {
       //   this.funWebsocket.onclose = this.funWebsocketClose
       // }
     },
-    NumFormat(value) {
-      if (!value) return '0.00'
-      value = value.toFixed(2)
-      var intPart = Math.trunc(value) // 获取整数部分
-      // var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
-      var floatPart = '.00' // 预定义小数部分
-      var value2Array = value.split('.')
-      // =2表示数据有小数位
-      if (value2Array.length === 2) {
-        floatPart = value2Array[1].toString() // 拿到小数部分
-        if (floatPart.length === 1) {
-          return intPart + '.' + floatPart + '0'
-        } else {
-          return intPart + '.' + floatPart
-        }
-      } else {
-        return intPart + floatPart
-      }
-    },
     // funWebsocketOnOpen() {
     //   console.log('socket连接成功')
     //   this.SJGWebsocket.onmessage()
@@ -861,7 +797,7 @@ export default {
 .myLegend{
   position: absolute;
   top: -20px;
-  right: 20px;
+  right: 50px;
   font-size: 12px;
   color: rgba(255,255,255,.6);
   .barLegend{
@@ -871,29 +807,19 @@ export default {
     height: 10px;
     display: inline-block;
     margin-right: 5px;
-    border-radius: 30%;
   }
   .barText{
     // float: right;
     display: inline-block;
     margin-right: 10px;
   }
-  .barCircleLegend{
-    width: 15px;
-    height: 1px;
-    background-color: rgba(255, 209, 96, 1);
-    position: absolute;
-    left: -4.1715px;
-    top: 21.7px;
-  }
   .barCircle{
-    width: 6px;
+    width: 7px;
-    height: 6px;
+    height: 7px;
     border-radius: 50%;
     background-color: rgba(255, 209, 96, 1);
     display: inline-block;
-    margin-right: 10px;
+    margin-right: 5px;
-    margin-bottom: 1.7px;
   }
   .barCircleText{
     display: inline-block;

src/views/OperationalOverview/components/PieChart.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-21 14:43:06
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-03 16:33:24
+ * @LastEditTime: 2024-03-29 14:50:50
  * @Description:
 -->
 <template>
@@ -85,6 +85,7 @@ export default {
       defaultConfig: {
         // 默认的legend配置
         legend: {
+          orient: 'vertical',
           left: '75%',
           bottom: 0,
           itemHeight: 10,
@@ -196,7 +197,7 @@ export default {
           // 默认配置
           ...this.defaultConfig.legend,
           // 外部传入配置
-          // ...this.legendConfig
+          ...this.legendConfig
         },
         color: this.barColor,
         series: [

src/views/OperationalOverview/components/coldDoubleYChart.vue

@@ -2,7 +2,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-03 16:28:40
+ * @LastEditTime: 2024-04-01 09:12:56
  * @LastEditors: zhp
  * @Description:
 -->
@@ -100,9 +100,8 @@ export default {
                show: true,		//开启显示
                position: 'top',	//在上方显示
                textStyle: {	    //数值样式
-                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                 color: '#ced1d5',
-                 fontSize: 12,
+                 fontSize: 12
-                 fontWight: 'bolder'
                }
              },
             }
@@ -194,19 +193,18 @@ export default {
           axisLine: {
             lineStyle: {
               type: 'solid',
-              color: '#25528f', // 左边线的颜色
+              color: '#213259', // 左边线的颜色
               width: '1' // 坐标线的宽度
             }
           },
           axisLabel: {
             textStyle: {
-              align: 'center',
               color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
             }
           },
           splitLine: {
             lineStyle: {
-              color: '#25528f'
+              color: '#213259'
             }
           },
           data: nameList
@@ -228,7 +226,6 @@ export default {
             nameTextStyle: {// y轴上方单位的颜色
               color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
               align: "left",
-              padding: [0, 0, 0, 8]
             },
             position: 'right',
             alignTicks: true,
@@ -236,20 +233,19 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#25528f', // 左边线的颜色
+                color: '#213259', // 左边线的颜色
                 width: '1' // 坐标线的宽度
               }
             },
             axisLabel: {
               textStyle: {
-                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                color: '#ced1d5', // 坐标值得具体的颜色
-                formatter: '{value}%',
+                formatter: '{value}%'
-                align:'left',
               }
             },
             splitLine: {
               lineStyle: {
-                color: '#25528f'
+                color: '#213259'
               }
             }
             // type: 'value'
@@ -274,7 +270,6 @@ export default {
               color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
               // fontSize: 10,
               align: "right",
-              padding:[0,4,0,0]
             },
             position: 'left',
             alignTicks: true,
@@ -282,21 +277,19 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#25528f', // 左边线的颜色
+                color: '#213259', // 左边线的颜色
                 width: '1' // 坐标线的宽度
               }
             },
             axisLabel: {
-              // padding: [0, 20, 0, 0],
               textStyle: {
-                margin: 60,
                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 formatter: '{value} 片'
               }
             },
             splitLine: {
               lineStyle: {
-                color: '#25528f'
+                color: '#213259'
               }
             }
             // type: 'value'

src/views/OperationalOverview/components/doubleYChart .vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-03 17:09:12
+ * @LastEditTime: 2024-03-29 16:26:28
  * @LastEditors: zhp
  * @Description:
 -->
@@ -105,7 +105,7 @@ export default {
                show: true,		//开启显示
                position: 'top',	//在上方显示
                textStyle: {	    //数值样式
-                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                 color: '#ced1d5',
                  fontSize: 12,
                  fontWight:'bolder'
                }
@@ -167,19 +167,19 @@ export default {
               type: 'cross'
             }
           },
-          grid: { top: 70, right: 20, bottom: 10, left: 10, containLabel: true },
+          grid: { top: 90, right: 70, bottom: 20, left: 20, containLabel: true },
-          // legend: {
+          legend: {
-          //   itemWidth: 10,
+            itemWidth: 10,
-          //   itemHeight: 10,
+            itemHeight: 10,
-          //   top: '2%',
+            top: '0%',
-          //   right: '30px',
+            right: '20px',
-          //   data: ['产线良品率', '产线产量'],
+            data: ['产线良品率', '产线产量'],
-          //   textStyle: {
+            textStyle: {
-          //     fontSize: 12 * this.beilv,
+              fontSize: 12 * this.beilv,
-          //     color: '#ced1d5',
+              color: '#ced1d5',
-          //     fontWight: 'bolder'
+              fontWight: 'bolder'
-          //   }
+            }
-          // },
+          },
           xAxis: {
             axisTick: {
               show: false
@@ -227,7 +227,6 @@ export default {
               nameTextStyle: {// y轴上方单位的颜色
                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 align: "left",
-                padding: [0, 0, 0, 2]
               },
               position: 'right',
               alignTicks: true,
@@ -272,7 +271,6 @@ export default {
               nameTextStyle: {
                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 // fontSize: 10,
-                padding: [0, 4, 0, 0],
                 align: "right",
               },
               // position: 'left',

src/views/OperationalOverview/components/linearBarChart.vue

@@ -113,7 +113,7 @@ export default {
                 textStyle: {	    //数值样式
                   color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                   fontSize: 12,
-                  fontWeight: 'normal'
+                  fontWeight: 'bolder'
                 }
               },
             }
@@ -133,7 +133,7 @@ export default {
               type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
             }
           },
-          grid: { top: 70, right: 40, bottom: 10, left: 40, containLabel: true },
+          grid: { top: 90, right: 60, bottom: 20, left: 30, containLabel: true },
           // legend: {
           //   itemWidth: 10,
           //   itemHeight: 10,
@@ -175,7 +175,7 @@ export default {
             name: '单位kwh',
             nameTextStyle: {
               color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-              fontSize: 12,
+              fontSize: 10,
               align: 'right',
             },
             type: 'value',

src/views/OperationalOverview/components/pileBarChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-04-03 18:12:18
+ * @LastEditTime: 2024-04-01 09:14:45
  * @LastEditors: zhp
  * @Description:
 -->
@@ -114,10 +114,6 @@ export default {
           totalData.push(sum);
         }
       // }
-      // rawData[1].map((d, did) =>
-      //   console.log((d / totalData[did]).toFixed(3))
-      //   // totalData[did] <= 0 ? 0 : d / totalData[did]
-      // )
       console.log('total', totalData)
       const series = [
         '良品',
@@ -138,7 +134,7 @@ export default {
           // },
           color:colors[sid],
           data: rawData.length != 0 ? rawData[sid].map((d, did) =>
-            totalData[did] <= 0 ? 0 : (d / totalData[did]).toFixed(4)
+            totalData[did] <= 0 ? 0 : d / totalData[did]
           ) : []
         };
       });
@@ -167,15 +163,15 @@ export default {
             let singleData = series.filter(function (item) {
               return item.name == name
             })
-            return name + parseFloat((singleData[0].data * 100).toFixed(0)) + '%'
+            return name + parseFloat((singleData[0].data * 100).toFixed(3)) + '%'
           },
           itemWidth: 12,
           itemHeight: 12,
           bottom: '20',
           left: '20',
-          icon: 'roundRect',
+          icon: 'rect',
           textStyle: {
-            color: 'rgba(255,255,255,.9)',
+            color: 'rgba(255,255,255,.6)',
             fontSize:12,
           }
         },
@@ -208,7 +204,7 @@ export default {
               splitNumber: 50,
               // boundaryGap: [20, 20],
               textStyle: {
-                color: 'rgba(255,255,255,.9)',
+                color: 'rgba(255,255,255,.6)',
                 verticalAlign: 'bottom',
                 fontSize: 16,
                 align: 'left',
@@ -236,7 +232,7 @@ export default {
               splitNumber: 50,
               // boundaryGap: [20, 20],
               textStyle: {
-                color: 'rgba(255,255,255,.9)',
+                color: 'rgba(255,255,255,.6)',
                 verticalAlign: 'bottom',
                 fontSize: 16,
                 align: 'right',

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-03 17:14:03
+ * @LastEditTime: 2024-04-02 09:46:46
  * @Description:
 -->
 <template>
@@ -39,11 +39,11 @@
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
           <base-container :height="318" :size="'small'" :title="'工单监控'" :title-icon="'eqMonitoring'">
             <div class="order" style="width: 100%; overflow: hidden scroll; height: 350px">
-              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em">
+              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: 1em">
                 <!-- <el-col :span="12"> -->
 
                 <p class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p>
-                <el-progress style="width: 620px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
+                <el-progress style="width: 610px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
                   define-back-color="rgba(32, 57, 96, 1)" :percentage="op.progressRate" class="custom-progress-bar" />
               </el-row>
             </div>
@@ -67,13 +67,6 @@
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
           <base-container :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
             :title="'产线产量及良品率'" :title-icon="'productLine'">
-            <div  class="myLegend">
-              <div class=" barCircleLegend"></div>
-              <div class=" barCircle"></div>
-              <h4 class="barText">产线良品率</h4>
-              <div class="barLegend"></div>
-              <h4 class="barCircleText">产线产量</h4>
-            </div>
             <double-y-chart ref="productLineChart" :id="'doubleYChart'" :height="390" :show-legend="true" />
           </base-container>
         </el-col>
@@ -380,27 +373,7 @@ export default {
 				id: '4',
 				name: '测试工单4',
 				progressRate: 0.32323,
-      },
+			},
-      {
-        id: '4',
-        name: '测试工单4',
-        progressRate: 0.32323,
-      },
-      {
-        id: '4',
-        name: '测试工单4',
-        progressRate: 0.32323,
-      },
-      {
-        id: '4',
-        name: '测试工单4',
-        progressRate: 0.32323,
-      },
-      {
-        id: '4',
-        name: '测试工单4',
-        progressRate: 0.32323,
-      },
 			// {
 			//   id: '5',
 			//   name: '测试工单',
@@ -416,7 +389,7 @@ export default {
 				return {
 					id: ele.id,
 					name: ele.name,
-					progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
+					progressRate: parseFloat((ele.progressRate * 100).toFixed(3)),
 				};
 			}
 		});
@@ -444,61 +417,28 @@ export default {
 			`<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
 		]);
     this.eqConfig.data = eqArr;
-    let data = [
+    let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
-      {
+    // let arr = [5, 6, 2, 4, 7, 9, 15];
-        lineName: 'D62',
+    // 因为7个数，所以长度减去一次为最大循环次数
-        outputNum: '11111',
+    for (let i = 0; i < arr.length - 1; i++) {
-        passRate: '0.9873'
-      },
-      {
-        lineName: 'D63',
-        outputNum: '23212',
-        passRate: '0.9873'
-      },
-      {
-        lineName: 'D61',
-        outputNum: '423323',
-        passRate: '0.9873'
-      },
-      {
-        lineName: 'D64',
-        outputNum: '43434',
-        passRate: '0.9873'
-      },
-    ]
-    let nameList = [];
-    let passRateList = [];
-    let outputNumList = [];
-    // let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
-    for (let i = 0; i < data.length - 1; i++) {
       // 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
-      for (let j = 0; j < data.length - i - 1; j++) {
+      for (let j = 0; j < arr.length - i - 1; j++) {
         // 当前一个值大于后一个值
-        if (data[j].lineName.substr(data[j].lineName.length - 1, 1) > data[j + 1].lineName.substr(data[j + 1].lineName.length - 1, 1)) {
+        if (arr[j].substr(arr[j].length - 1, 1) > arr[j + 1].substr(arr[j + 1].length - 1, 1)) {
           // 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
-          let temp = data[j];
+          let temp = arr[j];
-          data[j] = data[j + 1];
+          arr[j] = arr[j + 1];
-          data[j + 1] = temp;
+          arr[j + 1] = temp;
         }
       }
     }
-    data.forEach((ele) => {
+    console.log(arr);
-      // if (item.id == ele.productionLineId) {
+		this.$refs['eqScrollBoard'].updateRows(eqArr);
-      // if (item.name.substr(0, 1) == "D") {
+    this.$refs.productLineChart.initChart(
-      // console.log(ele)
+      arr,
-      nameList.push(ele.lineName);
+			[98, 97, 98.7, 98.5, 98.3],
-      outputNumList.push(ele.outputNum);
+			[3134, 2323, 3232, 3233, 2321]
-      passRateList.push(ele.passRate);
+		);
-      // }
-      // }
-    });
-    this.$nextTick(() => {
-      this.$refs.productLineChart.initChart(
-        nameList,
-        passRateList,
-        outputNumList
-      );
-    })
 		// this.getList()
 		this.initWebSocket();
 		this.SJGInitWebSocket();
@@ -690,7 +630,7 @@ export default {
 							return {
 								id: ele.id,
 								name: ele.name,
-								progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
+								progressRate: parseFloat((ele.progressRate * 100).toFixed(3)),
 							};
 						}
 					});
@@ -721,29 +661,29 @@ export default {
 					let nameList = [];
 					let passRateList = [];
 					let outputNumList = [];
+					this.SJGWsData.detData.forEach((ele) => {
+						// if (item.id == ele.productionLineId) {
+						// if (item.name.substr(0, 1) == "D") {
+						// console.log(ele)
+						nameList.push(ele.lineName);
+						outputNumList.push(ele.outputNum);
+						passRateList.push(ele.passRate);
+						// }
+						// }
+          });
           // let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
-          for (let i = 0; i < this.SJGWsData.detData.length - 1; i++) {
+          for (let i = 0; i < nameList.length - 1; i++) {
             // 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
-            for (let j = 0; j < this.SJGWsData.detData.length - i - 1; j++) {
+            for (let j = 0; j < nameList.length - i - 1; j++) {
               // 当前一个值大于后一个值
-              if (this.SJGWsData.detData[j].lineName.substr(this.SJGWsData.detData[j].lineName.length - 1, 1) > this.SJGWsData.detData[j + 1].lineName.substr(this.SJGWsData.detData[j + 1].lineName.length - 1, 1)) {
+              if (nameList[j].substr(nameList[j].length - 1, 1) > nameList[j + 1].substr(nameList[j + 1].length - 1, 1)) {
                 // 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
-                let temp = this.SJGWsData.detData[j];
+                let temp = nameList[j];
-                this.SJGWsData.detData[j] = this.SJGWsData.detData[j + 1];
+                nameList[j] = nameList[j + 1];
-                this.SJGWsData.detData[j + 1] = temp;
+                nameList[j + 1] = temp;
               }
             }
           }
-          this.SJGWsData.detData.forEach((ele) => {
-            // if (item.id == ele.productionLineId) {
-            // if (item.name.substr(0, 1) == "D") {
-            // console.log(ele)
-            nameList.push(ele.lineName);
-            outputNumList.push(ele.outputNum);
-            passRateList.push(ele.passRate);
-            // }
-            // }
-          });
           this.$nextTick(() => {
             this.$refs.productLineChart.initChart(
               nameList,
@@ -802,51 +742,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.myLegend {
-  position: absolute;
-  top: -28px;
-  right: 20px;
-  font-size: 12px;
-  color: rgba(255, 255, 255, .6);
-
-  .barLegend {
-    // float: left;
-    background: linear-gradient(#9DD5FF, #1295FF);
-    width: 10px;
-    height: 10px;
-    display: inline-block;
-    margin-right: 5px;
-    border-radius: 30%;
-  }
-
-  .barText {
-    // float: right;
-    display: inline-block;
-    margin-right: 10px;
-  }
-
-  .barCircleLegend {
-    width: 15px;
-    height: 1px;
-    background-color: rgba(255, 209, 96, 1);
-    position: absolute;
-    left: -4.1715px;
-    top: 21.7px;
-  }
-
-  .barCircle {
-    width: 6px;
-    height: 6px;
-    border-radius: 50%;
-    background-color: rgba(255, 209, 96, 1);
-    display: inline-block;
-    margin-right: 10px;
-    margin-bottom: 1.7px;
-  }
-  .barCircleText {
-    display: inline-block;
-  }
-}
 .visual-container {
 	width: 1920px;
 	height: 1080px;
@@ -920,9 +815,8 @@ export default {
 	background-image: linear-gradient(to right, #4573fe, #47f8dc);
 }
 ::v-deep .el-progress__text {
-  width: 50px;
   margin-top: -70px;
-  margin-left: 538px;
+  margin-left: 490px;
   // background-color: unset;
   // background-image: linear-gradient(to right, #4573fe, #47f8dc);
 }

src/views/base/coreAlarmLog/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -34,49 +33,38 @@ import {
 	getcoreAlarmLogPage
 } from '@/api/base/coreAlarmLog';
 import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict";
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'alarmTime',
 		label: '报警时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmSource',
-		label: '报警来源',
+		label: '报警来源'
-		width: 200,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmType',
-		label: '报警类型',
+		label: '报警类型'
-		width: 180,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmGrade',
 		label: '报警级别',
-		filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL),
+		filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL)
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmReason',
-		label: '报警原因',
+		label: '报警原因'
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'alarmContent',
-		label: '报警详细',
+		label: '报警详细'
-		showOverflowtooltip: true
 	}
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -86,7 +74,7 @@ export default {
 			tableBtn: [].filter((v)=>v),
 			tableData: [],
 			listQuery: {
-        pageSize: 20,
+        pageSize: 10,
         pageNo: 1,
         total: 0,
 				alarmSource: undefined,

src/views/base/coreCustomer/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-04-02 16:46:17
+ * @LastEditTime: 2024-03-20 16:20:39
  * @Description:
 -->
 <template>
@@ -96,7 +96,7 @@ export default {
 			dataRule: {
         code: [{ required: true, message: "客户编号不能为空", trigger: "blur" }],
         name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }],
-				// contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
 				telephone: [
 					{ required: false, trigger: "blur", message: "手机号不能为空" },
           {

src/views/base/coreCustomer/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -46,56 +45,41 @@ import {
 	getCustomerPage,
 	deleteCustomer
 } from '@/api/base/coreCustomer';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '客户名称',
+		label: '客户名称'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '客户编码',
+		label: '客户编码'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'contact',
-		label: '联系人',
+		label: '联系人'
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话',
+		label: '联系电话'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'address',
-		label: '地址',
+		label: '地址'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		minWidth: 150,
-		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreDepartment/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -46,7 +45,6 @@ import {
 	getCoreDepartmentPage,
 	deleteCoreDepartment
 } from '@/api/base/coreDepartment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -73,7 +71,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreEquipment/components/EquipmentInfoForm.vue

@@ -64,8 +64,8 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="进厂日期" prop="enterTime" :rules="[]">
+				<el-form-item label="进场日期" prop="enterTime" :rules="[]">
-					<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进厂日期"
+					<el-date-picker v-model="form.enterTime" :disabled="disabled" type="datetime" placeholder="请选择进场日期"
 						value-format="timestamp"></el-date-picker>
 				</el-form-item>
 			</el-col>

src/views/base/coreEquipment/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -79,7 +78,7 @@
 					queryParams: {
 						equipmentId: form.id,
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('base:core-equipment-attr:update')
@@ -119,7 +118,6 @@ import {
 } from '@/api/base/equipment';
 import Editor from '@/components/Editor';
 import AssetsUpload from './components/AssetsUpload.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'Equipment',
@@ -127,7 +125,7 @@ export default {
 		Editor,
 		EquipmentDrawer,
 	},
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['name', 'code'],
@@ -159,8 +157,8 @@ export default {
 					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true },
+				{ prop: 'name', label: '设备名称' },
-				{ width: 250, prop: 'code', label: '设备编码' },
+				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'equipmentTypeName', label: '设备类型' },
 				{ prop: 'enName', label: '英文名称' },
 				{ prop: 'abbr', label: '缩写' },
@@ -486,7 +484,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				code: '',
 				name: '',
 				special: false

src/views/base/coreEquipmentLineBind/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -52,13 +51,13 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import DialogForm from './dialogForm.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 // import { getAccessToken } from '@/utils/auth';
 
 export default {
 	name: 'EquipmentLineBind',
 	components: { DialogForm },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			basePath: '/base/core-equipment-bind-section',
@@ -82,13 +81,12 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 150,
+					width: 180,
-					showOverflowtooltip: true,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'productionLineName', label: '产线名称', width: 120, showOverflowtooltip: true },
+				{ prop: 'productionLineName', label: '产线名称' },
-				{ prop: 'workshopSectionName', label: '工段名称', width: 120, showOverflowtooltip: true },
+				{ prop: 'workshopSectionName', label: '工段名称' },
-				{ prop: 'equipmentName', label: '设备名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'sort', label: '工段中排序' },
 				{
 					prop: 'lineDataType',
@@ -238,7 +236,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				equipmentName: null,
 				productionLineId: null,
 			},

src/views/base/coreEquipmentType/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -51,7 +50,6 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 import {
 	createEquipmentType,
@@ -67,7 +65,7 @@ import {
 export default {
 	name: 'EquipmentType',
 	components: {},
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['name'],
@@ -173,7 +171,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				name: '',
 			},
 			// 表单参数

src/views/base/coreHotMaterial/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -44,51 +43,38 @@ import basicPage from '../../core/mixins/basic-page';
 import { parseTime } from '../../core/mixins/code-filter';
 import { getHotMaterialPage, deleteHotMaterial } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from "@/utils/dict";
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 180,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '原料名称',
+		label: '原料名称'
-		minWidth: 250,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '原料编码',
+		label: '原料编码'
-		width: 250,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict'),
+		filter: publicFormatter('unit_dict')
-		width: 90,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'dailyCost',
-		label: '每日消耗量',
+		label: '每日消耗量'
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		width: 120,
-		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreMajor/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -46,7 +45,6 @@ import {
 	getCoreMajorPage,
 	deleteCoreMajor
 } from '@/api/base/coreMajor';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -73,7 +71,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreProduct/add-or-updata.vue

@@ -2,17 +2,15 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-27 13:47:24
+ * @LastEditTime: 2024-03-13 13:54:01
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="true"
+		:wrapper-closable="isdetail"
 		class="drawer"
-		:before-close="beforeClose"
-		@closed="$emit('destroy')"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
@@ -264,15 +262,6 @@ export default {
 	},
 	mounted() {},
 	methods: {
-		beforeClose(done) {
-			if (!this.isdetail) {
-				this.$confirm('确认关闭？')
-					.then(_ => {
-						done();
-					})
-					.catch(_ => {});
-			}
-		},
 		clearArea() {
 			this.$set(this.dataForm, 'area', 0)
 			this.$set(this.dataForm, 'weight', 0)

src/views/base/coreProduct/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -27,8 +26,7 @@
 		<add-or-update
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getDataList"
+			@refreshDataList="getDataList" />
-			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -41,58 +39,43 @@ import {
 	getCoreProductPage,
 	deleteCoreProduct
 } from '@/api/base/coreProduct';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '产品名称',
+		label: '产品名称'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '产品编码',
+		label: '产品编码'
-		width: 190,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'productType',
 		label: '产品类型',
-		filter: publicFormatter('product_type'),
+		filter: publicFormatter('product_type')
-		width: 180,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'specifications',
-		label: '规格',
+		label: '规格'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict'),
+		filter: publicFormatter('unit_dict')
-		width: 90,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-		width: 120,
-		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreProductionLine/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -49,47 +48,34 @@ import {
 import { getStatus } from '@/api/core/base/productionLine';
 import codeFilter from '../../core/mixins/code-filter';
 import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'factoryName',
-		label: '工厂',
+		label: '工厂'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'roomNameDict',
 		label: '车间名称',
-		filter: publicFormatter('workshop'),
+		filter: publicFormatter('workshop')
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '产线名称',
+		label: '产线名称'
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '产线编码',
+		label: '产线编码'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'enabled',
 		label: '当前状态',
-		filter: codeFilter('lineStatus'),
+		filter: codeFilter('lineStatus')
-		width: 120,
-		showOverflowtooltip: true
 	},
 	// {
 	// 	prop: 'tvalue',
@@ -97,20 +83,16 @@ const tableProps = [
 	// },
 	{
 		prop: 'description',
-		label: '描述',
+		label: '描述'
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		width: 120,
-		showOverflowtooltip: true
 	}
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreSupplier/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-04-02 16:46:49
+ * @LastEditTime: 2023-11-22 10:27:43
  * @Description:
 -->
 <template>
@@ -79,7 +79,7 @@ export default {
 			dataRule: {
         code: [{ required: true, message: "供应商编号不能为空", trigger: "blur" }],
         name: [{ required: true, message: "供应商名称不能为空", trigger: "blur" }],
-				// contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+				contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
 				telephone: [
 					{ required: false, trigger: "blur", message: "手机号不能为空" },
           {

src/views/base/coreSupplier/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -46,56 +45,41 @@ import {
 	getCoreSupplierPage,
 	deleteCoreSupplier
 } from '@/api/base/coreSupplier';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '供应商编码',
+		label: '供应商编码'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '供应商名称',
+		label: '供应商名称'
-		width: 180,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'contact',
-		label: '联系人',
+		label: '联系人'
-		width: 180,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话',
+		label: '联系电话'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'address',
-		label: '地址',
+		label: '地址'
-		width: 180,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		minWidth: 90,
-		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreWorker/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -47,27 +46,20 @@ import {
 	deleteCoreWorker
 } from '@/api/base/coreWorker';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '创建时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '姓名',
+		label: '姓名'
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '员工号',
+		label: '员工号'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'sex',
@@ -78,44 +70,32 @@ const tableProps = [
 		prop: 'entryTime',
 		label: '入职时间',
 		filter: (val) => val ? moment(val).format('yyyy-MM-DD') : '',
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'telephone',
-		label: '联系电话',
+		label: '联系电话'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'status',
 		label: '状态',
-		filter: (val) => ['', '在职', '离职'][val],
+		filter: (val) => ['', '在职', '离职'][val]
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'departmentName',
-		label: '部门',
+		label: '部门'
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'majorName',
-		label: '专业',
+		label: '专业'
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		width: 150,
-		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreWorkshopSection/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -46,14 +45,12 @@ import {
 	getCWSectionPage,
 	deleteCWSection
 } from '@/api/base/coreWorkshopSection';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-
 	},
 	{
 		prop: 'code',
@@ -73,13 +70,12 @@ const tableProps = [
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/material/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -41,7 +40,6 @@ import {
 } from '@/api/base/material';
 import { listData } from "@/api/system/dict/data";
 import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -77,7 +75,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/base/materialProductBom/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -39,7 +38,6 @@ import {
 	getMaterialPBPage,
 	deleteMaterialPB
 } from '@/api/base/materialProductBom';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -57,7 +55,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	components: {
 		AddOrUpdate,
 	},

src/views/base/packagingPrintLog/index.vue

@@ -6,17 +6,34 @@
  * @Description:
 -->
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+			:formConfigs="formConfig"
-      :table-data="tableData">
+			ref="searchBarForm"
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+			@headBtnClick="buttonClick" />
-        @clickBtn="handleClick" />
+		<base-table
-    </base-table>
+			:table-props="tableProps"
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+			:page="listQuery.pageNo"
-      @pagination="getDataList" />
+			:limit="listQuery.pageSize"
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
+			:table-data="tableData">
-  </div>
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getDataList" />
+	</div>
 </template>
 
 <script>
@@ -24,7 +41,6 @@ import AddOrUpdate from './add-or-updata';
 // import unitDict from './unitDict';
 import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import {
   getPackingModel,
 } from '@/api/base/printModel.js'
@@ -75,7 +91,7 @@ const tableProps = [
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -298,7 +314,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
           this.listQuery.workOrderId = val.workOrderId;
           if (val.createTime && val.createTime.length != 0) {
             this.listQuery.createTime = val.createTime
@@ -313,7 +329,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

src/views/base/packagingPrintModel/index.vue

@@ -2,14 +2,13 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-03 15:08:38
+ * @LastEditTime: 2023-12-04 13:38:45
  * @Description:
 -->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData">
-      :table-data="tableData">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" />
     </base-table>
@@ -26,9 +25,7 @@ import AddOrUpdate from './add-or-updata';
 import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
 import printModelDesign from '../custom/index'
-import { updatePackingModel, } from '@/api/base/printModel.js';
+import { updatePackingModel,} from '@/api/base/printModel.js';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
 import {
   deletePackingModel,
   getPackingModelPage,
@@ -62,7 +59,7 @@ const tableProps = [
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -165,7 +162,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
           this.listQuery.packagingCode = val.packagingCode;
           this.listQuery.createTime = val.createTime;
 					this.getDataList();
@@ -173,7 +170,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

src/views/base/packagingPrintType/index.vue

@@ -2,21 +2,38 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-03 15:09:06
+ * @LastEditTime: 2023-12-04 13:44:01
  * @Description:
 -->
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+			:formConfigs="formConfig"
-      :table-data="tableData">
+			ref="searchBarForm"
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+			@headBtnClick="buttonClick" />
-        @clickBtn="handleClick" />
+		<base-table
-    </base-table>
+			:table-props="tableProps"
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+			:page="listQuery.pageNo"
-      @pagination="getDataList" />
+			:limit="listQuery.pageSize"
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
+			:table-data="tableData">
-  </div>
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<add-or-update
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getDataList" />
+	</div>
 </template>
 
 <script>
@@ -24,7 +41,6 @@ import AddOrUpdate from './add-or-updata';
 // import unitDict from './unitDict';
 import basicPage from '../mixins/basic-page';
 import { parseTime } from '../mixins/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import {
 	deletePackingType,
   getPackingTypePage,
@@ -48,7 +64,7 @@ const tableProps = [
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -138,7 +154,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
           this.listQuery.packagingCode = val.packagingCode;
           this.listQuery.createTime = val.createTime;
 					this.getDataList();
@@ -146,7 +162,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

src/views/core/analysis/balanceAnalysis/chart.vue

@@ -106,10 +106,6 @@ export default {
 		activeIndex(val) {
 			this.initChart(val);
 		},
-		daterange(val) {
-			console.log('222', val)
-			this.templateOption.xAxis.data = val
-		},
 	},
 	methods: {
 		/**
@@ -128,8 +124,8 @@ export default {
 		},
 		/** 初始化/设置 图表 */
 		initChart(val) {
+			console.log('tableData', this.tableData);
 			if (!this.chart) this.chart = echarts.init(this.$refs.chartDiv);
-			this.chart.clear();
 			switch (val) {
 				case 0:
 					const eqCt = this.tableData.map((row) => ({
@@ -143,7 +139,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
 						series: eqCt,
-					}, true);
+					});
 					break;
 				case 1:
 					const eqTt = this.tableData.map((row) => ({
@@ -157,7 +153,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
 						series: eqTt,
-					}, true);
+					});
 					break;
 				case 2:
 					const plCt = this.tableData.map((row) => ({
@@ -171,7 +167,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
 						series: plCt,
-					}, true);
+					});
 					break;
 				case 3:
 					const plTt = this.tableData.map((row) => ({
@@ -185,10 +181,9 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '产线TT' },
 						series: plTt,
-					}, true);
+					});
 					break;
 				default:
-					this.activeIndex = 0
 					const eqCt2 = this.tableData.map((row) => ({
 						name: row.equName,
 						type: 'line',
@@ -200,7 +195,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
 						series: eqCt2,
-					}, true);
+					});
 			}
 		},
 	},

src/views/core/analysis/balanceAnalysis/index.vue

@@ -18,15 +18,13 @@
 						:page="1"
 						:limit="999"
 						:table-props="tableProps"
-						:table-data="tableData"
+						:table-data="tableData" />
-						:max-height="tableH" />
 					<div v-if="tableData.length == 0" class="no-data-bg"></div>
 				</el-tab-pane>
 				<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
 					<div class="graph" style="height: 800px">
 						<!-- graph  -->
 						<AnalysisChart
-							ref="analysisChart"
 							v-if="activeName == 'graph'"
 							:table-data="tableData"
 							:daterange="dateArr"></AnalysisChart>
@@ -49,14 +47,13 @@ import BalanceChart from '../balanceChart';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import AnalysisChart from './chart.vue';
 import { parseTime } from '@/utils/ruoyi'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	components: {
 		BalanceChart,
 		AnalysisChart,
 	},
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			activeName: 'table',
@@ -179,11 +176,6 @@ export default {
 			// const p = this.tableProps
 			// const d = this.tableData
 			// debugger;
-			if (this.activeName == 'graph') {
-				this.$nextTick(() => {
-					this.$refs['analysisChart'].initChart()
-				})
-			}
 			this.ready = true;
 		},
 

src/views/core/base/factory/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -42,7 +41,6 @@
 import AddOrUpdate from './add-or-updata';
 import basicPage from '../../mixins/basic-page';
 import { parseTime } from '../../mixins/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import {
 	deleteFactory,
 	getFactoryPage
@@ -73,7 +71,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/core/mixins/basic-page.js

@@ -17,7 +17,7 @@ export default {
       },
       tableData: [],
       listQuery: {
-        pageSize: 20,
+        pageSize: 10,
         pageNo: 1,
         total: 1,
       },

src/views/core/monitoring/data24/index.vue

@@ -27,16 +27,13 @@
 import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
 import { parseTime } from '../../mixins/code-filter';
 import { getSchedulingMonitoringRecord1 } from '@/api/monitoring/teamProduction'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'productionLineData24',
-	mixins: [tableHeightMixin],
 	components: {},
 	props: {},
 	data() {
 		return {
-			heightNum: 240,
       urlOptions: {
 				getDataListURL: getPdlDataOneDay
 			},
@@ -59,9 +56,9 @@ export default {
 	},
 	computed: {},
 	mounted() {
-		// window.addEventListener('resize', () => {
+		window.addEventListener('resize', () => {
-    //   this.tableH = this.tableHeight(240)
+      this.tableH = this.tableHeight(240)
-    // })
+    })
 		this.getList();
 	},
 	methods: {
@@ -118,7 +115,7 @@ export default {
 		/** 把 list 里的数据转换成 tableProps 对应的格式 */
 		convertList(list) {
 			// let sectionArr= []
-			let temp = list.datamap ? Object.values(list?.datamap) : []
+			let temp = Object.values(list.datamap)                             
 			console.log('111', temp)
 
 			temp.forEach(item => {

src/views/energy/base/energyQuantityManual/components/AddTable.vue

@@ -1,139 +0,0 @@
-<template>
-	<div class="energyQuantityManualAddTable">
-		<el-table
-			:data="renderData"
-			border
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<el-table-column
-				prop="tableName"
-				label="表名*">
-				<template slot-scope="scope">
-					<div class="tableInner">
-						<el-select
-							v-model="scope.row.tableName"
-							placeholder="请选择"
-							style="width: 100%"
-							@change="changeSelect(scope.row, 'tableName')">
-							<el-option
-								v-for="item in tableNameList"
-								:key="item.id"
-								:label="item.label"
-								:value="item.id"></el-option>
-						</el-select>
-					</div>
-				</template>
-			</el-table-column>
-			<el-table-column
-				prop="readingQuantity"
-				label="抄表数*">
-				<template slot-scope="scope">
-					<div class="tableInner">
-						<el-input-number
-							v-model="scope.row.readingQuantity"
-							:min="0"
-							:max="999999999"
-							style="width: 100%"
-							:controls="false"
-							@change="changeInput(scope.row, 'readingQuantity')"
-							:precision="2"></el-input-number>
-					</div>
-				</template>
-			</el-table-column>
-		</el-table>
-		<el-button
-			class="addButton"
-			icon="el-icon-plus"
-			@click="emitButtonClick">
-			新增
-		</el-button>
-	</div>
-</template>
-<script>
-export default {
-	name: 'AddTable',
-	props: {
-		tableData: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-		tableNameList: {
-			type: Array,
-			required: true,
-			default: () => {
-				return [];
-			},
-		},
-	},
-	data() {
-		return {};
-	},
-	computed: {
-		renderData() {
-			return this.tableData.map((item, index) => {
-				return {
-					...item,
-					_pageIndex: index + 1,
-				};
-			});
-		},
-	},
-	methods: {
-		emitButtonClick() {
-			this.$emit('emitButtonClick');
-		},
-		changeInput(val1, val2) {
-			val1.prop = val2;
-			this.$emit('emitFun', val1);
-		},
-		changeSelect(val1, val2) {
-			val1.prop = val2;
-			this.$emit('emitFun', val1);
-		},
-	},
-};
-</script>
-<style lang='scss' scoped>
-.energyQuantityManualAddTable {
-	.el-table .el-table__cell {
-		padding: 0;
-		height: 35px;
-	}
-	.addButton {
-		width: 100%;
-		height: 35px;
-		border-top: none;
-		color: #0b58ff;
-		border-color: #ebeef5;
-		border-radius: 0;
-	}
-	.addButton:hover {
-		color: #0b58ff;
-		border-color: #ebeef5;
-		background-color: #fff;
-	}
-	.addButton:focus {
-		border-color: #ebeef5;
-		background-color: #fff;
-	}
-	.tableInner .el-input__inner {
-		border: none;
-		padding: 0;
-		height: 33px;
-	}
-}
-</style>
-<style lang='scss'>
-.energyQuantityManualAddTable {
-	.el-table .el-table__cell {
-		padding: 0;
-		height: 35px;
-	}
-}
-</style>

src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue

@@ -1,228 +1,167 @@
 <template>
-	<el-form
+  <el-form ref="energyQuantityManualForm" :rules="rules" label-width="90px" :model="form">
-		ref="energyQuantityManualForm"
+    <el-row :gutter="20">
-		:rules="rules"
+      <el-col :span='12'>
-		label-width="90px"
+        <el-form-item label="能源类型" prop="energyTypeId">
-		:model="form">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
-		<el-row :gutter="20">
+            <el-option v-for="item in this.energyTypeList" :key="item.id" :label="item.name" :value="item.id">
-			<el-col :span="12">
+            </el-option>
-				<el-form-item
+          </el-select>
-					label="能源类型"
+        </el-form-item>
-					prop="energyTypeId">
+      </el-col>
-					<el-select
+      <el-col :span='12'>
-						v-model="form.energyTypeId"
+        <el-form-item label="抄表日期" prop="recordTime">
-						placeholder="请选择"
+          <el-date-picker v-model="form.recordTime" type="date" format="yyyy-MM-dd" value-format="timestamp"
-						style="width: 100%"
+            placeholder="选择日期" style="width: 100%;">
-						@change="selEnergyType"
+          </el-date-picker>
-						filterable>
+        </el-form-item>
-						<el-option
+      </el-col>
-							v-for="item in this.energyTypeList"
+    </el-row>
-							:key="item.id"
+    <el-row :gutter="20">
-							:label="item.labelName"
+      <el-col :span='24'>
-							:value="item.id"></el-option>
+        <base-table border :table-props="tableProps" :table-data="tableData" :add-button-show="addButtonShow"
-					</el-select>
+          @emitFun="inputChange" @emitButtonClick="emitButtonClick" />
-				</el-form-item>
+      </el-col>
-			</el-col>
+    </el-row>
-			<el-col :span="12">
+  </el-form>
-				<el-form-item
-					label="抄表日期"
-					prop="recordTime">
-					<el-date-picker
-						v-model="form.recordTime"
-						type="date"
-						format="yyyy-MM-dd"
-						value-format="timestamp"
-						placeholder="选择日期"
-						style="width: 100%"></el-date-picker>
-				</el-form-item>
-			</el-col>
-		</el-row>
-		<el-row :gutter="20">
-			<el-col :span="24">
-				<add-table
-					:table-props="tableProps"
-					:table-data="tableData"
-					:table-name-list="tableNameList"
-					@emitFun="inputChange"
-					@emitButtonClick="emitButtonClick" />
-				<!-- <base-table
-					border
-					:table-props="tableProps"
-					:table-data="tableData"
-					:add-button-show="addButtonShow"
-					@emitFun="inputChange"
-					@emitButtonClick="emitButtonClick" /> -->
-			</el-col>
-		</el-row>
-	</el-form>
 </template>
 <script>
-import {
+import { energyQuantityManualCreate, energyQuantityManualUpdate, energyQuantityManualGet } from '@/api/base/energyQuantityManual'
-	energyQuantityManualCreate,
+import moment from 'moment'
-	energyQuantityManualUpdate,
+import InputArea from './InputArea'
-	energyQuantityManualGet,
+import SelectArea from './SelectArea'
-} from '@/api/base/energyQuantityManual';
-import moment from 'moment';
-import AddTable from './AddTable';
-import InputArea from './InputArea';
-import SelectArea from './SelectArea';
-import { energyTableGet } from '@/api/base/energyQuantityManual';
 const tableProps = [
-	{
+  {
-		prop: 'tableName',
+    prop: 'tableName',
-		label: '表名*',
+    label: '表名*',
-		subcomponent: SelectArea,
+    subcomponent: SelectArea
-	},
+  },
-	{
+  {
-		prop: 'readingQuantity',
+    prop: 'readingQuantity',
-		label: '抄表数*',
+    label: '抄表数*',
-		subcomponent: InputArea,
+    subcomponent: InputArea
-	},
+  }
-];
+]
 export default {
-	name: 'EnergyQuantityManualAdd',
+  name: 'EnergyQuantityManualAdd',
-	props: {
+  props: {
-		energyTypeList: {
+    energyTypeList: {
-			type: Array,
+      type: Array,
-			required: true,
+      required: true,
-			default: () => {
+      default: () => {
-				return [];
+        return []
-			},
+      }
-		},
+    }
-	},
+  },
-	data() {
+  data() {
-		return {
+    return {
-			tableProps,
+      tableProps,
-			tableData: [],
+      tableData: [],
-			tableNameList: [], //表名list
+      addButtonShow: '新增',
-			addButtonShow: '新增',
+      form: {
-			form: {
+        id: '',
-				id: '',
+        energyTypeId: '',
-				energyTypeId: '',
+        unit: '',
-				unit: '',
+        recordTime: ''
-				recordTime: '',
+      },
-			},
+      rules: {
-			rules: {
+        energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
-				energyTypeId: [
+        recordTime: [{ required: true, message: '抄表日期不能为空', trigger: 'change' }]
-					{ required: true, message: '能源类型不能为空', trigger: 'change' },
+      },
-				],
+      isEdit: false
-				recordTime: [
+    }
-					{ required: true, message: '抄表日期不能为空', trigger: 'change' },
+  },
-				],
+  methods: {
-			},
+    init(params) {
-			isEdit: false,
+      this.form.recordTime = moment().valueOf()
-		};
+      if (params.type === 'add') {
-	},
+        this.isEdit = false
-	components: { AddTable },
+      } else if (params.type === 'meterReading') {
-	methods: {
+        this.isEdit = false
-		init(params) {
+        this.form.energyTypeId = params.energyTypeId
-			this.form.recordTime = moment().valueOf();
+        let obj = {}
-			if (params.type === 'add') {
+        obj.tableName = params.tableName + ''
-				this.isEdit = false;
+        obj.readingQuantity = 0
-			} else if (params.type === 'meterReading') {
+        this.tableData.push(obj)
-				this.isEdit = false;
+      } else {
-				this.form.energyTypeId = params.energyTypeId;
+        this.isEdit = true
-				let obj = {};
+        this.form.id = params.id
-				obj.tableName = params.tableName + '';
+        this.addButtonShow = ''
-				obj.readingQuantity = 0;
+        energyQuantityManualGet({ id: this.form.id }).then(res => {
-				this.tableData.push(obj);
+          if (res.code === 0) {
-			} else {
+            this.form.energyTypeId = res.data.energyTypeId
-				this.isEdit = true;
+            this.form.recordTime = res.data.recordTime ? res.data.recordTime : null
-				this.form.id = params.id;
+            let obj = {}
-				this.addButtonShow = '';
+            obj.tableName = res.data.tableName ? res.data.tableName + '' : ''
-				energyQuantityManualGet({ id: this.form.id }).then((res) => {
+            obj.readingQuantity = res.data.readingQuantity
-					if (res.code === 0) {
+            this.tableData.push(obj)
-						this.form.energyTypeId = res.data.energyTypeId;
+          }
-						this.form.recordTime = res.data.recordTime
+        })
-							? res.data.recordTime
+      }
-							: null;
+    },
-						let obj = {};
+    inputChange(val) {
-						obj.tableName = res.data.tableName ? res.data.tableName + '' : '';
+      this.tableData[val._pageIndex - 1][val.prop] = val[val.prop]
-						obj.readingQuantity = res.data.readingQuantity;
+    },
-						this.tableData.push(obj);
+    emitButtonClick() {
-					}
+      let obj = {}
-				});
+      obj.tableName = ''
-			}
+      obj.readingQuantity = 0
-		},
+      this.tableData.push(obj)
-		inputChange(val) {
+    },
-			this.tableData[val._pageIndex - 1][val.prop] = val[val.prop];
+    submitForm() {
-			console.log(this.tableData);
+      this.$refs['energyQuantityManualForm'].validate((valid) => {
-		},
+        if (valid) {
-		emitButtonClick() {
+          // 校验表格
-			if (!this.form.energyTypeId) {
+          if (this.tableData.length === 0) {
-				this.$modal.msgWarning('请先选择能源类型');
+            this.$modal.msgError("抄表数据不能为空");
-				return false;
+            return false
-			}
+          } else {
-			let obj = {};
+            for (let item of this.tableData) {
-			obj.tableName = '';
+              console.log(item)
-			obj.readingQuantity = 0;
+              if (!item.tableName || (!item.readingQuantity && item.readingQuantity !== 0)) {
-			this.tableData.push(obj);
+                this.$modal.msgError("抄表数据有空值，请检查");
-		},
+                return false
-		selEnergyType(id) {
+              }
-			// 切换能源类型
+            }
-			this.tableData = [];
+          }
-			this.tableNameList = [];
+          if (this.isEdit) {
-			energyTableGet({ energyTypeId: id }).then((res) => {
+            // 编辑
-				this.tableNameList = res.data.tableObjs || [];
+            energyQuantityManualUpdate({
-			});
+              id: this.form.id,
-		},
+              energyTypeId: this.form.energyTypeId,
-		submitForm() {
+              recordTime: this.form.recordTime,
-			this.$refs['energyQuantityManualForm'].validate((valid) => {
+              tableName: this.tableData[0].tableName,
-				if (valid) {
+              readingQuantity: this.tableData[0].readingQuantity
-					// 校验表格
+            }).then((res) => {
-					if (this.tableData.length === 0) {
+              if (res.code === 0) {
-						this.$modal.msgError('抄表数据不能为空');
+                this.$modal.msgSuccess("操作成功");
-						return false;
+                this.$emit('successSubmit')
-					} else {
+              }
-						for (let item of this.tableData) {
+            })
-							console.log(item);
+          } else {
-							if (
+            energyQuantityManualCreate({
-								!item.tableName ||
+              energyTypeId: this.form.energyTypeId,
-								(!item.readingQuantity && item.readingQuantity !== 0)
+              recordTime: this.form.recordTime,
-							) {
+              data: this.tableData
-								this.$modal.msgError('抄表数据有空值，请检查');
+            }).then((res) => {
-								return false;
+              if (res.code === 0) {
-							}
+                this.$modal.msgSuccess("操作成功");
-						}
+                this.$emit('successSubmit')
-					}
+              }
-					if (this.isEdit) {
+            })
-						// 编辑
+          }
-						energyQuantityManualUpdate({
+        } else {
-							id: this.form.id,
+          return false
-							energyTypeId: this.form.energyTypeId,
+        }
-							recordTime: this.form.recordTime,
+      })
-							tableName: this.tableData[0].tableName,
+    },
-							readingQuantity: this.tableData[0].readingQuantity,
+    formClear() {
-						}).then((res) => {
+      this.$refs.energyQuantityManualForm.resetFields()
-							if (res.code === 0) {
+      this.form.unit = ''
-								this.$modal.msgSuccess('操作成功');
+      this.isEdit = false
-								this.$emit('successSubmit');
+      this.addButtonShow = '新增'
-							}
+      this.tableData = []
-						});
+    }
-					} else {
+  }
-						energyQuantityManualCreate({
+}
-							energyTypeId: this.form.energyTypeId,
-							recordTime: this.form.recordTime,
-							data: this.tableData,
-						}).then((res) => {
-							if (res.code === 0) {
-								this.$modal.msgSuccess('操作成功');
-								this.$emit('successSubmit');
-							}
-						});
-					}
-				} else {
-					return false;
-				}
-			});
-		},
-		formClear() {
-			this.$refs.energyQuantityManualForm.resetFields();
-			this.form.unit = '';
-			this.isEdit = false;
-			this.addButtonShow = '新增';
-			this.tableData = [];
-		},
-	},
-};
 </script>

src/views/energy/base/energyQuantityManual/index.vue

@@ -49,7 +49,9 @@ import {
 } from '@/api/base/energyQuantityManual';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
-import { parseTimeTable } from '@/utils/ruoyi';
+import { parseTime, parseTimeTable } from '@/utils/ruoyi';
+// import FileSaver from "file-saver"
+// import * as XLSX from 'xlsx/xlsx.mjs'
 import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
 import moment from 'moment';
 const tableProps = [

src/views/energy/base/tableNameConfig/components/tableNameConfigUpdate.vue

@@ -47,11 +47,7 @@ export default {
 			energyTableGet({ energyTypeId: id }).then((res) => {
 				this.form.energyType = res.data.energyType || '';
 				this.form.energyTypeId = res.data.energyTypeId || '';
-				this.form.tableIds =
+				this.form.tableIds = res.data.tableIds || [];
-					res.data.tableObjs &&
-					res.data.tableObjs.map((item) => {
-						return item.id;
-					});
 			});
 		},
 		submitForm() {

src/views/equipment/analysis/Statistics/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -34,7 +33,6 @@ import {
 	getEqAnalysis,
 	exportEqAnalysisExcel,
 } from '@/api/equipment/analysis/statistics';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	// {
@@ -54,49 +52,35 @@ const tableProps = [
 	{
 		prop: 'lineName',
 		label: '产线',
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'sectionName',
 		label: '工段',
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'equipmentName',
 		label: '设备名称',
-		minWidth: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'equipmentType',
 		label: '设备类型',
-		width: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'workTime',
 		label: '工作时间累积(h)',
-		width: 160,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'repairCount',
 		label: '维修次数',
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'maintainCount',
 		label: '保养次数',
-		width: 120,
-		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		const today = new Date();
 
@@ -126,7 +110,7 @@ export default {
 			tableBtn: [].filter((v) => v),
 			tableData: [],
 			listQuery: {
-				pageSize: 20,
+				pageSize: 10,
 				pageNo: 1,
 				total: 1,
 				recordTime: [

src/views/equipment/analysis/efficiency/components/pieChart.vue

@@ -75,12 +75,6 @@ export default {
 				},
 				tooltip: {
 					trigger: 'item',
-					formatter: (v) => {
-						const num = String(v.value)?.split('.').length === 2 ? v.value?.toFixed(2) : v.value
-						return `<div>
-						<span>${v.name}: ${num}</span>
-						</div>`
-					}
 				},
 				legend: {
 					show: false,

src/views/equipment/analysis/exception/index.vue

@@ -19,7 +19,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			:max-height="tableH"
+			max-height="600"
 			@emitFun="handleEmitFun">
 			<!-- <method-btn
 				v-if="tableBtn.length"
@@ -42,16 +42,14 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'ExceptionAnalysis',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: {},
 	props: {},
 	data() {
 		return {
-			heightNum: 220,
 			searchBarKeys: ['name', 'code'],
 			// tableBtn: [
 			// 	this.$auth.hasPermi('base:equipment-group:update')

src/views/equipment/analysis/quality/index.vue

@@ -48,11 +48,9 @@
 <script>
 import moment from 'moment';
 import LineChart from './components/lineChart.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'QualityAnalysis',
-	mixins: [tableHeightMixin],
 	components: { LineChart },
 	props: {},
 	data() {
@@ -60,6 +58,7 @@ export default {
 		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
 		return {
 			dialogVisible: false,
+			tableH: this.tableHeight(260),
 			urls: {
 				page: '/analysis/equipment-analysis/quality',
 			},
@@ -255,9 +254,9 @@ export default {
 		this.fillProductOptions();
 	},
 	mounted() {
-		// window.addEventListener('resize', () => {
+		window.addEventListener('resize', () => {
-    //   this.tableH = this.tableHeight(260)
+      this.tableH = this.tableHeight(260)
-    // })
+    })
 		this.$refs['search-bar'].headBtnClick('search');
 	},
 	methods: {

src/views/equipment/base/alarm/Record/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -62,8 +61,6 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { publicFormatter } from '@/utils/dict';
 import AddOrUpdate from './AddOrUpdate.vue';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 const btn = {
@@ -92,7 +89,7 @@ const btn = {
 export default {
 	name: 'Record',
 	components: { AddOrUpdate },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			readOnly: false,
@@ -119,17 +116,17 @@ export default {
 				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
+				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
+				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipment', label: '设备名称', width: 120, showOverflowtooltip: true },
+				{ prop: 'equipment', label: '设备名称' },
 				{
 					prop: 'alarmGrade',
 					label: '报警级别',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
 				},
-				{ prop: 'createTime', label: '报警时间', filter: timeFilter, width: 150, showOverflowtooltip: true },
+				{ prop: 'createTime', label: '报警时间', filter: timeFilter },
-				{ prop: 'alarmCode', label: '设备报警码', width: 180, showOverflowtooltip: true },
+				{ prop: 'alarmCode', label: '设备报警码' },
-				{ prop: 'alarmContent', label: '报警内容', width: 150, showOverflowtooltip: true },
+				{ prop: 'alarmContent', label: '报警内容' },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
 				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
 				// { prop: 'remark', label: '备注' },
@@ -206,7 +203,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				lineId: null,
 				equipmentId: null,
 				recordTime: [],

src/views/equipment/base/config/AlarmGroup/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -71,7 +70,7 @@
 					queryParams: {
 						equipmentGroupId: alarmForm.id,
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('equipment:alarm-group:update')
@@ -110,11 +109,10 @@ import { publicFormatter } from '@/utils/dict';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 // import { getAccessToken } from '@/utils/auth';
 import BasicDrawer from './components/BasicDrawer.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentGroup',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: { BasicDrawer },
 	data() {
 		return {

src/views/equipment/base/config/BindGroup/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -73,7 +72,7 @@
 					queryParams: {
 						equipmentGroupId: alarmForm.id,
 						pageNo: 1,
-						pageSize: 20,
+						pageSize: 10,
 					},
 					tableBtn: [
 						this.$auth.hasPermi('base:equipment-group:update')
@@ -113,12 +112,11 @@ import moment from 'moment';
 import { publicFormatter } from '@/utils/dict';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import BasicDrawer from './components/BasicDrawer.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentBindGroup',
 	components: { BasicDrawer },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['groupId', 'equipmentName'],
@@ -256,7 +254,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				equipmentName: null,
 				groupId: null,
 			},

src/views/equipment/base/config/DataCollection/CollectionConfig.vue

@@ -19,8 +19,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -128,11 +127,10 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import BasicDrawer from './components/BasicDrawer.vue';
 import { publicFormatter } from '@/utils/dict';
 import AddOrUpdate from './add-or-updata';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentPlcConnect',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: { BasicDrawer, AddOrUpdate },
 	data() {
 		return {
@@ -158,14 +156,14 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'productionLine', label: '产线', width: 120, showOverflowtooltip: true },
+				{ prop: 'productionLine', label: '产线' },
-				{ prop: 'workshopSection', label: '工段', width: 120, showOverflowtooltip: true },
+				{ prop: 'workshopSection', label: '工段' },
-				{ prop: 'equipmentName', label: '设备名', width: 120, showOverflowtooltip: true },
+				{ prop: 'equipmentName', label: '设备名' },
-				{ prop: 'equipmentCode', label: '设备编码', width: 200, showOverflowtooltip: true },
+				{ prop: 'equipmentCode', label: '设备编码' },
-				{ prop: 'plcCode', label: '关联表编码', width: 220, showOverflowtooltip: true },
+				{ prop: 'plcCode', label: '关联表编码' },
-				{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
+				{ prop: 'plcTableName', label: '关联表名' },
-				{ prop: 'plcName', label: '标识名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'plcName', label: '标识名称' },
-				{ prop: 'bindingParameters', label: '绑定参数数量', width: 120, showOverflowtooltip: true },
+				{ prop: 'bindingParameters', label: '绑定参数数量' },
 				// {
 				// 	_action: 'params-bind',
 				// 	label: '查看绑定',
@@ -271,7 +269,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				plcId: null,
 				equipmentId: null,
 			},

src/views/equipment/base/config/DataCollection/TableConfig.vue

@@ -20,8 +20,7 @@
 			:limit="queryParams.pageSize"
 			:table-data="list"
 			ref="pageTable"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -61,7 +60,6 @@ import {
 	exportEquipmentPlcExcel,
 } from '@/api/base/equipmentPlc';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const switchBtn = {
 	name: 'SwitchBtn',
@@ -101,7 +99,7 @@ const switchBtn = {
 
 export default {
 	name: 'EquipmentPlc',
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	components: {},
 	data() {
 		return {
@@ -129,16 +127,16 @@ export default {
 				// 	width: 180,
 				// 	filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				// },
-				{ prop: 'code', label: '编码', width: 180, showOverflowtooltip: true },
+				{ prop: 'code', label: '编码' },
-				{ prop: 'plcTableName', label: '关联表名', width: 150, showOverflowtooltip: true },
+				{ prop: 'plcTableName', label: '关联表名' },
-				{ prop: 'name', label: '标识名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'name', label: '标识名称' },
-				{ prop: 'enName', label: '英文名称', width: 150, showOverflowtooltip: true },
+				{ prop: 'enName', label: '英文名称' },
 				{
 					prop: 'collection',
 					label: '是否采集',
 					subcomponent: switchBtn,
 				},
-				{ prop: 'description', label: '描述', minWidth: 150, showOverflowtooltip: true },
+				{ prop: 'description', label: '描述' },
 			],
 			searchBarFormConfig: [
 				{
@@ -242,7 +240,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				plcTableName: null,
 				name: null,
 			},

src/views/equipment/base/inspection/Confirm/WaitingListTable.vue

@@ -15,7 +15,6 @@
 			background: '#f2f4f9',
 			color: '#606266',
 		}"
-		:max-height="tableH"
 		class="waiting-list-table">
 		<el-table-column
 			type="selection"
@@ -38,9 +37,8 @@
 		<el-table-column
 			v-if="selectedBox[0]"
 			label="巡检单名称"
-			:show-overflow-tooltip="true"
 			prop="name"></el-table-column>
-		<el-table-column v-if="selectedBox[1]" label="部门" :show-overflow-tooltip="true" prop="planName">
+		<el-table-column v-if="selectedBox[1]" label="部门" prop="planName">
 			<template slot-scope="scope">
 				{{ scope.row.department || '---' }}
 			</template>
@@ -48,7 +46,6 @@
 		<el-table-column
 			v-if="selectedBox[2]"
 			label="巡检时间"
-			width="150"
 			prop="actualCheckTime">
 			<template slot-scope="scope">
 				{{ scope.row.actualCheckTime | timeFilter }}
@@ -57,8 +54,6 @@
 		<el-table-column
 			v-if="selectedBox[3]"
 			label="班次"
-			width="180"
-			:show-overflow-tooltip="true"
 			prop="groupClass">
 			<template slot-scope="scope">
 				{{ scope.row.groupClass || '---' }}
@@ -67,7 +62,6 @@
 		<el-table-column
 			v-if="selectedBox[4]"
 			label="确认截止时间"
-			width="150"
 			prop="confirmDueTime">
 			<template slot-scope="scope">
 				{{ scope.row.confirmDueTime | timeFilter }}
@@ -76,7 +70,6 @@
 		<el-table-column
 			v-if="selectedBox[5]"
 			width="150"
-			:show-overflow-tooltip="true"
 			label="备注"
 			prop="remark">
 			<template slot-scope="scope">
@@ -179,7 +172,6 @@ export default {
 				true
 			],
 			selectedPlan: [],
-			tableH: this.tableHeight(260)
 		};
 	},
 	computed: {
@@ -190,16 +182,6 @@ export default {
 			}));
 		},
 	},
-	created() {
-		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-	},
-	destroyed() {
-		window.removeEventListener('resize', () => {
-			this.tableH = this.tableHeight(260)
-		});
-	},
 	methods: {
 		checkSelectable(row, index) {
 			return true;

src/views/equipment/base/inspection/Confirm/index.vue

@@ -139,7 +139,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				maintainPlanId: null,
 				startTime: null,
 				special: false,

src/views/equipment/base/inspection/Record/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -66,7 +65,6 @@ import addRecord from './addRecord.vue';
 import AddContent from './addContent.vue';
 import { exportCheckOrderExcel, deleteEqCheckLog } from '@/api/equipment/base/inspection/record'
 import { parseTime } from '../../../../core/mixins/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -93,7 +91,7 @@ const btn = {
 export default {
 	name: 'EquipmentInspectionRecord',
 	components: { addRecord, AddContent },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@@ -252,7 +250,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				special: false,
 				name: null,
 				actualCheckTime: null,

src/views/equipment/base/inspection/Settings/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -54,14 +53,13 @@ import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue';
 import { parseTime } from '../../../../core/mixins/code-filter';
 import { groupClassesListAll } from '@/api/monitoring/teamProduction';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentCheckSetting',
 	components: { addOrUpdata, add },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@@ -104,7 +102,7 @@ export default {
 				{
 					prop: 'code',
 					label: '巡检单编码',
-					minWidth: 170,
+					minWidth: 150,
 					showOverflowtooltip: true,
 				},
 				{ prop: 'department', label: '部门', showOverflowtooltip: true },
@@ -227,7 +225,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				equipmentId: null,
 				name: null,
 				special: false,

src/views/equipment/base/maintain/Confirm/WaitingListPlanned--edit.vue

@@ -7,13 +7,12 @@
 
 <template>
 	<el-drawer
-		:visible.sync="visible"
+		:visible="visible"
 		:show-close="false"
-		:wrapper-closable="true"
+		:wrapper-closable="false"
 		class="drawer"
 		custom-class="mes-drawer"
 		size="60%"
-		:before-close="beforeClose"
 		@closed="$emit('destroy')">
 		<SmallTitle slot="title">编辑</SmallTitle>
 
@@ -345,7 +344,6 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
-						bind: { clearable: true, filterable: true },
 						// method: 'post',
 						// queryParams: {
 						// 	pageNo: 1,
@@ -445,15 +443,6 @@ export default {
 		this.getList('line');
 	},
 	methods: {
-		beforeClose(done) {
-			// if (!this.isdetail) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					done();
-				})
-				.catch(_ => {});
-			// }
-		},
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':

src/views/equipment/base/maintain/Confirm/WaitingListTable.vue

@@ -15,7 +15,6 @@
 			background: '#f2f4f9',
 			color: '#606266',
 		}"
-		:max-height="tableH"
 		class="waiting-list-table">
 		<el-table-column
 			type="selection"
@@ -37,9 +36,8 @@
 		</el-table-column>
 		<el-table-column
 			v-if="selectedBox[0]"
-			width="160"
+			width="128"
 			label="设备保养单号"
-			:show-overflow-tooltip="true"
 			prop="maintainOrderNumber"></el-table-column>
 		<el-table-column v-if="selectedBox[1]" width="128" label="保养计划名称" prop="planName">
 			<template slot-scope="scope">
@@ -226,7 +224,6 @@ export default {
 				true,
 			],
 			selectedPlan: [],
-			tableH: this.tableHeight(260),
 		};
 	},
 	computed: {
@@ -237,16 +234,6 @@ export default {
 			}));
 		},
 	},
-	created() {
-		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-	},
-	destroyed() {
-		window.removeEventListener('resize', () => {
-			this.tableH = this.tableHeight(260)
-		});
-	},
 	methods: {
 		checkSelectable(row, index) {
 			return (

src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue

@@ -335,7 +335,6 @@ export default {
 						label: '设备名称',
 						prop: 'equipmentId',
 						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=false',
-						bind: { clearable: true, filterable: true },
 						// method: 'post',
 						// queryParams: {
 						// 	pageNo: 1,

src/views/equipment/base/maintain/Confirm/index.vue

@@ -197,7 +197,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				maintainPlanId: null,
 				startTime: null,
 				special: false,

src/views/equipment/base/maintain/Monitor/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<!-- <method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -60,7 +59,6 @@ import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { exportMaintainMonitorExcel } from '@/api/equipment/base/maintain/record'
 import { parseTime } from '@/utils/ruoyi'
 import AddContent from '../PlanConfig/addContent.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const remainBox = {
 	name: 'RemainBox',
@@ -118,7 +116,7 @@ const btn = {
 export default {
 	name: 'Monitor',
 	components: { AddContent },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addContent: false,
@@ -131,7 +129,7 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime(createTime),
 				// },
-				{ prop: 'code', label: '保养计划单号', width: 150, showOverflowtooltip: true },
+				{ prop: 'code', label: '保养计划单号', minWidth: 118, showOverflowtooltip: true },
 				{ prop: 'name', label: '保养计划名称', minWidth: 118, showOverflowtooltip: true },
 				{ prop: 'departmentName', label: '部门', minWidth: 100, showOverflowtooltip: true },
 				{ prop: 'lineName', label: '产线名', minWidth: 100, showOverflowtooltip: true },
@@ -207,7 +205,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				special: false,
 				equipmentName: null,
 				createTime: null,

src/views/equipment/base/maintain/PlanConfig/index.vue

@@ -9,12 +9,11 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="120"
+				:width="150"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -54,7 +53,6 @@ import { parseTime, toDay } from '../../../../core/mixins/code-filter';
 import { publicFormatter } from '@/utils/dict';
 import { getPlanPage } from '@/api/equipment/base/maintain/planconfig';
 import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	// {
@@ -64,64 +62,46 @@ const tableProps = [
 	// },
 	{
 		prop: 'name',
-		label: '保养计划名称',
+		label: '保养计划名称'
-		width: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'departmentName',
-		label: '部门',
+		label: '部门'
-		width: 120,
-		showOverflowtooltip: true
 	},
   {
 		prop: 'lineName',
-		label: '产线名',
+		label: '产线名'
-		width: 120,
-		showOverflowtooltip: true
 	},
   {
 		prop: 'maintenancePeriod',
-		label: '保养频率(天/次)',
+		label: '保养频率(天/次)'
-		width: 150,
-		showOverflowtooltip: true
 	},
   {
 		prop: 'firstMaintenanceTime',
 		label: '首次保养时间',
-		filter: parseTime,
+		filter: parseTime
-		width: 150,
-		showOverflowtooltip: true
 	},
   {
 		prop: 'maintainDuration',
-		label: '保养时长',
+		label: '保养时长'
-		width: 120,
-		showOverflowtooltip: true
 	},
   {
 		prop: 'maintainer',
-		label: '计划保养人员',
+		label: '计划保养人员'
-		width: 150,
-		showOverflowtooltip: true
 	},
   {
 		prop: 'confirmTimeLimit',
 		label: '确认时限',
-		filter: toDay,
+		filter: toDay
-		width: 130,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		width: 150,
-		showOverflowtooltip: true
 	}
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -131,7 +111,7 @@ export default {
 			tableProps,
 			addContent: false,
 			listQuery: {
-        pageSize: 20,
+        pageSize: 10,
         pageNo: 1,
         total: 0,
 				special: false,

src/views/equipment/base/maintain/Record/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -66,7 +65,6 @@ import Editor from '@/components/Editor';
 import { deleteEqMaintainLog, exportMaintainLogExcel } from '@/api/equipment/base/maintain/record';
 import AddContent from './addContent.vue';
 import { parseTime } from '../../../../core/mixins/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
@@ -93,7 +91,7 @@ const btn = {
 export default {
 	name: 'EquipmentMaintainRecord',
 	components: { AddContent },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addContent: false,
@@ -339,7 +337,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				special: false,
 				maintainPlanId: null,
 				maintainPlanId: null,

src/views/equipment/base/repair/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -59,13 +58,12 @@ import { deleteRepair, exportRepairLogExcel } from '@/api/equipment/base/repair'
 import { parseTime } from '@/utils/ruoyi'
 import htmls from './htmls.vue'
 import DialogForm from './Repair--add.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentRepair',
 	components: { CustomDialogForm, DialogForm },
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
@@ -104,16 +102,16 @@ export default {
 				// 	width: 180,
 				// 	filter: parseTime,
 				// },
-				{ prop: 'repairOrderNumber', label: '维修单号', width: 180, showOverflowtooltip: true },
+				{ prop: 'repairOrderNumber', label: '维修单号' },
-				{ prop: 'lineName', label: '产线名', width: 120, showOverflowtooltip: true },
+				{ prop: 'lineName', label: '产线名' },
-				{ prop: 'sectionName', label: '工段名', width: 120, showOverflowtooltip: true },
+				{ prop: 'sectionName', label: '工段名' },
 				{ prop: 'equipmentName', label: '设备名称', minWidth: 100, showOverflowtooltip: true },
-				{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls, width: 180, showOverflowtooltip: true },
+				{ prop: 'faultDetail', label: '故障明细', subcomponent: htmls },
 				// { prop: 'maintenanceDetail', label: '维修明细', subcomponent: htmls, minWidth: 100, showOverflowtooltip: true },
 				{
 					prop: 'maintenanceStartTime',
 					label: '维修开始时间',
-					width: 150,
+					width: 150, 
 					filter: parseTime,
 				},
 				{
@@ -195,7 +193,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				special: false,
 				maintenanceResult: null,
 				createTime: null,

src/views/extend/processEquMaterialBom/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+    <base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
       :limit="listQuery.pageSize" :table-data="tableData">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" />
@@ -16,7 +16,7 @@
 <script>
 import AddOrUpdate from './add-or-updata';
 // import DetailOrUpdate from './detail-or-updata';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 import basicPage from '../../core/mixins/basic-page';
 import StatusBtn from './statusBtn.vue'
 import {
@@ -54,7 +54,7 @@ const tableProps = [
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/extend/processEquValueBom/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+    <base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
       :limit="listQuery.pageSize" :table-data="tableData">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" />
@@ -16,7 +16,7 @@
 <script>
 import AddOrUpdate from './add-or-updata';
 // import DetailOrUpdate from './detail-or-updata';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 import basicPage from '../../core/mixins/basic-page';
 import StatusBtn from './statusBtn.vue'
 import {
@@ -54,7 +54,7 @@ const tableProps = [
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {

src/views/monitoring/equipmentProcessAmount/index.vue

@@ -88,8 +88,7 @@
 									:page="1"
 									:limit="999"
 									:table-data="list"
-									@emitFun="handleEmitFun"
+									@emitFun="handleEmitFun">
-									:max-height="tableH">
 									<!-- <method-btn
 							v-if="tableBtn.length"
 						slot="handleBtn"
@@ -120,11 +119,9 @@
 
 <script>
 import Graph from './graph.vue';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
 	name: 'EquipmentProcessAmount',
-	mixins: [tableHeightMixin],
 	components: { Graph },
 	props: {},
 	data() {

src/views/quality/base/qualityIsra/index.vue

@@ -10,7 +10,7 @@
       <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" />
 
       <!-- 列表 -->
-      <base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="20" :table-data="list">
+      <base-table :table-props="tableProps" :page="1" :limit="10" :table-data="list">
       </base-table>
     </el-row>
 
@@ -85,7 +85,6 @@ import {
 import moment from 'moment';
 // import DialogForm from './dialogForm.vue';
 import * as echarts from 'echarts';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 // import basicPageMixin from '@/mixins/lb/basicPageMixin';
 export default {
@@ -93,7 +92,7 @@ export default {
 	// components: {
 	// 	DialogForm,
 	// },
-  mixins: [tableHeightMixin],
+	// mixins: [basicPageMixin],
 	data() {
     return {
       list: [],

src/views/quality/base/qualityScrapDet/index.vue

@@ -1,18 +1,40 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <base-table  :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+			:formConfigs="formConfig"
-      :limit="listQuery.pageSize" :table-data="tableData">
+			ref="searchBarForm"
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+			@headBtnClick="buttonClick" />
-        @clickBtn="handleClick" />
+		<base-table
-    </base-table>
+			v-loading="dataListLoading"
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+			:table-props="tableProps"
-      @pagination="getDataList" />
+			:page="listQuery.pageNo"
-    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+			:limit="listQuery.pageSize"
-      @confirm="handleConfirm" :before-close="handleCancel" width="40%">
+			:table-data="tableData">
-      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
+			<method-btn
-    </base-dialog>
+				v-if="tableBtn.length"
-  </div>
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
 </template>
 
 <script>
@@ -24,7 +46,6 @@ import {
   deleteQualityScrapDet,
 } from '@/api/base/qualityScrapDet';
 import { getList, } from "@/api/base/qualityScrapType";
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'createTime',
@@ -50,7 +71,7 @@ const tableProps = [
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -156,7 +177,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
           this.listQuery.content = val.content ? val.content : undefined;
           this.listQuery.typeId = val.typeId ? val.typeId : undefined;
 					this.getDataList();
@@ -164,7 +185,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

src/views/quality/base/qualityScrapLog/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+    <base-table v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
       :limit="listQuery.pageSize" :table-data="tableData">
       <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" />
@@ -19,7 +19,7 @@
 <script>
 import AddOrUpdate from './add-or-updata';
 import DetailOrUpdate from './detail-or-updata';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 import basicPage from './basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
@@ -68,7 +68,7 @@ const tableProps = [
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -214,7 +214,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
           this.listQuery.workOrderId = val.workOrderId ? val.workOrderId : undefined;
           // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
 					this.getDataList();
@@ -222,7 +222,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

src/views/quality/base/qualityScrapType/index.vue

@@ -1,25 +1,46 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :page="listQuery.pageNo"
+			:formConfigs="formConfig"
-      :limit="listQuery.pageSize" :table-data="tableData">
+			ref="searchBarForm"
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+			@headBtnClick="buttonClick" />
-        @clickBtn="handleClick" />
+		<base-table
-    </base-table>
+			v-loading="dataListLoading"
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+			:table-props="tableProps"
-      @pagination="getDataList" />
+			:page="listQuery.pageNo"
-    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+			:limit="listQuery.pageSize"
-      @confirm="handleConfirm" :before-close="handleCancel" width="40%">
+			:table-data="tableData">
-      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
+			<method-btn
-    </base-dialog>
+				v-if="tableBtn.length"
-  </div>
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<pagination
+			:limit.sync="listQuery.pageSize"
+			:page.sync="listQuery.pageNo"
+			:total="listQuery.total"
+			@pagination="getDataList" />
+		<base-dialog
+			:dialogTitle="addOrEditTitle"
+			:dialogVisible="addOrUpdateVisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="40%">
+			<add-or-update
+				ref="addOrUpdate"
+				@refreshDataList="successSubmit"></add-or-update>
+		</base-dialog>
+	</div>
 </template>
 
 <script>
 import AddOrUpdate from './add-or-updata';
 import basicPage from '../../../core/mixins/basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import {
   getQualityScrapTypePage,
   deleteQualityScrapType
@@ -50,7 +71,7 @@ const tableProps = [
 ];
 
 export default {
-  mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -138,14 +159,14 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 20;
+					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name ? val.name : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 20,
+						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

src/views/quality/monitoring/currentData/index.vue

@@ -8,8 +8,7 @@
           <el-tab-pane :label="'\u2002表格数据\u2002'" name="table">
             <!-- 列表 -->
             <div class="blue-title">产品名：{{ productDetail.name }} 产品规格：{{ productDetail.specifications }}</div>
-            <base-table :max-height="tableH" class="base-table__margin" :table-props="productProps" :page="1"
+            <base-table class="base-table__margin" :table-props="productProps" :page="1" :limit="10" :table-data="list">
-              :limit="10" :table-data="list">
             </base-table>
             <div v-for="(item,index) in downProps" :key="index">
               <div class="blue-title">工单名称:{{ list[index].workOrderName }}</div>
@@ -52,7 +51,6 @@ import {
   getProductList,
   getWorkOrderList
 } from '@/api/monitoring/statisticalData';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // import Editor from '@/components/Editor';
 import moment from 'moment';
 // import DialogForm from './dialogForm.vue';
@@ -63,7 +61,7 @@ export default {
 	// components: {
 	// 	DialogForm,
 	// },
-  mixins: [tableHeightMixin],
+	// mixins: [basicPageMixin],
 	data() {
     return {
       list: [],

src/views/quality/monitoring/qualityInspectionRecord/index.vue

@@ -1,26 +1,47 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <!-- 搜索工作栏 -->
+		<!-- 搜索工作栏 -->
-    <SearchBar :isFold="true" :formConfigs="searchBarFormConfig" ref="search-bar"
+		<SearchBar
-      @headBtnClick="handleSearchBarBtnClick" />
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
 
-    <!-- 列表 -->
+		<!-- 列表 -->
-    <base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
+		<base-table
-      @emitFun="handleEmitFun">
+			:table-props="tableProps"
-      <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right" :method-list="tableBtn"
+			:page="queryParams.pageNo"
-        @clickBtn="handleTableBtnClick" />
+			:limit="queryParams.pageSize"
-    </base-table>
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				label="操作"
+				:width="120"
+				fixed="right"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
 
-    <!-- 分页组件 -->
+		<!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+		<pagination
-      @pagination="getList" />
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
 
-    <!-- 对话框(添加 / 修改) -->
+		<!-- 对话框(添加 / 修改) -->
-    <base-dialog :dialogTitle="title" :dialogVisible="open" width="50%" @close="cancel" @cancel="cancel"
+		<base-dialog
-      @confirm="submitForm">
+			:dialogTitle="title"
-      <DialogForm v-if="open" ref="form" v-model="form" />
+			:dialogVisible="open"
-    </base-dialog>
+			width="50%"
-  </div>
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogForm v-if="open" ref="form" v-model="form" />
+		</base-dialog>
+	</div>
 </template>
 
 <script>

src/views/quality/monitoring/statisticalData/index.vue

@@ -1,12 +1,18 @@
 <template>
-  <div class="app-container">
+	<div class="app-container">
-    <!-- 搜索工作栏 -->
+		<!-- 搜索工作栏 -->
-    <SearchBar  :formConfigs="searchBarFormConfig" ref="search-bar"
+		<SearchBar
-      @headBtnClick="handleSearchBarBtnClick" />
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+			@headBtnClick="handleSearchBarBtnClick" />
 
-    <!-- 列表 -->
+		<!-- 列表 -->
-    <base-table :max-height="tableH" :table-props="tableProps" :page="1" :limit="10" :table-data="list">
+		<base-table
-      <!-- <method-btn
+			:table-props="tableProps"
+			:page="1"
+			:limit="10"
+			:table-data="list">
+			<!-- <method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				label="操作"
@@ -14,18 +20,18 @@
 				fixed="right"
 				:method-list="tableBtn"
 				@clickBtn="handleTableBtnClick" /> -->
-    </base-table>
+		</base-table>
 
-    <!-- 分页组件 -->
+		<!-- 分页组件 -->
-    <!-- <pagination
+		<!-- <pagination
 			v-show="total > 0"
 			:total="total"
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			@pagination="getList" /> -->
 
-    <!-- 对话框(添加 / 修改) -->
+		<!-- 对话框(添加 / 修改) -->
-    <!-- <base-dialog
+		<!-- <base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
 			width="50%"
@@ -34,7 +40,7 @@
 			@confirm="submitForm">
 			<DialogForm v-if="open" ref="form" v-model="form" />
 		</base-dialog> -->
-  </div>
+	</div>
 </template>
 
 <script>
@@ -45,7 +51,6 @@ import {
 } from '@/api/monitoring/statisticalData';
 // import Editor from '@/components/Editor';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 // import DialogForm from './dialogForm.vue';
 
 // import basicPageMixin from '@/mixins/lb/basicPageMixin';
@@ -54,7 +59,7 @@ export default {
 	// components: {
 	// 	DialogForm,
 	// },
-  mixins: [tableHeightMixin],
+	// mixins: [basicPageMixin],
 	data() {
     return {
       list: [],
@@ -106,13 +111,7 @@ export default {
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
-        },
+				},
-        {
-          type: 'button',
-          btnName: '返回',
-          name: 'back',
-          color: 'primary',
-        },
 				// {
 				// 	type: this.$auth.hasPermi(
 				// 		'base:quality-inspection-record:create'
@@ -374,9 +373,8 @@ export default {
         this.queryParams.productionId = val.productionId ? val.productionId : undefined
         this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined
         this.queryParams.endTime = val.checkTime ? val.checkTime[1] : undefined
+
         this.getList()
-      } else if (val.btnName === 'back') {
-        this.$router.go(-1)
       }
     //  console.log(val);
     }