修改成本新的权限字段

Reviewed-on: #321

.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-25 15:59:53
+ # @LastEditTime: 2024-04-08 16:46:49
- # @LastEditors: zhp
+ # @LastEditors: DY
  # @Description:
 ###
 # 开发环境配置
@@ -13,20 +13,22 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://10.70.2.2:8080'
+# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # VUE_APP_BASE_API = 'http://192.168.1.20:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
+# VUE_APP_BASE_API = 'http://192.168.4.173:9001'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
-VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
-VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
+# VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
+VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
+VUE_APP_Socket_Dcs_API = 'ws://192.168.0.33:8080'
 
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://10.70.2.22:8080'

src/api/analysis/energyAnalysis.js

@@ -35,3 +35,21 @@ export function getQoq(data) {
     data: data
   })
 }
+
+// 获取能源设备树
+export function getTree() {
+  return request({
+    url: '/analysis/energy-analysis/getTree',
+    method: 'get'
+  })
+}
+
+// 导出（走势分析）
+export function exportTrend(data) {
+  return request({
+    url: '/analysis/energy-analysis/exportTrend',
+    method: 'post',
+    responseType: 'blob',
+    data: data
+  })
+}

src/api/base/energyQuantityManual.js

@@ -54,3 +54,27 @@ export function energyQuantityManualExport(data) {
     responseType: 'blob'
   })
 }
+// 获得能源表名配置分页
+export function energyTablePage(data) {
+  return request({
+    url: '/base/energy-table/page',
+    method: 'post',
+    data: data
+  })
+}
+// 获得能源表名配置
+export function energyTableGet(query) {
+  return request({
+    url: '/base/energy-table/get',
+    method: 'get',
+    params: query
+  })
+}
+// 更新能源表名配置
+export function energyTableUpdate(data) {
+  return request({
+    url: '/base/energy-table/update',
+    method: 'put',
+    data: data
+  })
+}

src/api/base/energyType.js

@@ -68,3 +68,4 @@ export function exportEnergyTypeExcel(query) {
     responseType: 'blob'
   })
 }
+

src/components/DialogForm/index.vue

@@ -12,7 +12,7 @@
 		:label-width="`${labelWidth}px`"
 		:size="size"
 		:label-position="labelPosition"
-		v-loading="formLoading">
+		v-loading="0 && formLoading">
 		<el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
 			<el-col v-for="col in row" :key="col.label" :span="24 / row.length">
 				<el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">

src/mixins/lb/tableHeightMixin.js

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

src/store/modules/dict.js

@@ -32,6 +32,7 @@ const actions = {
         }
         // 处理 dictValue 层级
         dictDataMap[dictData.dictType].push({
+          id: dictData.id,
           value: dictData.value,
           label: dictData.label,
           colorType: dictData.colorType,

src/utils/dict.js

@@ -97,6 +97,8 @@ export const DICT_TYPE = {
   TABLE_NAME: 'table_name',
   METHOD: 'method',
   PUSH: 'push',
+  ENERGY_TYPE: 'energy_type',
+
 
   // ============== ORDER - 订单模块 =============
   ORDER_STATUS: 'order_status',

src/views/OperationalOverview/AGVBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-28 15:28:07
+ * @LastEditTime: 2024-04-03 10:54:53
  * @Description:
 -->
 <template>
@@ -16,11 +16,11 @@
       许昌安彩AGV原片周转看板
       <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
       <h3 class="time">{{ times }}</h3>
-      <el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px', fontSize: '32px' }"
+      <!-- <el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px', fontSize: '32px' }"
         @click="changeFullScreen">
         <svg-icon width="32" height="32" v-if="isFullScreen" icon-class="unFullScreenView" />
         <svg-icon width="32" height="32" v-else icon-class="fullScreenView" />
-      </el-button>
+      </el-button> -->
     </el-row>
     <el-row class="container-main flex-col" type="flex">
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15 * beilv" type="flex" class="flex-1">
@@ -34,14 +34,16 @@
         <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: 1em">
+              <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: .5em">
-                <p v-if="op.outRate === 1" class="now-secondary-title" style="color:#4679FD">
+                <!-- <p v-if="op.outRate === 1" class="now-secondary-title"
+                  style="font-size: 14px; opacity: calc(.6);color:#4679FD">
                   <i class="el-icon-check" />
                   {{ op.name }}
-                </p>
+                </p> -->
-                <p v-else class="now-secondary-title">{{ op.name }}</p>
+                <!-- <p class="now-secondary-title">{{ op.name }}</p> -->
-                <el-progress :stroke-width="10" define-back-color="rgba(32, 57, 96, 1)" text-color="white"
+                <p  class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</p>
-                  :percentage="op.outRate * 100" class="custom-progress-bar" />
+                <el-progress style="width: 935px;" 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>
           </base-container>
@@ -496,7 +498,7 @@ export default {
         seconds = "0" + seconds;
       }
       //拼接格式化当前时间
-      this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+      this.times = year + "." + month + "." + day + " " + hours + ":" + minutes + ":" + seconds;
     },
     windowWidth(value) {
       this.clientWidth = value
@@ -530,11 +532,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
-
-
-
-
 .visual-container {
   width: 1920px;
   height: 1080px;
@@ -556,7 +553,7 @@ export default {
           top: 25px;
           color: rgba(255, 255, 255, 0.80);
           font-size: 20px;
-          letter-spacing: 0px;
+          letter-spacing: 1px;
         }
         .time {
           position: absolute;
@@ -564,7 +561,7 @@ export default {
             top: 25px;
           color: rgba(255, 255, 255, 0.80);
           font-size: 20px;
-          letter-spacing: 0px;
+          letter-spacing: .72px;
         }
     .title-button {
       color: #00fff0;
@@ -607,6 +604,14 @@ export default {
 ::v-deep .el-progress-bar__inner {
   background-color: unset;
   background-image: linear-gradient(to right, #4573fe, #47f8dc);
+}
+::v-deep .el-progress__text {
+  width: 50px;
+  margin-top: -70px;
+  margin-left: 834px;
+  text-align: right;
+  // background-color: unset;
+  // background-image: linear-gradient(to right, #4573fe, #47f8dc);
 }
  .visual-select {
    position: absolute;

src/views/OperationalOverview/coldBoard.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-03-28 16:35:49
+ * @LastEditTime: 2024-04-07 16:05:59
  * @LastEditors: zhp
  * @Description:
 -->
@@ -17,11 +17,11 @@
       许昌安彩冷端看板
       <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
       <h3 class="time">{{ times }}</h3>
-      <el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px',fontSize:'32px'}"
+      <!-- <el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px',fontSize:'32px'}"
         @click="changeFullScreen">
         <svg-icon width="32" height="32" v-if="isFullScreen" icon-class="unFullScreenView" />
         <svg-icon width="32" height="32" v-else icon-class="fullScreenView" />
-      </el-button>
+      </el-button> -->
     </el-row>
     <el-row class="container-main flex-col" type="flex">
       <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1">
@@ -40,6 +40,13 @@
               <top-radio-group />
             </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>
+            </div>
             <double-y-chart ref="productChart" :id="'doubleYChart'" :name-list="cxNameList" :data-list="cxDataList"
               :height="359" :show-legend="true" />
           </base-container>
@@ -64,11 +71,11 @@
             </div> -->
             <!-- <el-row :gutter="9"> -->
             <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> -->
-            <pile-bar-chart style="margin-bottom: -15px" ref="firstPileChart" :height="90" />
+            <pile-bar-chart id=" 'one' " style="margin-top: -5px;" ref="firstPileChart" :height="80" />
-            <second-pile-bar-chart style="margin-bottom: -15px" id=" 'second' " ref="secondPileChart" :height="90" />
+            <second-pile-bar-chart id=" 'second' " ref="secondPileChart" :height="90" />
-            <third-pile-bar-chart style="margin-bottom: -15px" id=" 'third' " ref="thirdPileChart" :height="90" />
+            <third-pile-bar-chart id=" 'third' " ref="thirdPileChart" :height="90" />
-            <fourth-pile-bar-chart style="margin-bottom: -15px" id=" 'fourth' " ref="fourthPileChart" :height="90" />
+            <fourth-pile-bar-chart id=" 'fourth' " ref="fourthPileChart" :height="90" />
-            <fifth-pile-bar-chart style="margin-bottom: -15px" id=" 'fifth' " ref="fifthPileChart" :height="100" />
+            <fifth-pile-bar-chart style="margin-top: -5px;" id=" 'fifth' " ref="fifthPileChart" :height="90" />
             <!-- <pile-bar-chart ref="secondPileChart"
               :height="90" />
             <pile-bar-chart ref="thirdPileChart"
@@ -244,6 +251,7 @@ export default {
       funWs: undefined,
       SJGws: undefined,
       funWsData: {},
+      coldDetData:[],
       SJGWsData: {},
       cxNameList:[],
       cxDataList:[],
@@ -302,6 +310,7 @@ export default {
       window.location.reload()
     }, 86400000)
     // this.getData()
+    // this.getReaiData()
   },
   destroyed() {
     this.CutWebsocketClose()
@@ -314,16 +323,39 @@ export default {
     }
   },
   mounted() {
+    this.getProductData()
+    // this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
+    this.getTimes()
+    // console.log(moment(this.logoutTime - 28800000).format('HH:mm:ss'));
+    this.funInitWebSocket()
+      if (!this.wsIsOpen) {
+        getDcsMsg()
+        this.wsIsOpen = true
+        console.log('开启websocket==========')
+      }
+    this.CutInitWebSocket()
+    this.SJGInitWebSocket()
+    const _this = this;
+    _this.beilv2 = document.documentElement.clientWidth / 1920
+    window.onresize = () => {
+      return (() => {
+        _this.clientWidth = `${document.documentElement.clientWidth}`
+        this.beilv2 = _this.clientWidth / 1920
+      })()
+    }
+  },
+  methods: {
+    getProductData() {
       let nameList = []
       let nameWasteList = []
       let topNameList = []
       let productList = []
       let wasteList = []
       let yieldList = []
-    // let sumAreaList = []
+      let sumAreaList = []
       // let yieldList = []
       // this.cutTableDataList =
-    let coldDetData = [
+      this.coldDetData = [
         {
           "first": 0.8834,
           "lineName": "Y61",
@@ -375,45 +407,69 @@ export default {
           "yield": 0.9133
         }
       ]
-    coldDetData.forEach((ele, index) => {
+      this.coldDetData.forEach((ele, index) => {
         nameList.push(ele.lineName)
-      topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea)
+        topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea + '㎡')
         productList.push(ele.productArea)
         wasteList.push(ele.wastArea)
-      nameWasteList.push('缺陷面积:' + ele.wastArea)
+        nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
-      yieldList.push({
+        // yieldList.push({
-        name: '良品',
+        //   name: '良品',
-        yield:ele.yield
+        //   yield:ele.yield
-      })
+        // })
-      // sumAreaList.push(ele.sumArea)
+        sumAreaList.push(ele.sumArea)
-      // yieldList.push((ele.yield * 100).toFixed(3))
+        yieldList.push((ele.yield * 100).toFixed(0))
       })
+      this.$nextTick(() => {
+        this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
         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.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
         this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
-    // this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
+      })
-    this.getTimes()
-    // console.log(moment(this.logoutTime - 28800000).format('HH:mm:ss'));
-    this.funInitWebSocket()
-      if (!this.wsIsOpen) {
-        getDcsMsg()
-        this.wsIsOpen = true
-        console.log('开启websocket==========')
-      }
-    this.CutInitWebSocket()
-    this.SJGInitWebSocket()
-    const _this = this;
-    _this.beilv2 = document.documentElement.clientWidth / 1920
-    window.onresize = () => {
-      return (() => {
-        _this.clientWidth = `${document.documentElement.clientWidth}`
-        this.beilv2 = _this.clientWidth / 1920
-      })()
-    }
     },
-  methods: {
+    // getReaiData() {
+    //   let detData = [
+    //     {
+    //       name: '1',
+    //       run: '运行',
+    //     },
+    //     {
+    //       name: '2',
+    //       run: '未运行',
+    //     },
+    //     {
+    //       name: '3',
+    //       run: '运行',
+    //     },
+    //     {
+    //       name: '4',
+    //       run: '未运行',
+    //     },
+    //     {
+    //       name: '1',
+    //       run: '运行',
+    //     },
+    //   ]
+    //   let arr = []
+    //   let index = 0
+    //   for (let i in detData) {
+    //     index++,
+    //       arr.push([
+    //         `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
+    //         </span>`,
+    //         // `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
+    //         // </span>`,
+    //         `<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 = [
     //     {
@@ -444,8 +500,10 @@ export default {
     //     `<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 );}
@@ -495,7 +553,7 @@ export default {
         seconds = "0" + seconds;
       }
       //拼接格式化当前时间
-      this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+      this.times = year + "." + month + "." + day + " " + hours + ":" + minutes + ":" + seconds;
     },
     SJGInitWebSocket() {
       let date = new Date().valueOf()
@@ -525,10 +583,9 @@ export default {
           ])
         }
         this.realEqConfig.data = this.realEqList
-        this.$nextTick(() => {
+        // this.$nextTick(() => {
           this.$refs['realEqScrollBoard'].updateRows(this.realEqList)
-
+        // })
-        })
       };
       // if (typeof (WebSocket) === 'undefined') {
       //   alert('您的浏览器不支持WebSocket')
@@ -560,19 +617,23 @@ 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.7)" >${index + 1 || ''}
+            `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
             </span>`,
-            `<span style="color:rgba(255,255,255,0.7)" >${item.lineName || ''}
+            `<span style="color:rgba(255,255,255,0.5)" >${item.lineName || ''}
             </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.formatTime(item.time) || ''}</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.getSize(item.size) || ''}</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.productArea) + '㎡' || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(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(0) > 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</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>`
+           <div style = "${(item.product * 100).toFixed(0) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>`
           ])
           this.cutConfig.data = cutArr
+          // this.$nextTick(() => {
             this.$refs['cutScrollBoard'].updateRows(cutArr)
+          // })
+          // this.cutConfig.data = cutArr
+          // this.$refs['cutScrollBoard'].updateRows(cutArr)
         } else if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'chart' && this.cutWsData.dateType === 'day') {
           let nameList = []
           let nameWasteList = []
@@ -581,22 +642,25 @@ export default {
           let wasteList = []
           let sumAreaList = []
           let yieldList = []
+          this.coldDetData = this.cutWsData.coldDetData
           // this.cutTableDataList =
           this.cutWsData.coldDetData.forEach((ele, index) => {
             nameList.push(ele.lineName)
-            topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea)
+            topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea + '㎡')
             productList.push(ele.productArea)
             wasteList.push(ele.wastArea)
-            nameWasteList.push('缺陷面积:' + ele.wastArea)
+            nameWasteList.push('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
             sumAreaList.push(ele.sumArea)
-            yieldList.push(parseFloat((ele.yield * 100).toFixed(3)))
+            yieldList.push(parseFloat((ele.yield * 100).toFixed(0)))
           })
+          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[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
+            this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
-          this.$refs.fourthPileChart.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.fifthPileChart.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.productChart.initChart(nameList, yieldList, sumAreaList)
+          })
         }
       };
       // if (typeof (WebSocket) === 'undefined') {
@@ -632,17 +696,18 @@ export default {
           for (let i in this.funWsData.data.annealFanInfo) {
             index++,
               arr.push([
-                `
+                `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
-          <span style="color:rgba(255,255,255,0.5)" >${index || ''}
             </span>`,
-                `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
+                // `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
-            </span>`,
+                // </span>`,
-                `<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`,
+                `<span style="color:rgba(255,255,255,0.5)">${i || ''}</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>`,
+                `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.annealFanInfo[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>  ${this.funWsData.data.annealFanInfo[i] || ''}</span>`,
               ])
           }
           this.annealFunConfig.data = arr
+          // this.$nextTick(() => {
             this.$refs['annealFunScrollBoard'].updateRows(arr)
+          // })
         }
         if (this.funWsData.type === 'FanInfo') {
           let arr = []
@@ -650,14 +715,16 @@ export default {
           for (let i in this.funWsData.data.fanInfo) {
             index++,
               arr.push([
-                `<span style="color:rgba(255,255,255,0.5)" >${index || ''}</span>`,
+                `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
+            </span>`,
                 `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
-                `<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`,
+                `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.fanInfo[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>  ${this.funWsData.data.fanInfo[i] || ''}</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.funConfig.data = arr
+          // this.$nextTick(() => {
             this.$refs['funScrollBoard'].updateRows(arr)
+          // })
         }
       };
       // if (typeof (WebSocket) === 'undefined') {
@@ -678,6 +745,25 @@ 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()
@@ -772,7 +858,47 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.myLegend{
+  position: absolute;
+  top: -20px;
+  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;
@@ -794,7 +920,7 @@ export default {
       top: 25px;
       color: rgba(255, 255, 255, 0.80);
       font-size: 20px;
-      letter-spacing: 0px;
+      letter-spacing: 1px;
       }
 
     .time {
@@ -803,7 +929,7 @@ export default {
       color: rgba(255, 255, 255, 0.80);
       top: 25px;
       font-size: 20px;
-      letter-spacing: 0px;
+      letter-spacing: .72px;
     }
 
     .title-button {

src/views/OperationalOverview/components/PieChart.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-21 14:43:06
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-28 16:45:24
+ * @LastEditTime: 2024-04-03 16:33:24
  * @Description:
 -->
 <template>
@@ -85,7 +85,6 @@ export default {
       defaultConfig: {
         // 默认的legend配置
         legend: {
-          orient: 'vertical',
           left: '75%',
           bottom: 0,
           itemHeight: 10,
@@ -158,6 +157,9 @@ export default {
   methods: {
     initChart() {
       this.chart = echarts.init(document.getElementById(this.id))
+      this.$nextTick(() => {
+        this.chart.resize();
+      });
       this.chart.setOption({
         title: this.showCenterTitle
           ? {
@@ -194,7 +196,7 @@ export default {
           // 默认配置
           ...this.defaultConfig.legend,
           // 外部传入配置
-          ...this.legendConfig
+          // ...this.legendConfig
         },
         color: this.barColor,
         series: [

src/views/OperationalOverview/components/baseContainer/index.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-01-19 15:58:17
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-27 10:26:35
+ * @LastEditTime: 2024-03-29 14:47:29
  * @Description: file content
  * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
 -->
@@ -164,7 +164,7 @@ export default {
   width: 100%;
   // background-color: rgba($color: #061027, $alpha: 0.15);
   position: relative;
-  opacity: calc(.8);
+  // opacity: calc(.8);
   // border: 2px solid;
     // background: url('../../../../assets/img/energy.png') no-repeat;
     // background-size: 100% 100%;
@@ -274,6 +274,8 @@ export default {
     width: 100%;
     color: #ffffff;
     font-size: 24px;
+    font-weight: normal;
+    letter-spacing: .8px;
     padding: 0.67em 0.67em 0.3em 0.67em;
     display: flex;
   }

src/views/OperationalOverview/components/coldDoubleYChart.vue

@@ -2,13 +2,13 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-03-25 18:34:58
+ * @LastEditTime: 2024-04-03 16:28:40
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
-    <div :id="id" class="productChart" :style="{ height:   '390px', width: width }" />
+    <div :id="id" class="coldProductChart" :style="{ height:   '390px', width: width }" />
   </div>
 </template>
 
@@ -71,9 +71,9 @@ export default {
   mounted() {
     console.log('mounted')
     console.log('borderRadius: ', this.borderRadius)
-    // this.$nextTick(() => {
+    this.$el.addEventListener('resize', () => {
-    //   this.initChart()
+      console.log('resziing.....');
-    // })
+    });
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -100,8 +100,9 @@ export default {
                show: true,		//开启显示
                position: 'top',	//在上方显示
                textStyle: {	    //数值样式
-                 color: '#ced1d5',
+                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-                 fontSize: 12
+                 fontSize: 12,
+                 fontWight: 'bolder'
                }
              },
             }
@@ -114,6 +115,7 @@ export default {
           name: '产线良品率',
           symbol: 'circle', //变为实心圆
           type: 'line',
+          // symbolSize: 7,
           yAxisIndex: 0,
           areaStyle: {
             opacity: 0.8,
@@ -141,6 +143,16 @@ export default {
       ]
       // const colors = ['#5470C6', '#91CC75', '#EE6666']
       this.chart = echarts.init(document.getElementById(this.id))
+      let isFinished = false //标记 isFinished
+      this.chart.on('finished', _ => {
+        if (!isFinished) {
+          console.log('我只执行一次')
+          isFinished = true
+          // this.isLoading = false //关闭loading
+          this.chart.resize() //重新渲染charts大小
+        }
+        console.log(113, 'finished')
+      })
       this.chart.setOption({
         // color: colors,
         tooltip: {
@@ -151,38 +163,50 @@ export default {
         },
         grid: {
           left: "3%",
-          right: "5%",
+          right: "10%",
           bottom: "3%",
           containLabel: true
         },
-        legend: {
+        // legend: {
-          itemWidth: 10,
+        //   itemWidth: 10,
-          itemHeight: 10,
+        //   itemHeight: 10,
-          top: '20',
+        //   top: '5',
         //   right: '20px',
-          data: ['产线产量', '产线良品率'],
+        //   data: [
-          textStyle: {
+        //     // { icon: 'rect', name: '直接访问' },
-            fontSize: 12 * this.beilv,
+        //     { icon: 'roundRect', name: '产线产量' },
-            color: '#ced1d5'
+        //     // {
-          }
+        //     //   icon: 'circle', name: '产线良品率',
-        },
+        //     //   itemWidth: 7,
+        //     //   itemHeight: 7,
+        //     //  },
+        //   ],
+        //   textStyle: {
+        //     fontSize: 12 * this.beilv,
+        //     color: '#ced1d5'
+        //   }
+        // },
         xAxis: {
+          axisTick: {
+            show: false
+          },
           type: 'category',
           axisLine: {
             lineStyle: {
               type: 'solid',
-              color: '#213259', // 左边线的颜色
+              color: '#25528f', // 左边线的颜色
               width: '1' // 坐标线的宽度
             }
           },
           axisLabel: {
             textStyle: {
+              align: 'center',
               color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
             }
           },
           splitLine: {
             lineStyle: {
-              color: '#213259'
+              color: '#25528f'
             }
           },
           data: nameList
@@ -202,8 +226,9 @@ export default {
             type: 'value',
             name: '良品率/%',
             nameTextStyle: {// y轴上方单位的颜色
-              color: '#fff',
+              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
               align: "left",
+              padding: [0, 0, 0, 8]
             },
             position: 'right',
             alignTicks: true,
@@ -211,19 +236,20 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#213259', // 左边线的颜色
+                color: '#25528f', // 左边线的颜色
                 width: '1' // 坐标线的宽度
               }
             },
             axisLabel: {
               textStyle: {
-                color: '#ced1d5', // 坐标值得具体的颜色
+                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-                formatter: '{value}%'
+                formatter: '{value}%',
+                align:'left',
               }
             },
             splitLine: {
               lineStyle: {
-                color: '#213259'
+                color: '#25528f'
               }
             }
             // type: 'value'
@@ -245,9 +271,10 @@ export default {
             type: 'value',
             name: '产量/㎡', // y轴上方的单位
             nameTextStyle: {
-              color: "#fff",
+              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
               // fontSize: 10,
               align: "right",
+              padding:[0,4,0,0]
             },
             position: 'left',
             alignTicks: true,
@@ -255,19 +282,21 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#213259', // 左边线的颜色
+                color: '#25528f', // 左边线的颜色
                 width: '1' // 坐标线的宽度
               }
             },
             axisLabel: {
+              // padding: [0, 20, 0, 0],
               textStyle: {
+                margin: 60,
                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 formatter: '{value} 片'
               }
             },
             splitLine: {
               lineStyle: {
-                color: '#213259'
+                color: '#25528f'
               }
             }
             // type: 'value'
@@ -286,7 +315,8 @@ export default {
 }
 </script>
 <style>
-.productChart{
+
+.coldProductChart{
   top: -10px;
 }
 </style>

src/views/OperationalOverview/components/doubleYChart .vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-03-28 16:31:20
+ * @LastEditTime: 2024-04-03 17:09:12
  * @LastEditors: zhp
  * @Description:
 -->
@@ -105,8 +105,9 @@ export default {
                show: true,		//开启显示
                position: 'top',	//在上方显示
                textStyle: {	    //数值样式
-                 color: '#ced1d5',
+                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-                 fontSize: 12
+                 fontSize: 12,
+                 fontWight:'bolder'
                }
              },
             }
@@ -142,7 +143,7 @@ export default {
             }
           },
           // data: passRateList
-          data: []
+          data: passRateList
         }
       ]
       // const colors = ['#5470C6', '#91CC75', '#EE6666']
@@ -166,19 +167,23 @@ export default {
               type: 'cross'
             }
           },
-          grid: { top: 90, right: 60, bottom: 20, left: 20, containLabel: true },
+          grid: { top: 70, right: 20, bottom: 10, left: 10, containLabel: true },
-          legend: {
+          // legend: {
-            itemWidth: 10,
+          //   itemWidth: 10,
-            itemHeight: 10,
+          //   itemHeight: 10,
-            top: '0%',
+          //   top: '2%',
-            right: '20px',
+          //   right: '30px',
-            data: ['产线产量', '产线良品率'],
+          //   data: ['产线良品率', '产线产量'],
-            textStyle: {
+          //   textStyle: {
-              fontSize: 12 * this.beilv,
+          //     fontSize: 12 * this.beilv,
-              color: '#ced1d5'
+          //     color: '#ced1d5',
-            }
+          //     fontWight: 'bolder'
-          },
+          //   }
+          // },
           xAxis: {
+            axisTick: {
+              show: false
+            },
             type: 'category',
             axisLine: {
               lineStyle: {
@@ -187,8 +192,11 @@ export default {
                 width: '1' // 坐标线的宽度
               }
             },
+            textStyle: {
+              fontWight: 'bolder'
+            },
             axisLabel: {
-              color: "#fff",
+              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
               fontSize: 12,
               // formatter: '{value}'
               // textStyle: {
@@ -217,8 +225,9 @@ export default {
               type: 'value',
               name: '良品率/%',
               nameTextStyle: {// y轴上方单位的颜色
-                color: '#fff',
+                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 align: "left",
+                padding: [0, 0, 0, 2]
               },
               position: 'right',
               alignTicks: true,
@@ -231,7 +240,7 @@ export default {
                 }
               },
               axisLabel: {
-                color: "#fff",
+                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 fontSize: 12,
                 // formatter: '{value}'
                 formatter: '{value}%'
@@ -261,8 +270,9 @@ export default {
               type: 'value',
               name: '产量/片', // y轴上方的单位
               nameTextStyle: {
-                color: "#fff",
+                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 // fontSize: 10,
+                padding: [0, 4, 0, 0],
                 align: "right",
               },
               // position: 'left',
@@ -278,7 +288,7 @@ export default {
               axisLabel: {
                 // textStyle: {
                 // color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-                color: "#fff",
+                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 // show: true,
                 lineStyle: {
                   color: "#25528f",

src/views/OperationalOverview/components/linearBarChart.vue

@@ -111,8 +111,9 @@ export default {
                 show: true,		//开启显示
                 position: 'top',	//在上方显示
                 textStyle: {	    //数值样式
-                  color: '#ced1d5',
+                  color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-                  fontSize: 12
+                  fontSize: 12,
+                  fontWeight: 'normal'
                 }
               },
             }
@@ -132,7 +133,7 @@ export default {
               type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
             }
           },
-          grid: { top: 90, right: 60, bottom: 20, left: 30, containLabel: true },
+          grid: { top: 70, right: 40, bottom: 10, left: 40, containLabel: true },
           // legend: {
           //   itemWidth: 10,
           //   itemHeight: 10,
@@ -144,6 +145,9 @@ export default {
           //   }
           // },
           xAxis: {
+            axisTick: {
+              show: false
+            },
             type: 'category',
             axisLine: {
               lineStyle: {
@@ -152,8 +156,11 @@ export default {
                 width: '1' // 坐标线的宽度
               }
             },
+            textStyle: {
+              fontWeight: 'bolder'
+            },
             axisLabel: {
-              color: "#fff",
+              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
               fontSize: 12,
               // formatter: '{value}'
             },
@@ -167,13 +174,13 @@ export default {
           yAxis: {
             name: '单位kwh',
             nameTextStyle: {
-              color: '#fff',
+              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-              fontSize: 10,
+              fontSize: 12,
               align: 'right',
             },
             type: 'value',
             axisLabel: {
-              color: "#fff",
+              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
               fontSize: 12,
               // formatter: '{value}/kwh'
             },

src/views/OperationalOverview/components/pileBarChart.vue

@@ -1,13 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-03-28 16:30:14
+ * @LastEditTime: 2024-04-03 18:12:18
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
-    <div :id="id" class="productChart" :style="{ height: height + 'px', width: width }" />
+    <div :id="id" :style="{ height:'75px', width: width }" />
   </div>
 </template>
 
@@ -71,7 +71,10 @@ export default {
     }
   },
   mounted() {
-    console.log('mounted')
+    // console.log('mounted')
+    window.addEventListener('resize', () => {
+      this.resize()
+    })
     // console.log('borderRadius: ', this.borderRadius)
     // console.log('33333', this.dataList)
     // let arr = []
@@ -91,6 +94,12 @@ export default {
     this.chart = null
   },
   methods: {
+    resize() {
+      this.chart.resize({
+        width: 'auto',
+        height: 90
+      });;
+    },
     initChart(nameList, topNameList, nameWasteList, passRateList, wasteList) {
       let rawData = []
       let colors = ['#0fdedb', '#2359ec']
@@ -105,8 +114,11 @@ 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)
-      this.chart = echarts.init(document.getElementById(this.id))
       const series = [
         '良品',
         '废品',
@@ -126,7 +138,7 @@ export default {
           // },
           color:colors[sid],
           data: rawData.length != 0 ? rawData[sid].map((d, did) =>
-            totalData[did] <= 0 ? 0 : d / totalData[did]
+            totalData[did] <= 0 ? 0 : (d / totalData[did]).toFixed(4)
           ) : []
         };
       });
@@ -137,6 +149,17 @@ export default {
       //   width,
       //   height
       // })
+      this.chart = echarts.init(document.getElementById(this.id))
+      let isFinished = false //标记 isFinished
+      this.chart.on('finished', _ => {
+        if (!isFinished) {
+          console.log('我只执行一次')
+          isFinished = true
+          // this.isLoading = false //关闭loading
+          this.chart.resize() //重新渲染charts大小
+        }
+        console.log(113, 'finished')
+      })
       this.chart.setOption({
         legend: {
           formatter: function (name) {
@@ -144,15 +167,16 @@ export default {
             let singleData = series.filter(function (item) {
               return item.name == name
             })
-            return name + parseFloat((singleData[0].data * 100).toFixed(3)) + '%'
+            return name + parseFloat((singleData[0].data * 100).toFixed(0)) + '%'
           },
           itemWidth: 12,
           itemHeight: 12,
           bottom: '20',
           left: '20',
-          icon: 'rect',
+          icon: 'roundRect',
           textStyle: {
-            color: '#ffffff'
+            color: 'rgba(255,255,255,.9)',
+            fontSize:12,
           }
         },
         grid: {
@@ -184,9 +208,9 @@ export default {
               splitNumber: 50,
               // boundaryGap: [20, 20],
               textStyle: {
-                color: '#ffffff',
+                color: 'rgba(255,255,255,.9)',
                 verticalAlign: 'bottom',
-                fontSize: 12,
+                fontSize: 16,
                 align: 'left',
                 padding: [0, 0, 10, -5]
               }
@@ -212,9 +236,9 @@ export default {
               splitNumber: 50,
               // boundaryGap: [20, 20],
               textStyle: {
-                color: '#ffffff',
+                color: 'rgba(255,255,255,.9)',
                 verticalAlign: 'bottom',
-                fontSize: 12,
+                fontSize: 16,
                 align: 'right',
                 padding: [0, 0, 10, -5]
               }
@@ -228,10 +252,15 @@ export default {
         },
         series:series
       })
-      this.chart.resize({
+      this.$nextTick(() => {
-        width: 'auto',
+        setTimeout(() => {
-        height: 90
+          this.resize()
-      });;
+        },1000);
+      })
+      // this.chart.resize({
+      //   width: 'auto',
+      //   height: 90
+      // });;
     }
   }
 }

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-28 16:10:47
+ * @LastEditTime: 2024-04-03 17:14:03
  * @Description:
 -->
 <template>
@@ -10,40 +10,41 @@
     <el-row class="container-title" :style="{
 				height: 88 + 'px',
 				lineHeight: 88 + 'px',
-      fontSize: 31 + 'px'
+				fontSize: 31 + 'px',
 			}">
-      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
+      <img src="../../assets/img/logo.png" style="width: 1.1em; position: relative; top: 0.22em" alt="" />
       许昌安彩深加工看板
       <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
       <h3 class="time">{{ times }}</h3>
-      <el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px',fontSize:'32px'}"
+      <!-- <el-button type="text" class="title-button" :style="{ right: 18 + 'px', top: 26 + 'px',fontSize:'32px'}"
         @click="changeFullScreen">
         <svg-icon width="32" height="32" v-if="isFullScreen" icon-class="unFullScreenView" />
         <svg-icon width="32" height="32" v-else icon-class="fullScreenView" />
-      </el-button>
+      </el-button> -->
     </el-row>
     <el-row class="container-main flex-col" type="flex">
-      <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1" style="height: 50%;">
+      <el-row :style="{ padding: '0 ' + 9 + 'px' }" :gutter="15" type="flex" class="flex-1" style="height: 50%">
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
           <base-container :title="'设备报警'" :size="'small'" :height="318" :title-icon="'eqAlarm'">
-            <dv-scroll-board class="eqTable" :config="eqConfig" style="width:100%;height:350px" ref='eqScrollBoard' />
+            <dv-scroll-board class="eqTable" :config="eqConfig" style="width: 100%; height: 350px"
+              ref="eqScrollBoard" />
           </base-container>
         </el-col>
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="8" height="100%">
           <base-container :title="'各工序缺陷汇总'" :size="'small'" :title-icon="'scrap'">
-            <dv-scroll-board :config="processConfig" style="width:100%;height:350px" ref='processScrollBoard' />
+            <dv-scroll-board :config="processConfig" style="width: 100%; height: 350px" ref="processScrollBoard" />
           </base-container>
         </el-col>
 
         <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;">
+            <div class="order" style="width: 100%; overflow: hidden scroll; height: 350px">
-              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: 1em">
+              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em">
                 <!-- <el-col :span="12"> -->
 
-                <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 :stroke-width="10" define-back-color="rgba(32, 57, 96, 1)" text-color="white"
+                <el-progress style="width: 620px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
-                  :percentage="op.progressRate" class="custom-progress-bar" />
+                  define-back-color="rgba(32, 57, 96, 1)" :percentage="op.progressRate" class="custom-progress-bar" />
               </el-row>
             </div>
             <!-- </div> -->
@@ -66,6 +67,13 @@
         <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>
@@ -75,105 +83,175 @@
 </template>
 
 <script>
-import baseContainer from './components/baseContainer'
+import baseContainer from './components/baseContainer';
-import baseTable1 from './components/baseTable'
+import baseTable1 from './components/baseTable';
-import screenfull from 'screenfull'
+import screenfull from 'screenfull';
-import doubleYChart from './components/doubleYChart '
+import doubleYChart from './components/doubleYChart ';
-import LinearBarChart from './components/linearBarChart'
+import LinearBarChart from './components/linearBarChart';
 import WebSocketHeartbeat from './ws.js';
 
 // 创建WebSocketHeartbeat实例
 const qualityYearList = [
 	{
-    name: '翻转机', code: 'EQ20240110112358000235', status: '运行', error: '否'
+		name: '翻转机',
+		code: 'EQ20240110112358000235',
+		status: '运行',
+		error: '否',
 	},
 	{
-    name: '烘干炉', code: 'EQ20240110112537000241', status: '运行', error: '否'
+		name: '烘干炉',
+		code: 'EQ20240110112537000241',
+		status: '运行',
+		error: '否',
 	},
 	{
-    name: '清洗机', code: '	EQ20240110112310000232', status: '运行', error: '否'
+		name: '清洗机',
-  },
+		code: '	EQ20240110112310000232',
-  { name: '钢化清洗机', code: 'EQ20240110111700000208', status: '运行', error: '否' },
+		status: '运行',
-  { name: '固化机', code: 'EQ20240110111700000201', status: '运行', error: '否' },
+		error: '否',
-  {
-    name: '磨边清洗机', code: '	EQ20240110111700000208', status: '运行', error: '否'
-  },
-  { name: '预热机', code: 'EQ20240110111700000205', status: '故障', error: '是' },
-  { name: '下片机', code: 'EQ20240115151435000279', status: '运行', error: '否' },
-  {
-    name: '冷却机', code: 'EQ20240110111700000203', status: '运行', error: '否'
 	},
 	{
-    name: 'A储片机106', code: 'EQ20240110111700000202', status: '运行', error: '否'
+		name: '钢化清洗机',
+		code: 'EQ20240110111700000208',
+		status: '运行',
+		error: '否',
 	},
-  { name: '二次清洗机', code: 'EQ20240110111700000209', status: '运行', error: '否' },
 	{
-    name: '二次磨边机', code: '	EQ20240110110927000181', status: '故障', error: '是'
+		name: '固化机',
+		code: 'EQ20240110111700000201',
+		status: '运行',
+		error: '否',
 	},
-  { name: '测试设备', code: 'EQ20240110111700000201', status: '运行', error: '否' }
+	{
-]
+		name: '磨边清洗机',
+		code: '	EQ20240110111700000208',
+		status: '运行',
+		error: '否',
+	},
+	{
+		name: '预热机',
+		code: 'EQ20240110111700000205',
+		status: '故障',
+		error: '是',
+	},
+	{
+		name: '下片机',
+		code: 'EQ20240115151435000279',
+		status: '运行',
+		error: '否',
+	},
+	{
+		name: '冷却机',
+		code: 'EQ20240110111700000203',
+		status: '运行',
+		error: '否',
+	},
+	{
+		name: 'A储片机106',
+		code: 'EQ20240110111700000202',
+		status: '运行',
+		error: '否',
+	},
+	{
+		name: '二次清洗机',
+		code: 'EQ20240110111700000209',
+		status: '运行',
+		error: '否',
+	},
+	{
+		name: '二次磨边机',
+		code: '	EQ20240110110927000181',
+		status: '故障',
+		error: '是',
+	},
+	{
+		name: '测试设备',
+		code: 'EQ20240110111700000201',
+		status: '运行',
+		error: '否',
+	},
+];
 const qualityMonthList = [
 	{
 		productionLineName: 'D61',
 		sectionName: '成型',
 		count: '3片',
-    inspectionTypeName: '细长泡'
+		inspectionTypeName: '细长泡',
 	},
 	{
 		productionLineName: 'D62',
 		sectionName: '组合落板',
 		count: '4片',
-    inspectionTypeName: '细长泡'
+		inspectionTypeName: '细长泡',
 	},
 	{
 		productionLineName: 'D61',
 		sectionName: '磨边',
 		count: '6片',
-    inspectionTypeName: '开口泡'
+		inspectionTypeName: '开口泡',
 	},
 	{
 		productionLineName: 'D63',
 		sectionName: '清洗',
 		count: '5片',
-    inspectionTypeName: '结石'
+		inspectionTypeName: '结石',
 	},
 	{
 		productionLineName: 'D64',
 		sectionName: '打孔',
 		count: '2片',
-    inspectionTypeName: '结石'
+		inspectionTypeName: '结石',
 	},
 	{
 		productionLineName: 'D63',
 		sectionName: '成型',
 		count: '7片',
-    inspectionTypeName: '开口泡'
+		inspectionTypeName: '开口泡',
 	},
 	{
 		productionLineName: 'D61',
 		sectionName: '上片',
 		count: '8片',
-    inspectionTypeName: '结石'
+		inspectionTypeName: '结石',
-  }
+	},
-]
+];
 const orderProcessList = [
 	{
-    id: '1', outRate: '.8', name: '凯盛0322'
+		id: '1',
-  }, {
+		outRate: '.8',
-    id: '2', outRate: '.4', name: '光伏玻璃4.0'
+		name: '凯盛0322',
-  }, {
-    id: '3', outRate: '.5', name: '光伏玻璃3.0'
-  }, {
-    id: '4', outRate: '.3', name: '光伏玻璃2.0'
-  }, {
-    id: '5', outRate: '.5', name: '光伏玻璃1.0'
-  }, {
-    id: '6', outRate: '.8', name: '光伏玻璃'
 	},
 	{
-    id: '7', outRate: '.8', name: '统计订单'
+		id: '2',
-  }
+		outRate: '.4',
-]
+		name: '光伏玻璃4.0',
+	},
+	{
+		id: '3',
+		outRate: '.5',
+		name: '光伏玻璃3.0',
+	},
+	{
+		id: '4',
+		outRate: '.3',
+		name: '光伏玻璃2.0',
+	},
+	{
+		id: '5',
+		outRate: '.5',
+		name: '光伏玻璃1.0',
+	},
+	{
+		id: '6',
+		outRate: '.8',
+		name: '光伏玻璃',
+	},
+	{
+		id: '7',
+		outRate: '.8',
+		name: '统计订单',
+	},
+];
 export default {
 	name: 'ProductionMonitoringCockpit',
 	components: {
@@ -183,7 +261,7 @@ export default {
 		// baseTable3,
 		// TopRadioGroup,
 		doubleYChart,
-    LinearBarChart
+		LinearBarChart,
 		// pieChart1,
 		// pieChart2
 		// pieChart3
@@ -204,22 +282,22 @@ export default {
 				headerBGC: 'rgba(32, 55, 96, 0.8)',
 				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
 				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-        columnWidth: [70, 100, 200, 90, 90,],
+				columnWidth: [70, 100, 200, 90, 90],
 				align: ['center'],
 				data: [],
 				// index:true,
-        rowNum: 10
+				rowNum: 10,
 			},
 			processConfig: {
 				header: ['序号', '产线名称', '工序', '损耗片数', '缺陷类型'],
 				headerBGC: 'rgba(32, 55, 96, 0.8)',
 				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
 				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-        columnWidth: [70, 130, 100, 120, 110,],
+				columnWidth: [70, 130, 100, 120, 110],
 				align: ['center'],
 				data: [],
 				// index:true,
-        rowNum: 10
+				rowNum: 10,
 			},
 			// cxDataList,
 			SJGws: undefined,
@@ -235,127 +313,205 @@ export default {
 			// qualityMonthTableProps,
 			modelMonth: '',
 			dateType: '0',
-    }
+		};
 	},
 	computed: {
 		styles() {
-      const v = Math.floor(this.value * this.beilv2 * 100) / 10000
+			const v = Math.floor(this.value * this.beilv2 * 100) / 10000;
 			return {
 				transform: `scale(${v})`,
-        transformOrigin: 'top left'
+				transformOrigin: 'top left',
-      }
+			};
-    }
+		},
 	},
 	watch: {
 		isFullScreen: function (val) {
 			if (val) {
 				const _this = this;
-        _this.beilv2 = document.documentElement.clientWidth / 1920
+				_this.beilv2 = document.documentElement.clientWidth / 1920;
 				console.log(_this.beilv2);
 			} else {
 				const _this = this;
-        _this.beilv2 = document.documentElement.clientWidth / 1920
+				_this.beilv2 = document.documentElement.clientWidth / 1920;
 			}
 		},
 		clientWidth(val) {
 			if (!this.timer) {
-        this.clientWidth = val
+				this.clientWidth = val;
-        this.beilv2 = this.clientWidth / 1920
+				this.beilv2 = this.clientWidth / 1920;
-        this.timer = true
+				this.timer = true;
-        let _this = this
+				let _this = this;
 				setTimeout(function () {
-          _this.timer = false
+					_this.timer = false;
-        }, 500)
+				}, 500);
 			}
 			this.windowWidth(val);
-    }
+		},
 	},
   created() {
-    this.init()
+    this.getData();
+		this.init();
 		setTimeout(() => {
-      window.location.reload()
+			window.location.reload();
-    }, 86400000)
+		}, 86400000);
 	},
 	destroyed() {
-    this.websocketClose()
+		this.websocketClose();
-    this.SJGWebsocketClose()
+		this.SJGWebsocketClose();
 	},
 	mounted() {
-    // let detData = [
+		let detData = [
+			{
+				id: '1',
+				name: '测试工单',
+				progressRate: 0.933333,
+			},
+			{
+				id: '2',
+				name: '测试工单2',
+				progressRate: 0.932323,
+			},
+			{
+				id: '3',
+				name: '测试工单3',
+				progressRate: 0.23232,
+			},
+			{
+				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:'1',
+			//   id: '5',
 			//   name: '测试工单',
-    //     progressRate:0.933333
+			//   progressRate: 0.5555
+			// }, {
+			//   id: '6',
+			//   name: '测试工单',
+			//   progressRate: 0.66564
 			// },
-    //   {
+		];
-    //     id: '2',
+		this.orderList = detData.map((ele, index) => {
-    //     name: '测试工单2',
+			if (ele.progressRate && ele.progressRate != 1) {
-    //     progressRate: 0.932323
+				return {
-    //   }, {
+					id: ele.id,
-    //     id: '3',
+					name: ele.name,
-    //     name: '测试工单3',
+					progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
-    //     progressRate: 0.23232
+				};
-    //   }, {
+			}
-    //     id: '4',
+		});
-    //     name: '测试工单4',
+		let EnergyNameList = ['Y61', 'Y62', 'Y63', 'Y64', 'Y65'];
-    //     progressRate: 0.32323
+		this.EnergyMonitoringNameList = EnergyNameList;
-    //   }
+		let EnergyDataList = [1, 2, 3, 4, 5];
-    //   // {
+		// this.wsData.data.forEach((ele) => {
-    //   //   id: '5',
+		//   EnergyDataList.push(ele.useQuantity)
-    //   //   name: '测试工单',
+		// })
-    //   //   progressRate: 0.5555
+		this.EnergyMonitoringList = EnergyDataList;
-    //   // }, {
+		// console.log(EnergyDataList)
-    //   //   id: '6',
+		this.$refs.EnergyMonitoringChart.initChart(
-    //   //   name: '测试工单',
+			this.EnergyMonitoringNameList,
-    //   //   progressRate: 0.66564
+			this.EnergyMonitoringList
-    //   // },
+		);
-    // ]
+		let eqArr = this.qualityYearList.map((item, index) => [
-    // this.orderList = detData.map((ele, index) => {
+			`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-    //   if (ele.progressRate && ele.progressRate != 1) {
+            </span>`,
-    //     return {
+			// formatDate(item.planStartTime) || '',
-    //       id: ele.id,
+			`
-    //       name: ele.name,
+          <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
-    //       progressRate: parseFloat((ele.progressRate * 100).toFixed(3))
+            </span>`,
+			`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
+			`<span style="color:rgba(255,255,255,0.5)">${item.status || ''}</span>`,
+			`<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
+		]);
+    this.eqConfig.data = eqArr;
+    let data = [
+      {
+        lineName: 'D62',
+        outputNum: '11111',
+        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++) {
+        // 当前一个值大于后一个值
+        if (data[j].lineName.substr(data[j].lineName.length - 1, 1) > data[j + 1].lineName.substr(data[j + 1].lineName.length - 1, 1)) {
+          // 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
+          let temp = data[j];
+          data[j] = data[j + 1];
+          data[j + 1] = temp;
+        }
+      }
+    }
+    data.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 EnergyNameList = ['Y61', 'Y62', 'Y63', 'Y64', 'Y65',]
+    this.$nextTick(() => {
-    // this.EnergyMonitoringNameList = EnergyNameList
+      this.$refs.productLineChart.initChart(
-    // let EnergyDataList = [1, 2, 3, 4, 5]
+        nameList,
-    // // this.wsData.data.forEach((ele) => {
+        passRateList,
-    // //   EnergyDataList.push(ele.useQuantity)
+        outputNumList
-    // // })
+      );
-    // this.EnergyMonitoringList = EnergyDataList
+    })
-    // // console.log(EnergyDataList)
-    // this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
-    // let eqArr = this.qualityYearList.map((item, index) => [
-    //   `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
-    //         </span>`,
-    //   // formatDate(item.planStartTime) || '',
-    //   `
-    //       <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
-    //         </span>`,
-    //   `<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
-    //   `<span style="color:rgba(255,255,255,0.5)">${item.status || ''}</span>`,
-    //   `<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
-    // ])
-    // this.eqConfig.data = eqArr
-    // this.$refs['eqScrollBoard'].updateRows(eqArr)
-    // this.$refs.productLineChart.initChart(['D61', 'D62', 'D63', 'D64', 'D65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
 		// this.getList()
-    this.initWebSocket()
+		this.initWebSocket();
-    this.SJGInitWebSocket()
+		this.SJGInitWebSocket();
-    this.getTimes()
+		this.getTimes();
 		// this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
 		const _this = this;
-    _this.beilv2 = document.documentElement.clientWidth / 1920
+		_this.beilv2 = document.documentElement.clientWidth / 1920;
 		window.onresize = () => {
 			return (() => {
-        _this.clientWidth = `${document.documentElement.clientWidth}`
+				_this.clientWidth = `${document.documentElement.clientWidth}`;
-        this.beilv2 = _this.clientWidth / 1920
+				this.beilv2 = _this.clientWidth / 1920;
-      })()
+			})();
-    }
+		};
-    this.getData()
 	},
 
 	// beforeDestroy() {
@@ -371,14 +527,22 @@ export default {
             </span>`,
 				// formatDate(item.planStartTime) || '',
 				`
-          <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
+          <span style="color:rgba(255,255,255,0.5)" >${
+						item.productionLineName || ''
+					}
             </span>`,
-        `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
+				`<span style="color:rgba(255,255,255,0.5)">${
+					item.sectionName || ''
+				}</span>`,
 				`<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
-        `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
+				`<span style="color:rgba(255,255,255,0.5)">${
-      ])
+					item.inspectionTypeName || ''
-      this.processConfig.data = processArr
+				}</span>`,
-      this.$refs['processScrollBoard'].updateRows(processArr)
+			]);
+      this.processConfig.data = processArr;
+      // this.$nextTick(() => {
+        this.$refs['processScrollBoard'].updateRows(processArr);
+      // })
 		},
 		// getList() {
 		//   // this.$axios.get(
@@ -439,41 +603,55 @@ export default {
 			let seconds = new Date().getSeconds(); //获取当前时间的秒数
 			//当小于 10 的是时候，在前面加 0
 			if (hours < 10) {
-        hours = "0" + hours;
+				hours = '0' + hours;
 			}
 			if (minutes < 10) {
-        minutes = "0" + minutes;
+				minutes = '0' + minutes;
 			}
 			if (seconds < 10) {
-        seconds = "0" + seconds;
+				seconds = '0' + seconds;
 			}
 			//拼接格式化当前时间
-      this.times = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
+			this.times =
+				year +
+				'.' +
+				month +
+				'.' +
+				day +
+				' ' +
+				hours +
+				':' +
+				minutes +
+				':' +
+				seconds;
 		},
 		initWebSocket() {
-      let date = new Date().valueOf()
+			let date = new Date().valueOf();
-      const wsUrl = process.env.VUE_APP_Socket_API + `/websocket/message?userId=EN${date}`
+			const wsUrl =
+				process.env.VUE_APP_Socket_API + `/websocket/message?userId=EN${date}`;
 			this.wsHeartbeat = new WebSocketHeartbeat(wsUrl);
 
 			// 处理收到的消息
 			this.wsHeartbeat.ws.onmessage = (event) => {
-        console.log('收到消息:', event.data)
+				console.log('收到消息:', event.data);
-        this.wsData = event?.data ? JSON.parse(event?.data) : {}
+				this.wsData = event?.data ? JSON.parse(event?.data) : {};
 				// console.log('22222', this.wsData.data)
 				if (this.wsData.type === 'EnergyMonitoring') {
-          let EnergyNameList = []
+					let EnergyNameList = [];
 					this.wsData.data.forEach((ele) => {
-            EnergyNameList.push(ele.lineName)
+						EnergyNameList.push(ele.lineName);
-          })
+					});
-          this.EnergyMonitoringNameList = EnergyNameList
+					this.EnergyMonitoringNameList = EnergyNameList;
-          let EnergyDataList = []
+					let EnergyDataList = [];
 					this.wsData.data.forEach((ele) => {
-            EnergyDataList.push(ele.useQuantity
+						EnergyDataList.push(ele.useQuantity);
-            )
+					});
+					this.EnergyMonitoringList = EnergyDataList;
+          console.log(EnergyDataList);
+          this.$nextTick(() => {
+            this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList,this.EnergyMonitoringList);
           })
-          this.EnergyMonitoringList = EnergyDataList
+
-          console.log(EnergyDataList)
-          this.$refs.EnergyMonitoringChart.initChart(this.EnergyMonitoringNameList, this.EnergyMonitoringList)
 				}
 			};
 			// if (typeof (WebSocket) === 'undefined') {
@@ -495,14 +673,15 @@ export default {
 			// }
 		},
 		SJGInitWebSocket() {
-      let date = new Date().valueOf()
+			let date = new Date().valueOf();
-      const SJGWsUrl = process.env.VUE_APP_Socket_API + `/websocket/message?userId=SJG${date}`
+			const SJGWsUrl =
+				process.env.VUE_APP_Socket_API + `/websocket/message?userId=SJG${date}`;
 			this.SJGws = new WebSocketHeartbeat(SJGWsUrl);
 
 			// 处理收到的消息
 			this.SJGws.ws.onmessage = (event) => {
-        console.log('收到消息:', event.data)
+				console.log('收到消息:', event.data);
-        this.SJGWsData = event?.data ? JSON.parse(event?.data) : {}
+				this.SJGWsData = event?.data ? JSON.parse(event?.data) : {};
 				// console.log(this.wsData.detData);
 				// console.log('22222', this.wsData.data)
 				if (this.SJGWsData.type === 'order') {
@@ -511,69 +690,100 @@ export default {
 							return {
 								id: ele.id,
 								name: ele.name,
-                progressRate: parseFloat((ele.progressRate * 100).toFixed(3))
+								progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
-              }
+							};
 						}
 					});
-          console.log(this.orderList)
+					console.log(this.orderList);
 				} else if (this.SJGWsData.type === 'equipment') {
 					let eqArr = this.SJGWsData.detData.map((item, index) => [
 						`<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)">${item.code || ''}</span>`,
+						`<span style="color:rgba(255,255,255,0.5)">${
-            `<span style="color:rgba(255,255,255,0.5)"><span style="color:rgba(255,255,255,0.5)"></span>  ${item.status || ''}</span>`,
+							item.code || ''
-            `<span style="color:rgba(255,255,255,0.5)">${item.error || ''}</span>`,
+						}</span>`,
-          ])
+						`<span style="color:rgba(255,255,255,0.5)"><span style="color:rgba(255,255,255,0.5)"></span>  ${
-          this.eqConfig.data = eqArr
+							item.status || ''
-          this.$refs['eqScrollBoard'].updateRows(eqArr)
+						}</span>`,
+						`<span style="color:rgba(255,255,255,0.5)">${
+							item.error || ''
+						}</span>`,
+					]);
+          this.eqConfig.data = eqArr;
+          // this.$nextTick(() => {
+            this.$refs['eqScrollBoard'].updateRows(eqArr);
+          // })
 					// console.log(SJGWsData.orderList)
 				} else if (this.SJGWsData.type === 'productline') {
 					console.log('aaaaaaaaaaaaaaaaaaa', this.SJGWsData);
-          let nameList = []
+					let nameList = [];
-          let passRateList = []
+					let passRateList = [];
-          let outputNumList = []
+					let outputNumList = [];
+          // let arr = ['D64', 'D62', 'D61', 'D63', 'D65']
+          for (let i = 0; i < this.SJGWsData.detData.length - 1; i++) {
+            // 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
+            for (let j = 0; j < this.SJGWsData.detData.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)) {
+                // 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
+                let temp = this.SJGWsData.detData[j];
+                this.SJGWsData.detData[j] = this.SJGWsData.detData[j + 1];
+                this.SJGWsData.detData[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)
+            nameList.push(ele.lineName);
-            outputNumList.push(ele.outputNum)
+            outputNumList.push(ele.outputNum);
-            passRateList.push(ele.passRate)
+            passRateList.push(ele.passRate);
             // }
             // }
+          });
+          this.$nextTick(() => {
+            this.$refs.productLineChart.initChart(
+              nameList,
+              passRateList,
+              outputNumList
+            );
           })
-          this.$refs.productLineChart.initChart(nameList, passRateList, outputNumList)
 				} else if (this.SJGInitWebSocket === 'inspection') {
 				}
 			};
 		},
 		SJGWebsocketClose(e) {
-      this.SJGws.ws.onclose = (event) => { console.log(event); }
+			this.SJGws.ws.onclose = (event) => {
+				console.log(event);
+			};
 		},
 		websocketClose(e) {
-      this.wsHeartbeat.ws.onclose = (event) => { console.log(event); }
+			this.wsHeartbeat.ws.onclose = (event) => {
+				console.log(event);
+			};
 		},
 		windowWidth(value) {
-      this.clientWidth = value
+			this.clientWidth = value;
-      this.beilv2 = this.clientWidth / 1920
+			this.beilv2 = this.clientWidth / 1920;
 		},
 		change() {
 			console.log(this.isFullScreen);
 			debugger;
-      this.isFullScreen = screenfull.isFullscreen
+			this.isFullScreen = screenfull.isFullscreen;
 		},
 		init() {
 			console.log(screenfull.isEnabled);
 			if (screenfull.isEnabled) {
 				debugger;
-        screenfull.on('change', this.change)
+				screenfull.on('change', this.change);
 			}
 		},
 		destroy() {
 			if (screenfull.isEnabled) {
-        screenfull.off('change', this.change)
+				screenfull.off('change', this.change);
 			}
 		},
 		changeFullScreen() {
@@ -581,19 +791,62 @@ export default {
 			if (!screenfull.isEnabled) {
 				this.$message({
 					message: 'you browser can not work',
-          type: 'warning'
+					type: 'warning',
-        })
+				});
-        return false
+				return false;
-      }
-      screenfull.toggle()
-    }
-  }
 			}
+			screenfull.toggle();
+		},
+	},
+};
 </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;
@@ -612,17 +865,17 @@ export default {
 			position: absolute;
 			left: 290px;
 			top: 25px;
-          color: rgba(255, 255, 255, 0.80);
+			color: rgba(255, 255, 255, 0.8);
 			font-size: 20px;
-          letter-spacing: 0px;
+			letter-spacing: 1px;
 		}
 		.time {
 			position: absolute;
 			left: 1360px;
-          color: rgba(255, 255, 255, 0.80);
+			color: rgba(255, 255, 255, 0.8);
 			top: 25px;
 			font-size: 20px;
-          letter-spacing: 0px;
+			letter-spacing: 0.72px;
 		}
 		.title-button {
 			color: #00fff0;
@@ -666,6 +919,13 @@ export default {
 	background-color: unset;
 	background-image: linear-gradient(to right, #4573fe, #47f8dc);
 }
+::v-deep .el-progress__text {
+  width: 50px;
+  margin-top: -70px;
+  margin-left: 538px;
+  // background-color: unset;
+  // background-image: linear-gradient(to right, #4573fe, #47f8dc);
+}
 .visual-select {
 	position: absolute;
 	right: 1em;
@@ -736,7 +996,7 @@ export default {
 	}
 }
 .order::-webkit-scrollbar {
-  display: none
+	display: none;
 }
 </style>
 

src/views/base/coreAlarmLog/index.vue

@@ -9,7 +9,8 @@
 			: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"
@@ -33,38 +34,49 @@ 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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -74,7 +86,7 @@ export default {
 			tableBtn: [].filter((v)=>v),
 			tableData: [],
 			listQuery: {
-        pageSize: 10,
+        pageSize: 20,
         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-03-20 16:20:39
+ * @LastEditTime: 2024-04-02 16:46:17
  * @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,7 +9,8 @@
 			: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"
@@ -45,41 +46,56 @@ 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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreDepartment/index.vue

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

src/views/base/coreEquipmentLineBind/index.vue

@@ -12,7 +12,8 @@
 			: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,13 +52,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],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			basePath: '/base/core-equipment-bind-section',
@@ -81,12 +82,13 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					width: 180,
+					width: 150,
+					showOverflowtooltip: true,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
-				{ prop: 'productionLineName', label: '产线名称' },
+				{ prop: 'productionLineName', label: '产线名称', width: 120, showOverflowtooltip: true },
-				{ prop: 'workshopSectionName', label: '工段名称' },
+				{ prop: 'workshopSectionName', label: '工段名称', width: 120, showOverflowtooltip: true },
-				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'equipmentName', label: '设备名称', width: 150, showOverflowtooltip: true },
 				{ prop: 'sort', label: '工段中排序' },
 				{
 					prop: 'lineDataType',
@@ -236,7 +238,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 10,
+				pageSize: 20,
 				equipmentName: null,
 				productionLineId: null,
 			},

src/views/base/coreEquipmentType/index.vue

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

src/views/base/coreHotMaterial/index.vue

@@ -9,7 +9,8 @@
 			: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"
@@ -43,38 +44,51 @@ 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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreMajor/index.vue

@@ -9,7 +9,8 @@
 			: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"
@@ -45,6 +46,7 @@ import {
 	getCoreMajorPage,
 	deleteCoreMajor
 } from '@/api/base/coreMajor';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -71,7 +73,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

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

@@ -2,15 +2,17 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-13 13:54:01
+ * @LastEditTime: 2024-03-27 13:47:24
  * @Description:
 -->
 <template>
 	<el-drawer
 		:visible.sync="visible"
 		:show-close="false"
-		:wrapper-closable="isdetail"
+		:wrapper-closable="true"
 		class="drawer"
+		:before-close="beforeClose"
+		@closed="$emit('destroy')"
 		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
@@ -262,6 +264,15 @@ 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,7 +9,8 @@
 			: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"
@@ -26,7 +27,8 @@
 		<add-or-update
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
-			@refreshDataList="getDataList" />
+			@refreshDataList="getDataList"
+			@destroy="addOrUpdateVisible = false" />
 	</div>
 </template>
 
@@ -39,43 +41,58 @@ 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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreProductionLine/index.vue

@@ -9,7 +9,8 @@
 			: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"
@@ -48,34 +49,47 @@ 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',
@@ -83,16 +97,20 @@ const tableProps = [
 	// },
 	{
 		prop: 'description',
-		label: '描述'
+		label: '描述',
+		width: 120,
+		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		width: 120,
+		showOverflowtooltip: true
 	}
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	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: 2023-11-22 10:27:43
+ * @LastEditTime: 2024-04-02 16:46:49
  * @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,7 +9,8 @@
 			: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"
@@ -45,41 +46,56 @@ 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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreWorkOrder/allocation.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-22 08:53:20
+ * @LastEditTime: 2024-04-08 10:21:46
  * @Description:
 -->
 <template>
@@ -214,7 +214,9 @@ export default {
 								actualQuantity: this.dataForm.actualQuantity
 							}).then(response => {
 								this.$modal.msgSuccess("操作成功！工单状态稍后将会更新！");
+								if (tempList.length > 0) {
 									this.saveData(tempList)
+								}
 								this.visible = false;
 								this.$emit("refreshDataList");
 							});

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-03-21 16:52:46
+ * @LastEditTime: 2024-04-08 14:27:29
  * @Description:
 -->
 <template>
@@ -182,7 +182,8 @@
 					:table-props="tableProps"
 					:page="listQuery.pageNo"
 					:limit="listQuery.pageSize"
-					:table-data="orderList">
+					:table-data="orderList"
+					:max-height="tableH">
 					<method-btn
 						v-if="!isdetail"
 						slot="handleBtn"
@@ -209,7 +210,8 @@
 					:table-props="tableProps1"
 					:page="listQuery1.pageNo"
 					:limit="listQuery1.pageSize"
-					:table-data="materialList" />
+					:table-data="materialList"
+					:max-height="tableH" />
 				<!-- <pagination
 					v-show="listQuery1.total > 0"
 					:total="listQuery1.total"
@@ -235,6 +237,7 @@ import SmallTitle from './SmallTitle';
 import { publicFormatter } from "@/utils/dict";
 import { parseTime } from '@/utils/ruoyi'
 import topTabVue from '../../order/base/orderManage/components/topTab.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableBtn = [
 	{
@@ -292,9 +295,11 @@ const tableProps1 = [
 ];
 
 export default {
+	mixins: [tableHeightMixin],
 	components: { SmallTitle, topTabVue },
 	data() {
 		return {
+			heightNum: 380,
 			tableBtn,
 			tableProps,
 			tableProps1,
@@ -455,7 +460,7 @@ export default {
 				// this.listQuery.total = response.data.total;
 			});
 			// 获取预使用原料列表
-			console.log()
+			console.log('111我看看', this.dataForm.materialMethod)
 			if (this.dataForm.id) {
 				if (this.dataForm.materialMethod === 1) {
 					// 产品

src/views/base/coreWorkOrder/index.vue

@@ -9,7 +9,8 @@
 			: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"
@@ -62,7 +63,7 @@ import {
 	getCoreWOList
 } from '@/api/base/coreWorkOrder';
 import { publicFormatter } from '@/utils/dict';
-
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -132,7 +133,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	components: {
 		AddWorkOrder,
 		AddOrUpdate,

src/views/base/coreWorker/index.vue

@@ -9,7 +9,8 @@
 			: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,20 +47,27 @@ 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',
@@ -70,32 +78,44 @@ 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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

src/views/base/coreWorkshopSection/index.vue

@@ -9,7 +9,8 @@
 			: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"
@@ -45,12 +46,14 @@ import {
 	getCWSectionPage,
 	deleteCWSection
 } from '@/api/base/coreWorkshopSection';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime
+		filter: parseTime,
+
 	},
 	{
 		prop: 'code',
@@ -70,12 +73,13 @@ const tableProps = [
 	},
 	{
 		prop: 'remark',
-		label: '备注'
+		label: '备注',
+		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

src/views/base/material/index.vue

@@ -9,7 +9,8 @@
 			: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"
@@ -40,6 +41,7 @@ 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 = [
 	{
@@ -75,7 +77,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

src/views/base/materialProductBom/index.vue

@@ -9,7 +9,8 @@
 			: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"
@@ -38,6 +39,7 @@ import {
 	getMaterialPBPage,
 	deleteMaterialPB
 } from '@/api/base/materialProductBom';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -55,7 +57,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	components: {
 		AddOrUpdate,
 	},

src/views/base/packagingPrintLog/index.vue

@@ -2,37 +2,20 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-28 10:38:34
+ * @LastEditTime: 2024-04-08 11:49:33
  * @Description:
 -->
 <template>
   <div class="app-container">
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
+    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			:table-props="tableProps"
-			:page="listQuery.pageNo"
-			:limit="listQuery.pageSize"
       :table-data="tableData">
-			<method-btn
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="120"
-				label="操作"
-				:method-list="tableBtn"
         @clickBtn="handleClick" />
     </base-table>
-		<pagination
+    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-			:limit.sync="listQuery.pageSize"
-			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
       @pagination="getDataList" />
-		<add-or-update
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			@refreshDataList="getDataList" />
   </div>
 </template>
 
@@ -41,6 +24,7 @@ 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'
@@ -91,7 +75,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+  mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -144,7 +128,7 @@ export default {
           param: 'createTime',
         },
 				{
-					type: 'button',
+          type: this.$auth.hasPermi('base:packaging-print-log:query') ? 'button' : '',
 					btnName: '搜索',
 					name: 'search',
 					color: 'primary',
@@ -314,7 +298,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
           this.listQuery.workOrderId = val.workOrderId;
           if (val.createTime && val.createTime.length != 0) {
             this.listQuery.createTime = val.createTime
@@ -329,7 +313,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};

src/views/base/packagingPrintModel/index.vue

@@ -2,13 +2,14 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-12-04 13:38:45
+ * @LastEditTime: 2024-04-03 15:08:38
  * @Description:
 -->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData">
+    <base-table :max-height="tableH" :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" />
     </base-table>
@@ -26,6 +27,8 @@ 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 tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 import {
   deletePackingModel,
   getPackingModelPage,
@@ -59,7 +62,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+  mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -162,7 +165,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
           this.listQuery.packagingCode = val.packagingCode;
           this.listQuery.createTime = val.createTime;
 					this.getDataList();
@@ -170,7 +173,7 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 10,
+						pageSize: 20,
 						pageNo: 1,
 						total: 1,
 					};

src/views/base/packagingPrintType/index.vue

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

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

@@ -106,6 +106,10 @@ export default {
 		activeIndex(val) {
 			this.initChart(val);
 		},
+		daterange(val) {
+			console.log('222', val)
+			this.templateOption.xAxis.data = val
+		},
 	},
 	methods: {
 		/**
@@ -124,8 +128,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) => ({
@@ -139,7 +143,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
 						series: eqCt,
-					});
+					}, true);
 					break;
 				case 1:
 					const eqTt = this.tableData.map((row) => ({
@@ -153,7 +157,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
 						series: eqTt,
-					});
+					}, true);
 					break;
 				case 2:
 					const plCt = this.tableData.map((row) => ({
@@ -167,7 +171,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
 						series: plCt,
-					});
+					}, true);
 					break;
 				case 3:
 					const plTt = this.tableData.map((row) => ({
@@ -181,9 +185,10 @@ 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',
@@ -195,7 +200,7 @@ export default {
 						...this.templateOption,
 						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
 						series: eqCt2,
-					});
+					}, true);
 			}
 		},
 	},

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

@@ -18,13 +18,15 @@
 						: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>
@@ -47,13 +49,14 @@ 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],
+	mixins: [basicPageMixin, tableHeightMixin],
 	data() {
 		return {
 			activeName: 'table',
@@ -176,6 +179,11 @@ 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,7 +9,8 @@
 			: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,6 +42,7 @@
 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
@@ -71,7 +73,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {

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

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

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

@@ -27,13 +27,16 @@
 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
 			},
@@ -56,9 +59,9 @@ export default {
 	},
 	computed: {},
 	mounted() {
-		window.addEventListener('resize', () => {
+		// window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(240)
+    //   this.tableH = this.tableHeight(240)
-    })
+    // })
 		this.getList();
 	},
 	methods: {
@@ -115,7 +118,7 @@ export default {
 		/** 把 list 里的数据转换成 tableProps 对应的格式 */
 		convertList(list) {
 			// let sectionArr= []
-			let temp = Object.values(list.datamap)                             
+			let temp = list.datamap ? Object.values(list?.datamap) : []
 			console.log('111', temp)
 
 			temp.forEach(item => {

src/views/cost/energyCost/index.vue

@@ -32,6 +32,7 @@ import {
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -61,7 +62,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage,tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -70,7 +71,6 @@ export default {
 			},
 			tableData: [],
 			tableProps,
-      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -92,13 +92,15 @@ export default {
 					param: 'searchTime',
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('extend:cost-energy-search:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('cost:energyCost:export')
+					type: this.$auth.hasPermi('extend:cost-energy-search:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -111,9 +113,6 @@ export default {
 	},
 	components: {},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		getEnergyTypeListAll().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});

src/views/cost/energyCostHis/index.vue

@@ -32,6 +32,7 @@ import {
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -71,7 +72,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage,tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -80,7 +81,6 @@ export default {
 			},
 			tableData: [],
 			tableProps,
-      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -116,13 +116,15 @@ export default {
 					defaultSelect: [],
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('extend:cost-enery-auto-report:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('cost:energyCostHis:export')
+					type: this.$auth.hasPermi('extend:cost-enery-auto-report:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -135,9 +137,6 @@ export default {
 	},
 	components: {},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		const end = new Date();
 		const start = new Date();
 		start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);

src/views/cost/rawMaterialConfig/index.vue

@@ -53,6 +53,7 @@ import {
 } from '@/api/cost/costMaterialSet';
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -91,7 +92,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage,tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -99,15 +100,14 @@ export default {
 				deleteURL: deleteCostMaterialSet,
 			},
 			tableProps,
-      tableH: this.tableHeight(260),
 			tableBtn: [
-				this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
+				this.$auth.hasPermi(`extend:cost-material-set:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`cost:rawMaterialConfig:delete`)
+				this.$auth.hasPermi(`extend:cost-material-set:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -124,16 +124,22 @@ export default {
 					filterable: true,
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('extend:cost-material-set:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type:
+						this.$auth.hasPermi('extend:cost-material-set:create') &&
+						this.$auth.hasPermi('extend:cost-material-set:query')
+							? 'separate'
+							: '',
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialConfig:create')
+					type: this.$auth.hasPermi('extend:cost-material-set:create')
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -148,9 +154,6 @@ export default {
 		AddOrUpdate,
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		getHotMaterialList().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});

src/views/cost/rawMaterialCost/index.vue

@@ -32,6 +32,7 @@ import {
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -66,7 +67,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage,tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -75,7 +76,6 @@ export default {
 			},
 			tableData: [],
 			tableProps,
-      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -97,13 +97,15 @@ export default {
 					param: 'searchTime',
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('extend:cost-material-search:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialCost:export')
+					type: this.$auth.hasPermi('extend:cost-material-search:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -116,9 +118,6 @@ export default {
 	},
 	components: {},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		getHotMaterialList().then((response) => {
 			this.formConfig[0].selectOptions = response.data;
 		});

src/views/cost/rawMaterialCostHis/index.vue

@@ -32,6 +32,7 @@ import {
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -70,7 +71,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage],
+	mixins: [basicPage,tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -79,7 +80,6 @@ export default {
 			},
 			tableData: [],
 			tableProps,
-      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -115,13 +115,15 @@ export default {
 					defaultSelect: [],
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('extend:cost-material-auto-report:query')
+						? 'button'
+						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('cost:rawMaterialCostHis:export')
+					type: this.$auth.hasPermi('extend:cost-material-auto-report:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -134,9 +136,6 @@ export default {
 	},
 	components: {},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		const end = new Date();
 		const start = new Date();
 		start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);

src/views/databoard/components/NumRateChart.vue

@@ -1,13 +1,17 @@
 <template>
-  <div style="height: 370px;">
+	<div style="height: 370px">
 		<NotMsg v-show="notMsg" />
-    <div id="numRateChart" class="num-rate-chart" style="width:900px;height:420px;" v-show='!notMsg'></div>
+		<div
+			id="numRateChart"
+			class="num-rate-chart"
+			style="width: 900px; height: 420px"
+			v-show="!notMsg"></div>
 	</div>
 </template>
 <script>
 import * as echarts from 'echarts';
-import resize from './../mixins/resize'
+import resize from './../mixins/resize';
-import NotMsg from './../components/NotMsg'
+import NotMsg from './../components/NotMsg';
 export default {
 	name: 'NumRateChart',
 	mixins: [resize],
@@ -15,65 +19,88 @@ export default {
 	data() {
 		return {
 			chart: null,
-      notMsg:true
+			notMsg: true,
-    }
+		};
 	},
 	computed: {
 		productline() {
-      return this.$store.state.websocket.productline
+			return this.$store.state.websocket.productline;
-    }
+		},
 	},
 	watch: {
 		productline: {
 			handler(newVal, oldVal) {
 				if (newVal === oldVal) {
-          return false
+					return false;
-        }
-        this.updateChart()
-        this.$emit('emitFun')
-			}
 				}
+				this.updateChart();
+				this.$emit('emitFun');
+			},
+		},
 	},
 	mounted() {
 		this.$el.addEventListener('resize', () => {
 			console.log('resziing.....');
 		});
-    this.updateChart()
+		this.updateChart();
 	},
 	methods: {
 		updateChart() {
 			if (this.productline && this.productline.length > 0) {
-        this.notMsg = false
+				this.notMsg = false;
 			} else {
-        this.notMsg = true
+				this.notMsg = true;
-        return
+				return;
 			}
-      let xData = []
+			let xData = [];
-      let outputNum = []
+			let outputNum = [];
-      let passRate = []
+			let passRate = [];
-      this.productline && this.productline.length > 0 && this.productline.map(item => {
+			for (let i = 0; i < this.productline.length - 1; i++) {
-        if ((item.lineName).includes('D')) {
+				// 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
-          xData.push(item.lineName)
+				for (let j = 0; j < this.productline.length - i - 1; j++) {
-          outputNum.push(item.outputNum)
+					// 当前一个值大于后一个值
-          passRate.push(item.passRate?item.passRate*100:null)
+					if (
+						this.productline[j].lineName.substr(
+							this.productline[j].lineName.length - 1,
+							1
+						) >
+						this.productline[j + 1].lineName.substr(
+							this.productline[j + 1].lineName.length - 1,
+							1
+						)
+					) {
+						// 定义变量，以赋值的形式前后交换，直到换到最小的在前面，左右再无比较，则循环结束形成排序结果
+						let temp = this.productline[j];
+						this.productline[j] = this.productline[j + 1];
+						this.productline[j + 1] = temp;
 					}
-      })
+				}
+			}
+			this.productline &&
+				this.productline.length > 0 &&
+				this.productline.map((item) => {
+					if (item.lineName.includes('D')) {
+						xData.push(item.lineName);
+						outputNum.push(item.outputNum);
+						passRate.push(item.passRate);
+					}
+				});
 			if (
 				this.chart !== null &&
 				this.chart !== '' &&
 				this.chart !== undefined
 			) {
-        this.chart.dispose()
+				this.chart.dispose();
 			}
 			this.chart = echarts.init(document.getElementById('numRateChart'));
 			var option = {
 				grid: { top: 82, right: 60, bottom: 20, left: 90 },
 				tooltip: {
-          trigger: "axis",
+					trigger: 'axis',
 					axisPointer: {
-            type: "shadow",
+						type: 'shadow',
 					},
-          className: "num-rate-chart-tooltip"
+					className: 'num-rate-chart-tooltip',
 				},
 				legend: {
 					itemWidth: 10,
@@ -83,32 +110,32 @@ export default {
 					icon: 'rect',
 					data: [
 						{ name: '产线产量', itemStyle: { color: '#364BFE' } },
-            {name:'良品率',itemStyle:{color:'#FFCB59'}}
+						{ name: '良品率', itemStyle: { color: '#FFCB59' } },
 					],
 					textStyle: {
-            color: "#DFF1FE",
+						color: '#DFF1FE',
 						fontSize: 12,
-          }
+					},
 				},
 				xAxis: [
 					{
 						type: 'category',
 						data: xData,
 						axisLabel: {
-              color: "#fff",
+							color: '#fff',
 							fontSize: 12,
 						},
 						axisPointer: {
-              type: 'shadow'
+							type: 'shadow',
 						},
 						axisTick: { show: false },
 						axisLine: {
 							lineStyle: {
 								width: 1,
-                color: "#213259",
+								color: '#213259',
+							},
 						},
 					},
-          }
 				],
 				yAxis: [
 					{
@@ -120,21 +147,20 @@ export default {
 							align: 'right',
 						},
 						axisLabel: {
-              color: "#fff",
+							color: '#fff',
 							fontSize: 12,
-              formatter: '{value}'
 						},
 						axisLine: {
 							show: true,
 							lineStyle: {
-                color: "#213259",
+								color: '#213259',
 							},
 						},
 						splitLine: {
 							lineStyle: {
-                color: "#213259a0",
+								color: '#213259a0',
+							},
 						},
-            }
 					},
 					{
 						type: 'value',
@@ -145,24 +171,22 @@ export default {
 							align: 'LEFT',
 						},
 						axisLabel: {
-              color: "#fff",
+							color: '#fff',
 							fontSize: 12,
-              formatter: () =>{
+							formatter: '{value}%',
-                return value ? '{value} %': '-'
-              }
 						},
 						axisLine: {
 							show: true,
 							lineStyle: {
-              color: "#213259",
+								color: '#213259',
 							},
 						},
 						splitLine: {
 							lineStyle: {
-              color: "#213259a0",
+								color: '#213259a0',
+							},
+						},
 					},
-          }
-          }
 				],
 				series: [
 					{
@@ -171,16 +195,16 @@ export default {
 						tooltip: {
 							valueFormatter: function (value) {
 								return value;
-              }
+							},
 						},
 						barWidth: 20,
 						itemStyle: {
 							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
 								{ offset: 0, color: '#5CB7FF' },
-                { offset: 1, color: '#364BFE' }
+								{ offset: 1, color: '#364BFE' },
-              ])
+							]),
 						},
-            data: outputNum
+						data: outputNum,
 					},
 					{
 						name: '良品率',
@@ -189,31 +213,31 @@ export default {
 						tooltip: {
 							valueFormatter: function (value) {
 								return value ? value + '%' : '-';
-              }
+							},
 						},
 						itemStyle: {
-              color: '#FFD160'
+							color: '#FFD160',
 						},
 						areaStyle: {
 							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                { offset: 0, color: '#FFCB59' + "40" },
+								{ offset: 0, color: '#FFCB59' + '40' },
-                { offset: 0.5, color: '#FFCB59' + "20" },
+								{ offset: 0.5, color: '#FFCB59' + '20' },
-                { offset: 1, color: '#FFCB59' + "00" },
+								{ offset: 1, color: '#FFCB59' + '00' },
 							]),
 						},
 						lineStyle: {
-                width: 1
+							width: 1,
 						},
 						symbol: 'circle',
 						symbolSize: 5,
-            data: passRate
+						data: passRate,
-          }
+					},
-        ]
+				],
+			};
+			option && this.chart.setOption(option);
+		},
+	},
 };
-      option && this.chart.setOption(option)
-    }
-  }
-}
 </script>
 <style scoped lang="scss">
 .num-rate-chart {

src/views/databoard/deepProcessing/DefectSum.vue

@@ -1,9 +1,17 @@
 <template>
-  <div style="flex: 1;">
+	<div style="flex: 1">
-    <Container name="各工序缺陷汇总" size="middle" style="">
+		<Container
-      <TimePrompt class="timeShow" :timestr="timestr" />
+			name="各工序缺陷汇总"
-      <div style="padding: 5px 10px;">
+			size="middle"
-        <dv-scroll-board :config="config" style="width:575px;height:380px" ref='defectScrollBoard'/>
+			style="">
+			<TimePrompt
+				class="timeShow"
+				:timestr="timestr" />
+			<div style="padding: 5px 10px">
+				<dv-scroll-board
+					:config="config"
+					style="width: 575px; height: 380px"
+					ref="defectScrollBoard" />
 			</div>
 		</Container>
 	</div>
@@ -11,14 +19,14 @@
 <script>
 import Container from '../components/Container.vue';
 import TimePrompt from '../components/TimePrompt';
-import { switchShowTime } from '../utils'
+import { switchShowTime } from '../utils';
 export default {
 	name: 'DefectSum',
 	components: { Container, TimePrompt },
 	computed: {
 		defectSum() {
-      return this.$store.state.websocket.defectSum
+			return this.$store.state.websocket.defectSum;
-    }
+		},
 	},
 	data() {
 		return {
@@ -30,14 +38,23 @@ export default {
 				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
 				columnWidth: [60],
 				align: ['center'],
-        data: [],
+				data: [
-        // data: [[1, 'Y61', '破损','10','气泡']],
+					//假数据
-        rowNum: 10
+					[1, 'D61', '成型', '3片', '细长泡'],
-      }
+					[2, 'D62', '组合落板', '4片', '细长泡'],
-    }
+					[3, 'D61', '磨边', '6片', '开口泡'],
+					[4, 'D63', '清洗', '5片', '结石'],
+					[5, 'D64', '打孔', '2片', '结石'],
+					[6, 'D63', '成型', '7片', '开口泡'],
+					[7, 'D61', '上片', '8片', '结石'],
+				],
+				// data: [],
+				rowNum: 10,
+			},
+		};
 	},
 	mounted() {
-    this.timestr = switchShowTime('日')
+		this.timestr = switchShowTime('日');
 	},
 	watch: {
 		defectSum: {
@@ -47,15 +64,15 @@ export default {
 					item.productionLineName,
 					item.sectionName,
 					item.count,
-          item.inspectionTypeName
+					item.inspectionTypeName,
 				]);
-        this.config.data = outArr
+				this.config.data = outArr;
-        this.$refs['defectScrollBoard'].updateRows(outArr)
+				this.$refs['defectScrollBoard'].updateRows(outArr);
-        this.timestr = switchShowTime('日')
+				this.timestr = switchShowTime('日');
-			}
+			},
-		}
+		},
-  }
+	},
-}
+};
 </script>
 <style lang='scss' scoped>
 .timeShow {

src/views/databoard/kiln/MaterialCost.vue

@@ -1,24 +1,23 @@
-<!-- 
-    filename: MaterialCost.vue
-    author: liubin
-    date: 2023-12-06 09:09:27
-    description: 
--->
-
 <template>
-	<Container name="原料用量统计" size="middle" style="">
+	<Container
-		<div style="flex: 1; display: flex; gap: 8px;flex-direction: column;">
+		name="原料用量统计"
+		size="middle"
+		style="">
+		<div style="flex: 1; display: flex; gap: 8px; flex-direction: column">
 			<div
 				class="absolute"
 				style="
-					flex:3;
+					flex: 2;
 					padding: 12px 12px 0 12px;
 					display: grid;
-					grid-template-columns: repeat(3, 1fr);
+					grid-template-columns: repeat(2, 1fr);
 					grid-auto-rows: repeat(4, 1fr);
 					gap: 8px;
 				">
-				<ShadowRect v-for="(item, index) in materialMsg1" :key="index" :rounded="false">
+				<ShadowRect
+					v-for="(item, index) in materialMsg"
+					:key="index"
+					:rounded="false">
 					<div
 						class="material"
 						style="
@@ -30,33 +29,15 @@
 							align-items: center;
 							justify-content: center;
 						">
-						<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
+						<span
-							{{item.materialUsed}}
-						</span>
-						<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
-							- {{item.materialName}}/kg-
-						</span>
-					</div>
-				</ShadowRect>
-			</div>
-			<div style="flex:1;
-					padding: 0 12px 12px 12px;
-					display: grid;
-					grid-template-columns: repeat(4, 1fr);
-					gap: 8px;">
-				<ShadowRect v-for="(item, index) in materialMsg2" :key="index" :rounded="false">
-					<div
-						class="material"
 							style="
-							flex: 1;
+								color: #0ee8e4;
-							padding-bottom: 3px;
+								font-weight: 500;
-							display: flex;
+								font-size: 32px;
-							flex-direction: column;
+								white-space: nowrap;
-							gap: 4px;
+								overflow: hidden;
-							align-items: center;
+								text-overflow: ellipsis;
-							justify-content: center;
 							">
-						<span style="color: #0ee8e4; font-weight: 500; font-size: 32px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
 							{{ item.materialUsed }}
 						</span>
 						<span style="color: #fff; font-size: 16px; letter-spacing: 1px">
@@ -66,7 +47,6 @@
 				</ShadowRect>
 			</div>
 		</div>
-		
 	</Container>
 </template>
 
@@ -81,12 +61,9 @@ export default {
 		return {};
 	},
 	computed: {
-		materialMsg1() {
+		materialMsg() {
-			return this.$store.state.websocket.material.slice(0,9)
+			return this.$store.state.websocket.material;
 		},
-		materialMsg2() {
-			return this.$store.state.websocket.material.slice(9)
-		}
 	},
 	methods: {},
 };

src/views/delivery/deliveryLog/index.vue

@@ -4,31 +4,27 @@
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
-      @headBtnClick="buttonClick"
+			@headBtnClick="buttonClick" />
-    />
 		<!-- 列表 -->
 		<base-table
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-props="tableProps"
 			:table-data="list"
-      :max-height="tableH"
+			:max-height="tableH">
-    >
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				:width="160"
 				label="操作"
 				:method-list="tableBtn"
-        @clickBtn="handleClick"
+				@clickBtn="handleClick" />
-      />
 		</base-table>
 		<pagination
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			:total="total"
-      @pagination="getList"
+			@pagination="getList" />
-    />
 		<!-- 新增 -->
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
@@ -36,9 +32,10 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%"
+			width="50%">
-    >
+			<add-or-update
-			<add-or-update ref="addOrUpdate" @successSubmit="successSubmit" />
+				ref="addOrUpdate"
+				@successSubmit="successSubmit" />
 		</base-dialog>
 		<!-- 装车 -->
 		<base-dialog
@@ -47,73 +44,78 @@
 			@cancel="handleCancel2"
 			@confirm="handleConfirm2"
 			:before-close="handleCancel2"
-			width="50%"
+			width="50%">
-    >
+			<loaded-page
-			<loaded-page ref="loadedPage" @successSubmit="successSubmit2" />
+				ref="loadedPage"
+				@successSubmit="successSubmit2" />
 		</base-dialog>
 		<!-- 发货详情 -->
-    <delivery-log-detail ref='deliveryLogDetail' v-if='showDetail' />
+		<delivery-log-detail
+			ref="deliveryLogDetail"
+			v-if="showDetail" />
 	</div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi'
+import { parseTime } from '@/utils/ruoyi';
-import { deliveryLogPage, deliveryLogDelete } from '@/api/base/delivery'
+import { deliveryLogPage, deliveryLogDelete } from '@/api/base/delivery';
-import AddOrUpdate from './components/addOrUpdate'
+import AddOrUpdate from './components/addOrUpdate';
-import LoadedPage from './components/loadedPage'
+import LoadedPage from './components/loadedPage';
-import DeliveryLogDetail from './components/deliveryLogDetail.vue'
+import DeliveryLogDetail from './components/deliveryLogDetail.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'orderName',
 		label: '订单名',
 		minWidth: 100,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'name',
 		label: '发货单名称',
 		minWidth: 100,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'deliveryTime',
 		label: '发货时间',
 		filter: parseTime,
-    minWidth: 160
+		minWidth: 160,
 	},
 	{
 		prop: 'code',
 		label: '发货单号',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'deliverPerName',
 		label: '发货负责人',
-    minWidth: 100
+		minWidth: 100,
 	},
 	{
 		prop: 'principal',
 		label: '运输负责人',
-    minWidth: 100
+		minWidth: 100,
 	},
 	{
 		prop: 'principalCall',
 		label: '运输联系方式',
 		minWidth: 110,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'principalCost',
 		label: '运输费用',
-    align: 'right'
+		align: 'right',
 	},
 	{
 		prop: 'remark',
 		label: '备注',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
-  }
+	},
-]
+];
 export default {
-  name: "DeliveryLog",
+	name: 'DeliveryLog',
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -121,34 +123,38 @@ export default {
 					type: 'input',
 					label: '订单名',
 					param: 'orderName',
-          defaultSelect: ''
+					defaultSelect: '',
 				},
 				{
 					type: 'input',
 					label: '发货单名称',
-          param: 'name'
+					param: 'name',
 				},
 				{
 					type: 'input',
 					label: '发货单号',
-          param: 'code'
+					param: 'code',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: this.$auth.hasPermi('extend:delivery-log:create') ? 'separate' : '',
+					type: this.$auth.hasPermi('extend:delivery-log:create')
+						? 'separate'
+						: '',
 				},
 				{
-          type: this.$auth.hasPermi('extend:delivery-log:create') ? 'button' : '',
+					type: this.$auth.hasPermi('extend:delivery-log:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			// 查询参数
 			queryParams: {
@@ -156,158 +162,163 @@ export default {
 				pageSize: 20,
 				orderName: '',
 				code: '',
-        name: ''
+				name: '',
 			},
 			tableProps,
 			list: [],
-      tableH: this.tableHeight(260),
 			total: 0,
 			tableBtn: [
 				this.$auth.hasPermi('extend:delivery-log:loaded')
 					? {
 							type: 'loaded',
-              btnName: '装车'
+							btnName: '装车',
 					  }
 					: undefined,
 				this.$auth.hasPermi('extend:delivery-log:detail')
 					? {
 							type: 'detail',
-              btnName: '详情'
+							btnName: '详情',
 					  }
 					: undefined,
 				this.$auth.hasPermi('extend:delivery-log:update')
 					? {
 							type: 'edit',
-              btnName: '编辑'
+							btnName: '编辑',
 					  }
 					: undefined,
 				this.$auth.hasPermi('extend:delivery-log:delete')
 					? {
 							type: 'delete',
-              btnName: '删除'
+							btnName: '删除',
 					  }
-          : undefined
+					: undefined,
 			].filter((v) => v),
 			addOrEditTitle: '',
 			centervisible: false,
 			centervisible2: false,
-      showDetail: false
+			showDetail: false,
-    }
+		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		if (location.href.indexOf('?') > 0) {
-      let arr = location.href.split('?')[1]
+			let arr = location.href.split('?')[1];
-      this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
+			this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1]);
 		} else {
-      this.formConfig[0].defaultSelect = ''
+			this.formConfig[0].defaultSelect = '';
 		}
-    this.queryParams.orderName = this.formConfig[0].defaultSelect
+		this.queryParams.orderName = this.formConfig[0].defaultSelect;
 		this.getList();
 	},
 	components: { AddOrUpdate, LoadedPage, DeliveryLogDetail },
 	watch: {
-    $route: 'initData'
+		$route: 'initData',
 	},
 	methods: {
 		initData(to) {
 			if (to.name === 'DeliveryLog') {
 				if (location.href.indexOf('?') > 0) {
-          let arr = location.href.split('?')[1]
+					let arr = location.href.split('?')[1];
-          this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1])
+					this.formConfig[0].defaultSelect = decodeURI(arr.split('=')[1]);
 				} else {
-          this.formConfig[0].defaultSelect = ''
+					this.formConfig[0].defaultSelect = '';
 				}
-        this.queryParams.orderName = this.formConfig[0].defaultSelect
+				this.queryParams.orderName = this.formConfig[0].defaultSelect;
-        this.getList()
+				this.getList();
 			}
 		},
 		getList() {
-      deliveryLogPage({...this.queryParams}).then(res => {
+			deliveryLogPage({ ...this.queryParams }).then((res) => {
-        let arr = res.data.list || []
+				let arr = res.data.list || [];
-        arr && arr.map(item => {
+				arr &&
-          item.principalCost = item.principalCost.toFixed(2)
+					arr.map((item) => {
-        })
+						item.principalCost = item.principalCost.toFixed(2);
-        this.list = arr
+					});
-        this.total = res.data.total || 0
+				this.list = arr;
-      })
+				this.total = res.data.total || 0;
+			});
 		},
 		buttonClick(val) {
 			if (val.btnName === 'search') {
-        this.queryParams.name = val.name
+				this.queryParams.name = val.name;
-        this.queryParams.orderName = val.orderName
+				this.queryParams.orderName = val.orderName;
-        this.queryParams.code = val.code
+				this.queryParams.code = val.code;
-        this.getList()
+				this.getList();
 			} else {
-        this.addOrEditTitle = '新增'
+				this.addOrEditTitle = '新增';
-        this.centervisible = true
+				this.centervisible = true;
 				this.$nextTick(() => {
-          this.$refs.addOrUpdate.init()
+					this.$refs.addOrUpdate.init();
-        })
+				});
 			}
 		},
 		handleClick(val) {
-      console.log(val)
+			console.log(val);
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
-          this.centervisible = true
+					this.centervisible = true;
 					this.$nextTick(() => {
-            this.$refs.addOrUpdate.init(val.data.id)
+						this.$refs.addOrUpdate.init(val.data.id);
-          })
+					});
-          break
+					break;
 				case 'delete':
-          this.handleDelete(val.data)
+					this.handleDelete(val.data);
-          break
+					break;
 				case 'loaded':
-          this.centervisible2 = true
+					this.centervisible2 = true;
 					this.$nextTick(() => {
-            this.$refs.loadedPage.init(val.data.id, val.data.code, val.data.orderId)
+						this.$refs.loadedPage.init(
-          })
+							val.data.id,
-          break
+							val.data.code,
+							val.data.orderId
+						);
+					});
+					break;
 				default:
-          this.showDetail = true
+					this.showDetail = true;
 					this.$nextTick(() => {
-            this.$refs.deliveryLogDetail.init(val.data)
+						this.$refs.deliveryLogDetail.init(val.data);
-          })
+					});
 			}
 		},
 		// 新增
 		handleCancel() {
-      this.$refs.addOrUpdate.formClear()
+			this.$refs.addOrUpdate.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.addOrUpdate.submitForm()
+			this.$refs.addOrUpdate.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		// 删除
 		handleDelete(val) {
-      this.$modal.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?').then(function() {
+			this.$modal
-          return deliveryLogDelete({ id: val.id })
+				.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?')
-        }).then(() => {
+				.then(function () {
+					return deliveryLogDelete({ id: val.id });
+				})
+				.then(() => {
 					this.getList();
-          this.$modal.msgSuccess("操作成功");
+					this.$modal.msgSuccess('操作成功');
-        }).catch(() => {});
+				})
+				.catch(() => {});
 		},
 		// 装车
 		handleCancel2() {
-      this.$refs.loadedPage.formClear()
+			this.$refs.loadedPage.formClear();
-      this.centervisible2 = false
+			this.centervisible2 = false;
 		},
 		handleConfirm2() {
-      this.$refs.loadedPage.submitForm()
+			this.$refs.loadedPage.submitForm();
 		},
 		successSubmit2() {
-      this.handleCancel2()
+			this.handleCancel2();
-      this.getList()
+			this.getList();
-    }
+		},
-  }
+	},
-}
+};
 </script>

src/views/delivery/deliveryLogDet/index.vue

@@ -4,127 +4,121 @@
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
-      @headBtnClick="buttonClick"
+			@headBtnClick="buttonClick" />
-    />
 		<!-- 列表 -->
 		<base-table
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-props="tableProps"
 			:table-data="list"
-      :max-height="tableH"
+			:max-height="tableH">
-    >
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				:width="80"
 				label="操作"
 				:method-list="tableBtn"
-        @clickBtn="handleClick"
+				@clickBtn="handleClick" />
-      />
 		</base-table>
 		<pagination
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			:total="total"
-      @pagination="getList"
+			@pagination="getList" />
-    />
 		<!-- 详情抽屉 -->
-    <delivery-log-det-detail ref='deliveryLogDetail'/>
+		<delivery-log-det-detail ref="deliveryLogDetail" />
 	</div>
 </template>
 <script>
-import { deliveryProgressPage } from '@/api/base/delivery'
+import { deliveryProgressPage } from '@/api/base/delivery';
-import DeliveryLogDetDetail from './components/deliveryLogDetDetail.vue'
+import DeliveryLogDetDetail from './components/deliveryLogDetDetail.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'orderName',
 		label: '订单名',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'customerName',
 		label: '客户名称',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'unit',
-    label: '单位'
+		label: '单位',
 	},
 	{
 		prop: 'orderNum',
-    label: '订单数量'
+		label: '订单数量',
 	},
 	{
 		prop: 'num',
-    label: '发货数量'
+		label: '发货数量',
 	},
 	{
 		prop: 'rate',
-    label: '累计发货比例(%)'
+		label: '累计发货比例(%)',
-  }
+	},
-]
+];
 export default {
-  name: "DeliveryLogDet",
+	name: 'DeliveryLogDet',
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
 				{
 					type: 'input',
 					label: '订单名',
-          param: 'orderName'
+					param: 'orderName',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
-        }
+				},
 			],
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 20,
-        orderName: ''
+				orderName: '',
 			},
 			tableProps,
 			list: [],
-      tableH: this.tableHeight(260),
 			total: 0,
 			tableBtn: [
 				this.$auth.hasPermi('extend:delivery-log-det:detail')
 					? {
 							type: 'detail',
-              btnName: '详情'
+							btnName: '详情',
-            }
-          : undefined
-      ].filter((v) => v)
 					  }
+					: undefined,
+			].filter((v) => v),
+		};
 	},
 	components: { DeliveryLogDetDetail },
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		this.getList();
 	},
 	methods: {
 		getList() {
-      deliveryProgressPage({...this.queryParams}).then(res => {
+			deliveryProgressPage({ ...this.queryParams }).then((res) => {
-        this.list = res.data.list || []
+				this.list = res.data.list || [];
-        this.total = res.data.total || 0
+				this.total = res.data.total || 0;
-      })
+			});
 		},
 		buttonClick(val) {
-      this.queryParams.orderName = val.orderName
+			this.queryParams.orderName = val.orderName;
-      this.getList()
+			this.getList();
 		},
 		handleClick(val) {
-      console.log(val)
+			console.log(val);
 			this.$nextTick(() => {
-        this.$refs.deliveryLogDetail.init(val.data)
+				this.$refs.deliveryLogDetail.init(val.data);
-      })
+			});
-    }
+		},
-  }
+	},
-}
+};
 </script>

src/views/energy/analysis/contrastAnalysis/components/barChart.vue

@@ -2,44 +2,43 @@
 	<div
 		id="analysischartBar"
 		style="width: 100%"
-    :style="{ height: chartHeight + 'px' }"
+		:style="{ height: chartHeight + 'px' }"></div>
-  ></div>
 </template>
 <script>
-import * as echarts from 'echarts'
+import * as echarts from 'echarts';
-import resize from '@/utils/chartMixins/resize'
+import resize from '@/utils/chartMixins/resize';
 export default {
-  name: "BarChart",
+	name: 'BarChart',
 	mixins: [resize],
 	data() {
 		return {
 			chartDom: '',
 			chart: '',
-      chartHeight: this.tableHeight(214) - 70
+			chartHeight: this.tableHeight(250) / 2,
-    }
+		};
 	},
 	props: {
 		chartData: {
 			type: Array,
 			required: true,
 			default: () => {
-        return []
+				return [];
-      }
+			},
 		},
 		timeDim: {
 			type: String,
-      default: ''
+			default: '',
-    }
+		},
 	},
 	watch: {
 		chartData: function () {
-      this.getChart()
+			this.getChart();
-    }
+		},
 	},
 	mounted() {
 		window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
+			this.chartHeight = this.tableHeight(250) / 2;
-    })
+		});
 	},
 	methods: {
 		getChart() {
@@ -48,29 +47,29 @@ export default {
 				this.chart !== '' &&
 				this.chart !== undefined
 			) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+				this.chart.dispose(); // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
 			}
-      this.chartDom = document.getElementById('analysischartBar')
+			this.chartDom = document.getElementById('analysischartBar');
-      this.chart = echarts.init(this.chartDom)
+			this.chart = echarts.init(this.chartDom);
-      let tempArr = []
+			let tempArr = [];
-      let xData = []
+			let xData = [];
-      let yData = []
+			let yData = [];
-      let legendData = []
+			let legendData = [];
 			if (this.chartData.length === 0) {
-        return false
+				return false;
 			} else {
-        tempArr = this.chartData[0].trendRespVOList
+				tempArr = this.chartData[0].trendRespVOList;
 			}
 			for (let k = 0; k < tempArr.length; k++) {
-        let time = ''
+				let time = '';
 				if (this.timeDim === '3') {
-          let year = tempArr[k].time.slice(0,4)
+					let year = tempArr[k].time.slice(0, 4);
-          let weak = tempArr[k].time.slice(4,6)
+					let weak = tempArr[k].time.slice(4, 6);
-          time = year+' 第 '+weak+' 周'
+					time = year + ' 第 ' + weak + ' 周';
 				} else {
-          time = tempArr[k].time
+					time = tempArr[k].time;
 				}
-        xData.push(time)
+				xData.push(time);
 			}
 			for (let i = 0; i < this.chartData.length; i++) {
 				let obj = {
@@ -79,70 +78,72 @@ export default {
 					barMaxWidth: 20,
 					label: {
 						show: true,
-            position: 'top'
+						position: 'top',
 					},
-          data: []
+					data: [],
-        }
+				};
-        legendData.push(this.chartData[i].objName + this.chartData[i].objCode)
+				legendData.push(this.chartData[i].objName + this.chartData[i].objCode);
-        let temp = this.chartData[i].trendRespVOList
+				let temp = this.chartData[i].trendRespVOList;
 				for (let j = 0; j < temp.length; j++) {
-          let num = temp[j].useNum ? temp[j].useNum : ''
+					let num = temp[j].useNum ? temp[j].useNum.toFixed(2) : '';
-          obj.data.push(num)
+					obj.data.push(num);
 				}
-        yData.push(obj)
+				yData.push(obj);
 			}
 			var option = {
 				color: ['#FFDC94', '#8EF0AB', '#63BDFF', '#288AFF', '#7164FF'],
 				tooltip: {
 					trigger: 'axis',
 					axisPointer: {
-            type: 'shadow'
+						type: 'shadow',
 					},
 					formatter: function (params) {
 						return (
 							params[0].axisValue +
 							`<br>` +
-              params.map((item) => {
+							params
-                let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
+								.map((item) => {
-                let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
+									let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`;
-						let value = item.value ? item.value : '-'
+									let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`;
-						let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
+									let value = item.value ? item.value : '-';
+									let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`;
 									return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
 									<span>${str}${seriesNameStr}</span>
 									<span>${valueStr}</span>
-								</span>`
+								</span>`;
-              }).join(``)
+								})
-            )
+								.join(``)
-          }
+						);
+					},
 				},
 				grid: {
 					left: '4%',
 					right: '1%',
 					bottom: '1%',
-          containLabel: true
+					containLabel: true,
 				},
 				legend: {
 					data: legendData,
 					right: '1%',
 					icon: 'rect',
 					itemHeight: 8,
-          itemWidth: 8
+					itemWidth: 8,
 				},
 				xAxis: {
 					type: 'category',
 					data: xData,
 					axisLabel: {
-            rotate: "45"
+						rotate: '45',
-          }
+					},
 				},
 				yAxis: {
-          type: 'value'
+					type: 'value',
 				},
-        series: yData
+				series: yData,
 			};
 
 			option && this.chart.setOption(option);
-    }
+		},
-  }
+	},
-}
+};
 </script>

src/views/energy/analysis/contrastAnalysis/components/lineChart.vue

@@ -1,126 +0,0 @@
-<template>
-  <div 
-    id="analysischartLine"
-    style="width: 100%"
-    :style="{ height: chartHeight + 'px' }"
-  ></div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import resize from '@/utils/chartMixins/resize'
-export default {
-  name: "LineChart",
-  mixins: [resize],
-  data() {
-    return {
-      chartDom: '',
-      chart: '',
-      chartHeight: this.tableHeight(214) - 70
-    }
-  },
-  props: {
-    chartData: {
-      type: Array,
-      required: true,
-      default: () => {
-        return []
-      }
-    },
-    timeDim: {
-      type: String,
-      default: ''
-    }
-  },
-  watch: {
-    chartData: function () {
-      this.getChart()
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
-    })
-  },
-  methods: {
-    getChart() {
-      if (
-        this.chart !== null &&
-        this.chart !== '' &&
-        this.chart !== undefined
-      ) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-      }
-      this.chartDom = document.getElementById('analysischartLine')
-      this.chart = echarts.init(this.chartDom)
-      let tempArr = []
-      let xData = []
-      let yData = []
-      let legendData = []
-      if (this.chartData.length === 0) {
-        return false
-      } else {
-        tempArr = this.chartData[0].trendRespVOList
-      }
-      for (let k = 0; k < tempArr.length; k++) {
-        let time = ''
-        if (this.timeDim === '3') {
-          let year = tempArr[k].time.slice(0,4)
-          let weak = tempArr[k].time.slice(4,6)
-          time = year+' 第 '+weak+' 周'
-        } else {
-          time = tempArr[k].time
-        }
-        xData.push(time)
-      }
-      for (let i = 0; i < this.chartData.length; i++) {
-        let obj = {
-          name: this.chartData[i].objName + this.chartData[i].objCode,
-          type: 'line',
-          stack: 'Total',
-          data: []
-        }
-        legendData.push(this.chartData[i].objName + this.chartData[i].objCode)
-        let temp = this.chartData[i].trendRespVOList
-        for (let j = 0; j < temp.length; j++) {
-          let num = temp[j].useNum ? temp[j].useNum : ''
-          obj.data.push(num)
-        }
-        yData.push(obj)
-      }
-
-      var option = {
-        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'cross'
-          }
-        },
-        grid: {
-          left: '4%',
-          right: '1%',
-          bottom: '1%',
-          containLabel: true
-        },
-        legend: {
-          data: legendData,
-          right: '1%'
-        },
-        xAxis: {
-          type: 'category',
-          data: xData,
-          axisLabel: {
-            rotate: "45"
-          }
-        },
-        yAxis: {
-          type: 'value'
-        },
-        series: yData
-      };
-
-      option && this.chart.setOption(option);
-    }
-  }
-}
-</script>

src/views/energy/analysis/contrastAnalysis/components/searchArea.vue

@@ -1,28 +1,47 @@
 <template>
-  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
+	<div
-    <el-form :inline="true" class="demo-form-inline">
+		class="searchBarBox divHeight"
+		ref="searchBarRef"
+		:style="{ paddingRight: isFold ? '55px' : '0px' }">
+		<el-form
+			:inline="true"
+			class="demo-form-inline">
 			<span class="blue-block"></span>
-      <el-form-item label="能源类型" required>
+			<el-form-item
-        <el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small">
+				label="能源类型"
+				required>
+				<el-select
+					v-model="queryParams.energyTypeId"
+					placeholder="请选择"
+					style="width: 150px"
+					@change="chooseType"
+					filterable
+					size="small">
 					<el-option
 						v-for="item in energyTypeList"
 						:key="item.id"
-            :label="item.name"
+						:label="item.labelName"
-            :value="item.id">
+						:value="item.id"></el-option>
-          </el-option>
 				</el-select>
 			</el-form-item>
-      <el-form-item label="时间维度" required>
+			<el-form-item
-        <el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small">
+				label="时间维度"
+				required>
+				<el-select
+					v-model="queryParams.timeDim"
+					placeholder="请选择"
+					style="width: 80px"
+					size="small">
 					<el-option
 						v-for="item in getDictDatas(this.DICT_TYPE.TIME_DIM)"
 						:key="item.value"
 						:label="item.label"
-            :value="item.value">
+						:value="item.value"></el-option>
-          </el-option>
 				</el-select>
 			</el-form-item>
-      <el-form-item label="时间范围" required>
+			<el-form-item
+				label="时间范围"
+				required>
 				<div v-show="queryParams.timeDim === '1'">
 					<el-date-picker
 						v-model="timeValue"
@@ -36,10 +55,8 @@
 						popper-class="noneMinute"
 						@change="timeSelect"
 						size="small"
-            style='width:350px;'
+						style="width: 350px"
-            :clearable="false"
+						:clearable="false"></el-date-picker>
-            >
-          </el-date-picker>
 				</div>
 				<div v-show="queryParams.timeDim === '2'">
 					<el-date-picker
@@ -52,34 +69,31 @@
 						:picker-options="pickerOptions"
 						:clearable="false"
 						size="small"
-            style='width:350px;'
+						style="width: 350px"
-            @change="timeSelect"
+						@change="timeSelect"></el-date-picker>
-            >
-          </el-date-picker>
 				</div>
 				<div v-show="queryParams.timeDim === '3'">
 					<el-date-picker
 						v-model="weekValue1"
 						type="week"
 						format="yyyy 第 WW 周"
-            style='width:170px;'
+						style="width: 170px"
 						:picker-options="pickerOptionsWeek"
 						@change="startWeek"
 						:clearable="false"
 						size="small"
-            placeholder="选择周">
+						placeholder="选择周"></el-date-picker>
-          </el-date-picker>-
+					-
 					<el-date-picker
 						v-model="weekValue2"
 						type="week"
 						format="yyyy 第 WW 周"
 						:picker-options="pickerOptionsWeek"
-            style='width:170px;'
+						style="width: 170px"
 						@change="endWeek"
 						:clearable="false"
 						size="small"
-            placeholder="选择周">
+						placeholder="选择周"></el-date-picker>
-          </el-date-picker>
 				</div>
 				<div v-show="queryParams.timeDim === '4'">
 					<el-date-picker
@@ -92,14 +106,12 @@
 						:clearable="false"
 						:picker-options="pickerOptions"
 						size="small"
-            style='width:350px;'
+						style="width: 350px"
-            @change="timeSelect"
+						@change="timeSelect"></el-date-picker>
-            >
-          </el-date-picker>
 				</div>
 				<div v-show="queryParams.timeDim === '5'">
 					<el-date-picker
-            style='width:170px;'
+						style="width: 170px"
 						v-model="yearValue1"
 						type="year"
 						:picker-options="pickerOptions"
@@ -107,11 +119,10 @@
 						placeholder="选择年"
 						@change="startYear"
 						size="small"
-            :clearable="false"
+						:clearable="false"></el-date-picker>
-          >
+					-
-          </el-date-picker>-
 					<el-date-picker
-            style='width:170px;'
+						style="width: 170px"
 						v-model="yearValue2"
 						type="year"
 						:picker-options="pickerOptions"
@@ -119,58 +130,99 @@
 						placeholder="选择年"
 						@change="endYear"
 						size="small"
-            :clearable="false"
+						:clearable="false"></el-date-picker>
-          >
-          </el-date-picker>
 				</div>
 			</el-form-item>
-      <el-form-item label="对象维度" required>
+			<el-form-item
-        <el-select v-model="queryParams.objType" placeholder="请选择" style="width: 80px;" @change="selectObjs" size="small">
+				v-if="energyType !== 0"
+				label="对象维度"
+				required>
+				<el-select
+					v-model="queryParams.objType"
+					placeholder="请选择"
+					style="width: 80px"
+					@change="selectObjs"
+					:disabled="energyType === 2"
+					size="small">
 					<el-option
 						v-for="item in getDictDatas(this.DICT_TYPE.OBJECT_TYPE)"
 						:key="item.value"
 						:label="item.label"
-            :value="item.value">
+						:value="item.value"></el-option>
-          </el-option>
 				</el-select>
 			</el-form-item>
-      <el-form-item label="对象选择" required>
+			<el-form-item
-        <el-select v-model="queryParams.objIds" placeholder="请选择" multiple :multiple-limit='5' collapse-tags style="width: 200px;" size="small">
+				label="对象选择"
+				required>
+				<el-select
+					v-model="queryParams.objIds"
+					placeholder="请选择"
+					multiple
+					:multiple-limit="5"
+					collapse-tags
+					filterable
+					style="width: 200px"
+					size="small">
 					<el-option
 						v-for="item in objectList"
 						:key="item.id"
 						:label="item.name"
 						:value="item.id">
 						<span style="float: left">{{ item.name }}</span>
-            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+						<span style="float: right; color: #8492a6; font-size: 13px">
+							{{ item.code }}
+						</span>
 					</el-option>
 				</el-select>
 			</el-form-item>
 			<el-form-item>
-        <el-button type="primary" size="small" @click="search">查询</el-button>
+				<el-button
-        <span class="separateStyle"></span>
+					type="primary"
-        <el-button size="small" @click="resetBtn">重置</el-button>
+					size="small"
+					@click="search">
+					查询
+				</el-button>
+				<el-button
+					size="small"
+					@click="resetBtn">
+					重置
+				</el-button>
+				<span
+					class="separateStyle"
+					v-hasPermi="['analysis:contrast-analysis:export']"></span>
+				<el-button
+					v-hasPermi="['analysis:contrast-analysis:export']"
+					type="primary"
+					size="small"
+					plain
+					@click="exportBtn">
+					导出
+				</el-button>
 			</el-form-item>
 		</el-form>
-    <span v-if="isFold" class="foldClass" @click='switchMode'>
+		<span
+			v-if="isFold"
+			class="foldClass"
+			@click="switchMode">
 			{{ isExpand ? '收起' : '展开' }}
 			<svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
 		</span>
 	</div>
 </template>
 <script>
-import { getEnergyTypeListAll } from "@/api/base/energyType"
+import { getEnergyTypeListAll } from '@/api/base/energyType';
-import { getLineAll } from "@/api/base/productionLine"
+import { getLineAll } from '@/api/base/productionLine';
-import { getWorkShopAll } from "@/api/base/workshopSection"
+import { getWorkShopAll } from '@/api/base/workshopSection';
-import { getEquipmentAll } from "@/api/base/equipment"
+import { getFactoryList } from '@/api/core/base/factory';
-import moment from 'moment'
+import moment from 'moment';
 export default {
 	name: 'searchArea',
 	props: {
-    isFold: {// 多行模式（默认否）
+		isFold: {
+			// 多行模式（默认否）
 			type: Boolean,
-      default: false
+			default: false,
-    }
+		},
 	},
 	data() {
 		return {
@@ -182,8 +234,9 @@ export default {
 				objType: '',
 				timeDim: null,
 				startTime: null,
-        endTime: null
+				endTime: null,
 			},
+			energyType: 0, //1电2非电
 			timeValue: [], // 最大7天只能整点
 			dateValue: [], // 最大30天
 			weekValue1: null, //最多24周
@@ -195,262 +248,295 @@ export default {
 			objectList: [],
 			pickerOptions: {
 				disabledDate(date) {
-          return date.getTime() > Date.now()
+					return date.getTime() > Date.now();
-        }
+				},
 			},
 			pickerOptionsWeek: {
 				disabledDate(time) {
-          let day = Date.now()
+					let day = Date.now();
-          let limitTime = moment(day).day(-1)
+					let limitTime = moment(day).day(-1);
-          return time.getTime() > new Date(limitTime).getTime()
+					return time.getTime() > new Date(limitTime).getTime();
-        }
+				},
-      }
+			},
-    }
+		};
 	},
 	mounted() {
-    this.getTypeList()
+		this.getTypeList();
-    this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+		this.queryParams.timeDim = this.getDictDatas(
+			this.DICT_TYPE.TIME_DIM
+		)[0].value; // 默认时
 	},
 	methods: {
 		getTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        this.energyTypeList = res.data || []
+				this.energyTypeList = res.data || [];
-      })
+			});
+		},
+		// 切换能源类型
+		chooseType(id) {
+			let val;
+			this.energyTypeList.map((item) => {
+				if (item.id === id) {
+					val = item.name;
+				}
+			});
+			if (val == 1 || val == 2) {
+				this.energyType = 1;
+				this.queryParams.objType = null;
+			} else {
+				this.energyType = 2;
+				this.queryParams.objType = this.getDictDatas(
+					this.DICT_TYPE.OBJECT_TYPE
+				)[0].value;
+			}
+			this.selectObjs(this.queryParams.objType);
 		},
 		// 范围选择器
 		timeSelect() {
 			switch (this.queryParams.timeDim) {
 				case '1':
 					if (!this.timeValue) {
-            this.$modal.msgError('时间范围不能为空')
+						this.$modal.msgError('时间范围不能为空');
-            return false
+						return false;
 					}
 					if (this.timeValue[1] - this.timeValue[0] > 7 * 24 * 3600000) {
-            this.$modal.msgError('最大时间范围为7天，请重新选择')
+						this.$modal.msgError('最大时间范围为7天，请重新选择');
-            this.timeValue = []
+						this.timeValue = [];
 					}
-          break
+					break;
 				case '2':
 					if (!this.dateValue) {
-            this.$modal.msgError('时间范围不能为空')
+						this.$modal.msgError('时间范围不能为空');
-            return false
+						return false;
 					}
 					if (this.dateValue[1] - this.dateValue[0] > 29 * 24 * 3600000) {
-            this.$modal.msgError('最大时间范围为30天，请重新选择') // 自动选择默认是0:00:00要求是23:59:59
+						this.$modal.msgError('最大时间范围为30天，请重新选择'); // 自动选择默认是0:00:00要求是23:59:59
-            this.dateValue = []
+						this.dateValue = [];
 					}
-          break
+					break;
 				case '4':
 					if (!this.monthValue) {
-            this.$modal.msgError('时间范围不能为空')
+						this.$modal.msgError('时间范围不能为空');
-            return false
+						return false;
 					}
 					if (this.monthValue[1] - this.monthValue[0] > 729 * 24 * 3600000) {
-            this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
+						this.$modal.msgError('最大时间范围为24个月，请重新选择'); // 同理上面
-            this.monthValue = []
+						this.monthValue = [];
 					}
-          break
+					break;
 				default:
 			}
 		},
 		// 年选择器
 		startYear() {
 			if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
+				this.$modal.msgError('开始时间不能晚于结束时间，请重新选择');
-        this.yearValue1 = null
+				this.yearValue1 = null;
-        return false
+				return false;
 			}
 			if (this.yearValue1 && this.yearValue2) {
 				if (this.yearValue2 - this.yearValue1 > 10 * 365 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
+					this.$modal.msgError('最大时间范围为10年，请重新选择');
-          this.yearValue1 = null
+					this.yearValue1 = null;
-          return false
+					return false;
 				}
 			}
 		},
 		endYear() {
 			if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
+				this.$modal.msgError('结束时间不能早于开始时间，请重新选择');
-        this.yearValue2 = null
+				this.yearValue2 = null;
-        return false
+				return false;
 			}
 			if (this.yearValue1 && this.yearValue2) {
 				if (this.yearValue2 - this.yearValue1 > 10 * 365 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
+					this.$modal.msgError('最大时间范围为10年，请重新选择');
-          this.yearValue2 = null
+					this.yearValue2 = null;
-          return false
+					return false;
 				}
 			}
 		},
 		// 周选择器
 		startWeek() {
 			if (this.weekValue1 && this.weekValue2) {
-        let a = new Date(this.weekValue1).getTime()
+				let a = new Date(this.weekValue1).getTime();
-        let b = new Date(this.weekValue2).getTime()
+				let b = new Date(this.weekValue2).getTime();
 				if (a > b) {
-          this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
+					this.$modal.msgError('开始时间不能晚于结束时间，请重新选择');
-          this.weekValue1 = null
+					this.weekValue1 = null;
-          return false
+					return false;
 				}
 				if (b - a > 167 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为24周，请重新选择')
+					this.$modal.msgError('最大时间范围为24周，请重新选择');
-          this.weekValue1 = null
+					this.weekValue1 = null;
-          return false
+					return false;
 				}
 			}
 		},
 		endWeek() {
 			if (this.weekValue1 && this.weekValue2) {
-        let a = new Date(this.weekValue1).getTime()
+				let a = new Date(this.weekValue1).getTime();
-        let b = new Date(this.weekValue2).getTime()
+				let b = new Date(this.weekValue2).getTime();
 				if (a > b) {
-          this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
+					this.$modal.msgError('结束时间不能早于开始时间，请重新选择');
-          this.weekValue2 = null
+					this.weekValue2 = null;
-          return false
+					return false;
 				}
 				if (b - a > 167 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为24周，请重新选择')
+					this.$modal.msgError('最大时间范围为24周，请重新选择');
-          this.weekValue2 = null
+					this.weekValue2 = null;
-          return false
+					return false;
 				}
 			}
 		},
 		// 对象维度
 		selectObjs(val) {
-      console.log(val)
+			console.log(val);
 			switch (val) {
 				case '1':
-          getLineAll().then(res => {
+					getFactoryList().then((res) => {
-            this.objectList = res.data || []
+						this.objectList = res.data || [];
-            this.queryParams.objIds = []
+						this.queryParams.objIds = [];
-          })
+					});
 					break;
 				case '2':
-          getWorkShopAll().then(res => {
+					getLineAll().then((res) => {
-            this.objectList = res.data || []
+						this.objectList = res.data || [];
-            this.queryParams.objIds = []
+						this.queryParams.objIds = [];
-          })
+					});
 					break;
 				default:
-          getEquipmentAll().then(res => {
+					getWorkShopAll().then((res) => {
-            this.objectList = res.data || []
+						this.objectList = res.data || [];
-            this.queryParams.objIds = []
+						this.queryParams.objIds = [];
-          })
+					});
 			}
 		},
 		// 查询
 		search() {
 			if (!this.queryParams.energyTypeId) {
-        this.$modal.msgError('请选择能源类型')
+				this.$modal.msgError('请选择能源类型');
-        return false
+				return false;
 			}
 			if (!this.queryParams.timeDim) {
-        this.$modal.msgError('请选择时间维度')
+				this.$modal.msgError('请选择时间维度');
-        return false
+				return false;
 			}
 			switch (this.queryParams.timeDim) {
 				case '1':
 					if (this.timeValue && this.timeValue.length > 0) {
-            this.queryParams.startTime = this.timeValue[0]
+						this.queryParams.startTime = this.timeValue[0];
-            this.queryParams.endTime = this.timeValue[1] // 不用转
+						this.queryParams.endTime = this.timeValue[1]; // 不用转
 					} else {
-            this.$modal.msgError('时间范围不能为空')
+						this.$modal.msgError('时间范围不能为空');
-            return false
+						return false;
 					}
-          break
+					break;
 				case '2':
 					if (this.dateValue.length > 0) {
-            this.queryParams.startTime = this.dateValue[0]
+						this.queryParams.startTime = this.dateValue[0];
-            this.queryParams.endTime = this.dateValue[1] + 86399000 // 转为23:59:59
+						this.queryParams.endTime = this.dateValue[1] + 86399000; // 转为23:59:59
 					} else {
-            this.$modal.msgError('日范围不能为空')
+						this.$modal.msgError('日范围不能为空');
-            return false
+						return false;
 					}
-          break
+					break;
 				case '3':
 					if (this.weekValue1 && this.weekValue2) {
-            let a = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00'
+						let a =
-            let b = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59'
+							moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00';
-            this.queryParams.startTime = new Date(a).getTime()
+						let b =
-            this.queryParams.endTime = new Date(b).getTime()
+							moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59';
+						this.queryParams.startTime = new Date(a).getTime();
+						this.queryParams.endTime = new Date(b).getTime();
 					} else {
-            this.$modal.msgError('周范围不能为空')
+						this.$modal.msgError('周范围不能为空');
-            return false
+						return false;
 					}
-          break
+					break;
 				case '4': // 转为本月最后一天的最后一秒
 					if (this.monthValue.length > 0) {
-            this.queryParams.startTime = this.monthValue[0]
+						this.queryParams.startTime = this.monthValue[0];
-            this.queryParams.endTime = this.transformTime(this.monthValue[1])
+						this.queryParams.endTime = this.transformTime(this.monthValue[1]);
 					} else {
-            this.$modal.msgError('月范围不能为空')
+						this.$modal.msgError('月范围不能为空');
-            return false
+						return false;
 					}
-          break
+					break;
 				default: //本年最后一天
 					if (this.yearValue1 && this.yearValue2) {
 						if (this.yearValue2 < this.yearValue1) {
-              this.$modal.msgError('结束时间不能早于开始时间')
+							this.$modal.msgError('结束时间不能早于开始时间');
-              return false
+							return false;
 						} else {
-              this.queryParams.startTime = this.yearValue1
+							this.queryParams.startTime = this.yearValue1;
-              this.queryParams.endTime = this.transformYear(this.yearValue2)
+							this.queryParams.endTime = this.transformYear(this.yearValue2);
 						}
 					} else {
-            this.$modal.msgError('年范围不能为空')
+						this.$modal.msgError('年范围不能为空');
-            return false
+						return false;
 					}
 			}
 			if (!this.queryParams.objType) {
-        this.$modal.msgError('请选择对象维度')
+				this.$modal.msgError('请选择对象维度');
-        return false
+				return false;
 			}
 			if (this.queryParams.objIds.length === 0) {
-        this.$modal.msgError('请选择对象')
+				this.$modal.msgError('请选择对象');
-        return false
+				return false;
 			}
-      this.queryParams.startTime = this.queryParams.startTime + ''
+			this.queryParams.startTime = this.queryParams.startTime + '';
-      this.queryParams.endTime = this.queryParams.endTime + ''
+			this.queryParams.endTime = this.queryParams.endTime + '';
-      console.log(this.queryParams)
+			console.log(this.queryParams);
-      this.$emit('submit', this.queryParams)
+			this.$emit('submit', this.queryParams);
 		},
 		resetBtn() {
-      this.queryParams.energyTypeId = null
+			this.queryParams.energyTypeId = null;
-      this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+			this.queryParams.timeDim = this.getDictDatas(
-      this.queryParams.objIds = []
+				this.DICT_TYPE.TIME_DIM
-      this.queryParams.objType = ''
+			)[0].value; // 默认时
-      this.timeValue = []
+			this.queryParams.objIds = [];
-      this.dateValue = []
+			this.queryParams.objType = '';
-      this.weekValue1 = null
+			this.timeValue = [];
-      this.weekValue2 = null
+			this.dateValue = [];
-      this.monthValue = []
+			this.weekValue1 = null;
-      this.yearValue1 = null
+			this.weekValue2 = null;
-      this.yearValue2 = null
+			this.monthValue = [];
+			this.yearValue1 = null;
+			this.yearValue2 = null;
 		},
-    transformTime(timeStamp) {// 本月最后一天
+		// 导出
-      let year = moment(timeStamp).format('YYYY')
+		exportBtn() {
-      let month = moment(timeStamp).format('MM')
+			this.$emit('export');
-      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
-      let value = new Date(newData).getTime()
-      return value
 		},
-    transformYear(timeStamp) {// 本年最后一天
+		transformTime(timeStamp) {
-      let year = moment(timeStamp).format('YYYY')
+			// 本月最后一天
-      let newData = year+'-12-31 23:59:59'
+			let year = moment(timeStamp).format('YYYY');
-      let value = new Date(newData).getTime()
+			let month = moment(timeStamp).format('MM');
-      return value
+			let newData =
+				moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59';
+			let value = new Date(newData).getTime();
+			return value;
 		},
-    switchMode() {// 展开和收起切换
+		transformYear(timeStamp) {
-      this.isExpand = !this.isExpand
+			// 本年最后一天
-      const element = this.$refs.searchBarRef
+			let year = moment(timeStamp).format('YYYY');
+			let newData = year + '-12-31 23:59:59';
+			let value = new Date(newData).getTime();
+			return value;
+		},
+		switchMode() {
+			// 展开和收起切换
+			this.isExpand = !this.isExpand;
+			const element = this.$refs.searchBarRef;
 			if (this.isExpand) {
-        element.classList.remove('divHeight')
+				element.classList.remove('divHeight');
 			} else {
-        element.classList.add('divHeight')
+				element.classList.add('divHeight');
-      }
-    }
-  }
 			}
+		},
+	},
+};
 </script>
 <style lang='scss'>
 /* 时间整点 */
@@ -463,11 +549,11 @@ export default {
 .demo-form-inline {
 	.el-date-editor .el-range__icon {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 	.el-input__prefix .el-icon-date {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 }
 </style>
@@ -477,11 +563,15 @@ export default {
 		display: inline-block;
 		width: 4px;
 		height: 16px;
-    background-color: #0B58FF;
+		background-color: #0b58ff;
 		border-radius: 1px;
 		margin-right: 8px;
 		margin-top: 12px;
 	}
+	.el-form-item {
+		margin-right: 10px;
+		margin-bottom: 4px;
+	}
 }
 .searchBarBox .foldClass {
 	position: absolute;
@@ -489,7 +579,7 @@ export default {
 	right: 0;
 	cursor: pointer;
 	font-size: 12px;
-  color:#0B58FF;
+	color: #0b58ff;
 }
 .searchBarBox .foldClass .iconfont {
 	font-size: 14px;
@@ -502,7 +592,7 @@ export default {
 	display: inline-block;
 	width: 1px;
 	height: 24px;
-  background: #E8E8E8;
+	background: #e8e8e8;
 	vertical-align: middle;
 	margin: 0 10px;
 }

src/views/energy/analysis/contrastAnalysis/index.vue

@@ -1,96 +1,129 @@
 <template>
-  <div class="app-container contrastAnalysisBox" id="contrastAnalysisBox">
+	<div
+		class="app-container contrastAnalysisBox"
+		id="contrastAnalysisBox">
 		<!-- 搜索工作栏 -->
-    <search-area  :isFold="isFold" @submit="getList"/>
+		<search-area
-    <el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'>
+			:isFold="isFold"
-      <el-tab-pane label="柱状图" name="bar">
+			@submit="getList"
-        <bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim" />
+			@export="exportExl" />
-      </el-tab-pane>
+		<div v-show="chartData.length">
-      <el-tab-pane label="折线图" name="line">
+			<bar-chart
-        <line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/>
+				ref="analysisBarChart"
-      </el-tab-pane>
+				:chartData="chartData"
-    </el-tabs>
+				:timeDim="timeDim" />
+			<base-table
+				:table-props="tableProps"
+				:table-data="list"
+				:max-height="tableH"
+				class="contrast-out-table" />
+		</div>
 		<!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
+		<div
+			class="no-data-bg"
+			v-show="!chartData.length"></div>
 	</div>
 </template>
 <script>
-import { getCompare } from "@/api/analysis/energyAnalysis"
+import { getCompare } from '@/api/analysis/energyAnalysis';
-import SearchArea from "./components/searchArea"
+import SearchArea from './components/searchArea';
-import BarChart from "./components/barChart"
+import BarChart from './components/barChart';
-import LineChart from "./components/lineChart"
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import FileSaver from 'file-saver';
+import * as XLSX from 'xlsx/xlsx.mjs';
 // import moment from 'moment'
 export default {
 	name: 'ContrastAnalysis',
-  components: { SearchArea, BarChart, LineChart },
+	components: { SearchArea, BarChart },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			isFold: false,
-      activeName: 'bar',
 			chartData: [],
-      timeDim: ''
+			timeDim: '',
-    }
+			tableProps: [],
+			list: [],
+			tableH: this.tableHeight(250) / 2,
+		};
 	},
 	mounted() {
 		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
+			this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437);
-      this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437)
 			// console.log(document.getElementById("contrastAnalysisBox").offsetWidth)
-    })
+		});
-    this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437)
+		this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437);
 	},
 	methods: {
-    getList(params) {
+		_setTableHeight() {
-      this.timeDim = params.timeDim
+			this.tableH = this.tableHeight(250) / 2;
-      getCompare({ ...params }).then((res) => {
-        console.log(res)
-        if (res.code === 0) {
-          this.chartData = res.data || []
-        } else {
-          this.chartData = []
-        }
-      })
 		},
-    switchChart() {
+		getList(params) {
-      if (this.activeName === 'bar') {
+			this.timeDim = params.timeDim;
-        this.$nextTick((res) => {
+			getCompare({ ...params }).then((res) => {
-          this.$refs.analysisBarChart.getChart()
+				if (res.code === 0) {
-        })
+					this.getTableList(res.data || []);
+					this.chartData = res.data || [];
 				} else {
-        this.$nextTick((res) => {
+					this.chartData = [];
-          this.$refs.analysisLineChart.getChart()
+				}
-        })
+			});
+		},
+		getTableList(arr) {
+			this.tableProps = [];
+			this.list = [];
+			let tempX = [];
+			let timeArr = arr[0].trendRespVOList || [];
+			this.list = timeArr.map((item) => {
+				return { time: item.time };
+			});
+			for (let i = 0; i < arr.length; i++) {
+				let obj = {};
+				obj.prop = arr[i].objId;
+				obj.label = arr[i].objName;
+				obj.minWidth = 100;
+				tempX.push(obj);
+				let tiemList = arr[i].trendRespVOList;
+				for (let j = 0; j < tiemList.length; j++) {
+					this.list[j][arr[i].objId] = tiemList[j].useNum
+						? tiemList[j].useNum.toFixed(2)
+						: null;
 				}
 			}
+			this.tableProps = [{ prop: 'time', label: '时间' }].concat(tempX);
+		},
+		// 导出
+		exportExl() {
+			if (this.list.length > 0) {
+				var wb = XLSX.utils.table_to_book(
+					document.querySelector('.contrast-out-table')
+				);
+				let fileName = '对比分析.xlsx';
+				var wbout = XLSX.write(wb, {
+					bookType: 'xlsx',
+					bookSST: true,
+					type: 'array',
+				});
+				try {
+					FileSaver.saveAs(
+						new Blob([wbout], { type: 'application/octet-stream' }),
+						fileName
+					);
+					this.$message.success('导出成功');
+				} catch (e) {
+					if (typeof console !== 'undefined') console.log(e, wbout);
 				}
+				return wbout;
+			} else {
+				this.$modal.msgWarning('暂无数据导出');
 			}
+		},
+	},
+};
 </script>
 <style lang='scss'>
 .contrastAnalysisBox {
-  .el-tabs__nav::after {
+	.contrast-out-table {
-    content: "";
+		margin-top: 20px;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #e4e7ed;
-    /* z-index: 1; */
-  }
-  .el-tabs__nav-wrap::after {
-    width: 0;
-  }
-  .el-tabs__item {
-    padding: 0 10px;
-  }
-  .el-tabs__item:hover {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item.is-active {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item {
-    color: rgba(0, 0, 0, 0.45);
 	}
 }
 </style>

src/views/energy/analysis/qoqAnalysis/components/searchArea.vue

@@ -1,28 +1,44 @@
 <template>
-  <el-form :inline="true" class="demo-form-inline">
+	<el-form
+		:inline="true"
+		class="demo-form-inline">
 		<span class="blue-block"></span>
-    <el-form-item label="对象选择" required>
+		<el-form-item
-      <el-cascader
+			label="对象选择"
-        v-model="objArr"
+			required>
-        :options="objList"
+			<el-select
-        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
+				v-model="queryParams.objId"
-        popper-class="cascaderParent"
+				placeholder="请选择"
-        size="small"
+				style="width: 250px"
-        style="width: 250px;"
+				filterable
-        clearable></el-cascader>
+				size="small">
+				<el-option
+					v-for="item in objList"
+					:key="item.id"
+					:label="item.name"
+					:value="item.id"
+					:clearable="false"></el-option>
+			</el-select>
 		</el-form-item>
-    <el-form-item label="时间维度" required>
+		<el-form-item
-      <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
+			label="时间维度"
+			required>
+			<el-select
+				v-model="queryParams.type"
+				placeholder="请选择"
+				style="width: 80px"
+				size="small">
 				<el-option
 					v-for="item in timeType"
 					:key="item.id"
 					:label="item.name"
 					:value="item.id"
-          :clearable="false">
+					:clearable="false"></el-option>
-        </el-option>
 			</el-select>
 		</el-form-item>
-    <el-form-item label="时间" required>
+		<el-form-item
+			label="时间"
+			required>
 			<div v-show="queryParams.type === 1">
 				<el-date-picker
 					v-model="monthValue"
@@ -31,8 +47,7 @@
 					@change="selectTime"
 					:clearable="false"
 					size="small"
-          placeholder="选择月">
+					placeholder="选择月"></el-date-picker>
-        </el-date-picker>
 			</div>
 			<div v-show="queryParams.type === 2">
 				<el-date-picker
@@ -43,8 +58,7 @@
 					@change="selectTime"
 					:clearable="false"
 					size="small"
-          placeholder="选择周">
+					placeholder="选择周"></el-date-picker>
-        </el-date-picker>
 			</div>
 			<div v-show="queryParams.type === 3">
 				<el-date-picker
@@ -54,24 +68,37 @@
 					@change="selectTime"
 					:clearable="false"
 					size="small"
-          placeholder="选择日">
+					placeholder="选择日"></el-date-picker>
-        </el-date-picker>
 			</div>
 		</el-form-item>
 		<el-form-item>
-      <el-button type="primary" size="small" @click="search">查询</el-button>
+			<el-button
+				type="primary"
+				size="small"
+				@click="search">
+				查询
+			</el-button>
 		</el-form-item>
 		<el-form-item>
-      <span class="separateStyle"></span>
+			<span
+				class="separateStyle"
+				v-hasPermi="['analysis:qoq-analysis:export']"></span>
 		</el-form-item>
 		<el-form-item>
-      <el-button type="primary" size="small" @click="exportData" plain>导出</el-button>
+			<el-button
+				v-hasPermi="['analysis:qoq-analysis:export']"
+				type="primary"
+				size="small"
+				@click="exportData"
+				plain>
+				导出
+			</el-button>
 		</el-form-item>
 	</el-form>
 </template>
 <script>
-import { getTree } from '@/api/base/factory'
+import { getTree } from '@/api/analysis/energyAnalysis';
-import moment from 'moment'
+import moment from 'moment';
 export default {
 	name: 'searchArea',
 	data() {
@@ -80,133 +107,126 @@ export default {
 			queryParams: {
 				type: 1,
 				searchTime: null,
-        objId: null
+				objId: null,
+				objType: 1,
 			},
 			timeType: [
 				{ id: 1, name: '月' },
 				{ id: 2, name: '周' },
-        {id: 3, name: '日'}
+				{ id: 3, name: '日' },
 			],
 			monthValue: '',
 			weekValue: '',
 			dateValue: '',
-      objArr: [],
 			objList: [],
 			pickerOptions: {
 				disabledDate(date) {
-          return date.getTime() > Date.now()
+					return date.getTime() > Date.now();
-        }
+				},
 			},
 			pickerOptionsWeek: {
 				disabledDate(time) {
-          let day = Date.now()
+					let day = Date.now();
-          let limitTime = moment(day).day(-1)
+					let limitTime = moment(day).day(-1);
-          return time.getTime() > new Date(limitTime).getTime()
+					return time.getTime() > new Date(limitTime).getTime();
-        }
+				},
-      }
+			},
-    }
+		};
 	},
 	mounted() {
-    this.getObjTree()
+		this.getObjTree();
 	},
 	methods: {
 		getObjTree() {
-      getTree().then(res => {
+			getTree().then((res) => {
-        this.objList = res.data || []
+				this.objList = res.data || [];
-      })
+				if (this.objList.length > 0) {
+					this.queryParams.objId = this.objList[0].id;
+				}
+			});
 		},
 		selectTime() {
 			switch (this.queryParams.type) {
 				case 1:
-          this.queryParams.searchTime = this.monthValue
+					this.queryParams.searchTime = this.monthValue;
 					break;
 				case 2:
-          this.queryParams.searchTime = this.weekValue
+					this.queryParams.searchTime = this.weekValue;
 					break;
 				default:
-          this.queryParams.searchTime = this.dateValue
+					this.queryParams.searchTime = this.dateValue;
 			}
 		},
 		// 查询
 		search() {
-      if (this.objArr.length === 0) {
+			if (!this.queryParams.objId) {
-        this.$modal.msgError('请选择对象')
+				this.$modal.msgError('请选择对象');
-        return false
+				return false;
-      } else {
-        this.queryParams.objId = this.objArr[this.objArr.length-1]
 			}
 			if (!this.queryParams.type) {
-        this.$modal.msgError('请选择时间维度')
+				this.$modal.msgError('请选择时间维度');
-        return false
+				return false;
 			}
 			if (!this.queryParams.searchTime) {
-        this.$modal.msgError('请选择时间')
+				this.$modal.msgError('请选择时间');
-        return false
+				return false;
 			}
 			switch (this.queryParams.type) {
 				case 1:
-          this.queryParams.searchTime = this.transformTime(this.monthValue)
+					this.queryParams.searchTime = this.transformTime(this.monthValue);
 					break;
 				case 2:
-          let value = moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59'
+					let value =
-          this.queryParams.searchTime = new Date(value).getTime()
+						moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59';
+					this.queryParams.searchTime = new Date(value).getTime();
 					break;
 				default:
-           let value2 = moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59'
+					let value2 =
-           this.queryParams.searchTime = new Date(value2).getTime()
+						moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59';
+					this.queryParams.searchTime = new Date(value2).getTime();
 			}
-      this.$emit('submit', this.queryParams)
+			this.$emit('submit', this.queryParams);
 		},
 		exportData() {
-      let name
+			let name;
 			if (this.queryParams.objId) {
-        name = this.getObjName(this.objList, this.queryParams.objId)
+				name = this.getObjName(this.objList, this.queryParams.objId);
 			} else {
-        this.$modal.msgWarning("对象不能为空")
+				this.$modal.msgWarning('对象不能为空');
-        return false
+				return false;
 			}
-      this.$emit('exportD', {name: name})
+			this.$emit('exportD', { name: name });
 		},
 		// 递归取对象name
 		getObjName(list, id) {
-      let _this = this
 			for (let i = 0; i < list.length; i++) {
-        let a = list[i]
+				let a = list[i];
 				if (a.id === id) {
-          return a.name
+					return a.name;
-        } else {
-          if (a.children && a.children.length > 0) {
-            let res = _this.getObjName(a.children, id)
-            if (res) {
-              return res
-            }
-          }
 				}
 			}
 		},
-    transformTime(timeStamp) {// 本月最后一天
+		transformTime(timeStamp) {
-      let year = moment(timeStamp).format('YYYY')
+			// 本月最后一天
-      let month = moment(timeStamp).format('MM')
+			let year = moment(timeStamp).format('YYYY');
-      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
+			let month = moment(timeStamp).format('MM');
-      let value = new Date(newData).getTime()
+			let newData =
-      return value
+				moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59';
-    }
+			let value = new Date(newData).getTime();
-  }
+			return value;
-}
+		},
+	},
+};
 </script>
 <style lang='scss'>
-/* 级联选择器 */
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
 .demo-form-inline {
 	.el-date-editor .el-range__icon {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 	.el-input__prefix .el-icon-date {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 }
 </style>
@@ -215,7 +235,7 @@ export default {
 	display: inline-block;
 	width: 1px;
 	height: 24px;
-  background: #E8E8E8;
+	background: #e8e8e8;
 	vertical-align: middle;
 }
 .demo-form-inline {
@@ -223,10 +243,14 @@ export default {
 		display: inline-block;
 		width: 4px;
 		height: 16px;
-    background-color: #0B58FF;
+		background-color: #0b58ff;
 		border-radius: 1px;
 		margin-right: 8px;
 		margin-top: 10px;
 	}
+	.el-form-item {
+		margin-right: 10px;
+		margin-bottom: 4px;
+	}
 }
 </style>

src/views/energy/analysis/qoqAnalysis/index.vue

@@ -1,29 +1,34 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
-    <search-area @submit="getList" @exportD="exportData"/>
+		<search-area
+			@submit="getList"
+			@exportD="exportData" />
 		<!-- 表格 -->
 		<div v-show="chartData.length">
 			<base-table
 				:table-props="tableProps"
 				:table-data="list"
-        class="qoq-out-table"
+				class="qoq-out-table" />
-      />
 			<div class="chartTitle">环比分析图</div>
-      <div style='width: 100%'>
+			<div style="width: 100%">
-        <line-chart ref="analysisLineChart" :chartData="chartData"/>
+				<line-chart
+					ref="analysisLineChart"
+					:chartData="chartData" />
 			</div>
 		</div>
 		<!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
+		<div
+			class="no-data-bg"
+			v-show="!chartData.length"></div>
 	</div>
 </template>
 <script>
-import { getQoq } from "@/api/analysis/energyAnalysis"
+import { getQoq } from '@/api/analysis/energyAnalysis';
-import SearchArea from "./components/searchArea"
+import SearchArea from './components/searchArea';
-import LineChart from "./components/lineChart"
+import LineChart from './components/lineChart';
-import FileSaver from "file-saver"
+import FileSaver from 'file-saver';
-import * as XLSX from 'xlsx/xlsx.mjs'
+import * as XLSX from 'xlsx/xlsx.mjs';
 export default {
 	name: 'QoqAnalysis',
 	components: { SearchArea, LineChart },
@@ -31,87 +36,90 @@ export default {
 		return {
 			chartData: [],
 			tableProps: [],
-      list: []
+			list: [],
-    }
+		};
 	},
 	methods: {
 		getList(params) {
 			getQoq({ ...params }).then((res) => {
 				if (res.code === 0 && res.data) {
-          this.getTableList(res.data)
+					this.getTableList(res.data);
 				} else {
-          this.chartData = []
+					this.chartData = [];
-          this.list = []
+					this.list = [];
 				}
-      })
+			});
 		},
 		getTableList(arr) {
-      let data = arr.data
+			let data = arr.data;
-      let nameData = arr.nameData
+			let nameData = arr.nameData;
-      let tempX = []
+			let tempX = [];
 			data[0].data.map((item) => {
-        let obj = {}
+				let obj = {};
-        obj.prop = item.dynamicName
+				obj.prop = item.dynamicName;
-        obj.label = item.dynamicName
+				obj.label = item.dynamicName;
-        obj.id = item.id
+				obj.id = item.id;
-        obj.children = []
+				obj.children = [];
-        tempX.push(obj)
+				tempX.push(obj);
-      })
+			});
 			for (let i = 0; i < nameData.length; i++) {
 				for (let j = 0; j < tempX.length; j++) {
 					if (tempX[j].id === nameData[i].parentId) {
-            let obj = {}
+						let obj = {};
-            obj.prop = tempX[j].prop + '_' + nameData[i].name
+						obj.prop = tempX[j].prop + '_' + nameData[i].name;
-            obj.label = nameData[i].name
+						obj.label = nameData[i].name;
-            tempX[j].children.push(obj)
+						tempX[j].children.push(obj);
 					}
 				}
 			}
-      this.tableProps = [{prop: 'time',label: '时间'}].concat(tempX)
+			this.tableProps = [{ prop: 'time', label: '时间' }].concat(tempX);
 			// 数据
-      this.list = []
+			this.list = [];
 			for (let k = 0; k < data.length; k++) {
-        let obj = {}
+				let obj = {};
-        obj.time = data[k].time
+				obj.time = data[k].time;
-        let arr1 = data[k].data
+				let arr1 = data[k].data;
-        obj.type = []
+				obj.type = [];
 				for (let q = 0; q < arr1.length; q++) {
-          let name = arr1[q].dynamicName
+					let name = arr1[q].dynamicName;
-          obj.type.push(name)
+					obj.type.push(name);
-          let arr2 = arr1[q].children
+					let arr2 = arr1[q].children;
 					for (let p = 0; p < arr2.length; p++) {
-            let prop = name + '_' + arr2[p].dynamicName
+						let prop = name + '_' + arr2[p].dynamicName;
-            obj[prop] = arr2[p].dynamicValue
+						obj[prop] = arr2[p].dynamicValue;
 					}
 				}
-        this.list.push(obj)
+				this.list.push(obj);
 			}
-      this.chartData = this.list
+			this.chartData = this.list;
 		},
 		exportData(val) {
 			if (this.list.length > 0) {
-        var wb = XLSX.utils.table_to_book(document.querySelector(".qoq-out-table"))
+				var wb = XLSX.utils.table_to_book(
-        let fileName = val.name + "环比分析.xlsx"
+					document.querySelector('.qoq-out-table')
+				);
+				let fileName = val.name + '环比分析.xlsx';
 				var wbout = XLSX.write(wb, {
-            bookType: "xlsx",
+					bookType: 'xlsx',
 					bookSST: true,
-            type: "array"
+					type: 'array',
-        })
+				});
 				try {
 					FileSaver.saveAs(
-            new Blob([wbout], { type: "application/octet-stream" }),
+						new Blob([wbout], { type: 'application/octet-stream' }),
 						fileName
-            )
+					);
+					this.$message.success('导出成功');
 				} catch (e) {
-            if (typeof console !== "undefined") console.log(e, wbout);
+					if (typeof console !== 'undefined') console.log(e, wbout);
 				}
-        return wbout
+				return wbout;
 			} else {
-        this.$modal.msgWarning("暂无数据导出")
+				this.$modal.msgWarning('暂无数据导出');
-      }
-    }
-  }
 			}
+		},
+	},
+};
 </script>
 <style lang='scss' scoped>
 .chartTitle {
@@ -124,7 +132,7 @@ export default {
 	display: inline-block;
 	width: 4px;
 	height: 18px;
-  background-color: #0B58FF;
+	background-color: #0b58ff;
 	border-radius: 1px;
 	margin-right: 8px;
 	vertical-align: bottom;

src/views/energy/analysis/trendAnalysis/components/lineChart.vue

@@ -2,44 +2,43 @@
 	<div
 		id="analysischartLine"
 		style="width: 100%"
-    :style="{ height: chartHeight + 'px' }"
+		:style="{ height: chartHeight + 'px' }"></div>
-  ></div>
 </template>
 <script>
-import * as echarts from 'echarts'
+import * as echarts from 'echarts';
-import resize from '@/utils/chartMixins/resize'
+import resize from '@/utils/chartMixins/resize';
 export default {
-  name: "LineChart",
+	name: 'LineChart',
 	mixins: [resize],
 	data() {
 		return {
 			chartDom: '',
 			chart: '',
-      chartHeight: this.tableHeight(214) - 70
+			chartHeight: this.tableHeight(314),
-    }
+		};
 	},
 	props: {
 		chartData: {
 			type: Array,
 			required: true,
 			default: () => {
-        return []
+				return [];
-      }
+			},
 		},
 		timeDim: {
 			type: String,
-      default: ''
+			default: '',
-    }
+		},
 	},
 	watch: {
 		chartData: function () {
-      this.getChart()
+			this.getChart();
-    }
+		},
 	},
 	mounted() {
 		window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
+			this.chartHeight = this.tableHeight(314);
-    })
+		});
 	},
 	methods: {
 		getChart() {
@@ -48,23 +47,23 @@ export default {
 				this.chart !== '' &&
 				this.chart !== undefined
 			) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+				this.chart.dispose(); // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
 			}
-      this.chartDom = document.getElementById('analysischartLine')
+			this.chartDom = document.getElementById('analysischartLine');
-      this.chart = echarts.init(this.chartDom)
+			this.chart = echarts.init(this.chartDom);
-      let xData = []
+			let xData = [];
-      let yData = []
+			let yData = [];
 			for (let i = 0; i < this.chartData.length; i++) {
-        let time = ""
+				let time = '';
 				if (this.timeDim === '3') {
-          let year = this.chartData[i].time.slice(0,4)
+					let year = this.chartData[i].time.slice(0, 4);
-          let weak = this.chartData[i].time.slice(4,6)
+					let weak = this.chartData[i].time.slice(4, 6);
-          time = year+' 第 '+weak+' 周'
+					time = year + ' 第 ' + weak + ' 周';
 				} else {
-          time = this.chartData[i].time
+					time = this.chartData[i].time;
 				}
-        xData.push(time)
+				xData.push(time);
-        yData.push(this.chartData[i].useNum)
+				yData.push(this.chartData[i].useNum);
 			}
 
 			var option = {
@@ -76,28 +75,28 @@ export default {
 					left: '4%',
 					right: '1%',
 					bottom: '1%',
-          containLabel: true
+					containLabel: true,
 				},
 				xAxis: {
 					type: 'category',
 					data: xData,
 					axisLabel: {
-            rotate: "45"
+						rotate: '45',
-          }
+					},
 				},
 				yAxis: {
-          type: 'value'
+					type: 'value',
 				},
 				series: [
 					{
 						data: yData,
-            type: 'line'
+						type: 'line',
-          }
+					},
-        ]
+				],
 			};
 
 			option && this.chart.setOption(option);
-    }
+		},
-  }
+	},
-}
+};
 </script>

src/views/energy/analysis/trendAnalysis/components/searchArea.vue

@@ -1,38 +1,79 @@
 <template>
-  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
+	<div
-    <el-form :inline="true" class="demo-form-inline">
+		class="searchBarBox divHeight"
+		ref="searchBarRef"
+		:style="{ paddingRight: isFold ? '55px' : '0px' }">
+		<el-form
+			:inline="true"
+			class="demo-form-inline">
 			<span class="blue-block"></span>
-      <el-form-item label="能源类型" required>
+			<el-form-item
-        <el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small">
+				label="能源类型"
+				required>
+				<el-select
+					v-model="queryParams.energyTypeId"
+					placeholder="请选择"
+					size="small"
+					@change="chooseType"
+					filterable
+					style="width: 100%">
 					<el-option
 						v-for="item in energyTypeList"
 						:key="item.id"
-            :label="item.name"
+						:label="item.labelName"
-            :value="item.id">
+						:value="item.id"></el-option>
-          </el-option>
 				</el-select>
 			</el-form-item>
-      <el-form-item label="对象选择" required>
+			<el-form-item
+				v-if="energyType === 1"
+				label="对象选择"
+				required>
 				<el-cascader
 					v-model="objArr"
 					:options="objList"
+					:show-all-levels="false"
 					:props="{ checkStrictly: true, value: 'id', label: 'name' }"
-          popper-class="cascaderParent"
 					size="small"
+					@change="changeLine"
 					clearable></el-cascader>
 			</el-form-item>
-      <el-form-item label="时间维度" required>
+			<el-form-item
-        <el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small">
+				v-if="energyType === 2"
+				label="对象选择"
+				required>
+				<el-select
+					v-model="objId"
+					placeholder="请选择"
+					style="width: 250px"
+					filterable
+					size="small">
+					<el-option
+						v-for="item in objList"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+						:clearable="false"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item
+				label="时间维度"
+				required>
+				<el-select
+					v-model="queryParams.timeDim"
+					placeholder="请选择"
+					style="width: 80px"
+					size="small">
 					<el-option
 						v-for="item in getDictDatas(this.DICT_TYPE.TIME_DIM)"
 						:key="item.value"
 						:label="item.label"
 						:value="item.value"
-            size="small">
+						size="small"></el-option>
-          </el-option>
 				</el-select>
 			</el-form-item>
-      <el-form-item label="时间范围" required>
+			<el-form-item
+				label="时间范围"
+				required>
 				<div v-show="queryParams.timeDim === '1'">
 					<el-date-picker
 						v-model="timeValue"
@@ -46,9 +87,7 @@
 						popper-class="noneMinute"
 						@change="timeSelect"
 						size="small"
-            style='width:350px;'
+						style="width: 350px"></el-date-picker>
-            >
-          </el-date-picker>
 				</div>
 				<div v-show="queryParams.timeDim === '2'">
 					<el-date-picker
@@ -61,31 +100,28 @@
 						:picker-options="pickerOptions"
 						@change="timeSelect"
 						size="small"
-            style='width:350px;'
+						style="width: 350px"></el-date-picker>
-            >
-          </el-date-picker>
 				</div>
 				<div v-show="queryParams.timeDim === '3'">
 					<el-date-picker
 						v-model="weekValue1"
 						type="week"
 						format="yyyy 第 WW 周"
-            style='width:170px;'
+						style="width: 170px"
 						:picker-options="pickerOptionsWeek"
 						@change="startWeek"
 						size="small"
-            placeholder="选择周">
+						placeholder="选择周"></el-date-picker>
-          </el-date-picker>-
+					-
 					<el-date-picker
 						v-model="weekValue2"
 						type="week"
 						format="yyyy 第 WW 周"
 						:picker-options="pickerOptionsWeek"
-            style='width:170px;'
+						style="width: 170px"
 						@change="endWeek"
 						size="small"
-            placeholder="选择周">
+						placeholder="选择周"></el-date-picker>
-          </el-date-picker>
 				</div>
 				<div v-show="queryParams.timeDim === '4'">
 					<el-date-picker
@@ -97,59 +133,77 @@
 						value-format="timestamp"
 						:picker-options="pickerOptions"
 						size="small"
-            style='width:350px;'
+						style="width: 350px"
-            @change="timeSelect"
+						@change="timeSelect"></el-date-picker>
-            >
-          </el-date-picker>
 				</div>
 				<div v-show="queryParams.timeDim === '5'">
 					<el-date-picker
-            style='width:170px;'
+						style="width: 170px"
 						v-model="yearValue1"
 						type="year"
 						:picker-options="pickerOptions"
 						value-format="timestamp"
 						placeholder="选择年"
 						size="small"
-            @change="startYear"
+						@change="startYear"></el-date-picker>
-          >
+					-
-          </el-date-picker>-
 					<el-date-picker
-            style='width:170px;'
+						style="width: 170px"
 						v-model="yearValue2"
 						type="year"
 						:picker-options="pickerOptions"
 						value-format="timestamp"
 						placeholder="选择年"
 						size="small"
-            @change="endYear"
+						@change="endYear"></el-date-picker>
-          >
-          </el-date-picker>
 				</div>
 			</el-form-item>
 			<el-form-item>
-        <el-button type="primary" size="small" @click="search">查询</el-button>
+				<el-button
-        <span class="separateStyle"></span>
+					type="primary"
-        <el-button size="small" @click="resetBtn">重置</el-button>
+					size="small"
+					@click="handBtn('search')">
+					查询
+				</el-button>
+				<el-button
+					size="small"
+					@click="resetBtn">
+					重置
+				</el-button>
+				<span
+					class="separateStyle"
+					v-hasPermi="['analysis:trend-analysis:export']"></span>
+				<el-button
+					v-hasPermi="['analysis:trend-analysis:export']"
+					type="primary"
+					size="small"
+					plain
+					@click="handBtn('exportBtn')">
+					导出
+				</el-button>
 			</el-form-item>
 		</el-form>
-    <span v-if="isFold" class="foldClass" @click='switchMode'>
+		<span
+			v-if="isFold"
+			class="foldClass"
+			@click="switchMode">
 			{{ isExpand ? '收起' : '展开' }}
 			<svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
 		</span>
 	</div>
 </template>
 <script>
-import { getEnergyTypeListAll } from "@/api/base/energyType"
+import { getTree } from '@/api/analysis/energyAnalysis';
-import { getTree } from '@/api/base/factory'
+import { getEnergyTypeListAll } from '@/api/base/energyType';
-import moment from 'moment'
+import moment from 'moment';
 export default {
 	name: 'searchArea',
 	props: {
-    isFold: {// 多行模式（默认否）
+		isFold: {
+			// 多行模式（默认否）
 			type: Boolean,
-      default: false
+			default: false,
-    }
+		},
 	},
 	data() {
 		return {
@@ -160,8 +214,13 @@ export default {
 				objId: null,
 				timeDim: null,
 				startTime: null,
-        endTime: null
+				endTime: null,
+				objType: 1, //1工厂2产线3工段
 			},
+			objId: null,
+			objType: 1, //1工厂2产线3工段,非电使用
+			energyTypeList: [],
+			energyType: 0, //1电2非电
 			objArr: [],
 			timeValue: [], // 最大7天只能整点
 			dateValue: [], // 最大30天
@@ -170,248 +229,300 @@ export default {
 			monthValue: [], //最多24月
 			yearValue1: null, //最多10年
 			yearValue2: null,
-      energyTypeList: [],
 			objList: [],
 			pickerOptions: {
 				disabledDate(date) {
-          return date.getTime() > Date.now()
+					return date.getTime() > Date.now();
-        }
+				},
 			},
 			pickerOptionsWeek: {
 				disabledDate(time) {
-          let day = Date.now()
+					let day = Date.now();
-          let limitTime = moment(day).day(-1)
+					let limitTime = moment(day).day(-1);
-          return time.getTime() > new Date(limitTime).getTime()
+					return time.getTime() > new Date(limitTime).getTime();
-        }
+				},
-      }
+			},
-    }
+		};
 	},
 	mounted() {
-    this.getTypeList()
+		this.getEnergyList();
-    this.getObjTree()
+		this.getObjTree();
-    this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+		this.queryParams.timeDim = this.getDictDatas(
-    this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000]
+			this.DICT_TYPE.TIME_DIM
+		)[0].value; // 默认时
+		this.timeValue = [
+			moment().startOf('day'),
+			moment().endOf('day') - 59 * 61 * 1000,
+		];
 	},
 	methods: {
-    getTypeList() {
-      getEnergyTypeListAll().then((res) => {
-        this.energyTypeList = res.data || []
-      })
-    },
 		getObjTree() {
-      getTree().then(res => {
+			getTree().then((res) => {
-        this.objList = res.data || []
+				this.objList = res.data || [];
-      })
+				if (this.objList.length > 0) {
+					this.objId = this.objList[0].id;
+				}
+			});
+		},
+		// 获取能源类型
+		getEnergyList() {
+			getEnergyTypeListAll().then((res) => {
+				this.energyTypeList = res.data || [];
+			});
+		},
+		// 切换能源类型
+		chooseType(id) {
+			let val;
+			this.energyTypeList.map((item) => {
+				if (item.id === id) {
+					val = item.name;
+				}
+			});
+			if (val == 1 || val == 2) {
+				this.energyType = 1;
+			} else {
+				this.energyType = 2;
+			}
+		},
+		// 选择工厂/产线/单元
+		changeLine(val) {
+			this.objType = val.length || 0;
 		},
 		// 范围选择器
 		timeSelect() {
 			switch (this.queryParams.timeDim) {
 				case '1':
 					if (!this.timeValue) {
-            this.$modal.msgError('时间范围不能为空')
+						this.$modal.msgError('时间范围不能为空');
-            return false
+						return false;
 					}
 					if (this.timeValue[1] - this.timeValue[0] > 7 * 24 * 3600000) {
-            this.$modal.msgError('最大时间范围为7天，请重新选择')
+						this.$modal.msgError('最大时间范围为7天，请重新选择');
-            this.timeValue = []
+						this.timeValue = [];
 					}
-          break
+					break;
 				case '2':
 					if (!this.dateValue) {
-            this.$modal.msgError('时间范围不能为空')
+						this.$modal.msgError('时间范围不能为空');
-            return false
+						return false;
 					}
 					if (this.dateValue[1] - this.dateValue[0] > 29 * 24 * 3600000) {
-            this.$modal.msgError('最大时间范围为30天，请重新选择') // 自动选择默认是0:00:00要求是23:59:59
+						this.$modal.msgError('最大时间范围为30天，请重新选择'); // 自动选择默认是0:00:00要求是23:59:59
-            this.dateValue = []
+						this.dateValue = [];
 					}
-          break
+					break;
 				case '4':
 					if (!this.monthValue) {
-            this.$modal.msgError('时间范围不能为空')
+						this.$modal.msgError('时间范围不能为空');
-            return false
+						return false;
 					}
 					if (this.monthValue[1] - this.monthValue[0] > 729 * 24 * 3600000) {
-            this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
+						this.$modal.msgError('最大时间范围为24个月，请重新选择'); // 同理上面
-            this.monthValue = []
+						this.monthValue = [];
 					}
-          break
+					break;
 				default:
 			}
 		},
 		// 年选择器
 		startYear() {
 			if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
+				this.$modal.msgError('开始时间不能晚于结束时间，请重新选择');
-        this.yearValue1 = null
+				this.yearValue1 = null;
-        return false
+				return false;
 			}
 			if (this.yearValue1 && this.yearValue2) {
 				if (this.yearValue2 - this.yearValue1 > 10 * 365 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
+					this.$modal.msgError('最大时间范围为10年，请重新选择');
-          this.yearValue1 = null
+					this.yearValue1 = null;
-          return false
+					return false;
 				}
 			}
 		},
 		endYear() {
 			if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
+				this.$modal.msgError('结束时间不能早于开始时间，请重新选择');
-        this.yearValue2 = null
+				this.yearValue2 = null;
-        return false
+				return false;
 			}
 			if (this.yearValue1 && this.yearValue2) {
 				if (this.yearValue2 - this.yearValue1 > 10 * 365 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
+					this.$modal.msgError('最大时间范围为10年，请重新选择');
-          this.yearValue2 = null
+					this.yearValue2 = null;
-          return false
+					return false;
 				}
 			}
 		},
 		// 周选择器
 		startWeek() {
 			if (this.weekValue1 && this.weekValue2) {
-        let a = new Date(this.weekValue1).getTime()
+				let a = new Date(this.weekValue1).getTime();
-        let b = new Date(this.weekValue2).getTime()
+				let b = new Date(this.weekValue2).getTime();
 				if (a > b) {
-          this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
+					this.$modal.msgError('开始时间不能晚于结束时间，请重新选择');
-          this.weekValue1 = null
+					this.weekValue1 = null;
-          return false
+					return false;
 				}
 				if (b - a > 167 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为24周，请重新选择')
+					this.$modal.msgError('最大时间范围为24周，请重新选择');
-          this.weekValue1 = null
+					this.weekValue1 = null;
-          return false
+					return false;
 				}
 			}
 		},
 		endWeek() {
 			if (this.weekValue1 && this.weekValue2) {
-        let a = new Date(this.weekValue1).getTime()
+				let a = new Date(this.weekValue1).getTime();
-        let b = new Date(this.weekValue2).getTime()
+				let b = new Date(this.weekValue2).getTime();
 				if (a > b) {
-          this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
+					this.$modal.msgError('结束时间不能早于开始时间，请重新选择');
-          this.weekValue2 = null
+					this.weekValue2 = null;
-          return false
+					return false;
 				}
 				if (b - a > 167 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为24周，请重新选择')
+					this.$modal.msgError('最大时间范围为24周，请重新选择');
-          this.weekValue2 = null
+					this.weekValue2 = null;
-          return false
+					return false;
 				}
 			}
 		},
 		// 查询
-    search() {
+		handBtn(val) {
 			if (!this.queryParams.energyTypeId) {
-        this.$modal.msgError('请选择能源类型')
+				this.$modal.msgError('请选择能源类型');
-        return false
+				return false;
 			}
+			if (this.energyType == 1) {
 				if (this.objArr.length === 0) {
-        this.$modal.msgError('请选择对象')
+					this.$modal.msgError('请选择对象');
-        return false
+					return false;
 				} else {
-        this.queryParams.objId = this.objArr[this.objArr.length-1]
+					this.queryParams.objId = this.objArr[this.objArr.length - 1];
+					this.queryParams.objType = this.objType;
 				}
+			} else if (this.energyType == 2) {
+				if (!this.objId) {
+					this.$modal.msgError('请选择对象');
+					return false;
+				} else {
+					this.queryParams.objId = this.objId;
+					this.queryParams.objType = 1;
+				}
+			}
+
 			if (!this.queryParams.timeDim) {
-        this.$modal.msgError('请选择时间维度')
+				this.$modal.msgError('请选择时间维度');
-        return false
+				return false;
 			}
 			switch (this.queryParams.timeDim) {
 				case '1':
 					if (this.timeValue && this.timeValue.length > 0) {
-            this.queryParams.startTime = this.timeValue[0]
+						this.queryParams.startTime = this.timeValue[0];
-            this.queryParams.endTime = this.timeValue[1] // 不用转
+						this.queryParams.endTime = this.timeValue[1]; // 不用转
 					} else {
-            this.$modal.msgError('时间范围不能为空')
+						this.$modal.msgError('时间范围不能为空');
-            return false
+						return false;
 					}
-          break
+					break;
 				case '2':
 					if (this.dateValue && this.dateValue.length > 0) {
-            this.queryParams.startTime = this.dateValue[0]
+						this.queryParams.startTime = this.dateValue[0];
-            this.queryParams.endTime = this.dateValue[1] + 86399000 // 转为23:59:59
+						this.queryParams.endTime = this.dateValue[1] + 86399000; // 转为23:59:59
 					} else {
-            this.$modal.msgError('日范围不能为空')
+						this.$modal.msgError('日范围不能为空');
-            return false
+						return false;
 					}
-          break
+					break;
 				case '3':
 					if (this.weekValue1 && this.weekValue2) {
-            let a = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00'
+						let a =
-            let b = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59'
+							moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00';
-            this.queryParams.startTime = new Date(a).getTime()
+						let b =
-            this.queryParams.endTime = new Date(b).getTime()
+							moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59';
+						this.queryParams.startTime = new Date(a).getTime();
+						this.queryParams.endTime = new Date(b).getTime();
 					} else {
-            this.$modal.msgError('周范围不能为空')
+						this.$modal.msgError('周范围不能为空');
-            return false
+						return false;
 					}
-          break
+					break;
 				case '4': // 转为本月最后一天的最后一秒
 					if (this.monthValue && this.monthValue.length > 0) {
-            this.queryParams.startTime = this.monthValue[0]
+						this.queryParams.startTime = this.monthValue[0];
-            this.queryParams.endTime = this.transformTime(this.monthValue[1])
+						this.queryParams.endTime = this.transformTime(this.monthValue[1]);
 					} else {
-            this.$modal.msgError('月范围不能为空')
+						this.$modal.msgError('月范围不能为空');
-            return false
+						return false;
 					}
-          break
+					break;
 				default: //本年最后一天
 					if (this.yearValue1 && this.yearValue2) {
 						if (this.yearValue2 < this.yearValue1) {
-              this.$modal.msgError('结束时间不能早于开始时间')
+							this.$modal.msgError('结束时间不能早于开始时间');
-              return false
+							return false;
 						} else {
-              this.queryParams.startTime = this.yearValue1
+							this.queryParams.startTime = this.yearValue1;
-              this.queryParams.endTime = this.transformYear(this.yearValue2)
+							this.queryParams.endTime = this.transformYear(this.yearValue2);
 						}
 					} else {
-            this.$modal.msgError('年范围不能为空')
+						this.$modal.msgError('年范围不能为空');
-            return false
+						return false;
 					}
 			}
-      this.queryParams.startTime = this.queryParams.startTime + ''
+			this.queryParams.startTime = this.queryParams.startTime + '';
-      this.queryParams.endTime = this.queryParams.endTime + ''
+			this.queryParams.endTime = this.queryParams.endTime + '';
-      this.$emit('submit', this.queryParams)
+			if (val === 'search') {
+				this.$emit('submit', this.queryParams);
+			} else {
+				this.$emit('export', this.queryParams);
+			}
 		},
 		// 重置
 		resetBtn() {
-      this.queryParams.energyTypeId = null
+			this.queryParams.energyTypeId = null;
-      this.queryParams.objId = null
+			this.energyType = 0;
-      this.objArr = []
+			this.queryParams.objId = null;
-      this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
+			this.objId = null;
-      this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000]
+			this.objType = 1;
+			this.objArr = [];
+			this.queryParams.timeDim = this.getDictDatas(
+				this.DICT_TYPE.TIME_DIM
+			)[0].value; // 默认时
+			this.timeValue = [
+				moment().startOf('day'),
+				moment().endOf('day') - 59 * 61 * 1000,
+			];
 		},
-    transformTime(timeStamp) {// 本月最后一天
+		transformTime(timeStamp) {
-      let year = moment(timeStamp).format('YYYY')
+			// 本月最后一天
-      let month = moment(timeStamp).format('MM')
+			let year = moment(timeStamp).format('YYYY');
-      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
+			let month = moment(timeStamp).format('MM');
-      let value = new Date(newData).getTime()
+			let newData =
-      return value
+				moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59';
+			let value = new Date(newData).getTime();
+			return value;
 		},
-    transformYear(timeStamp) {// 本年最后一天
+		transformYear(timeStamp) {
-      let year = moment(timeStamp).format('YYYY')
+			// 本年最后一天
-      let newData = year+'-12-31 23:59:59'
+			let year = moment(timeStamp).format('YYYY');
-      let value = new Date(newData).getTime()
+			let newData = year + '-12-31 23:59:59';
-      return value
+			let value = new Date(newData).getTime();
+			return value;
 		},
-    switchMode() {// 展开和收起切换
+		switchMode() {
-      this.isExpand = !this.isExpand
+			// 展开和收起切换
-      const element = this.$refs.searchBarRef
+			this.isExpand = !this.isExpand;
+			const element = this.$refs.searchBarRef;
 			if (this.isExpand) {
-        element.classList.remove('divHeight')
+				element.classList.remove('divHeight');
 			} else {
-        element.classList.add('divHeight')
+				element.classList.add('divHeight');
-      }
-    }
-  }
 			}
+		},
+	},
+};
 </script>
 <style lang='scss'>
-/* 级联选择器 */
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
 /* 时间整点 */
 .noneMinute .el-time-spinner__wrapper {
 	width: 100%;
@@ -422,11 +533,11 @@ export default {
 .demo-form-inline {
 	.el-date-editor .el-range__icon {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 	.el-input__prefix .el-icon-date {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 }
 </style>
@@ -436,11 +547,15 @@ export default {
 		display: inline-block;
 		width: 4px;
 		height: 16px;
-    background-color: #0B58FF;
+		background-color: #0b58ff;
 		border-radius: 1px;
 		margin-right: 8px;
 		margin-top: 12px;
 	}
+	.el-form-item {
+		margin-right: 10px;
+		margin-bottom: 4px;
+	}
 }
 .searchBarBox .foldClass {
 	position: absolute;
@@ -448,7 +563,7 @@ export default {
 	right: 0;
 	cursor: pointer;
 	font-size: 12px;
-  color:#0B58FF;
+	color: #0b58ff;
 }
 .searchBarBox .foldClass .iconfont {
 	font-size: 14px;
@@ -461,7 +576,7 @@ export default {
 	display: inline-block;
 	width: 1px;
 	height: 24px;
-  background: #E8E8E8;
+	background: #e8e8e8;
 	vertical-align: middle;
 	margin: 0 10px;
 }

src/views/energy/analysis/trendAnalysis/index.vue

@@ -1,94 +1,113 @@
 <template>
-  <div class="app-container trendAnalysisBox" id="trendAnalysisBox">
+	<div
+		class="app-container trendAnalysisBox"
+		id="trendAnalysisBox">
 		<!-- 搜索工作栏 -->
-    <search-area :isFold="isFold" @submit="getList"/>
+		<search-area
-    <el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'>
+			:isFold="isFold"
-      <el-tab-pane label="柱状图" name="bar">
+			@submit="getList"
-        <bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim"/>
+			@export="exportExl" />
-      </el-tab-pane>
+		<div v-show="chartData.length">
-      <el-tab-pane label="折线图" name="line">
+			<base-table
-        <line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/>
+				:table-props="tableProps"
-      </el-tab-pane>
+				:table-data="list"
-    </el-tabs>
+				class="trend-out-table" />
+			<line-chart
+				ref="analysisLineChart"
+				:chartData="chartData"
+				:timeDim="timeDim" />
+		</div>
 		<!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
+		<div
+			class="no-data-bg"
+			v-show="!chartData.length"></div>
 	</div>
 </template>
 <script>
-import { getEnergyTrend } from "@/api/analysis/energyAnalysis"
+import { getEnergyTrend, exportTrend } from '@/api/analysis/energyAnalysis';
-import SearchArea from "./components/searchArea"
+import SearchArea from './components/searchArea';
-import BarChart from "./components/barChart"
+import LineChart from './components/lineChart';
-import LineChart from "./components/lineChart"
 // import moment from 'moment'
 export default {
 	name: 'TrendAnalysis',
-  components: { SearchArea, BarChart, LineChart },
+	components: { SearchArea, LineChart },
 	data() {
 		return {
 			isFold: false,
-      activeName: 'bar',
 			chartData: [],
-      timeDim: ''
+			timeDim: '',
-    }
+			tableProps: [],
+			list: [],
+		};
 	},
 	mounted() {
 		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
+			this.tableH = this.tableHeight(260);
-      this.isFold = this.searchBarWidth('trendAnalysisBox', 1263)
+			this.isFold = this.searchBarWidth('trendAnalysisBox', 1480);
-    })
+		});
-    this.isFold = this.searchBarWidth('trendAnalysisBox', 1263)
+		this.isFold = this.searchBarWidth('trendAnalysisBox', 1480);
 	},
 	methods: {
 		getList(params) {
-      this.timeDim = params.timeDim
+			this.timeDim = params.timeDim;
 			getEnergyTrend({ ...params }).then((res) => {
 				if (res.code === 0) {
-          this.chartData = res.data
+					this.getTableList(res.data || []);
+					this.chartData = res.data || [];
 				} else {
-          this.chartData = []
+					this.chartData = [];
 				}
-      })
+			});
 		},
-    switchChart() {
+		getTableList(arr) {
-      if (this.activeName === 'bar') {
+			this.tableProps = [];
-        this.$nextTick((res) => {
+			this.list = [];
-          this.$refs.analysisBarChart.getChart()
+			let tempX = [];
-        })
+			let listObj = { useNum: '消耗量' }; // 数据
-      } else {
+			for (let i = 0; i < arr.length; i++) {
-        this.$nextTick((res) => {
+				let obj = {};
-          this.$refs.analysisLineChart.getChart()
+				obj.prop = arr[i].time;
-        })
+				obj.label = arr[i].time;
-      }
+				obj.minWidth = 100;
-    }
+				tempX.push(obj);
-  }
+				listObj[arr[i].time] = arr[i].useNum || null;
 			}
+			this.tableProps = [{ prop: 'useNum', label: '时间' }].concat(tempX);
+			this.list.push(listObj);
+		},
+		// 导出excel
+		exportExl(params) {
+			exportTrend({ ...params }).then((res) => {
+				// let fileName = '';
+				// const contentDisposition = res.headers['content-disposition'];
+				// if (contentDisposition) {
+				// 	fileName = decodeURIComponent(
+				// 		contentDisposition.slice(
+				// 			contentDisposition.indexOf('filename=') + 9
+				// 		)
+				// 	);
+				// }
+				const blob = new Blob([res.data]);
+				const reader = new FileReader();
+				reader.readAsDataURL(blob);
+				reader.onload = (e) => {
+					const a = document.createElement('a');
+					a.download = '走势分析';
+					a.href = e.target.result;
+					document.body.appendChild(a);
+					a.click();
+					document.body.removeChild(a);
+					this.$message.success('导出成功');
+				};
+			});
+		},
+	},
+};
 </script>
 <style lang='scss'>
 .trendAnalysisBox {
-  .el-tabs__nav::after {
+	.trend-out-table {
-    content: "";
+		margin-bottom: 15px;
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #e4e7ed;
-    /* z-index: 1; */
-  }
-  .el-tabs__nav-wrap::after {
-    width: 0;
-  }
-  .el-tabs__item {
-    padding: 0 10px;
-  }
-  .el-tabs__item:hover {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item.is-active {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item {
-    color: rgba(0, 0, 0, 0.45);
 	}
 }
 </style>

src/views/energy/analysis/yoyAnalysis/components/lineChart.vue

@@ -1,37 +1,40 @@
 <template>
-  <div id="analysischartLine" style="width: 100%;height: 100%;"></div>
+	<div
+		id="analysischartLine"
+		style="width: 100%"
+		:style="{ height: chartHeight + 'px' }"></div>
 </template>
 <script>
-import * as echarts from 'echarts'
+import * as echarts from 'echarts';
-import resize from '@/utils/chartMixins/resize'
+import resize from '@/utils/chartMixins/resize';
 export default {
-  name: "LineChart",
+	name: 'LineChart',
 	mixins: [resize],
 	data() {
 		return {
 			chartDom: '',
 			chart: '',
-      chartHeight: this.tableHeight(214) - 70
+			chartHeight: this.tableHeight(250) / 2,
-    }
+		};
 	},
 	props: {
 		chartData: {
 			type: Array,
 			required: true,
 			default: () => {
-        return []
+				return [];
-      }
+			},
-    }
+		},
 	},
 	watch: {
 		chartData: function () {
-      this.getChart()
+			this.getChart();
-    }
+		},
 	},
 	mounted() {
 		window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(214) - 70
+			this.chartHeight = this.tableHeight(250) / 2;
-    })
+		});
 	},
 	methods: {
 		getChart() {
@@ -40,63 +43,77 @@ export default {
 				this.chart !== '' &&
 				this.chart !== undefined
 			) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+				this.chart.dispose(); // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
 			}
-      this.chartDom = document.getElementById('analysischartLine')
+			this.chartDom = document.getElementById('analysischartLine');
-      this.chart = echarts.init(this.chartDom)
+			this.chart = echarts.init(this.chartDom);
 			if (this.chartData.length === 0) {
-        return false
+				return false;
 			}
-      let xData = []
+			let xData = [];
-      let arr = this.chartData[0].type
+			let arr = this.chartData[0].type;
-      let keys = Object.keys(this.chartData[0])
+			let keys = Object.keys(this.chartData[0]);
-      let yData = []
+			let yData = [];
 			for (let j = 0; j < arr.length; j++) {
 				for (let k = 0; k < keys.length; k++) {
-          if (keys[k].indexOf(arr[j] + '_上年同期') > -1 || keys[k].indexOf(arr[j] + '_能源消耗') > -1) {
+					if (
+						keys[k].indexOf(arr[j] + '_上年同期') > -1 ||
+						keys[k].indexOf(arr[j] + '_能源消耗') > -1
+					) {
 						let obj = {
 							name: '',
 							type: 'line',
-              data: []
+							data: [],
-            }
+						};
-            obj.name = keys[k]
+						obj.name = keys[k];
-            yData.push(obj)
+						yData.push(obj);
 					}
 				}
 			}
 			for (let i = 0; i < this.chartData.length; i++) {
-        xData.push(this.chartData[i].time)
+				xData.push(this.chartData[i].time);
 				for (let p = 0; p < yData.length; p++) {
-          yData[p].data.push(this.chartData[i][yData[p].name])
+					yData[p].data.push(this.chartData[i][yData[p].name]);
 				}
 			}
 			var option = {
-        color: ['#FFDC94', '#8EF0AB', '#63BDFF', '#288AFF', '#7164FF', '#FF6860', '#FF9747', '#B0EB42', '#D680FF', '#0043D2'],
+				color: [
+					'#FFDC94',
+					'#8EF0AB',
+					'#63BDFF',
+					'#288AFF',
+					'#7164FF',
+					'#FF6860',
+					'#FF9747',
+					'#B0EB42',
+					'#D680FF',
+					'#0043D2',
+				],
 				legend: {
 					data: keys,
-          right: '1%'
+					right: '1%',
 				},
 				tooltip: {
-          trigger: 'axis'
+					trigger: 'axis',
 				},
 				grid: {
 					left: '1%',
 					right: '1%',
 					bottom: '3%',
-          containLabel: true
+					containLabel: true,
 				},
 				xAxis: {
 					type: 'category',
-          data: xData
+					data: xData,
 				},
 				yAxis: {
-          type: 'value'
+					type: 'value',
 				},
-        series: yData
+				series: yData,
 			};
 
 			option && this.chart.setOption(option);
-    }
+		},
-  }
+	},
-}
+};
 </script>

src/views/energy/analysis/yoyAnalysis/components/searchArea.vue

@@ -1,27 +1,44 @@
 <template>
-  <el-form :inline="true" class="demo-form-inline">
+	<el-form
+		:inline="true"
+		class="demo-form-inline">
 		<span class="blue-block"></span>
-    <el-form-item label="对象选择" required>
+		<el-form-item
-      <el-cascader
+			label="对象选择"
-        v-model="objArr"
+			required>
-        :options="objList"
+			<el-select
-        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
+				v-model="queryParams.objId"
-        popper-class="cascaderParent"
+				placeholder="请选择"
-        size="small"
+				style="width: 250px"
-        clearable></el-cascader>
+				filterable
+				size="small">
+				<el-option
+					v-for="item in objList"
+					:key="item.id"
+					:label="item.name"
+					:value="item.id"
+					:clearable="false"></el-option>
+			</el-select>
 		</el-form-item>
-    <el-form-item label="时间维度" required>
+		<el-form-item
-      <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
+			label="时间维度"
+			required>
+			<el-select
+				v-model="queryParams.type"
+				placeholder="请选择"
+				style="width: 80px"
+				size="small">
 				<el-option
 					v-for="item in timeType"
 					:key="item.id"
 					:label="item.name"
 					:value="item.id"
-          :clearable="false">
+					:clearable="false"></el-option>
-        </el-option>
 			</el-select>
 		</el-form-item>
-    <el-form-item label="时间" required>
+		<el-form-item
+			label="时间"
+			required>
 			<div v-show="queryParams.type === 1 || queryParams.type === 2">
 				<el-date-picker
 					v-model="yearValue"
@@ -30,8 +47,7 @@
 					@change="selectTime"
 					:clearable="false"
 					size="small"
-          placeholder="选择年">
+					placeholder="选择年"></el-date-picker>
-        </el-date-picker>
 			</div>
 			<div v-show="queryParams.type === 3">
 				<el-date-picker
@@ -41,24 +57,37 @@
 					@change="selectTime"
 					:clearable="false"
 					size="small"
-          placeholder="选择月">
+					placeholder="选择月"></el-date-picker>
-        </el-date-picker>
 			</div>
 		</el-form-item>
 		<el-form-item>
-      <el-button type="primary" size="small" @click="search">查询</el-button>
+			<el-button
+				type="primary"
+				size="small"
+				@click="search">
+				查询
+			</el-button>
 		</el-form-item>
 		<el-form-item>
-      <span class="separateStyle"></span>
+			<span
+				class="separateStyle"
+				v-hasPermi="['analysis:yoy-analysis:export']"></span>
 		</el-form-item>
 		<el-form-item>
-      <el-button type="primary" size="small" @click="exportData" plain>导出</el-button>
+			<el-button
+				v-hasPermi="['analysis:yoy-analysis:export']"
+				type="primary"
+				size="small"
+				@click="exportData"
+				plain>
+				导出
+			</el-button>
 		</el-form-item>
 	</el-form>
 </template>
 <script>
-import { getTree } from '@/api/base/factory'
+import { getTree } from '@/api/analysis/energyAnalysis';
-import moment from 'moment'
+import moment from 'moment';
 export default {
 	name: 'searchArea',
 	data() {
@@ -67,119 +96,111 @@ export default {
 			queryParams: {
 				type: 1, // 1季度2月3日
 				searchTime: null,
-        objId: null
+				objId: null,
+				objType: 1,
 			},
 			timeType: [
 				{ id: 1, name: '季度' },
 				{ id: 2, name: '月' },
-        {id: 3, name: '日'}
+				{ id: 3, name: '日' },
 			],
 			yearValue: '',
 			yearMonth: '',
-      objArr: [],
 			objList: [],
 			pickerOptions: {
 				disabledDate(date) {
-          return date.getTime() > Date.now()
+					return date.getTime() > Date.now();
-        }
+				},
-      }
+			},
-    }
+		};
 	},
 	mounted() {
-    this.getObjTree()
+		this.getObjTree();
 	},
 	methods: {
 		getObjTree() {
-      getTree().then(res => {
+			getTree().then((res) => {
-        this.objList = res.data || []
+				this.objList = res.data || [];
-      })
+				if (this.objList.length > 0) {
+					this.queryParams.objId = this.objList[0].id;
+				}
+			});
 		},
 		selectTime() {
 			if (this.queryParams.type === 3) {
-        this.queryParams.searchTime = this.yearMonth
+				this.queryParams.searchTime = this.yearMonth;
 			} else {
-        this.queryParams.searchTime = this.yearValue
+				this.queryParams.searchTime = this.yearValue;
 			}
 		},
 		// 查询
 		search() {
-      if (this.objArr.length === 0) {
+			if (!this.queryParams.objId) {
-        this.$modal.msgError('请选择对象')
+				this.$modal.msgError('请选择对象');
-        return false
+				return false;
-      } else {
-        this.queryParams.objId = this.objArr[this.objArr.length-1]
 			}
 			if (!this.queryParams.type) {
-        this.$modal.msgError('请选择时间维度')
+				this.$modal.msgError('请选择时间维度');
-        return false
+				return false;
 			}
 			if (!this.queryParams.searchTime) {
-        this.$modal.msgError('请选择时间')
+				this.$modal.msgError('请选择时间');
-        return false
+				return false;
 			}
 			if (this.queryParams.type === 3) {
-        this.queryParams.searchTime = this.transformTime(this.yearMonth) + ''
+				this.queryParams.searchTime = this.transformTime(this.yearMonth) + '';
 			} else {
-        this.queryParams.searchTime = this.transformYear(this.yearValue) + ''
+				this.queryParams.searchTime = this.transformYear(this.yearValue) + '';
 			}
-      this.$emit('submit', this.queryParams)
+			this.$emit('submit', this.queryParams);
 		},
 		exportData() {
-      let name
+			let name;
 			if (this.queryParams.objId) {
-        name = this.getObjName(this.objList, this.queryParams.objId)
+				name = this.getObjName(this.objList, this.queryParams.objId);
 			} else {
-        this.$modal.msgWarning("对象不能为空")
+				this.$modal.msgWarning('对象不能为空');
-        return false
+				return false;
 			}
-      this.$emit('exportD', {name: name})
+			this.$emit('exportD', { name: name });
 		},
 		// 递归取对象name
 		getObjName(list, id) {
-      let _this = this
 			for (let i = 0; i < list.length; i++) {
-        let a = list[i]
+				let a = list[i];
 				if (a.id === id) {
-          return a.name
+					return a.name;
-        } else {
-          if (a.children && a.children.length > 0) {
-            let res = _this.getObjName(a.children, id)
-            if (res) {
-              return res
-            }
-          }
 				}
 			}
 		},
-    transformTime(timeStamp) {// 本月最后一天
+		transformTime(timeStamp) {
-      let year = moment(timeStamp).format('YYYY')
+			// 本月最后一天
-      let month = moment(timeStamp).format('MM')
+			let year = moment(timeStamp).format('YYYY');
-      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
+			let month = moment(timeStamp).format('MM');
-      let value = new Date(newData).getTime()
+			let newData =
-      return value
+				moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59';
+			let value = new Date(newData).getTime();
+			return value;
 		},
-    transformYear(timeStamp) {// 本年最后一天
+		transformYear(timeStamp) {
-      let year = moment(timeStamp).format('YYYY')
+			// 本年最后一天
-      let newData = year+'-12-31 23:59:59'
+			let year = moment(timeStamp).format('YYYY');
-      let value = new Date(newData).getTime()
+			let newData = year + '-12-31 23:59:59';
-      return value
+			let value = new Date(newData).getTime();
-    }
+			return value;
-  }
+		},
-}
+	},
+};
 </script>
 <style lang='scss'>
-/* 级联选择器 */
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
 .demo-form-inline {
 	.el-date-editor .el-range__icon {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 	.el-input__prefix .el-icon-date {
 		font-size: 16px;
-    color: #0B58FF;
+		color: #0b58ff;
 	}
 }
 </style>
@@ -189,17 +210,21 @@ export default {
 		display: inline-block;
 		width: 4px;
 		height: 16px;
-    background-color: #0B58FF;
+		background-color: #0b58ff;
 		border-radius: 1px;
 		margin-right: 8px;
 		margin-top: 10px;
 	}
+	.el-form-item {
+		margin-right: 10px;
+		margin-bottom: 4px;
+	}
 }
 .separateStyle {
 	display: inline-block;
 	width: 1px;
 	height: 24px;
-  background: #E8E8E8;
+	background: #e8e8e8;
 	vertical-align: middle;
 }
 </style>

src/views/energy/analysis/yoyAnalysis/index.vue

@@ -1,31 +1,36 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
-    <search-area @submit="getList" @exportD="exportData"/>
+		<search-area
-    <div v-show='chartData.length'>
+			@submit="getList"
+			@exportD="exportData" />
+		<div v-show="chartData.length">
 			<div class="chartTitle">同比分析图</div>
-      <div style='width: 100%;height: 400px;'>
+			<div style="width: 100%">
-        <line-chart ref="analysisLineChart" :chartData="chartData"/>
+				<line-chart
+					ref="analysisLineChart"
+					:chartData="chartData" />
 			</div>
 			<!-- 表格 -->
 			<base-table
 				:table-props="tableProps"
 				:table-data="list"
 				:max-height="tableH"
-        class="yoy-out-table"
+				class="yoy-out-table" />
-      />
 		</div>
 		<!-- 没有数据 -->
-    <div class="no-data-bg" v-show='!chartData.length'></div>
+		<div
+			class="no-data-bg"
+			v-show="!chartData.length"></div>
 	</div>
 </template>
 <script>
-import { getYoy } from "@/api/analysis/energyAnalysis"
+import { getYoy } from '@/api/analysis/energyAnalysis';
-import subRate from "./components/subRate.vue"
+import subRate from './components/subRate.vue';
-import SearchArea from "./components/searchArea"
+import SearchArea from './components/searchArea';
-import LineChart from "./components/lineChart"
+import LineChart from './components/lineChart';
-import FileSaver from "file-saver"
+import FileSaver from 'file-saver';
-import * as XLSX from 'xlsx/xlsx.mjs'
+import * as XLSX from 'xlsx/xlsx.mjs';
 export default {
 	name: 'YoyAnalysis',
 	components: { SearchArea, LineChart },
@@ -34,98 +39,103 @@ export default {
 			chartData: [],
 			tableProps: [],
 			list: [],
-      tableH: this.tableHeight(640)
+			tableH: this.tableHeight(250) / 2,
-    }
+		};
 	},
 	mounted() {
 		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(640)
+			this.tableH = this.tableHeight(250) / 2;
-    })
+		});
 	},
 	methods: {
 		getList(params) {
 			getYoy({ ...params }).then((res) => {
 				if (res.code === 0 && res.data) {
-          this.getTableList(res.data)
+					this.getTableList(res.data);
 				} else {
-          this.chartData = []
+					this.chartData = [];
-          this.list = []
+					this.list = [];
 				}
-      })
+			});
 		},
 		getTableList(arr) {
-      let data = arr.data
+			let data = arr.data;
-      let nameData = arr.nameData
+			let nameData = arr.nameData;
-      let tempX = []
+			let tempX = [];
 			data[0].data.map((item) => {
-        let obj = {}
+				let obj = {};
-        obj.prop = item.dynamicName
+				obj.prop = item.dynamicName;
-        obj.label = item.dynamicName
+				obj.label = item.dynamicName;
-        obj.id = item.id
+				obj.id = item.id;
-        obj.children = []
+				obj.children = [];
-        tempX.push(obj)
+				tempX.push(obj);
-      })
+			});
 			for (let i = 0; i < nameData.length; i++) {
 				for (let j = 0; j < tempX.length; j++) {
 					if (tempX[j].id === nameData[i].parentId) {
-            let obj = {}
+						let obj = {};
-            obj.prop = tempX[j].prop + '_' + nameData[i].name
+						obj.prop = tempX[j].prop + '_' + nameData[i].name;
-            obj.label = nameData[i].name
+						obj.label = nameData[i].name;
 						if (obj.label.indexOf('同比') != -1) {
-              obj.subcomponent = subRate
+							obj.subcomponent = subRate;
 						}
-            tempX[j].children.push(obj)
+						tempX[j].children.push(obj);
 					}
 				}
 			}
-      this.tableProps = [{prop: 'time',label: '时间'}].concat(tempX)
+			this.tableProps = [{ prop: 'time', label: '时间' }].concat(tempX);
-      console.log(this.tableProps)
+			console.log(this.tableProps);
 			// 数据
-      this.list = []
+			this.list = [];
 			for (let k = 0; k < data.length; k++) {
-        let obj = {}
+				let obj = {};
-        obj.time = data[k].time
+				obj.time = data[k].time;
-        let arr1 = data[k].data
+				let arr1 = data[k].data;
-        obj.type = []
+				obj.type = [];
 				for (let q = 0; q < arr1.length; q++) {
-          let name = arr1[q].dynamicName
+					let name = arr1[q].dynamicName;
-          obj.type.push(name)
+					obj.type.push(name);
-          let arr2 = arr1[q].children
+					let arr2 = arr1[q].children;
 					for (let p = 0; p < arr2.length; p++) {
-            let prop = name + '_' + arr2[p].dynamicName
+						let prop = name + '_' + arr2[p].dynamicName;
-            obj[prop] = arr2[p].dynamicValue
+						obj[prop] = arr2[p].dynamicValue;
 					}
 				}
-        this.list.push(obj)
+				this.list.push(obj);
 			}
-      this.chartData = this.list
+			this.chartData = this.list;
 		},
 		exportData(val) {
 			if (this.list.length > 0) {
-        var wb = XLSX.utils.table_to_book(document.querySelector(".yoy-out-table"))
+				var wb = XLSX.utils.table_to_book(
-        let fileName = val.name + "同比分析.xlsx"
+					document.querySelector('.yoy-out-table')
+				);
+				let fileName = val.name + '同比分析.xlsx';
 				var wbout = XLSX.write(wb, {
-            bookType: "xlsx",
+					bookType: 'xlsx',
 					bookSST: true,
-            type: "array"
+					type: 'array',
-        })
+				});
 				try {
 					FileSaver.saveAs(
-            new Blob([wbout], { type: "application/octet-stream" }),
+						new Blob([wbout], { type: 'application/octet-stream' }),
 						fileName
-            )
+					);
 				} catch (e) {
-            if (typeof console !== "undefined") console.log(e, wbout);
+					if (typeof console !== 'undefined') console.log(e, wbout);
 				}
-        return wbout
+				return wbout;
 			} else {
-        this.$modal.msgWarning("暂无数据导出")
+				this.$modal.msgWarning('暂无数据导出');
-      }
-    }
-  }
 			}
+		},
+	},
+};
 </script>
 <style lang='scss' scoped>
+.yoy-out-table {
+	margin-top: 20px;
+}
 .chartTitle {
 	font-size: 16px;
 	color: #000;
@@ -135,7 +145,7 @@ export default {
 	display: inline-block;
 	width: 4px;
 	height: 18px;
-  background-color: #0B58FF;
+	background-color: #0b58ff;
 	border-radius: 1px;
 	margin-right: 8px;
 	vertical-align: bottom;

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

@@ -1,63 +1,84 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
 		<!-- 列表 -->
-    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+		<base-table
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-props="tableProps"
+			:table-data="list"
 			:max-height="tableH">
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="80"
+				label="操作"
+				:method-list="tableBtn"
 				@clickBtn="handleClick" />
 		</base-table>
-    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+		<pagination
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			:total="total"
 			@pagination="getList" />
 		<!-- 新增 -->
-    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
+		<base-dialog
-      @confirm="handleConfirm" :before-close="handleCancel">
+			:dialogTitle="addOrEditTitle"
-      <energy-plc-add ref="energyPlc" @successSubmit="successSubmit" />
+			:dialogVisible="centervisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel">
+			<energy-plc-add
+				ref="energyPlc"
+				@successSubmit="successSubmit" />
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-import { getEnergyPlcPage, deleteEnergyPlc } from "@/api/base/energyPlc";
+import { getEnergyPlcPage, deleteEnergyPlc } from '@/api/base/energyPlc';
-// import { publicFormatter } from '@/utils/dict'
+import EnergyPlcAdd from './components/energyPlcAdd.vue';
-import EnergyPlcAdd from './components/energyPlcAdd.vue'
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'plcTableName',
 		label: '关联表名',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'code',
 		label: '关联表编码',
 		minWidth: 150,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'name',
 		label: '标识名',
 		minWidth: 150,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'enName',
-    label: '英文标识名'
+		label: '英文标识名',
 	},
 	{
 		prop: 'collection',
-    label: '是否采集'
+		label: '是否采集',
 	},
 	{
 		prop: 'description',
 		label: '描述',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
-  }
+	},
-]
+];
 export default {
-  name: "EnergyPlc",
+	name: 'EnergyPlc',
 	components: { EnergyPlcAdd },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -65,65 +86,61 @@ export default {
 					type: 'input',
 					label: '标识名',
 					placeholder: '标识名',
-          param: 'name'
+					param: 'name',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
 			tableBtn: [
 				this.$auth.hasPermi('base:energy-plc:update')
 					? {
 							type: 'edit',
-            btnName: '编辑'
+							btnName: '编辑',
 					  }
 					: undefined,
 				this.$auth.hasPermi('base:energy-plc:delete')
 					? {
 							type: 'delete',
-            btnName: '删除'
+							btnName: '删除',
 					  }
-          : undefined
+					: undefined,
 			].filter((v) => v),
-      tableH: this.tableHeight(260),
 			collectionList: [
 				{ value: 0, label: '否' },
-        { value: 1, label: '是' }
+				{ value: 1, label: '是' },
 			],
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
 			list: [],
 			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
 			// 是否显示弹出层
 			centervisible: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 20,
-        name: null
+				name: null,
-      }
+			},
 		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		this.getList();
 	},
 	methods: {
@@ -131,67 +148,72 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.queryParams.pageNo = 1;
-          this.queryParams.name = val.name
+					this.queryParams.name = val.name;
-          this.getList()
+					this.getList();
-          break
+					break;
 				default:
-          this.addOrEditTitle = '新增'
+					this.addOrEditTitle = '新增';
-          this.centervisible = true
+					this.centervisible = true;
 					this.$nextTick(() => {
-            this.$refs.energyPlc.init()
+						this.$refs.energyPlc.init();
-          })
+					});
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      getEnergyPlcPage(this.queryParams).then(response => {
+			getEnergyPlcPage(this.queryParams).then((response) => {
 				let arr = response.data.list || [];
-        arr && arr.map(item => {
+				arr &&
-          this.collectionList.map(i => {
+					arr.map((item) => {
+						this.collectionList.map((i) => {
 							if (item.collection === i.value) {
-              item.collection = i.label
+								item.collection = i.label;
 							}
-          })
+						});
-        })
+					});
-        this.list = arr
+				this.list = arr;
 				this.total = response.data.total;
 			});
 		},
 		handleClick(val) {
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
 					this.$nextTick(() => {
-            this.$refs.energyPlc.init(val.data.id)
+						this.$refs.energyPlc.init(val.data.id);
-          })
+					});
-          this.centervisible = true
+					this.centervisible = true;
-          break
+					break;
 				default:
-          this.handleDelete(val.data)
+					this.handleDelete(val.data);
 			}
 		},
 		handleCancel() {
-      this.$refs.energyPlc.formClear()
+			this.$refs.energyPlc.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.energyPlc.submitForm()
+			this.$refs.energyPlc.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-      this.$modal.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?').then(function () {
+			this.$modal
+				.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?')
+				.then(function () {
 					return deleteEnergyPlc(row.id);
-      }).then(() => {
+				})
+				.then(() => {
 					this.queryParams.pageNo = 1;
 					this.getList();
-        this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-      }).catch(() => { });
+				})
-    }
+				.catch(() => {});
-  }
+		},
+	},
 };
 </script>

src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue

@@ -1,36 +1,50 @@
 <template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
+	<el-form
-    <el-form-item label="关联表名" prop="plcId">
+		ref="form"
-      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;" filterable>
+		:rules="rules"
+		label-width="100px"
+		:model="form">
+		<el-form-item
+			label="关联表名"
+			prop="plcId">
+			<el-select
+				v-model="form.plcId"
+				placeholder="请选择"
+				style="width: 100%"
+				filterable>
 				<el-option
 					v-for="item in plcList"
 					:key="item.id"
 					:label="item.plcTableName"
-          :value="item.id">
+					:value="item.id"></el-option>
-        </el-option>
 			</el-select>
 		</el-form-item>
-    <el-form-item label="对象" prop="bindObjectId">
+		<el-form-item
+			label="对象"
+			prop="bindObjectId">
 			<el-cascader
-        style='width: 100%;'
+				style="width: 100%"
 				v-model="objIds"
 				:options="objList"
 				:props="{ checkStrictly: true, value: 'id', label: 'name' }"
-        popper-class="cascaderParent"
 				@change="selectObj"
 				clearable></el-cascader>
 		</el-form-item>
 	</el-form>
 </template>
 <script>
-import { getEnergyPlcConnect, updateEnergyPlcConnect, createEnergyPlcConnect } from '@/api/base/energyPlcConnect'
+import {
-import { getEnergyPlcAll } from '@/api/base/energyPlc'
+	getEnergyPlcConnect,
+	updateEnergyPlcConnect,
+	createEnergyPlcConnect,
+} from '@/api/base/energyPlcConnect';
+import { getEnergyPlcAll } from '@/api/base/energyPlc';
 export default {
 	name: 'EnergyPlcConnectAdd',
 	props: {
 		objList: {
 			type: Array,
-      default: () => []
+			default: () => [],
 		},
 	},
 	data() {
@@ -39,63 +53,70 @@ export default {
 				id: '',
 				plcId: '',
 				bindObjectId: '',
-        bindObjectType: ''
+				bindObjectType: '',
 			},
 			objIds: [], // 回显数组
 			plcList: [],
 			isEdit: false, //是否是编辑
 			rules: {
-        plcId: [{ required: true, message: '关联表名不能为空', trigger: 'change' }],
+				plcId: [
-        bindObjectId: [{ required: true, message: '对象不能为空', trigger: 'change' }]
+					{ required: true, message: '关联表名不能为空', trigger: 'change' },
-      }
+				],
-    }
+				bindObjectId: [
+					{ required: true, message: '对象不能为空', trigger: 'change' },
+				],
+			},
+		};
 	},
 	methods: {
 		init(id) {
 			getEnergyPlcAll().then((res) => {
-        this.plcList = res.data || []
+				this.plcList = res.data || [];
-      })
+			});
 			if (id) {
-        this.isEdit = true
+				this.isEdit = true;
-        this.form.id = id
+				this.form.id = id;
 				getEnergyPlcConnect(id).then((res) => {
 					if (res.code === 0) {
-            this.form = res.data
+						this.form = res.data;
-            this.objIds = this.changeDetSelect(this.form.bindObjectId, this.objList)
+						this.objIds = this.changeDetSelect(
+							this.form.bindObjectId,
+							this.objList
+						);
 					}
-        })
+				});
 			} else {
-        this.isEdit = false
+				this.isEdit = false;
-        this.form.id = ''
+				this.form.id = '';
 			}
 		},
 		// 递归处理分类回显问题
 		changeDetSelect(key, treeData) {
-      let arr = [] // 递归时操作的数组
+			let arr = []; // 递归时操作的数组
-      let returnArr = [] // 存放结果的数组
+			let returnArr = []; // 存放结果的数组
-      let depth = 0 // 定义全局层级
+			let depth = 0; // 定义全局层级
 			// 定义递归函数
 			function childrenEach(childrendData, depthN) {
 				for (var j = 0; j < childrendData.length; j++) {
-          depth = depthN
+					depth = depthN;
-          arr[depthN] = childrendData[j].id
+					arr[depthN] = childrendData[j].id;
 					if (childrendData[j].id == key) {
-            returnArr = arr.slice(0, depthN + 1)
+						returnArr = arr.slice(0, depthN + 1);
-            break
+						break;
 					} else {
 						if (childrendData[j].children) {
-              depth++
+							depth++;
-              childrenEach(childrendData[j].children, depth)
+							childrenEach(childrendData[j].children, depth);
 						}
 					}
 				}
-        return returnArr
+				return returnArr;
 			}
-      return childrenEach(treeData, depth)
+			return childrenEach(treeData, depth);
 		},
 		selectObj(val) {
-      this.form.bindObjectId = val[val.length-1]
+			this.form.bindObjectId = val[val.length - 1];
-      this.form.bindObjectType = val.length-1
+			this.form.bindObjectType = val.length - 1;
 		},
 		submitForm() {
 			this.$refs['form'].validate((valid) => {
@@ -104,36 +125,31 @@ export default {
 						// 编辑
 						updateEnergyPlcConnect({ ...this.form }).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					} else {
 						createEnergyPlcConnect({ ...this.form }).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					}
 				} else {
-          return false
+					return false;
 				}
-      })
+			});
 		},
 		formClear() {
-      this.form.id = ''
+			this.form.id = '';
-      this.form.plcId = ''
+			this.form.plcId = '';
-      this.form.bindObjectId = ''
+			this.form.bindObjectId = '';
-      this.form.bindObjectType = ''
+			this.form.bindObjectType = '';
-      this.objIds = []
+			this.objIds = [];
-      this.isEdit = false
+			this.isEdit = false;
-    }
+		},
-  }
+	},
-}
+};
 </script>
-<style>
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
-</style>

src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue

@@ -1,16 +1,35 @@
 <template>
 	<div>
-    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
+		<el-drawer
+			:title="drawerTitle"
+			:visible.sync="visible"
+			size="70%"
+			@close="closeD"
+			:show-close="false">
 			<div class="box">
 				<el-form :inline="true">
 					<el-form-item label="关联表名">
-            <el-input v-model="plcTableName" size='small' readonly></el-input>
+						<el-input
+							v-model="plcTableName"
+							size="small"
+							readonly
+							style="width: 250px"></el-input>
 					</el-form-item>
 					<el-form-item label="对象">
-            <el-input v-model="objName" size='small' readonly></el-input>
+						<el-input
+							v-model="objName"
+							size="small"
+							readonly
+							style="width: 250px"></el-input>
 					</el-form-item>
 					<el-form-item v-if="showBtn">
-            <el-button type="success" size='small' plain @click="addNew">新增</el-button>
+						<el-button
+							type="success"
+							size="small"
+							plain
+							@click="addNew">
+							新增
+						</el-button>
 					</el-form-item>
 				</el-form>
 				<base-table
@@ -18,23 +37,20 @@
 					:limit="queryParams.pageSize"
 					:table-props="tableProps"
 					:table-data="tableData"
-          :max-height="tableH"
+					:max-height="tableH">
-        >
 					<method-btn
 						v-if="tableBtn.length"
 						slot="handleBtn"
 						:width="100"
 						label="操作"
 						:method-list="tableBtn"
-            @clickBtn="handleClick"
+						@clickBtn="handleClick" />
-          />
 				</base-table>
 				<pagination
 					:page.sync="queryParams.pageNo"
 					:limit.sync="queryParams.pageSize"
 					:total="total"
-          @pagination="getList"
+					@pagination="getList" />
-        />
 			</div>
 		</el-drawer>
 		<!-- 新增 -->
@@ -43,43 +59,48 @@
 			:dialogVisible="centervisible"
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
-      :before-close="handleCancel"
+			:before-close="handleCancel">
-    >
+			<energy-plc-param-add
-      <energy-plc-param-add ref="energyPlcParam" @successSubmit="successSubmit" />
+				ref="energyPlcParam"
+				@successSubmit="successSubmit" />
 		</base-dialog>
 	</div>
 </template>
 <script>
-import { getEnergyPlcParamPage, deleteEnergyPlcParam } from '@/api/base/energyPlcParam'
+import {
-import EnergyPlcParamAdd from './energyPlcParamAdd'
+	getEnergyPlcParamPage,
-import { publicFormatter } from '@/utils/dict'
+	deleteEnergyPlcParam,
+} from '@/api/base/energyPlcParam';
+import EnergyPlcParamAdd from './energyPlcParamAdd';
+import { publicFormatter } from '@/utils/dict';
 const tableProps = [
 	{
 		prop: 'typeId',
-    label: '能源类型'
+		label: '能源类型',
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'plcParamName',
-    label: '参数列名'
+		label: '参数列名',
 	},
 	{
 		prop: 'name',
-    label: '参数名称'
+		label: '参数名称',
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-    filter: publicFormatter('energy_unit')
+		filter: publicFormatter('unit_dict'),
 	},
 	{
 		prop: 'collection',
-    label: '是否采集'
+		label: '是否采集',
 	},
 	{
 		prop: 'description',
-    label: '描述'
+		label: '描述',
-  }
+	},
-]
+];
 export default {
 	name: 'EnergyPlcParam',
 	props: {
@@ -87,9 +108,9 @@ export default {
 			type: Array,
 			required: true,
 			default: () => {
-        return []
+				return [];
-      }
+			},
-    }
+		},
 	},
 	data() {
 		return {
@@ -103,121 +124,132 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 30,
-        connectId: null
+				connectId: null,
 			},
 			plcTableName: '',
 			objName: '',
 			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
 			// 是否显示弹出层
 			centervisible: false,
 			collectionList: [
 				{ value: 0, label: '否' },
-        {value: 1,label: '是'}
+				{ value: 1, label: '是' },
 			],
-      showBtn: true
+			showBtn: true,
-    }
+		};
 	},
 	components: { EnergyPlcParamAdd },
 	created() {
 		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(115)
+			this.tableH = this.tableHeight(115);
-    })
+		});
 	},
 	methods: {
 		init(data, title) {
-      this.visible = true
+			this.visible = true;
-      this.queryParams.connectId = data.id
+			this.queryParams.connectId = data.id;
-      this.plcTableName = data.plcTableName
+			this.plcTableName = data.plcTableName;
-      this.objName = data.objName
+			this.objName = data.objName;
-      this.getList()
+			this.getList();
 			if (title === 'detail') {
-        this.drawerTitle = '查看参数'
+				this.drawerTitle = '查看参数';
-        this.showBtn = false
+				this.showBtn = false;
-        this.tableBtn = []
+				this.tableBtn = [];
 			} else {
-        this.drawerTitle = '参数绑定'
+				this.drawerTitle = '参数绑定';
-        this.showBtn = true
+				this.showBtn = true;
 				this.tableBtn = [
 					{
 						type: 'edit',
-            btnName: '编辑'
+						btnName: '编辑',
 					},
 					{
 						type: 'delete',
-            btnName: '删除'
+						btnName: '删除',
-          }
+					},
-        ]
+				];
 			}
 		},
 		getList() {
 			getEnergyPlcParamPage({ ...this.queryParams }).then((res) => {
-        let arr = res.data.list || []
+				let arr = res.data.list || [];
-        arr&&arr.map(item => {
+				arr &&
-          this.collectionList.map(i => {
+					arr.map((item) => {
+						this.collectionList.map((i) => {
 							if (item.collection === i.value) {
-              item.collection = i.label
+								item.collection = i.label;
 							}
-          })
+						});
-          this.energyTypeList.map(j => {
+						this.energyTypeList.map((j) => {
 							if (item.typeId === j.id) {
-              item.typeId = j.name
+								item.typeId = j.name;
 							}
-          })
+						});
-        })
+					});
-        this.tableData = arr
+				this.tableData = arr;
 				this.total = res.data.total;
-      })
+			});
 		},
 		// 新增
 		addNew() {
-      this.addOrEditTitle = '新增'
+			this.addOrEditTitle = '新增';
-      this.centervisible = true
+			this.centervisible = true;
 			this.$nextTick(() => {
-        this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: ''})
+				this.$refs.energyPlcParam.init({
-      })
+					connectId: this.queryParams.connectId,
+					id: '',
+				});
+			});
 		},
 		handleCancel() {
-      this.$refs.energyPlcParam.formClear()
+			this.$refs.energyPlcParam.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.energyPlcParam.submitForm()
+			this.$refs.energyPlcParam.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		handleClick(val) {
-      console.log(val)
+			console.log(val);
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
-          this.centervisible = true
+					this.centervisible = true;
 					this.$nextTick(() => {
-            this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: val.data.id})
+						this.$refs.energyPlcParam.init({
-          })
+							connectId: this.queryParams.connectId,
-          break
+							id: val.data.id,
+						});
+					});
+					break;
 				default:
-          this.handleDelete(val.data)
+					this.handleDelete(val.data);
 			}
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-      this.$modal.confirm('是否确认删除参数列名为"' + row.plcParamName + '"的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除参数列名为"' + row.plcParamName + '"的数据项?')
+				.then(function () {
 					return deleteEnergyPlcParam(row.id);
-        }).then(() => {
+				})
+				.then(() => {
 					this.queryParams.pageNo = 1;
 					this.getList();
-          this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-        }).catch(() => {});
+				})
+				.catch(() => {});
 		},
 		closeD() {
-      this.$emit('closeDrawer')
+			this.$emit('closeDrawer');
-    }
+		},
-  }
+	},
-}
+};
 </script>
 <style lang="scss" scoped>
 .box {

src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue

@@ -1,51 +1,72 @@
 <template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
+	<el-form
+		ref="form"
+		:rules="rules"
+		label-width="100px"
+		:model="form">
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="能源类型" prop="typeId">
+				<el-form-item
-          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;" filterable>
+					label="能源类型"
+					prop="typeId">
+					<el-select
+						v-model="form.typeId"
+						placeholder="请选择"
+						style="width: 100%"
+						filterable>
 						<el-option
 							v-for="item in energyListType"
 							:key="item.id"
-              :label="item.name"
+							:label="item.labelName"
-              :value="item.id">
+							:value="item.id"></el-option>
-            </el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-        <el-form-item label="参数列名" prop="plcParamName">
+				<el-form-item
+					label="参数列名"
+					prop="plcParamName">
 					<el-input v-model="form.plcParamName"></el-input>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="参数名称" prop="name">
+				<el-form-item
+					label="参数名称"
+					prop="name">
 					<el-input v-model="form.name"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-        <el-form-item label="单位" prop="unit">
+				<el-form-item
-          <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
+					label="单位"
+					prop="unit">
+					<el-select
+						v-model="form.unit"
+						placeholder="请选择"
+						style="width: 100%">
 						<el-option
-              v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)"
+							v-for="item in getDictDatas(DICT_TYPE.UNIT_DICT)"
 							:key="item.value"
 							:label="item.label"
-              :value="item.value">
+							:value="item.value"></el-option>
-            </el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="是否采集" prop="collection">
+				<el-form-item
+					label="是否采集"
+					prop="collection">
 					<el-switch v-model="form.collection"></el-switch>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-        <el-form-item label="描述" prop="description">
+				<el-form-item
+					label="描述"
+					prop="description">
 					<el-input v-model="form.description"></el-input>
 				</el-form-item>
 			</el-col>
@@ -53,8 +74,12 @@
 	</el-form>
 </template>
 <script>
-import { getEnergyPlcParam, updateEnergyPlcParam, createEnergyPlcParam } from '@/api/base/energyPlcParam'
+import {
-import { getEnergyTypeListAll } from '@/api/base/energyType'
+	getEnergyPlcParam,
+	updateEnergyPlcParam,
+	createEnergyPlcParam,
+} from '@/api/base/energyPlcParam';
+import { getEnergyTypeListAll } from '@/api/base/energyType';
 export default {
 	name: 'EnergyPlcParamAdd',
 	data() {
@@ -67,66 +92,72 @@ export default {
 				unit: '',
 				description: '',
 				collection: true,
-        connectId: ''
+				connectId: '',
 			},
 			energyListType: [],
 			isEdit: false, //是否是编辑
 			rules: {
-        typeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
+				typeId: [
-        plcParamName: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
+					{ required: true, message: '能源类型不能为空', trigger: 'change' },
-        name: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }]
+				],
-      }
+				plcParamName: [
-    }
+					{ required: true, message: '参数列名不能为空', trigger: 'blur' },
+				],
+				name: [
+					{ required: true, message: '参数名称不能为空', trigger: 'blur' },
+				],
+			},
+		};
 	},
 	methods: {
 		init(param) {
-      this.form.connectId = param.connectId
+			this.form.connectId = param.connectId;
 			getEnergyTypeListAll().then((res) => {
-        this.energyListType = res.data || []
+				this.energyListType = res.data || [];
-      })
+			});
 			if (param.id) {
-        this.isEdit = true
+				this.isEdit = true;
-        this.form.id = param.id
+				this.form.id = param.id;
 				getEnergyPlcParam(this.form.id).then((res) => {
 					if (res.code === 0) {
-            this.form = res.data
+						this.form = res.data;
-            this.form.collection = this.form.collection === 0 ? false : true
+						this.form.collection = this.form.collection === 0 ? false : true;
 					}
-        })
+				});
 			} else {
-        this.isEdit = false
+				this.isEdit = false;
-        this.form.id = ''
+				this.form.id = '';
 			}
 		},
 		submitForm() {
 			this.$refs['form'].validate((valid) => {
 				if (valid) {
-          this.form.collection = this.form.collection === false ? 0 : 1
+					this.form.collection = this.form.collection === false ? 0 : 1;
 					if (this.isEdit) {
 						// 编辑
 						updateEnergyPlcParam({ ...this.form }).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					} else {
 						createEnergyPlcParam({ ...this.form }).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					}
 				} else {
-          return false
+					return false;
 				}
-      })
+			});
 		},
 		formClear() {
-      this.$refs.form.resetFields()
+			this.$refs.form.resetFields();
-      this.isEdit = false
+			this.isEdit = false;
-    }
+		},
-  }
+	},
-}
+};
 </script>

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

@@ -1,68 +1,102 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
 		<!-- 列表 -->
-    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+		<base-table
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-props="tableProps"
+			:table-data="list"
 			:max-height="tableH">
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="160"
+				label="操作"
+				:method-list="tableBtn"
 				@clickBtn="handleClick" />
 		</base-table>
-    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+		<pagination
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			:total="total"
 			@pagination="getList" />
 		<!-- 新增 -->
-    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
+		<base-dialog
-      @confirm="handleConfirm" :before-close="handleCancel" width='30%'>
+			:dialogTitle="addOrEditTitle"
-      <energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" />
+			:dialogVisible="centervisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel"
+			width="30%">
+			<energy-plc-connect-add
+				ref="energyPlcConnect"
+				:objList="objList"
+				@successSubmit="successSubmit" />
 		</base-dialog>
 		<!-- 参数绑定/查看 -->
-    <energy-plc-param v-if="paramVisible" ref="plcParam" @closeDrawer="closeDrawer"
+		<energy-plc-param
+			v-if="paramVisible"
+			ref="plcParam"
+			@closeDrawer="closeDrawer"
 			:energyTypeList="energyTypeList"></energy-plc-param>
 	</div>
 </template>
 
 <script>
-import { getEnergyPlcConnectPage, deleteEnergyPlcConnect } from "@/api/base/energyPlcConnect";
+import {
+	getEnergyPlcConnectPage,
+	deleteEnergyPlcConnect,
+} from '@/api/base/energyPlcConnect';
 // import { publicFormatter } from '@/utils/dict'
-import { getTree } from '@/api/base/factory'
+import { getTree } from '@/api/analysis/energyAnalysis';
-import { getEnergyTypeListAll } from '@/api/base/energyType'
+import { getEnergyTypeListAll } from '@/api/base/energyType';
-import EnergyPlcConnectAdd from './components/energyPlcConnectAdd'
+import EnergyPlcConnectAdd from './components/energyPlcConnectAdd';
-import EnergyPlcParam from './components/energyPlcParam'
+import EnergyPlcParam from './components/energyPlcParam';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'objName',
-    label: '对象'
+		label: '对象',
+		minWidth: 130,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'objCode',
 		label: '对象编码',
-    showOverflowtooltip: true
+		minWidth: 150,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'plcTableName',
-    label: '关联表名'
+		label: '关联表名',
 	},
 	{
 		prop: 'plcTableCode',
 		label: '关联表编码',
 		minWidth: 150,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'cnName',
 		label: '标识名',
 		minWidth: 150,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'varNum',
-    label: '绑定参数数量'
+		label: '绑定参数数量',
-  }
+		width: 110,
-]
+	},
+];
 export default {
-  name: "EnergyPlcConnect",
+	name: 'EnergyPlcConnect',
 	components: { EnergyPlcConnectAdd, EnergyPlcParam },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -70,167 +104,169 @@ export default {
 					type: 'input',
 					label: '标识名',
 					placeholder: '标识名',
-          param: 'cnName'
+					param: 'cnName',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:energy-plc-connect:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:energy-plc-connect:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
 			tableBtn: [
 				this.$auth.hasPermi('base:energy-plc-connect:bind')
 					? {
 							type: 'connect',
-            btnName: '绑定'
+							btnName: '绑定',
 					  }
 					: undefined,
 				{
 					type: 'detail',
-          btnName: '详情'
+					btnName: '详情',
 				},
 				this.$auth.hasPermi('base:energy-plc-connect:update')
 					? {
 							type: 'edit',
-            btnName: '编辑'
+							btnName: '编辑',
 					  }
 					: undefined,
 				this.$auth.hasPermi('base:energy-plc-connect:delete')
 					? {
 							type: 'delete',
-            btnName: '删除'
+							btnName: '删除',
 					  }
-          : undefined
+					: undefined,
 			].filter((v) => v),
-      tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
 			list: [],
 			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
 			// 是否显示弹出层
 			centervisible: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 20,
-        cnName: null
+				cnName: null,
 			},
 			paramVisible: false,
 			energyTypeList: [],
-      objList: []
+			objList: [],
 		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		this.getList();
 	},
 	mounted() {
 		// 获取能源列表
-    this.getEnergyTypeList()
+		this.getEnergyTypeList();
 		// 获取对象树形结构
-    this.getObjTree()
+		this.getObjTree();
 	},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.queryParams.pageNo = 1;
-          this.queryParams.cnName = val.cnName
+					this.queryParams.cnName = val.cnName;
-          this.getList()
+					this.getList();
-          break
+					break;
 				default:
-          this.addOrEditTitle = '新增'
+					this.addOrEditTitle = '新增';
-          this.centervisible = true
+					this.centervisible = true;
 					this.$nextTick(() => {
-            this.$refs.energyPlcConnect.init()
+						this.$refs.energyPlcConnect.init();
-          })
+					});
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      getEnergyPlcConnectPage(this.queryParams).then(response => {
+			getEnergyPlcConnectPage(this.queryParams).then((response) => {
 				let arr = response.data.list || [];
-        this.list = arr
+				this.list = arr;
 				this.total = response.data.total;
 			});
 		},
 		handleClick(val) {
-      console.log(val)
+			console.log(val);
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
 					this.$nextTick(() => {
-            this.$refs.energyPlcConnect.init(val.data.id)
+						this.$refs.energyPlcConnect.init(val.data.id);
-          })
+					});
-          this.centervisible = true
+					this.centervisible = true;
-          break
+					break;
 				case 'delete':
-          this.handleDelete(val.data)
+					this.handleDelete(val.data);
-          break
+					break;
 				case 'detail':
-          this.paramVisible = true
+					this.paramVisible = true;
 					this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'detail')
+						this.$refs.plcParam.init(val.data, 'detail');
-          })
+					});
-          break
+					break;
 				default:
-          this.paramVisible = true
+					this.paramVisible = true;
 					this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'connect')
+						this.$refs.plcParam.init(val.data, 'connect');
-          })
+					});
 			}
 		},
 		handleCancel() {
-      this.$refs.energyPlcConnect.formClear()
+			this.$refs.energyPlcConnect.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.energyPlcConnect.submitForm()
+			this.$refs.energyPlcConnect.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-      this.$modal.confirm('是否确认删除对象为"' + row.objName + '"的数据项?').then(function () {
+			this.$modal
+				.confirm('是否确认删除对象为"' + row.objName + '"的数据项?')
+				.then(function () {
 					return deleteEnergyPlcConnect(row.id);
-      }).then(() => {
+				})
+				.then(() => {
 					this.queryParams.pageNo = 1;
 					this.getList();
-        this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-      }).catch(() => { });
+				})
+				.catch(() => {});
 		},
 		closeDrawer() {
-      this.getList()
+			this.getList();
 		},
 		getEnergyTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        this.energyTypeList = res.data || []
+				this.energyTypeList = res.data || [];
-      })
+			});
 		},
 		getObjTree() {
-      getTree().then(res => {
+			getTree().then((res) => {
-        this.objList = res.data || []
+				this.objList = res.data || [];
-      })
+			});
-    }
+		},
-  }
+	},
 };
 </script>

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

@@ -0,0 +1,139 @@
+<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.value"
+								:label="item.label"
+								:value="item.value"></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/InputArea.vue

@@ -1,38 +0,0 @@
-<template>
-  <div class="tableInner">
-    <!-- <el-input v-model="list[itemProp]" @blur="changeInput" /> -->
-    <el-input-number v-model="list[itemProp]" @change="changeInput" :min="0" :max="999999999" style='width: 100%;' :controls='false' :precision='2'></el-input-number>
-  </div>
-</template>
-<script>
-export default {
-  name: 'InputArea',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    },
-    itemProp: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      list: this.injectData
-    }
-  },
-  methods: {
-    changeInput() {
-      console.log(this.list)
-      this.$emit('emitData', this.list)
-    }
-  }
-}
-</script>
-<style scoped>
-.tableInner .el-input__inner {
-  border: none;
-  padding: 0;
-  height: 33px;
-}
-</style>

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

@@ -1,44 +0,0 @@
-<template>
-  <div class="tableInner">
-    <el-select v-model="list[itemProp]" placeholder="请选择" style="width: 100%;" @change="changeSelect">
-      <el-option
-        v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
-        :key="item.value"
-        :label="item.label"
-        :value="item.value">
-      </el-option>
-    </el-select>
-  </div>
-</template>
-<script>
-export default {
-  name: 'SelectArea',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    },
-    itemProp: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      list: this.injectData
-    }
-  },
-  methods: {
-    changeSelect() {
-      console.log(this.list)
-      this.$emit('emitData', this.list)
-    }
-  }
-}
-</script>
-<style scoped>
-.tableInner .el-input__inner {
-  border: none;
-  padding: 0;
-  height: 33px;
-}
-</style>

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

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

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

@@ -1,119 +1,147 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
 		<!-- 列表 -->
-    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+		<base-table
-      :max-height="tableH" @selection-change="selectChange">
+			:page="queryParams.pageNo"
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+			:limit="queryParams.pageSize"
+			:table-props="tableProps"
+			:table-data="list"
+			:max-height="tableH"
+			@selection-change="selectChange">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
 				@clickBtn="handleClick" />
 		</base-table>
-    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+		<pagination
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			:total="total"
 			@pagination="getList" />
 		<!-- 新增 -->
-    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
+		<base-dialog
-      @confirm="handleConfirm" :before-close="handleCancel">
+			:dialogTitle="addOrEditTitle"
-      <energy-quantity-manual-add ref="energyQuantityManualAdd" :energyTypeList="energyTypeList"
+			:dialogVisible="centervisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel">
+			<energy-quantity-manual-add
+				ref="energyQuantityManualAdd"
+				:energyTypeList="energyTypeList"
 				@successSubmit="successSubmit" />
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-import { energyQuantityManualPage, energyQuantityManualDelete, energyQuantityManualExport } from "@/api/base/energyQuantityManual"
+import {
-import { getEnergyTypeListAll } from "@/api/base/energyType"
+	energyQuantityManualPage,
-import { publicFormatter } from '@/utils/dict'
+	energyQuantityManualDelete,
-import { parseTime, parseTimeTable } from '@/utils/ruoyi'
+	energyQuantityManualExport,
-// import FileSaver from "file-saver"
+} from '@/api/base/energyQuantityManual';
-// import * as XLSX from 'xlsx/xlsx.mjs'
+import { getEnergyTypeListAll } from '@/api/base/energyType';
-import EnergyQuantityManualAdd from './components/energyQuantityManualAdd'
+import { publicFormatter } from '@/utils/dict';
-import moment from 'moment'
+import { parseTimeTable } from '@/utils/ruoyi';
+import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
+import moment from 'moment';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
-    prop: 'energyType',
+		prop: 'energyTypeLabel',
 		label: '能源类型',
 		minWidth: 110,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-    filter: publicFormatter('energy_unit'),
+		filter: publicFormatter('unit_dict'),
-    minWidth: 110
+		minWidth: 110,
 	},
 	{
 		prop: 'tableName',
 		label: '能源表名',
 		filter: publicFormatter('table_name'),
 		minWidth: 110,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'recordTime',
 		label: '抄表日期',
 		filter: parseTimeTable('{y}-{m}-{d}'),
-    minWidth: 110
+		minWidth: 110,
 	},
 	{
 		prop: 'readingQuantity',
-    label: '抄表值'
+		label: '抄表值',
 	},
 	{
 		prop: 'useQty',
-    label: '差值'
+		label: '差值',
-  }
+	},
-]
+];
 export default {
-  name: "EnergyQuantityManual",
+	name: 'EnergyQuantityManual',
 	data() {
 		return {
 			formConfig: [
 				{
 					type: 'select',
 					label: '能源类型',
+					labelField: 'labelName',
 					selectOptions: [],
 					param: 'energyTypeId',
-          filterable: true
+					filterable: true,
 				},
 				{
 					type: 'datePicker',
 					label: '抄表日期',
 					dateType: 'daterange',
 					format: 'yyyy-MM-dd',
-          valueFormat: "timestamp",
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'timeVal',
-          defaultSelect: []
+					defaultSelect: [],
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:energy-quantity-manual:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:energy-quantity-manual:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',
-          plain: true
+					plain: true,
 				},
 				{
-          type: this.$auth.hasPermi('base:energy-quantity-manual:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:energy-quantity-manual:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
-      tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -122,150 +150,174 @@ export default {
 				this.$auth.hasPermi('base:energy-quantity-manual:create')
 					? {
 							type: 'meterReading',
-            btnName: '抄表'
+							btnName: '抄表',
 					  }
 					: undefined,
 				this.$auth.hasPermi('base:energy-quantity-manual:update')
 					? {
 							type: 'edit',
-            btnName: '编辑'
+							btnName: '编辑',
 					  }
 					: undefined,
 				this.$auth.hasPermi('base:energy-quantity-manual:delete')
 					? {
 							type: 'delete',
-            btnName: '删除'
+							btnName: '删除',
 					  }
-          : undefined
+					: undefined,
 			].filter((v) => v),
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 20,
 				energyTypeId: '',
-        recordTime: []
+				recordTime: [],
 			},
 			energyTypeList: [],
 			exportList: [],
 			addOrEditTitle: '',
 			centervisible: false,
-
 		};
 	},
 	components: { EnergyQuantityManualAdd },
+	mixins: [tableHeightMixin],
 	created() {
-    window.addEventListener('resize', () => {
+		let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
-      this.tableH = this.tableHeight(260)
+		let start = moment(
-    })
+			moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
-    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
+		).valueOf();
-    let start = moment(moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')).valueOf()
+		this.formConfig[1].defaultSelect = [start, end];
-    this.formConfig[1].defaultSelect = [start, end]
+		this.queryParams.recordTime[0] = start;
-    this.queryParams.recordTime[0] = start
+		this.queryParams.recordTime[1] = end;
-    this.queryParams.recordTime[1] = end
 		this.getList();
-    this.getTypeList()
+		this.getTypeList();
 	},
 	methods: {
 		buttonClick(val) {
 			this.queryParams.pageNo = 1;
-      this.queryParams.energyTypeId = val.energyTypeId
+			this.queryParams.energyTypeId = val.energyTypeId;
-      this.queryParams.recordTime[0] = val.timeVal ? moment(moment(val.timeVal[0]).format('YYYY-MM-DD 00:00:00')).valueOf() : null
+			this.queryParams.recordTime[0] = val.timeVal
-      this.queryParams.recordTime[1] = val.timeVal ? moment(moment(val.timeVal[1]).format('YYYY-MM-DD 23:59:59')).valueOf() : null
+				? moment(moment(val.timeVal[0]).format('YYYY-MM-DD 00:00:00')).valueOf()
+				: null;
+			this.queryParams.recordTime[1] = val.timeVal
+				? moment(moment(val.timeVal[1]).format('YYYY-MM-DD 23:59:59')).valueOf()
+				: null;
 			switch (val.btnName) {
 				case 'search':
-          this.getList()
+					this.getList();
-          break
+					break;
 				case 'add':
-          this.addOrEditTitle = '新增'
+					this.addOrEditTitle = '新增';
-          this.centervisible = true
+					this.centervisible = true;
-          let params = {}
+					let params = {};
-          params.type = 'add'
+					params.type = 'add';
 					this.$nextTick(() => {
-            this.$refs.energyQuantityManualAdd.init(params)
+						this.$refs.energyQuantityManualAdd.init(params);
-          })
+					});
-          break
+					break;
 				default:
-          this.$modal.confirm('是否确认导出').then(() => {
+					this.$modal
-            return energyQuantityManualExport({ energyTypeId: this.queryParams.energyTypeId, recordTime: this.queryParams.recordTime });
+						.confirm('是否确认导出')
-          }).then(response => {
+						.then(() => {
+							return energyQuantityManualExport({
+								energyTypeId: this.queryParams.energyTypeId,
+								recordTime: this.queryParams.recordTime,
+							});
+						})
+						.then((response) => {
 							this.$download.excel(response, '能源报表.xls');
-          }).catch(() => { })
+						})
+						.catch(() => {});
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      energyQuantityManualPage(this.queryParams).then(response => {
+			energyQuantityManualPage(this.queryParams).then((response) => {
-        let arr = response.data.list || []
+				let arr = response.data.list || [];
-        arr && arr.map(item => {
+				arr &&
-          item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : ''
+					arr.map((item) => {
-        })
+						item.amount = item.amount
-        this.list = arr
+							? !isNaN(parseFloat(item.amount)) && isFinite(item.amount)
+								? item.amount.toFixed(2)
+								: ''
+							: '';
+						this.getDictDatas('energy_type').map((subItem) => {
+							if (item.energyType === subItem.value) {
+								item.energyTypeLabel = subItem.label;
+							}
+						});
+					});
+				this.list = arr;
 				this.total = response.data.total;
-        this.exportList = []
+				this.exportList = [];
 			});
 		},
 		getTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        this.formConfig[0].selectOptions = res.data || []
+				this.formConfig[0].selectOptions = res.data || [];
-        this.energyTypeList = res.data || []
+				this.energyTypeList = res.data || [];
-      })
+			});
 		},
 		selectChange(val) {
-      console.log(val)
+			console.log(val);
-      this.exportList = val
+			this.exportList = val;
 		},
 		handleClick(val) {
-      console.log(val)
+			console.log(val);
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
-          this.centervisible = true
+					this.centervisible = true;
-          let paramA = {}
+					let paramA = {};
-          paramA.type = 'edit'
+					paramA.type = 'edit';
-          paramA.id = val.data.id
+					paramA.id = val.data.id;
 					this.$nextTick(() => {
-            this.$refs.energyQuantityManualAdd.init(paramA)
+						this.$refs.energyQuantityManualAdd.init(paramA);
-          })
+					});
-          break
+					break;
 				case 'meterReading':
-          this.addOrEditTitle = '新增'
+					this.addOrEditTitle = '新增';
-          this.centervisible = true
+					this.centervisible = true;
-          let paramB = {}
+					let paramB = {};
-          paramB.type = 'meterReading'
+					paramB.type = 'meterReading';
-          paramB.energyTypeId = val.data.energyTypeId
+					paramB.energyTypeId = val.data.energyTypeId;
-          paramB.tableName = val.data.tableName
+					paramB.tableName = val.data.tableName;
 					this.$nextTick(() => {
-            this.$refs.energyQuantityManualAdd.init(paramB)
+						this.$refs.energyQuantityManualAdd.init(paramB);
-          })
+					});
-          break
+					break;
 				default:
-          this.handleDelete(val.data)
+					this.handleDelete(val.data);
 			}
 		},
 		// 新增
 		handleCancel() {
-      this.$refs.energyQuantityManualAdd.formClear()
+			this.$refs.energyQuantityManualAdd.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.energyQuantityManualAdd.submitForm()
+			this.$refs.energyQuantityManualAdd.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-      console.log(row.id)
+			console.log(row.id);
-      this.$modal.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?').then(function () {
+			this.$modal
+				.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
+				.then(function () {
 					return energyQuantityManualDelete({ id: row.id });
-      }).then(() => {
+				})
+				.then(() => {
 					this.queryParams.pageNo = 1;
 					this.getList();
-        this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-      }).catch(() => { });
+				})
-    }
+				.catch(() => {});
-  }
+		},
+	},
 };
 </script>

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

@@ -1,99 +1,114 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
 		<!-- 列表 -->
-    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+		<base-table
-      :selectWidth="55" :max-height="tableH" @selection-change="selectChange" />
+			:page="queryParams.pageNo"
-    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+			:limit="queryParams.pageSize"
+			:table-props="tableProps"
+			:table-data="list"
+			:selectWidth="55"
+			:max-height="tableH"
+			@selection-change="selectChange" />
+		<pagination
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			:total="total"
 			@pagination="getList" />
 	</div>
 </template>
 
 <script>
-import { getEnergyQuantityRealtimePage } from "@/api/base/energyQuantityRealtime"
+import { getEnergyQuantityRealtimePage } from '@/api/base/energyQuantityRealtime';
-import { getEnergyTypeListAll } from "@/api/base/energyType"
+import { getEnergyTypeListAll } from '@/api/base/energyType';
-// import { publicFormatter } from '@/utils/dict'
+// import { publicFormatter } from '@/utils/dict';
-import FileSaver from "file-saver"
+import FileSaver from 'file-saver';
-import * as XLSX from 'xlsx/xlsx.mjs'
+import * as XLSX from 'xlsx/xlsx.mjs';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'objName',
 		label: '统计对象',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'objCode',
 		label: '对象编码',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
-    prop: 'energyTypeName',
+		prop: 'energyTypeLabel',
 		label: '能源类型',
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'startValue',
-    label: '初始值'
+		label: '初始值',
 	},
 	{
 		prop: 'endValue',
-    label: '当前值'
+		label: '当前值',
 	},
 	{
 		prop: 'diffValue',
-    label: '差值'
+		label: '差值',
 	},
 	{
 		prop: 'amount',
-    label: '金额'
+		label: '金额',
-  }
+	},
-]
+];
 export default {
-  name: "EnergyQuantityRealtime",
+	name: 'EnergyQuantityRealtime',
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
 				{
 					type: 'select',
 					label: '能源类型',
+					labelField: 'labelName',
 					selectOptions: [],
 					param: 'energyTypeId',
-          filterable: true
+					filterable: true,
 				},
 				{
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'datetimerange',
 					format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "timestamp",
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'timeVal',
 					defaultSelect: [],
-          width: 350
+					width: 350,
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('base:energy-quantity-realtime:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:energy-quantity-realtime:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
-      tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -104,78 +119,97 @@ export default {
 				pageSize: 20,
 				energyTypeId: '',
 				startTime: null,
-        endTime: null
+				endTime: null,
 			},
 			energyTypeList: [],
-      exportList: []
+			exportList: [],
 		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		if (location.href.indexOf('?') > 0) {
-      let arr = location.href.split('?')[1].split('&')
+			let arr = location.href.split('?')[1].split('&');
-      this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
+			this.formConfig[1].defaultSelect = [
+				arr[0].split('=')[1],
+				arr[1].split('=')[1],
+			];
 		} else {
-      this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()]
+			this.formConfig[1].defaultSelect = [
+				Date.now() - 7 * 24 * 3600000,
+				Date.now(),
+			];
 		}
-    this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
+		this.queryParams.startTime = this.formConfig[1].defaultSelect[0];
-    this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
+		this.queryParams.endTime = this.formConfig[1].defaultSelect[1];
 		this.getList();
-    this.getTypeList()
+		this.getTypeList();
 	},
 	watch: {
-    $route: 'initData'
+		$route: 'initData',
 	},
 	methods: {
 		initData(to) {
 			if (to.name === 'EnergyQuantityRealtime') {
 				if (location.href.indexOf('?') > 0) {
-          let arr = location.href.split('?')[1].split('&')
+					let arr = location.href.split('?')[1].split('&');
-          this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
+					this.formConfig[1].defaultSelect = [
+						arr[0].split('=')[1],
+						arr[1].split('=')[1],
+					];
 				} else {
-          this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()]
+					this.formConfig[1].defaultSelect = [
+						Date.now() - 7 * 24 * 3600000,
+						Date.now(),
+					];
 				}
-        this.queryParams.startTime = this.formConfig[1].defaultSelect[0]
+				this.queryParams.startTime = this.formConfig[1].defaultSelect[0];
-        this.queryParams.endTime = this.formConfig[1].defaultSelect[1]
+				this.queryParams.endTime = this.formConfig[1].defaultSelect[1];
-        this.getList()
+				this.getList();
 			}
 		},
 		buttonClick(val) {
 			this.queryParams.pageNo = 1;
-      this.queryParams.energyTypeId = val.energyTypeId
+			this.queryParams.energyTypeId = val.energyTypeId;
-      this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
+			this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
-      this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
+			this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
 			switch (val.btnName) {
 				case 'search':
-          this.getList()
+					this.getList();
-          break
+					break;
 				default:
-          this.exportTable()
+					this.exportTable();
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      getEnergyQuantityRealtimePage(this.queryParams).then(response => {
+			getEnergyQuantityRealtimePage(this.queryParams).then((response) => {
-        let arr = response.data.list || []
+				let arr = response.data.list || [];
-        arr && arr.map(item => {
+				arr &&
-          item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : ''
+					arr.map((item) => {
-        })
+						item.amount = item.amount
-        this.list = arr
+							? !isNaN(parseFloat(item.amount)) && isFinite(item.amount)
+								? item.amount.toFixed(2)
+								: ''
+							: '';
+						this.getDictDatas('energy_type').map((subItem) => {
+							if (item.energyTypeName === subItem.value) {
+								item.energyTypeLabel = subItem.label;
+							}
+						});
+					});
+				this.list = arr;
 				this.total = response.data.total;
-        this.exportList = []
+				this.exportList = [];
 			});
 		},
 		getTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        this.formConfig[0].selectOptions = res.data || []
+				this.formConfig[0].selectOptions = res.data || [];
-        this.energyTypeList = res.data || []
+				this.energyTypeList = res.data || [];
-      })
+			});
 		},
 		selectChange(val) {
-      console.log(val)
+			console.log(val);
-      this.exportList = val
+			this.exportList = val;
 		},
 		// 勾选导出
 		exportTable() {
@@ -183,38 +217,38 @@ export default {
 				let body = this.exportList.map((x) => [
 					x.objName,
 					x.objCode,
-          x.energyTypeName,
+					x.energyTypeLabel,
 					x.startValue,
 					x.endValue,
 					x.diffValue,
-          x.amount
+					x.amount,
-        ])
+				]);
-        let header = []
+				let header = [];
 				this.tableProps.map((y) => {
-          header.push(y.label)
+					header.push(y.label);
-        })
+				});
-        body.unshift(header)
+				body.unshift(header);
-        console.log(body)
+				console.log(body);
-        const filename = '能源抄表.xlsx'
+				const filename = '能源抄表.xlsx';
-        const ws_name = 'Sheet1'
+				const ws_name = 'Sheet1';
-        const wb = XLSX.utils.book_new()
+				const wb = XLSX.utils.book_new();
-        const ws = XLSX.utils.aoa_to_sheet(body)
+				const ws = XLSX.utils.aoa_to_sheet(body);
-        XLSX.utils.book_append_sheet(wb, ws, ws_name)
+				XLSX.utils.book_append_sheet(wb, ws, ws_name);
 				let wbout = XLSX.write(wb, {
 					bookType: 'xlsx',
 					bookSST: false,
-          type: 'array'
+					type: 'array',
-        })
+				});
 				FileSaver.saveAs(
 					new Blob([wbout], {
-            type: 'application/octet-stream'
+						type: 'application/octet-stream',
 					}),
 					filename
-        )
+				);
 			} else {
-        this.$modal.msgWarning('请勾选需要导出的数据')
+				this.$modal.msgWarning('请勾选需要导出的数据');
-      }
-    }
 			}
+		},
+	},
 };
 </script>

src/views/energy/base/energyType/components/energyTypeAdd.vue

@@ -1,79 +1,161 @@
 <template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
+	<el-form
+		ref="form"
+		:rules="rules"
+		label-width="100px"
+		:model="form">
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="能源类型" prop="name">
+				<el-form-item
-          <el-input v-model="form.name"></el-input>
+					label="能源类型"
+					prop="name">
+					<el-select
+						v-model="form.name"
+						placeholder="请选择"
+						style="width: 100%">
+						<el-option
+							v-for="item in getDictDatas(DICT_TYPE.ENERGY_TYPE)"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"></el-option>
+					</el-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-        <el-form-item label="类型编码" prop="code">
+				<el-form-item
-          <el-input v-model="form.code" disabled></el-input>
+					label="类型编码"
+					prop="code">
+					<el-input
+						v-model="form.code"
+						disabled></el-input>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="单位" prop="unit">
+				<el-form-item
-          <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
+					label="单位"
-            <el-option v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)" :key="item.value" :label="item.label"
+					prop="unit">
-              :value="item.value">
+					<el-select
-            </el-option>
+						v-model="form.unit"
+						placeholder="请选择"
+						filterable
+						style="width: 100%">
+						<el-option
+							v-for="item in getDictDatas(DICT_TYPE.UNIT_DICT)"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-        <el-form-item label="计价方式" prop="pricingMethod">
+				<el-form-item
-          <el-select v-model="form.pricingMethod" placeholder="请选择" style="width: 100%;">
+					label="计价方式"
-            <el-option label="时间段" :value='0'></el-option>
+					prop="pricingMethod">
-            <el-option label="使用量" :value='1'></el-option>
+					<el-select
-            <el-option label="固定价位" :value='2'></el-option>
+						v-model="form.pricingMethod"
+						placeholder="请选择"
+						style="width: 100%">
+						<el-option
+							label="时间段"
+							:value="0"></el-option>
+						<el-option
+							label="使用量"
+							:value="1"></el-option>
+						<el-option
+							label="固定价位"
+							:value="2"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row>
-      <el-col :span="12" v-show="form.pricingMethod === 2">
+			<el-col
-        <el-form-item label="单价(元)" prop="pricingMethod">
+				:span="12"
-          <el-input-number v-model="form.singlePrice" :precision="2" :min="0" :max="999999999"
+				v-show="form.pricingMethod === 2">
-            style="width: 100%;"></el-input-number>
+				<el-form-item
+					label="单价(元)"
+					prop="pricingMethod">
+					<el-input-number
+						v-model="form.singlePrice"
+						:precision="2"
+						:min="0"
+						:max="999999999"
+						style="width: 100%"></el-input-number>
 				</el-form-item>
 			</el-col>
-      <el-col :span="12" v-show="form.pricingMethod === 1">
+			<el-col
-        <el-form-item label="计量维度" prop="dim">
+				:span="12"
-          <el-select v-model="form.dim" placeholder="请选择" style="width: 100%;">
+				v-show="form.pricingMethod === 1">
-            <el-option label="月" :value='4'></el-option>
+				<el-form-item
-            <el-option label="年" :value='5'></el-option>
+					label="计量维度"
+					prop="dim">
+					<el-select
+						v-model="form.dim"
+						placeholder="请选择"
+						style="width: 100%">
+						<el-option
+							label="月"
+							:value="4"></el-option>
+						<el-option
+							label="年"
+							:value="5"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
-      <el-col :span="24" v-show="form.pricingMethod === 0">
+			<el-col
-        <el-form-item label="时间段" prop="pricingMethod">
+				:span="24"
-          <base-table :key='timeKye' :table-props="tableProps1" :table-data="tableData1"
+				v-show="form.pricingMethod === 0">
-            :add-button-show="addButtonShow" @emitButtonClick="emitButtonClick1" @emitFun="inputChange1">
+				<el-form-item
-            <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+					label="时间段"
+					prop="pricingMethod">
+					<base-table
+						:key="timeKye"
+						:table-props="tableProps1"
+						:table-data="tableData1"
+						:add-button-show="addButtonShow"
+						@emitButtonClick="emitButtonClick1"
+						@emitFun="inputChange1">
+						<method-btn
+							v-if="tableBtn.length"
+							slot="handleBtn"
+							:width="80"
+							label="操作"
+							:method-list="tableBtn"
 							@clickBtn="handleClick1" />
 					</base-table>
 				</el-form-item>
 			</el-col>
-      <el-col :span="24" v-show="form.pricingMethod === 1">
+			<el-col
-        <el-form-item label="使用量" prop="pricingMethod">
+				:span="24"
-          <base-table :key='usedKye' :table-props="tableProps2" :table-data="tableData2"
+				v-show="form.pricingMethod === 1">
-            :add-button-show="addButtonShow" @emitButtonClick="emitButtonClick2" @emitFun="inputChange2">
+				<el-form-item
-            <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+					label="使用量"
+					prop="pricingMethod">
+					<base-table
+						:key="usedKye"
+						:table-props="tableProps2"
+						:table-data="tableData2"
+						:add-button-show="addButtonShow"
+						@emitButtonClick="emitButtonClick2"
+						@emitFun="inputChange2">
+						<method-btn
+							v-if="tableBtn.length"
+							slot="handleBtn"
+							:width="80"
+							label="操作"
+							:method-list="tableBtn"
 							@clickBtn="handleClick2" />
 					</base-table>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row>
-      <el-col :span="12">
+			<el-col :span="24">
-        <el-form-item label="是否推送" prop="push">
+				<el-form-item
-          <el-switch v-model="form.push"></el-switch>
+					label="描述"
-        </el-form-item>
+					prop="description">
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="描述" prop="description">
 					<el-input v-model="form.description"></el-input>
 				</el-form-item>
 			</el-col>
@@ -81,26 +163,31 @@
 	</el-form>
 </template>
 <script>
-import { getEnergyType, updateEnergyType, createEnergyType, getEnergyTypeCode } from '@/api/base/energyType'
+import {
-import inputArea from './InputArea.vue'
+	getEnergyType,
-import timePickerArea from './TimePickerArea.vue'
+	updateEnergyType,
+	createEnergyType,
+	getEnergyTypeCode,
+} from '@/api/base/energyType';
+import inputArea from './InputArea.vue';
+import timePickerArea from './TimePickerArea.vue';
 const tableProps1 = [
 	{
 		prop: 'startTime',
 		label: '开始时间',
-    subcomponent: timePickerArea
+		subcomponent: timePickerArea,
 	},
 	{
 		prop: 'endTime',
 		label: '结束时间',
-    subcomponent: timePickerArea
+		subcomponent: timePickerArea,
 	},
 	{
 		prop: 'price',
 		label: '单价(元)',
-    subcomponent: inputArea
+		subcomponent: inputArea,
-  }
+	},
-]
+];
 const tableProps2 = [
 	{
 		prop: 'startUsed',
@@ -110,14 +197,14 @@ const tableProps2 = [
 	{
 		prop: 'endUsed',
 		label: '上限量',
-    subcomponent: inputArea
+		subcomponent: inputArea,
 	},
 	{
 		prop: 'price',
 		label: '单价(元)',
-    subcomponent: inputArea
+		subcomponent: inputArea,
-  }
+	},
-]
+];
 export default {
 	name: 'energyTypeAdd',
 	data() {
@@ -130,13 +217,16 @@ export default {
 				singlePrice: 0,
 				pricingMethod: 2,
 				dim: '',
-        push: false,
+				description: '',
-        description: ''
 			},
 			isEdit: false, //是否是编辑
 			rules: {
-        name: [{ required: true, message: '能源类型不能为空', trigger: 'blur' }],
+				name: [
-        pricingMethod: [{ required: true, message: '计价方式不能为空', trigger: 'change' }]
+					{ required: true, message: '能源类型不能为空', trigger: 'blur' },
+				],
+				pricingMethod: [
+					{ required: true, message: '计价方式不能为空', trigger: 'change' },
+				],
 			},
 			timeKye: 0,
 			usedKye: 0,
@@ -147,92 +237,91 @@ export default {
 			tableBtn: [
 				{
 					type: 'delete',
-          name: '删除'
+					name: '删除',
-        }
+				},
 			],
-      addButtonShow: '新增'
+			addButtonShow: '新增',
-    }
+		};
 	},
 	methods: {
 		init(id) {
 			if (id) {
-        this.isEdit = true
+				this.isEdit = true;
-        this.form.id = id
+				this.form.id = id;
 				getEnergyType(id).then((res) => {
 					if (res.code === 0) {
-            this.form.name = res.data.name
+						this.form.name = res.data.name;
-            this.form.code = res.data.code
+						this.form.code = res.data.code;
-            this.form.unit = res.data.unit
+						this.form.unit = res.data.unit;
-            this.form.pricingMethod = res.data.pricingMethod
+						this.form.pricingMethod = res.data.pricingMethod;
-            this.form.push = res.data.push ? true : false
+						this.form.description = res.data.description;
-            this.form.description = res.data.description
 						switch (this.form.pricingMethod) {
 							case 0:
-                this.tableData1 = res.data.segPriceList || []
+								this.tableData1 = res.data.segPriceList || [];
 								break;
 							case 1:
-                this.tableData2 = res.data.usedPriceList || []
+								this.tableData2 = res.data.usedPriceList || [];
-                this.form.dim = res.data.dim
+								this.form.dim = res.data.dim;
 								break;
 							default:
-                this.form.singlePrice = res.data.singlePrice || 0
+								this.form.singlePrice = res.data.singlePrice || 0;
 						}
 					}
-        })
+				});
-        console.log(this.form)
+				console.log(this.form);
 			} else {
-        this.isEdit = false
+				this.isEdit = false;
-        this.form.id = ''
+				this.form.id = '';
 				getEnergyTypeCode().then((res) => {
-          this.form.code = res.data
+					this.form.code = res.data;
-        })
+				});
 			}
 		},
 		// 输入框失去焦点
 		inputChange1(val) {
-      this.tableData1[val._pageIndex - 1][val.prop] = val[val.prop]
+			this.tableData1[val._pageIndex - 1][val.prop] = val[val.prop];
-      if ((this.tableData1.length > val._pageIndex) && val.prop === 'endTime') {
+			if (this.tableData1.length > val._pageIndex && val.prop === 'endTime') {
-        this.tableData1[val._pageIndex].startTime = val[val.prop]
+				this.tableData1[val._pageIndex].startTime = val[val.prop];
 			}
-      this.timeKye++
+			this.timeKye++;
 		},
 		inputChange2(val) {
 			// 上限值必须大于下限值
-      if (!!val.endUsed && (val.endUsed <= val.startUsed)) {
+			if (!!val.endUsed && val.endUsed <= val.startUsed) {
-        this.$modal.msgError('上限值不能等于或者小于下限值')
+				this.$modal.msgError('上限值不能等于或者小于下限值');
-        return false
+				return false;
 			}
-      this.tableData2[val._pageIndex - 1][val.prop] = val[val.prop]
+			this.tableData2[val._pageIndex - 1][val.prop] = val[val.prop];
-      if ((this.tableData2.length > val._pageIndex) && val.prop === 'endUsed') {
+			if (this.tableData2.length > val._pageIndex && val.prop === 'endUsed') {
-        this.tableData2[val._pageIndex].startUsed = val[val.prop]
+				this.tableData2[val._pageIndex].startUsed = val[val.prop];
 			}
-      this.usedKye++
+			this.usedKye++;
 		},
 		// 增加
 		emitButtonClick1() {
-      let n = this.tableData1.length
+			let n = this.tableData1.length;
-      let obj = {}
+			let obj = {};
-      obj.startTime = n === 0 ? '' : this.tableData1[n - 1].endTime
+			obj.startTime = n === 0 ? '' : this.tableData1[n - 1].endTime;
-      obj.endTime = ''
+			obj.endTime = '';
-      obj.price = 0
+			obj.price = 0;
-      this.tableData1.push(obj)
+			this.tableData1.push(obj);
 		},
 		emitButtonClick2() {
-      let n = this.tableData2.length
+			let n = this.tableData2.length;
-      let obj = {}
+			let obj = {};
-      obj.startUsed = n === 0 ? 0 : this.tableData2[n - 1].endUsed
+			obj.startUsed = n === 0 ? 0 : this.tableData2[n - 1].endUsed;
-      obj.endUsed = 0
+			obj.endUsed = 0;
-      obj.price = 0
+			obj.price = 0;
-      this.tableData2.push(obj)
+			this.tableData2.push(obj);
 		},
 		// 删除
 		handleClick1(val) {
-      this.tableData1.splice(val.data._pageIndex - 1, 1)
+			this.tableData1.splice(val.data._pageIndex - 1, 1);
-      this.timeKye++
+			this.timeKye++;
 		},
 		handleClick2(val) {
-      this.tableData2.splice(val.data._pageIndex - 1, 1)
+			this.tableData2.splice(val.data._pageIndex - 1, 1);
-      this.usedKye++
+			this.usedKye++;
 		},
 		submitForm() {
 			this.$refs['form'].validate((valid) => {
@@ -240,37 +329,37 @@ export default {
 					switch (this.form.pricingMethod) {
 						case 0: // 时间段
 							if (this.tableData1.length === 0) {
-                this.$modal.msgError('时间段表格数据不能为空')
+								this.$modal.msgError('时间段表格数据不能为空');
-                return false
+								return false;
 							} else {
-                this.tableData1.map(item => {
+								this.tableData1.map((item) => {
 									if (item.price <= 0) {
-                    this.$modal.msgError('单价有误请检查，请检查')
+										this.$modal.msgError('单价有误请检查，请检查');
-                    return false
+										return false;
 									}
-                })
+								});
 							}
 							break;
 						case 1: // 使用量
 							if (this.tableData2.length === 0) {
-                this.$modal.msgError('使用量表格数据不能为空')
+								this.$modal.msgError('使用量表格数据不能为空');
-                return false
+								return false;
 							} else {
-                this.tableData1.map(item => {
+								this.tableData1.map((item) => {
 									if (item.price <= 0) {
-                    this.$modal.msgError('单价有误请检查，请检查')
+										this.$modal.msgError('单价有误请检查，请检查');
-                    return false
+										return false;
 									}
-                })
+								});
 							}
 							break;
 						default: // 固定单价
 							if (!this.form.singlePrice) {
-                this.$modal.msgError('单价有误请检查，请检查')
+								this.$modal.msgError('单价有误请检查，请检查');
-                return false
+								return false;
 							}
 					}
-          console.log(this.form)
+					console.log(this.form);
 					if (this.isEdit) {
 						// 编辑
 						updateEnergyType({
@@ -281,16 +370,18 @@ export default {
 							pricingMethod: this.form.pricingMethod,
 							description: this.form.description,
 							dim: this.form.pricingMethod === 1 ? this.form.dim : '',
-              singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
+							singlePrice:
-              segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [],
+								this.form.pricingMethod === 2 ? this.form.singlePrice : '',
-              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [],
+							segPriceList:
-              push: this.form.push ? 1 : 0
+								this.form.pricingMethod === 0 ? this.tableData1 : [],
+							usedPriceList:
+								this.form.pricingMethod === 1 ? this.tableData2 : [],
 						}).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					} else {
 						createEnergyType({
 							code: this.form.code,
@@ -299,31 +390,33 @@ export default {
 							pricingMethod: this.form.pricingMethod,
 							description: this.form.description,
 							dim: this.form.pricingMethod === 1 ? this.form.dim : '',
-              singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
+							singlePrice:
-              segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [],
+								this.form.pricingMethod === 2 ? this.form.singlePrice : '',
-              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [],
+							segPriceList:
-              push: this.form.push ? 1 : 0
+								this.form.pricingMethod === 0 ? this.tableData1 : [],
+							usedPriceList:
+								this.form.pricingMethod === 1 ? this.tableData2 : [],
 						}).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					}
 				} else {
-          return false
+					return false;
 				}
-      })
+			});
 		},
 		formClear() {
-      this.$refs.form.resetFields()
+			this.$refs.form.resetFields();
-      this.form.singlePrice = 0
+			this.form.singlePrice = 0;
-      this.isEdit = false
+			this.isEdit = false;
-      this.timeKye = 0
+			this.timeKye = 0;
-      this.usedKye = 0
+			this.usedKye = 0;
-      this.tableData1 = []
+			this.tableData1 = [];
-      this.tableData2 = []
+			this.tableData2 = [];
-    }
+		},
-  }
+	},
-}
+};
 </script>

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

@@ -1,224 +1,195 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
-      @headBtnClick="buttonClick"
+			:removeBlue="true"
-    />
+			@headBtnClick="buttonClick" />
 		<!-- 列表 -->
 		<base-table
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-props="tableProps"
 			:table-data="list"
-      :max-height="tableH"
+			:max-height="tableH">
-    >
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				:width="80"
 				label="操作"
 				:method-list="tableBtn"
-        @clickBtn="handleClick"
+				@clickBtn="handleClick" />
-      />
 		</base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
 		<!-- 新增 -->
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
 			:dialogVisible="centervisible"
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
-      :before-close="handleCancel"
+			:before-close="handleCancel">
-    >
+			<energy-type-add
-      <energy-type-add ref="energyType" @successSubmit="successSubmit" />
+				ref="energyType"
+				@successSubmit="successSubmit" />
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-import { getEnergyTypePage, deleteEnergyType } from "@/api/base/energyType";
+import { getEnergyTypePage, deleteEnergyType } from '@/api/base/energyType';
-import { publicFormatter } from '@/utils/dict'
+import { publicFormatter } from '@/utils/dict';
-import InnerTable from './components/InnerTable'
+import InnerTable from './components/InnerTable';
-import EnergyTypeAdd from './components/energyTypeAdd'
+import EnergyTypeAdd from './components/energyTypeAdd';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'code',
 		label: '类型编码',
 		showOverflowtooltip: true,
-    minWidth: 150
+		minWidth: 150,
 	},
 	{
-    prop: 'name',
+		prop: 'energyTypeLabel',
-    label: '能源类型'
+		label: '能源类型',
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-    filter: publicFormatter('energy_unit')
+		filter: publicFormatter('unit_dict'),
 	},
 	{
 		prop: 'pricingMethod',
-    label: '计价方式'
+		label: '计价方式',
-  },
-  {
-    prop: 'push',
-    label: '是否推送',
-    filter: publicFormatter('push')
 	},
 	{
 		prop: 'price',
 		label: '价格(元)',
-    subcomponent: InnerTable
+		subcomponent: InnerTable,
-  }
+	},
-]
+];
 export default {
-  name: "EnergyType",
+	name: 'EnergyType',
 	components: { EnergyTypeAdd },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
-        {
-          type: 'input',
-          label: '能源类型',
-          placeholder: '能源类型',
-          param: 'name'
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: this.$auth.hasPermi('base:energy-type:create') ? 'separate' : '',
-        },
 				{
 					type: this.$auth.hasPermi('base:energy-type:create') ? 'button' : '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
 			tableBtn: [
 				this.$auth.hasPermi('base:energy-type:update')
 					? {
 							type: 'edit',
-              btnName: '编辑'
+							btnName: '编辑',
 					  }
 					: undefined,
 				this.$auth.hasPermi('base:energy-type:delete')
 					? {
 							type: 'delete',
-              btnName: '删除'
+							btnName: '删除',
 					  }
-          : undefined
+					: undefined,
 			].filter((v) => v),
-      tableH: this.tableHeight(260),
+			heightNum: 220,
 			pricingMethodList: [
 				{ value: 0, label: '分时间段计价' },
 				{ value: 1, label: '分使用量计价' },
-        {value: 2,label: '单一计价'}
+				{ value: 2, label: '单一计价' },
 			],
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
 			list: [],
 			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
 			// 是否显示弹出层
 			centervisible: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-        pageSize: 20,
+				pageSize: 100,
-        name: null,
+			},
-        code: null
-      }
 		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		this.getList();
 	},
 	methods: {
-    buttonClick(val) {
+		buttonClick() {
-      switch (val.btnName) {
+			this.addOrEditTitle = '新增';
-        case 'search':
+			this.centervisible = true;
-          this.queryParams.pageNo = 1;
-          this.queryParams.name = val.name
-          this.queryParams.code = val.code
-          this.getList()
-          break
-        default:
-          this.addOrEditTitle = '新增'
-          this.centervisible = true
 			this.$nextTick(() => {
-            this.$refs.energyType.init()
+				this.$refs.energyType.init();
-          })
+			});
-      }
 		},
 		/** 查询列表 */
 		getList() {
-      getEnergyTypePage(this.queryParams).then(response => {
+			getEnergyTypePage(this.queryParams).then((response) => {
 				let arr = response.data.list || [];
-        arr&&arr.map(item => {
+				arr &&
-          this.pricingMethodList.map(i => {
+					arr.map((item) => {
+						this.pricingMethodList.map((i) => {
 							if (item.pricingMethod === i.value) {
-              item.pricingMethod = i.label
+								item.pricingMethod = i.label;
 							}
-          })
+						});
-        })
+						this.getDictDatas('energy_type').map((subItem) => {
-        this.list = arr
+							if (item.name === subItem.value) {
+								item.energyTypeLabel = subItem.label;
+							}
+						});
+					});
+				this.list = arr;
 				this.total = response.data.total;
 			});
 		},
 		handleClick(val) {
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
 					this.$nextTick(() => {
-            this.$refs.energyType.init(val.data.id)
+						this.$refs.energyType.init(val.data.id);
-          })
+					});
-          this.centervisible = true
+					this.centervisible = true;
-          break
+					break;
 				default:
-        this.handleDelete(val.data)
+					this.handleDelete(val.data);
 			}
 		},
 		handleCancel() {
-      this.$refs.energyType.formClear()
+			this.$refs.energyType.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.energyType.submitForm()
+			this.$refs.energyType.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-      this.$modal.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?').then(function() {
+			console.log(row);
+			this.$modal
+				.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
+				.then(function () {
 					return deleteEnergyType(row.id);
-        }).then(() => {
+				})
+				.then(() => {
 					this.queryParams.pageNo = 1;
 					this.getList();
-          this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-        }).catch(() => {});
+				})
-    }
+				.catch(() => {});
-  }
+		},
+	},
 };
 </script>

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

@@ -0,0 +1,76 @@
+<template>
+	<el-form
+		ref="form"
+		label-width="100px"
+		:model="form">
+		<el-form-item
+			label="能源类型"
+			prop="energyType">
+			<el-input v-model="form.energyType"></el-input>
+		</el-form-item>
+		<el-form-item
+			label="能源表名"
+			prop="tableIds">
+			<el-select
+				v-model="form.tableIds"
+				placeholder="请选择"
+				style="width: 100%"
+				:multiple="true"
+				filterable>
+				<el-option
+					v-for="dict in getDictDatas('table_name')"
+					:key="dict.id"
+					:label="dict.label"
+					:value="dict.id" />
+			</el-select>
+		</el-form-item>
+	</el-form>
+</template>
+<script>
+import {
+	energyTableGet,
+	energyTableUpdate,
+} from '@/api/base/energyQuantityManual';
+export default {
+	name: 'TableNameConfigUpdate',
+	data() {
+		return {
+			form: {
+				energyType: '',
+				energyTypeId: '',
+				tableIds: [],
+			},
+		};
+	},
+	methods: {
+		init(id) {
+			energyTableGet({ energyTypeId: id }).then((res) => {
+				this.form.energyType = res.data.energyType || '';
+				this.form.energyTypeId = res.data.energyTypeId || '';
+				this.form.tableIds =
+					res.data.tableObjs &&
+					res.data.tableObjs.map((item) => {
+						return item.id;
+					});
+			});
+		},
+		submitForm() {
+			this.$refs['form'].validate((valid) => {
+				// 编辑
+				energyTableUpdate({ ...this.form }).then((res) => {
+					if (res.code === 0) {
+						this.$modal.msgSuccess('操作成功');
+						this.$emit('successSubmit');
+					}
+				});
+			});
+		},
+		formClear() {
+			this.form.energyType = '';
+			this.form.energyTypeId = '';
+			this.form.tableIds = [];
+			this.isEdit = false;
+		},
+	},
+};
+</script>

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

@@ -0,0 +1,108 @@
+<template>
+	<div class="app-container">
+		<!-- 列表 -->
+		<base-table
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-props="tableProps"
+			:table-data="list"
+			:max-height="tableH">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="80"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleClick" />
+		</base-table>
+		<!-- 新增 -->
+		<base-dialog
+			dialogTitle="编辑"
+			:dialogVisible="centervisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel">
+			<table-name-config-update
+				ref="tableNameConfigU"
+				@successSubmit="successSubmit" />
+		</base-dialog>
+	</div>
+</template>
+<script>
+import { energyTablePage } from '@/api/base/energyQuantityManual';
+import { publicFormatter } from '@/utils/dict';
+import tableNameConfigUpdate from './components/tableNameConfigUpdate.vue';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+const tableProps = [
+	{
+		prop: 'energyType',
+		label: '能源类型',
+		width: 200,
+		filter: publicFormatter('energy_type'),
+	},
+	{
+		prop: 'tableName',
+		label: '能源表名',
+	},
+];
+export default {
+	name: 'TableNameConfig',
+	components: { tableNameConfigUpdate },
+	data() {
+		return {
+			tableProps,
+			tableBtn: [
+				this.$auth.hasPermi('base:table-name-config:edit')
+					? {
+							type: 'edit',
+							btnName: '编辑',
+					  }
+					: undefined,
+			].filter((v) => v),
+			list: [],
+			queryParams: {
+				pageNo: 1,
+				pageSize: 100,
+			},
+			heightNum: 165,
+			centervisible: false,
+		};
+	},
+	mixins: [tableHeightMixin],
+	created() {
+		this.getList();
+	},
+	methods: {
+		getList() {
+			energyTablePage({ ...this.queryParams }).then((res) => {
+				let temp = res.data.list || [];
+				this.list = temp.map((item) => {
+					return {
+						energyType: item.energyType,
+						energyTypeId: item.energyTypeId,
+						tableName: item.tables.join('、'),
+					};
+				});
+			});
+		},
+		handleClick(val) {
+			console.log('编辑');
+			this.centervisible = true;
+			this.$nextTick(() => {
+				this.$refs.tableNameConfigU.init(val.data.energyTypeId);
+			});
+		},
+		handleCancel() {
+			this.$refs.tableNameConfigU.formClear();
+			this.centervisible = false;
+		},
+		handleConfirm() {
+			this.$refs.tableNameConfigU.submitForm();
+		},
+		successSubmit() {
+			this.handleCancel();
+			this.getList();
+		},
+	},
+};
+</script>

src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue

@@ -1,97 +1,159 @@
 <template>
-  <el-form ref="form" :rules="rules" label-width="110px" :model="form">
+	<el-form
+		ref="form"
+		:rules="rules"
+		label-width="110px"
+		:model="form">
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="抄表方式" prop="method">
+				<el-form-item
-          <el-select v-model="form.method" placeholder="请选择" style="width: 100%;" @change="changeMethod">
+					label="抄表方式"
+					prop="method">
+					<el-select
+						v-model="form.method"
+						placeholder="请选择"
+						style="width: 100%"
+						@change="changeMethod">
 						<el-option
 							v-for="item in getDictDatas(DICT_TYPE.METHOD)"
 							:key="item.value"
 							:label="item.label"
-              :value="item.value">
+							:value="item.value"></el-option>
-            </el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
-      <el-col :span="12" v-if='form.method == 1'>
+			<el-col
-        <el-form-item label="监控对象" prop="objectId">
+				:span="12"
+				v-if="form.method == 1">
+				<el-form-item
+					label="监控对象"
+					prop="objectId">
 					<el-cascader
-            style='width: 100%;'
+						style="width: 100%"
 						v-model="objIds"
 						:options="objList"
 						:props="{ checkStrictly: true, value: 'id', label: 'name' }"
-            popper-class="cascaderParent"
 						@change="selectObj"
 						clearable></el-cascader>
 				</el-form-item>
 			</el-col>
-      <el-col :span="12" v-if='form.method == 2'>
+			<el-col :span="12">
-        <el-form-item label="水/气表名" prop="tableName">
+				<el-form-item
-          <el-select v-model="form.tableName" placeholder="请选择" style="width: 100%;">
+					label="监控能源类型"
+					prop="energyTypeId">
+					<el-select
+						v-model="form.energyTypeId"
+						placeholder="请选择"
+						style="width: 100%"
+						filterable
+						@change="toggleType">
+						<el-option
+							v-for="item in this.energyTypeList"
+							:key="item.id"
+							:label="item.labelName"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col
+				:span="12"
+				v-if="form.method == 2">
+				<el-form-item
+					label="能源表名"
+					prop="tableName">
+					<el-select
+						v-model="form.tableName"
+						placeholder="请选择"
+						style="width: 100%">
 						<el-option
 							v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
 							:key="item.value"
 							:label="item.label"
-              :value="item.value">
+							:value="item.value"></el-option>
-            </el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
-      <el-col :span="12">
+			<el-col
-        <el-form-item label="监控能源类型" prop="energyTypeId">
+				:span="12"
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable @change="toggleType">
+				v-if="form.method == 1">
+				<el-form-item
+					label="监控模式"
+					prop="type">
+					<el-select
+						v-model="form.type"
+						placeholder="请选择"
+						style="width: 100%"
+						@change="typeChange">
 						<el-option
-              v-for="item in this.energyTypeList"
+							label="合并"
-              :key="item.id"
+							:value="1"></el-option>
-              :label="item.name"
+						<el-option
-              :value="item.id">
+							label="详细"
-            </el-option>
+							:value="2"></el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
-      <el-col :span="12" v-if='form.method == 1'>
+			<el-col
-        <el-form-item label="监控模式" prop="type">
+				:span="12"
-          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
+				v-if="form.method == 1">
-            <el-option label="合并" :value= "1" ></el-option>
+				<el-form-item
-            <el-option label="详细" :value= "2" ></el-option>
+					label="监控详细参数"
-          </el-select>
+					prop="type"
-        </el-form-item>
+					v-if="form.type === 2">
-      </el-col>
+					<el-select
-      <el-col :span="12" v-if='form.method == 1'>
+						v-model="form.plcParamId"
-        <el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
+						placeholder="请选择"
-          <el-select v-model="form.plcParamId" placeholder="请选择" style="width: 100%;" @change="selectDetail">
+						style="width: 100%"
+						@change="selectDetail">
 						<el-option
 							v-for="item in detailList"
 							:key="item.id"
 							:label="item.name"
-              :value="item.id">
+							:value="item.id"></el-option>
-            </el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-        <el-form-item label="指标类型" prop="limitType">
+				<el-form-item
-          <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;" :disabled='form.method == 2'>
+					label="指标类型"
+					prop="limitType">
+					<el-select
+						v-model="form.limitType"
+						placeholder="请选择"
+						style="width: 100%"
+						:disabled="form.method == 2">
 						<el-option
 							v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
 							:key="item.value"
 							:label="item.label"
-              :value="item.value">
+							:value="item.value"></el-option>
-            </el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
 				<el-form-item label="消耗量阈值">
-          <el-input-number v-model="form.minValue" placeholder="最小值" :max="9999999" style="width: 50%;"></el-input-number>
+					<el-input-number
-          <el-input-number v-model="form.maxValue" placeholder="最大值" :max="9999999" style="width: 50%;"></el-input-number>
+						v-model="form.minValue"
+						placeholder="最小值"
+						:max="9999999"
+						style="width: 50%"></el-input-number>
+					<el-input-number
+						v-model="form.maxValue"
+						placeholder="最大值"
+						:max="9999999"
+						style="width: 50%"></el-input-number>
 				</el-form-item>
 			</el-col>
 		</el-row>
 	</el-form>
 </template>
 <script>
-import { getEnergyLimit, updateEnergyLimit, createEnergyLimit, getEnergyParamList } from '@/api/monitoring/energyLimit'
+import {
+	getEnergyLimit,
+	updateEnergyLimit,
+	createEnergyLimit,
+	getEnergyParamList,
+} from '@/api/monitoring/energyLimit';
 export default {
 	name: 'energyLimitAdd',
 	props: {
@@ -99,13 +161,13 @@ export default {
 			type: Array,
 			required: true,
 			default: () => {
-        return []
+				return [];
-      }
+			},
 		},
 		objList: {
 			type: Array,
-      default: () => []
+			default: () => [],
-    }
+		},
 	},
 	data() {
 		return {
@@ -119,164 +181,178 @@ export default {
 				plcParamId: '',
 				limitType: '',
 				minValue: 0,
-        maxValue: 0
+				maxValue: 0,
+				tableName: '',
 			},
 			objIds: [], // 回显数组
 			isEdit: false, //是否是编辑
 			rules: {
-        method: [{ required: true, message: '抄表方式不能为空', trigger: 'change' }],
+				method: [
-        objectId: [{ required: true, message: '监控对象不能为空', trigger: 'change' }],
+					{ required: true, message: '抄表方式不能为空', trigger: 'change' },
-        energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
+				],
-        type: [{ required: true, message: '监控模式不能为空', trigger: 'change' }],
+				objectId: [
-        limitType: [{ required: true, message: '指标类型不能为空', trigger: 'change' }]
+					{ required: true, message: '监控对象不能为空', trigger: 'change' },
+				],
+				energyTypeId: [
+					{ required: true, message: '能源类型不能为空', trigger: 'change' },
+				],
+				type: [
+					{ required: true, message: '监控模式不能为空', trigger: 'change' },
+				],
+				limitType: [
+					{ required: true, message: '指标类型不能为空', trigger: 'change' },
+				],
 			},
-      detailList: []
+			detailList: [],
-    }
+		};
 	},
 	methods: {
 		init(id) {
 			if (id) {
-        this.isEdit = true
+				this.isEdit = true;
-        this.form.id = id
+				this.form.id = id;
 				getEnergyLimit(id).then((res) => {
 					if (res.code === 0) {
-            this.form = res.data
+						this.form = res.data;
-            this.form.plcParamId = res.data.plcParamId || ''
+						this.form.plcParamId = res.data.plcParamId || '';
-            this.form.method = this.form.method ? this.form.method + '' : ''
+						this.form.tableName = this.form.tableName
-            this.form.limitType = this.form.limitType ? this.form.limitType + '' : ''
+							? this.form.tableName + ''
-            this.objIds = this.changeDetSelect(this.form.objectId, this.objList)
+							: '';
+						this.form.method = this.form.method ? this.form.method + '' : '';
+						this.form.limitType = this.form.limitType
+							? this.form.limitType + ''
+							: '';
+						this.objIds = this.changeDetSelect(
+							this.form.objectId,
+							this.objList
+						);
 						if (this.form.type === 2) {
-              this.getDetailList()
+							this.getDetailList();
 						}
 					}
-        })
+				});
 			} else {
-        this.isEdit = false
+				this.isEdit = false;
-        this.form.id = ''
+				this.form.id = '';
 			}
 		},
 		// 切换方式
 		changeMethod() {
 			if (this.form.method === '2') {
-        this.form.limitType = "2"
+				this.form.limitType = '2';
 			} else {
-        this.form.limitType = ''
+				this.form.limitType = '';
 			}
 		},
 		// 监控详细参数
 		getDetailList() {
 			getEnergyParamList({
 				objId: this.form.objectId,
-        energyTypeId: this.form.energyTypeId
+				energyTypeId: this.form.energyTypeId,
 			}).then((res) => {
 				if (res.code === 0) {
-          this.detailList = res.data
+					this.detailList = res.data;
 				} else {
-          this.detailList = []
+					this.detailList = [];
 				}
-      })
+			});
 		},
 		typeChange(val) {
-      console.log(this.form)
+			console.log(this.form);
-      this.form.plcParamId = ''
+			this.form.plcParamId = '';
 			if (val === 2) {
 				if (this.form.objectId && this.form.energyTypeId) {
-          this.getDetailList()
+					this.getDetailList();
 				}
 			}
 		},
 		toggleType() {
 			if (this.form.energyTypeId && this.form.type) {
-        this.getDetailList()
+				this.getDetailList();
-        this.form.plcParamId = ''
+				this.form.plcParamId = '';
 			}
 		},
 		// 递归处理分类回显问题
 		changeDetSelect(key, treeData) {
-      let arr = [] // 递归时操作的数组
+			let arr = []; // 递归时操作的数组
-      let returnArr = [] // 存放结果的数组
+			let returnArr = []; // 存放结果的数组
-      let depth = 0 // 定义全局层级
+			let depth = 0; // 定义全局层级
 			// 定义递归函数
 			function childrenEach(childrendData, depthN) {
 				for (var j = 0; j < childrendData.length; j++) {
-          depth = depthN
+					depth = depthN;
-          arr[depthN] = childrendData[j].id
+					arr[depthN] = childrendData[j].id;
 					if (childrendData[j].id == key) {
-            returnArr = arr.slice(0, depthN + 1)
+						returnArr = arr.slice(0, depthN + 1);
-            break
+						break;
 					} else {
 						if (childrendData[j].children) {
-              depth++
+							depth++;
-              childrenEach(childrendData[j].children, depth)
+							childrenEach(childrendData[j].children, depth);
 						}
 					}
 				}
-        return returnArr
+				return returnArr;
 			}
-      return childrenEach(treeData, depth)
+			return childrenEach(treeData, depth);
 		},
 		selectObj(val) {
-      this.form.objectId = val[val.length-1]
+			this.form.objectId = val[val.length - 1];
-      this.form.objectType = val.length-1
+			this.form.objectType = val.length;
 			if (this.form.energyTypeId && this.form.type) {
-        this.getDetailList()
+				this.getDetailList();
-        this.form.plcParamId = ''
+				this.form.plcParamId = '';
 			}
 		},
 		selectDetail() {
-      this.$forceUpdate()
+			this.$forceUpdate();
 		},
 		submitForm() {
 			this.$refs['form'].validate((valid) => {
 				if (valid) {
 					if (this.form.type === 2 && !this.form.plcParamId) {
-            this.$modal.msgError("监控模式为详细时，详细参数为必填");
+						this.$modal.msgError('监控模式为详细时，详细参数为必填');
-            return false
+						return false;
 					}
 					if (this.form.minValue && this.form.maxValue) {
 						if (this.form.minValue > this.form.maxValue) {
-              this.$modal.msgError("消耗量阈值，最小值不能大于最大值");
+							this.$modal.msgError('消耗量阈值，最小值不能大于最大值');
-              return false
+							return false;
 						}
 					}
-          this.form.minValue = this.form.minValue || 0
+					this.form.minValue = this.form.minValue || 0;
-          this.form.maxValue = this.form.maxValue || 0
+					this.form.maxValue = this.form.maxValue || 0;
 					if (this.isEdit) {
 						// 编辑
 						updateEnergyLimit({ ...this.form }).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					} else {
 						createEnergyLimit({ ...this.form }).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					}
 				} else {
-          return false
+					return false;
 				}
-      })
+			});
 		},
 		formClear() {
-      this.$refs.form.resetFields()
+			this.$refs.form.resetFields();
-      this.form.type = ''
+			this.form.type = '';
-      this.form.plcParamId = ''
+			this.form.plcParamId = '';
-      this.form.minValue = null
+			this.form.minValue = null;
-      this.form.maxValue = null
+			this.form.maxValue = null;
-      this.objIds = ''
+			this.objIds = '';
-      this.detailList = []
+			this.detailList = [];
-      this.isEdit = false
+			this.isEdit = false;
-    }
+		},
-  }
+	},
-}
+};
 </script>
-<style>
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-  display: none;
-}
-</style>

src/views/energy/monitoring/energyLimit/index.vue

@@ -1,35 +1,30 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
-      @headBtnClick="buttonClick"
+			@headBtnClick="buttonClick" />
-    />
 		<!-- 列表 -->
 		<base-table
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-props="tableProps"
 			:table-data="list"
-      :max-height="tableH"
+			:max-height="tableH">
-    >
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				:width="80"
 				label="操作"
 				:method-list="tableBtn"
-        @clickBtn="handleClick"
+				@clickBtn="handleClick" />
-      />
 		</base-table>
 		<pagination
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			:total="total"
-      @pagination="getList"
+			@pagination="getList" />
-    />
 		<!-- 新增 -->
 		<base-dialog
 			:dialogTitle="addOrEditTitle"
@@ -37,41 +32,56 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-      width='50%'
+			width="50%">
-    >
+			<energy-limit-add
-      <energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/>
+				ref="energyLimit"
+				@successSubmit="successSubmit"
+				:energyTypeList="energyTypeList"
+				:objList="objList" />
 		</base-dialog>
 	</div>
 </template>
 
 <script>
-import { getEnergyLimitPage, deleteEnergyLimit } from "@/api/monitoring/energyLimit";
+import {
-import { getEnergyTypeListAll } from "@/api/base/energyType";
+	getEnergyLimitPage,
-import { getTree } from '@/api/base/factory'
+	deleteEnergyLimit,
-import { publicFormatter } from '@/utils/dict'
+} from '@/api/monitoring/energyLimit';
-import EnergyLimitAdd from './components/energyLimitAdd'
+import { getEnergyTypeListAll } from '@/api/base/energyType';
+import { getTree } from '@/api/analysis/energyAnalysis';
+import { publicFormatter } from '@/utils/dict';
+import EnergyLimitAdd from './components/energyLimitAdd';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'method',
 		label: '抄表方式',
-    filter: publicFormatter('method')
+		filter: publicFormatter('method'),
 	},
 	{
 		prop: 'objName',
-    label: '监控对象'
+		label: '监控对象',
+		minWidth: 100,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'objCode',
-    label: '对象编码'
+		label: '对象编码',
+		minWidth: 140,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'tableName',
-    label: '水/气表名',
+		label: '能源表名',
-    filter: publicFormatter('table_name')
+		filter: publicFormatter('table_name'),
+		minWidth: 120,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'energyType',
-    label: '能源类型'
+		label: '能源类型',
+		filter: publicFormatter('energy_type'),
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'type',
@@ -80,21 +90,22 @@ const tableProps = [
 	},
 	{
 		prop: 'plcParamName',
-    label: '监控参数'
+		label: '监控参数',
 	},
 	{
 		prop: 'limitType',
 		label: '指标类型',
-    filter: publicFormatter('monitor_index_type')
+		filter: publicFormatter('monitor_index_type'),
 	},
 	{
 		prop: 'limitValue',
-    label: '阈值'
+		label: '阈值',
-  }
+	},
-]
+];
 export default {
-  name: "EnergyLimit",
+	name: 'EnergyLimit',
 	components: { EnergyLimitAdd },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -102,7 +113,8 @@ export default {
 					type: 'select',
 					label: '能源类型',
 					selectOptions: [],
-          param: 'energyTypeId'
+					labelField: 'labelName',
+					param: 'energyTypeId',
 				},
 				{
 					type: 'select',
@@ -110,47 +122,48 @@ export default {
 					selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE),
 					labelField: 'label',
 					valueField: 'value',
-          param: 'limitType'
+					param: 'limitType',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('monitoring:energy-limit:create') ? 'button' : '',
+					type: this.$auth.hasPermi('monitoring:energy-limit:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
 			tableBtn: [
 				this.$auth.hasPermi('monitoring:energy-limit:update')
 					? {
 							type: 'edit',
-              btnName: '编辑'
+							btnName: '编辑',
 					  }
 					: undefined,
 				this.$auth.hasPermi('monitoring:energy-limit:delete')
 					? {
 							type: 'delete',
-              btnName: '删除'
+							btnName: '删除',
 					  }
-          : undefined
+					: undefined,
 			].filter((v) => v),
-      tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
 			list: [],
 			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
 			// 是否显示弹出层
 			centervisible: false,
 			// 查询参数
@@ -158,112 +171,114 @@ export default {
 				pageNo: 1,
 				pageSize: 20,
 				energyTypeId: null,
-        limitType: null
+				limitType: null,
 			},
 			energyTypeList: [],
 			typeList: [
 				{ label: '合并', value: '1' },
-        {label: '详细', value: '2'}
+				{ label: '详细', value: '2' },
 			],
-      objList: []
+			objList: [],
 		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		this.getList();
-    this.getTypeList()
+		this.getTypeList();
 		// 获取对象树形结构
-    this.getObjTree()
+		this.getObjTree();
 	},
 	methods: {
 		getTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        this.formConfig[0].selectOptions = res.data || []
+				this.formConfig[0].selectOptions = res.data || [];
-        this.energyTypeList = res.data || []
+				this.energyTypeList = res.data || [];
-      })
+			});
 		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.queryParams.pageNo = 1;
-          this.queryParams.energyTypeId = val.energyTypeId
+					this.queryParams.energyTypeId = val.energyTypeId;
-          this.queryParams.limitType = val.limitType
+					this.queryParams.limitType = val.limitType;
-          this.getList()
+					this.getList();
-          break
+					break;
 				default:
-          this.addOrEditTitle = '新增'
+					this.addOrEditTitle = '新增';
-          this.centervisible = true
+					this.centervisible = true;
 					this.$nextTick(() => {
-            this.$refs.energyLimit.init()
+						this.$refs.energyLimit.init();
-          })
+					});
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      getEnergyLimitPage(this.queryParams).then(response => {
+			getEnergyLimitPage(this.queryParams).then((response) => {
 				let arr = response.data.list || [];
-        arr&&arr.map(item => {
+				arr &&
-          this.typeList.map(i => {
+					arr.map((item) => {
+						this.typeList.map((i) => {
 							if (item.type === i.value) {
-              item.type = i.label
+								item.type = i.label;
 							}
-          })
+						});
 						if (item.minValue && item.maxValue) {
-            item.limitValue = item.minValue + '-' + item.maxValue
+							item.limitValue = item.minValue + '-' + item.maxValue;
 						} else if (item.minValue) {
-            item.limitValue = '最小值' + item.minValue
+							item.limitValue = '最小值' + item.minValue;
 						} else if (item.maxValue) {
-            item.limitValue = '最大值' + item.maxValue
+							item.limitValue = '最大值' + item.maxValue;
 						} else {
-            item.limitValue = ''
+							item.limitValue = '';
 						}
-        })
+					});
-        this.list = arr
+				this.list = arr;
 				this.total = response.data.total;
 			});
 		},
 		handleClick(val) {
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
 					this.$nextTick(() => {
-            this.$refs.energyLimit.init(val.data.id)
+						this.$refs.energyLimit.init(val.data.id);
-          })
+					});
-          this.centervisible = true
+					this.centervisible = true;
-          break
+					break;
 				default:
-        this.handleDelete(val.data)
+					this.handleDelete(val.data);
 			}
 		},
 		handleCancel() {
-      this.$refs.energyLimit.formClear()
+			this.$refs.energyLimit.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.energyLimit.submitForm()
+			this.$refs.energyLimit.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-      this.$modal.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?')
+				.then(function () {
 					return deleteEnergyLimit(row.id);
-        }).then(() => {
+				})
+				.then(() => {
 					this.queryParams.pageNo = 1;
 					this.getList();
-          this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-        }).catch(() => {});
+				})
+				.catch(() => {});
 		},
 		getObjTree() {
-      getTree().then(res => {
+			getTree().then((res) => {
-        this.objList = res.data || []
+				this.objList = res.data || [];
-      })
+			});
-    }
+		},
-  }
+	},
 };
 </script>

src/views/energy/monitoring/energyOverlimitLog/index.vue

@@ -1,115 +1,139 @@
 <template>
 	<div class="app-container energyOverlimitLog">
-
 		<!-- 搜索工作栏 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
-    <el-tabs v-model="activeName" @tab-click="toggleTab">
+			:formConfigs="formConfig"
-      <el-tab-pane label="自动抄表" name="auto"></el-tab-pane>
+			ref="searchBarForm"
-      <el-tab-pane label="手动抄表" name="manual"></el-tab-pane>
+			@headBtnClick="buttonClick" />
+		<el-tabs
+			v-model="activeName"
+			@tab-click="toggleTab">
+			<el-tab-pane
+				label="自动抄表"
+				name="auto"></el-tab-pane>
+			<el-tab-pane
+				label="手动抄表"
+				name="manual"></el-tab-pane>
 		</el-tabs>
 		<!-- 列表 -->
 		<div v-if="activeName === 'auto'">
-      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+			<base-table
+				:page="queryParams.pageNo"
+				:limit="queryParams.pageSize"
+				:table-props="tableProps"
+				:table-data="list"
 				:max-height="tableH" />
 		</div>
 		<div v-if="activeName === 'manual'">
-      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps2"
+			<base-table
-        :table-data="list2" :max-height="tableH" />
+				:page="queryParams.pageNo"
+				:limit="queryParams.pageSize"
+				:table-props="tableProps2"
+				:table-data="list2"
+				:max-height="tableH" />
 		</div>
-    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+		<pagination
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			:total="total"
 			@pagination="getList" />
 	</div>
 </template>
 
 <script>
-import { getEnergyOverlimitLogPage } from "@/api/monitoring/energyOverlimitLog";
+import { getEnergyOverlimitLogPage } from '@/api/monitoring/energyOverlimitLog';
-import { getEnergyTypeListAll } from "@/api/base/energyType";
+import { getEnergyTypeListAll } from '@/api/base/energyType';
-import { publicFormatter } from '@/utils/dict'
+import { publicFormatter } from '@/utils/dict';
-import { parseTime } from '@/utils/ruoyi'
+import { parseTime } from '@/utils/ruoyi';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'objName',
-    label: '监控对象'
+		label: '监控对象',
 	},
 	{
 		prop: 'objCode',
-    label: '对象编码'
+		label: '对象编码',
 	},
 	{
 		prop: 'energyType',
-    label: '能源类型'
+		label: '能源类型',
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'type',
-    label: '监控模式'
+		label: '监控模式',
 	},
 	{
 		prop: 'paramName',
-    label: '监控参数'
+		label: '监控参数',
 	},
 	{
 		prop: 'limitType',
 		label: '指标类型',
-    filter: publicFormatter('monitor_index_type')
+		filter: publicFormatter('monitor_index_type'),
 	},
 	{
 		prop: 'realityValue',
-    label: '实际值'
+		label: '实际值',
 	},
 	{
 		prop: 'limitValue',
-    label: '阈值'
+		label: '阈值',
 	},
 	{
 		prop: 'overValue',
-    label: '超出值'
+		label: '超出值',
 	},
 	{
 		prop: 'time',
 		label: '提醒时间',
 		filter: parseTime,
-    minWidth: 160
+		minWidth: 160,
-  }
+	},
-]
+];
 const tableProps2 = [
 	{
 		prop: 'energyType',
-    label: '能源类型'
+		label: '能源类型',
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'limitType',
 		label: '指标类型',
-    filter: publicFormatter('monitor_index_type')
+		filter: publicFormatter('monitor_index_type'),
 	},
 	{
 		prop: 'realityValue',
-    label: '实际值'
+		label: '实际值',
 	},
 	{
 		prop: 'limitValue',
-    label: '阈值'
+		label: '阈值',
 	},
 	{
 		prop: 'overValue',
-    label: '超出值'
+		label: '超出值',
 	},
 	{
 		prop: 'time',
 		label: '提醒时间',
 		filter: parseTime,
-    minWidth: 160
+		minWidth: 160,
-  }
+	},
-]
+];
 export default {
-  name: "EnergyOverlimitLog",
+	name: 'EnergyOverlimitLog',
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
 				{
 					type: 'select',
 					label: '能源类型',
+					labelField: 'labelName',
 					selectOptions: [],
-          param: 'energyTypeId'
+					param: 'energyTypeId',
 				},
 				{
 					type: 'select',
@@ -117,102 +141,100 @@ export default {
 					selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE),
 					labelField: 'label',
 					valueField: 'value',
-          param: 'indexType'
+					param: 'indexType',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
-        }
+				},
 			],
 			activeName: 'auto',
 			tableProps,
 			tableProps2,
-      tableH: this.tableHeight(260),
 			total: 0,
 			list: [],
 			list2: [],
+			heightNum: 300,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 20,
 				energyTypeId: '',
 				indexType: '',
-        method: '1'
+				method: '1',
 			},
 			typeList: [
 				{ id: 1, name: '合并' },
-        { id: 2, name: '详细' }
+				{ id: 2, name: '详细' },
-      ]
+			],
 		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		this.getList();
-    this.getTypeList()
+		this.getTypeList();
 	},
 	methods: {
 		buttonClick(val) {
 			this.queryParams.pageNo = 1;
-      this.queryParams.energyTypeId = val.energyTypeId
+			this.queryParams.energyTypeId = val.energyTypeId;
-      this.queryParams.indexType = val.indexType
+			this.queryParams.indexType = val.indexType;
-      this.getList()
+			this.getList();
 		},
 		/** 查询列表 */
 		getList() {
-      getEnergyOverlimitLogPage(this.queryParams).then(response => {
+			getEnergyOverlimitLogPage(this.queryParams).then((response) => {
 				let arr = response.data.list || [];
-        arr && arr.map((item) => {
+				arr &&
+					arr.map((item) => {
 						this.typeList.map((i) => {
 							if (item.type === i.id) {
-              item.type = i.name
+								item.type = i.name;
 							}
-          })
+						});
 						if (item.minValue && item.maxValue) {
-            item.limitValue = item.minValue + '-' + item.maxValue
+							item.limitValue = item.minValue + '-' + item.maxValue;
 						} else if (item.minValue) {
-            item.limitValue = '最小值' + item.minValue
+							item.limitValue = '最小值' + item.minValue;
 						} else if (item.maxValue) {
-            item.limitValue = '最大值' + item.maxValue
+							item.limitValue = '最大值' + item.maxValue;
 						} else {
-            item.limitValue = ''
+							item.limitValue = '';
 						}
-        })
+					});
 				if (this.queryParams.method === '1') {
-          this.list = arr
+					this.list = arr;
-          this.list2 = []
+					this.list2 = [];
 				} else {
-          this.list2 = arr
+					this.list2 = arr;
-          this.list1 = []
+					this.list1 = [];
 				}
 				this.total = response.data.total;
 			});
 		},
 		getTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        console.log(res)
+				console.log(res);
-        this.formConfig[0].selectOptions = res.data || []
+				this.formConfig[0].selectOptions = res.data || [];
-      })
+			});
 		},
 		toggleTab() {
 			if (this.activeName === 'auto') {
-        this.queryParams.method = '1'
+				this.queryParams.method = '1';
 			} else {
-        this.queryParams.method = '2'
+				this.queryParams.method = '2';
-      }
-      this.queryParams.pageNo = 1
-      this.getList()
-    }
 			}
+			this.queryParams.pageNo = 1;
+			this.getList();
+		},
+	},
 };
 </script>
 <style lang='scss'>
 .energyOverlimitLog {
 	.el-tabs__nav::after {
-    content: "";
+		content: '';
 		position: absolute;
 		left: 0;
 		bottom: 0;

src/views/energy/monitoring/energyReport/index.vue

@@ -1,76 +1,78 @@
 <template>
-  <div class="app-container" id='energyReportBox'>
+	<div
-
+		class="app-container"
+		id="energyReportBox">
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			:isFold="isFold"
-      @headBtnClick="buttonClick"
+			@headBtnClick="buttonClick" />
-    />
 		<!-- 列表 -->
 		<base-table
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-props="tableProps"
 			:table-data="list"
-      :max-height="tableH"
+			:max-height="tableH" />
-    />
 		<pagination
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			:total="total"
-      @pagination="getList"
+			@pagination="getList" />
-    />
 	</div>
 </template>
 
 <script>
-import { energyReportPageAuto, energyReportPageExportAuto } from "@/api/monitoring/energyReport"
+import {
-import { getEnergyTypeListAll } from "@/api/base/energyType";
+	energyReportPageAuto,
-import { publicFormatter } from '@/utils/dict'
+	energyReportPageExportAuto,
-import { parseTime } from '@/utils/ruoyi'
+} from '@/api/monitoring/energyReport';
+import { getEnergyTypeListAll } from '@/api/base/energyType';
+import { publicFormatter } from '@/utils/dict';
+import { parseTime } from '@/utils/ruoyi';
 const tableProps = [
 	{
 		prop: 'statisticType',
 		label: '统计类型',
-    filter: publicFormatter('statistic_type')
+		filter: publicFormatter('statistic_type'),
 	},
 	{
 		prop: 'startTime',
 		label: '开始时间',
 		filter: parseTime,
-    minWidth: 160
+		minWidth: 160,
 	},
 	{
 		prop: 'endTime',
 		label: '结束时间',
 		filter: parseTime,
-    minWidth: 160
+		minWidth: 160,
 	},
 	{
 		prop: 'statisticName',
-    label: '统计方案'
+		label: '统计方案',
 	},
 	{
 		prop: 'energyType',
-    label: '能源类型'
+		label: '能源类型',
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'startNum',
-    label: '抄表数(起始)'
+		label: '抄表数(起始)',
 	},
 	{
 		prop: 'endNum',
-    label: '抄表数(结束)'
+		label: '抄表数(结束)',
 	},
 	{
 		prop: 'useNum',
-    label: '消耗量'
+		label: '消耗量',
-  }
+	},
-]
+];
 export default {
-  name: "EnergyLimit",
+	name: 'EnergyReport',
 	data() {
 		return {
 			isFold: false,
@@ -78,9 +80,10 @@ export default {
 				{
 					type: 'select',
 					label: '能源类型',
+					labelField: 'labelName',
 					selectOptions: [],
 					param: 'energyTypeId',
-          filterable: true
+					filterable: true,
 				},
 				{
 					type: 'select',
@@ -88,37 +91,39 @@ export default {
 					selectOptions: this.getDictDatas(this.DICT_TYPE.STATISTIC_TYPE),
 					labelField: 'label',
 					valueField: 'value',
-          param: 'statisticType'
+					param: 'statisticType',
 				},
 				{
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'datetimerange',
 					format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "timestamp",
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'timeVal',
 					defaultSelect: [],
-          width: 350
+					width: 350,
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('monitoring:energy-report:export') ? 'button' : '',
+					type: this.$auth.hasPermi('monitoring:energy-report:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'add',
 					color: 'primary',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
 			tableH: this.tableHeight(260),
@@ -133,53 +138,61 @@ export default {
 				energyTypeId: null,
 				statisticType: null,
 				startTime: null,
-        endTime: null
+				endTime: null,
-      }
+			},
 		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
+		window.addEventListener('resize', this._eventListeners);
-      this.tableH = this.tableHeight(260)
+		this.getList();
-      this.isFold = this.searchBarWidth('energyReportBox', 1198)
+		this.getTypeList();
-    })
-    this.getList()
-    this.getTypeList()
 	},
 	mounted() {
-    this.isFold = this.searchBarWidth('energyReportBox', 1198)
+		this.isFold = this.searchBarWidth('energyReportBox', 1198);
+	},
+	destroyed() {
+		window.removeEventListener('resize', this._eventListeners);
 	},
 	methods: {
+		_eventListeners() {
+			this.tableH = this.tableHeight(260);
+			this.isFold = this.searchBarWidth('energyReportBox', 1198);
+		},
 		getTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        this.formConfig[0].selectOptions = res.data || []
+				this.formConfig[0].selectOptions = res.data || [];
 				// this.energyTypeList = res.data || []
-      })
+			});
 		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
-          this.queryParams.pageNo = 1
+					this.queryParams.pageNo = 1;
-          this.queryParams.energyTypeId = val.energyTypeId
+					this.queryParams.energyTypeId = val.energyTypeId;
-          this.queryParams.statisticType = val.statisticType
+					this.queryParams.statisticType = val.statisticType;
-          this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
+					this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
-          this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
+					this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
-          this.getList()
+					this.getList();
-          break
+					break;
 				default:
-          this.$modal.confirm('是否确认导出').then(() => {
+					this.$modal
+						.confirm('是否确认导出')
+						.then(() => {
 							return energyReportPageExportAuto({ ...this.queryParams });
-            }).then(response => {
+						})
-              this.$download.excel(response, '能源统计报表.xls');
+						.then((response) => {
-            }).catch(() => {})
+							this.$download.excel(response, '能耗统计报表.xls');
+						})
+						.catch(() => {});
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      energyReportPageAuto(this.queryParams).then(response => {
+			energyReportPageAuto(this.queryParams).then((response) => {
 				this.list = response.data.list || [];
 				this.total = response.data.total;
 			});
-    }
+		},
-  }
+	},
 };
 </script>

src/views/energy/monitoring/energyReportSearch/index.vue

@@ -1,57 +1,60 @@
 <template>
-  <div class="app-container" id='energyReportSearchBox'>
+	<div
-
+		class="app-container"
+		id="energyReportSearchBox">
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			:isFold="isFold"
-      @headBtnClick="buttonClick"
+			@headBtnClick="buttonClick" />
-    />
 		<!-- 列表 -->
 		<base-table
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-props="tableProps"
 			:table-data="list"
-      :max-height="tableH"
+			:max-height="tableH" />
-    />
 		<pagination
 			:page.sync="queryParams.pageNo"
 			:limit.sync="queryParams.pageSize"
 			:total="total"
-      @pagination="getList"
+			@pagination="getList" />
-    />
 	</div>
 </template>
 
 <script>
-import { energyReportPage, energyReportPageExport } from "@/api/monitoring/energyReport";
+import {
-import { getEnergyTypeListAll } from "@/api/base/energyType"
+	energyReportPage,
+	energyReportPageExport,
+} from '@/api/monitoring/energyReport';
+import { publicFormatter } from '@/utils/dict';
+import { getEnergyTypeListAll } from '@/api/base/energyType';
 const tableProps = [
 	{
 		prop: 'statisticName',
-    label: '统计方案'
+		label: '统计方案',
 	},
 	{
 		prop: 'energyType',
-    label: '能源类型'
+		label: '能源类型',
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'startValue',
-    label: '抄表数(起始)'
+		label: '抄表数(起始)',
 	},
 	{
 		prop: 'endValue',
-    label: '抄表数(结束)'
+		label: '抄表数(结束)',
 	},
 	{
 		prop: 'diffValue',
-    label: '消耗量'
+		label: '消耗量',
-  }
+	},
-]
+];
 export default {
-  name: "EnergyReportSearch",
+	name: 'EnergyReportSearch',
 	data() {
 		return {
 			isFold: false,
@@ -59,45 +62,48 @@ export default {
 				{
 					type: 'input',
 					label: '统计方案',
-          param: 'statisticName'
+					param: 'statisticName',
 				},
 				{
 					type: 'select',
 					label: '能源类型',
+					labelField: 'labelName',
 					selectOptions: [],
 					param: 'energyTypeId',
-          filterable: true
+					filterable: true,
 				},
 				{
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'datetimerange',
 					format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "timestamp",
+					valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
 					param: 'timeVal',
 					defaultSelect: [],
 					width: 350,
-          clearable: false
+					clearable: false,
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('monitoring:energy-report-search:export') ? 'button' : '',
+					type: this.$auth.hasPermi('monitoring:energy-report-search:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'add',
 					color: 'primary',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
 			tableH: this.tableHeight(260),
@@ -111,51 +117,55 @@ export default {
 				pageSize: 20,
 				statisticName: null,
 				startTime: null,
-        endTime: null
+				endTime: null,
 			},
-      energyTypeList: []
+			energyTypeList: [],
 		};
 	},
 	mounted() {
 		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
+			this.tableH = this.tableHeight(260);
-      this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
+			this.isFold = this.searchBarWidth('energyReportSearchBox', 1180);
-    })
+		});
-    this.getList()
+		this.getList();
-    this.getTypeList()
+		this.getTypeList();
-    this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
+		this.isFold = this.searchBarWidth('energyReportSearchBox', 1180);
 	},
 	methods: {
 		getTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        this.formConfig[1].selectOptions = res.data || []
+				this.formConfig[1].selectOptions = res.data || [];
-      })
+			});
 		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
-          this.queryParams.pageNo = 1
+					this.queryParams.pageNo = 1;
-          this.queryParams.statisticName = val.statisticName
+					this.queryParams.statisticName = val.statisticName;
-          this.queryParams.energyTypeId = val.energyTypeId
+					this.queryParams.energyTypeId = val.energyTypeId;
-          this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
+					this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
-          this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
+					this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
-          this.getList()
+					this.getList();
-          break
+					break;
 				default:
-          this.$modal.confirm('是否确认导出').then(() => {
+					this.$modal
+						.confirm('是否确认导出')
+						.then(() => {
 							return energyReportPageExport({ ...this.queryParams });
-              }).then(response => {
+						})
+						.then((response) => {
 							this.$download.excel(response, '能源统计查询报表.xls');
-              }).catch(() => {})
+						})
+						.catch(() => {});
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      energyReportPage({...this.queryParams}).then(response => {
+			energyReportPage({ ...this.queryParams }).then((response) => {
 				this.list = response.data.list || [];
 				this.total = response.data.total;
 			});
-    }
+		},
-  }
+	},
 };
 </script>

src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue

@@ -1,46 +1,67 @@
 <template>
-  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
+	<el-form
+		ref="form"
+		:rules="rules"
+		label-width="100px"
+		:model="form">
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="方案名称" prop="name">
+				<el-form-item
+					label="方案名称"
+					prop="name">
 					<el-input v-model="form.name"></el-input>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-        <el-form-item label="方案编码" prop="code">
+				<el-form-item
-          <el-input v-model="form.code" disabled></el-input>
+					label="方案编码"
+					prop="code">
+					<el-input
+						v-model="form.code"
+						disabled></el-input>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="统计类型" prop="type">
+				<el-form-item
-          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;">
+					label="统计类型"
+					prop="type">
+					<el-select
+						v-model="form.type"
+						placeholder="请选择"
+						style="width: 100%">
 						<el-option
 							v-for="item in getDictDatas(DICT_TYPE.STATISTIC_TYPE)"
 							:key="item.value"
 							:label="item.label"
-              :value="item.value">
+							:value="item.value"></el-option>
-            </el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-        <el-form-item label="能源类型" prop="energyTypeId">
+				<el-form-item
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
+					label="能源类型"
+					prop="energyTypeId">
+					<el-select
+						v-model="form.energyTypeId"
+						placeholder="请选择"
+						style="width: 100%"
+						filterable>
 						<el-option
 							v-for="item in energyListType"
 							:key="item.id"
-              :label="item.name"
+							:label="item.labelName"
-              :value="item.id">
+							:value="item.id"></el-option>
-            </el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
 		</el-row>
 		<el-row>
 			<el-col :span="12">
-        <el-form-item label="备注" prop="remark">
+				<el-form-item
+					label="备注"
+					prop="remark">
 					<el-input v-model="form.remark"></el-input>
 				</el-form-item>
 			</el-col>
@@ -48,8 +69,13 @@
 	</el-form>
 </template>
 <script>
-import { getCode, createEnergyStatistics, updateEnergyStatistics, getEnergyStatistics } from "@/api/monitoring/energyStatistics";
+import {
-import { getEnergyTypeListAll } from '@/api/base/energyType'
+	getCode,
+	createEnergyStatistics,
+	updateEnergyStatistics,
+	getEnergyStatistics,
+} from '@/api/monitoring/energyStatistics';
+import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { number } from 'echarts';
 export default {
 	name: 'EnergyStatisticsAdd',
@@ -60,39 +86,45 @@ export default {
 				name: '',
 				code: '',
 				type: '',
-        energyTypeId: ''
+				energyTypeId: '',
 			},
 			plcList: [],
 			objList: [],
 			isEdit: false, //是否是编辑
 			rules: {
-        name: [{ required: true, message: '方案名称不能为空', trigger: 'blur' }],
+				name: [
-        type: [{ required: true, message: '统计类型不能为空', trigger: 'change' }],
+					{ required: true, message: '方案名称不能为空', trigger: 'blur' },
-        energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }]
+				],
+				type: [
+					{ required: true, message: '统计类型不能为空', trigger: 'change' },
+				],
+				energyTypeId: [
+					{ required: true, message: '能源类型不能为空', trigger: 'change' },
+				],
 			},
 			energyListType: [],
-    }
+		};
 	},
 	methods: {
 		init(id) {
 			getEnergyTypeListAll().then((res) => {
-        this.energyListType = res.data || []
+				this.energyListType = res.data || [];
-      })
+			});
 			if (id) {
-        this.isEdit = true
+				this.isEdit = true;
-        this.form.id = id
+				this.form.id = id;
 				getEnergyStatistics(id).then((res) => {
 					if (res.code === 0) {
-            this.form = res.data
+						this.form = res.data;
-            this.form.type = this.form.type + ''
+						this.form.type = this.form.type + '';
 					}
-        })
+				});
 			} else {
 				getCode().then((res) => {
-          this.form.code = res.data
+					this.form.code = res.data;
-        })
+				});
-        this.isEdit = false
+				this.isEdit = false;
-        this.form.id = ''
+				this.form.id = '';
 			}
 		},
 		submitForm() {
@@ -102,27 +134,27 @@ export default {
 						// 编辑
 						updateEnergyStatistics({ ...this.form }).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					} else {
 						createEnergyStatistics({ ...this.form }).then((res) => {
 							if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
+								this.$modal.msgSuccess('操作成功');
-                this.$emit('successSubmit')
+								this.$emit('successSubmit');
 							}
-            })
+						});
 					}
 				} else {
-          return false
+					return false;
 				}
-      })
+			});
 		},
 		formClear() {
-      this.$refs.form.resetFields()
+			this.$refs.form.resetFields();
-      this.isEdit = false
+			this.isEdit = false;
-    }
+		},
-  }
+	},
-}
+};
 </script>

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue

@@ -1,17 +1,42 @@
 <template>
 	<div>
-    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
+		<el-drawer
+			:title="drawerTitle"
+			:visible.sync="visible"
+			size="70%"
+			@close="closeD"
+			:show-close="false">
 			<div class="box">
 				<el-form :inline="true">
 					<el-form-item label="方案名称">
-            <el-input v-model="name" size='small' readonly></el-input>
+						<el-input
+							v-model="name"
+							size="small"
+							readonly></el-input>
 					</el-form-item>
 					<el-form-item label="能源类型">
-            <el-input v-model="energyType" size='small' readonly></el-input>
+						<el-input
+							v-model="energyTypeLabel"
+							size="small"
+							readonly></el-input>
 					</el-form-item>
 					<el-form-item>
-            <el-button type="success" size='small' v-if="showBtn" plain @click="addNew">新增</el-button>
+						<el-button
-            <el-button type="danger" size='small' v-if="showBtn" plain @click="deleteAll">批量删除</el-button>
+							type="success"
+							size="small"
+							v-if="showBtn"
+							plain
+							@click="addNew">
+							新增
+						</el-button>
+						<el-button
+							type="danger"
+							size="small"
+							v-if="showBtn"
+							plain
+							@click="deleteAll">
+							批量删除
+						</el-button>
 					</el-form-item>
 				</el-form>
 				<base-table
@@ -21,56 +46,59 @@
 					:table-data="tableData"
 					:max-height="tableH"
 					:selectWidth="55"
-          @selection-change="selectChange"
+					@selection-change="selectChange">
-        >
 					<method-btn
 						v-if="tableBtn.length"
 						slot="handleBtn"
 						:width="80"
 						label="操作"
 						:method-list="tableBtn"
-            @clickBtn="handleClick"
+						@clickBtn="handleClick" />
-          />
 				</base-table>
 				<pagination
 					:page.sync="queryParams.pageNo"
 					:limit.sync="queryParams.pageSize"
 					:total="total"
-          @pagination="getList"
+					@pagination="getList" />
-        />
 			</div>
 		</el-drawer>
 		<!-- 新增 -->
-    <energy-statistics-det-add ref="energyStatistics" @closeDet="closeDet" />
+		<energy-statistics-det-add
+			ref="energyStatistics"
+			@closeDet="closeDet" />
 	</div>
 </template>
 <script>
-import { getEnergyStatisticsDetPage, deleteEnergyStatisticsDet, deleteMany } from '@/api/monitoring/energyStatisticsDet'
+import {
-import EnergyStatisticsDetAdd from './energyStatisticsDetAdd'
+	getEnergyStatisticsDetPage,
-import { publicFormatter } from '@/utils/dict'
+	deleteEnergyStatisticsDet,
+	deleteMany,
+} from '@/api/monitoring/energyStatisticsDet';
+import EnergyStatisticsDetAdd from './energyStatisticsDetAdd';
+import { publicFormatter } from '@/utils/dict';
 const tableProps = [
 	{
 		prop: 'objName',
-    label: '所属对象'
+		label: '所属对象',
 	},
 	{
 		prop: 'objCode',
-    label: '对象编码'
+		label: '对象编码',
 	},
 	{
 		prop: 'paramName',
-    label: '参数名称'
+		label: '参数名称',
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-    filter: publicFormatter('energy_unit')
+		filter: publicFormatter('unit_dict'),
 	},
 	{
 		prop: 'desc',
-    label: '描述'
+		label: '描述',
-  }
+	},
-]
+];
 export default {
 	name: 'EnergyStatisticsDet',
 	props: {
@@ -78,9 +106,9 @@ export default {
 			type: Array,
 			required: true,
 			default: () => {
-        return []
+				return [];
-      }
+			},
-    }
+		},
 	},
 	data() {
 		return {
@@ -94,134 +122,147 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 30,
-        statisticsId: null
+				statisticsId: null,
 			},
 			name: '',
-      energyType: '',
+			energyTypeLabel: '',
 			energyTypeId: '',
 			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
 			// 是否显示弹出层
 			centervisible: false,
 			collectionList: [
 				{ value: 0, label: '否' },
-        {value: 1,label: '是'}
+				{ value: 1, label: '是' },
 			],
 			showBtn: true,
-      selectedList: []
+			selectedList: [],
-    }
+		};
 	},
 	components: { EnergyStatisticsDetAdd },
 	created() {
 		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(115)
+			this.tableH = this.tableHeight(115);
-    })
+		});
 	},
 	methods: {
 		init(data, title) {
-      this.visible = true
+			this.visible = true;
-      this.queryParams.statisticsId = data.id
+			this.queryParams.statisticsId = data.id;
-      this.name = data.name
+			this.name = data.name;
-      this.energyType = data.energyType
+			this.energyTypeLabel = data.energyTypeLabel;
-      this.energyTypeId = data.energyTypeId
+			this.energyTypeId = data.energyTypeId;
-      this.getList()
+			this.getList();
 			if (title === 'detail') {
-        this.drawerTitle = '查看参数'
+				this.drawerTitle = '查看参数';
-        this.showBtn = false
+				this.showBtn = false;
-        this.tableBtn = []
+				this.tableBtn = [];
 			} else {
-        this.drawerTitle = '参数绑定'
+				this.drawerTitle = '参数绑定';
-        this.showBtn = true
+				this.showBtn = true;
 				this.tableBtn = [
 					{
 						type: 'delete',
-            btnName: '删除'
+						btnName: '删除',
-          }
+					},
-        ]
+				];
 			}
 		},
 		getList() {
-      console.log(this.queryParams)
+			console.log(this.queryParams);
 			getEnergyStatisticsDetPage({ ...this.queryParams }).then((res) => {
-        let arr = res.data.list || []
+				let arr = res.data.list || [];
-        arr&&arr.map(item => {
+				arr &&
-          this.collectionList.map(i => {
+					arr.map((item) => {
+						this.collectionList.map((i) => {
 							if (item.collection === i.value) {
-              item.collection = i.label
+								item.collection = i.label;
 							}
-          })
+						});
-          this.energyTypeList.map(j => {
+						this.energyTypeList.map((j) => {
 							if (item.typeId === j.id) {
-              item.typeId = j.name
+								item.typeId = j.name;
 							}
-          })
+						});
-        })
+					});
-        this.tableData = arr
+				this.tableData = arr;
 				this.total = res.data.total;
-      })
+			});
 		},
 		// 新增
 		addNew() {
 			this.$nextTick(() => {
-        this.$refs.energyStatistics.init({'statisticsId': this.queryParams.statisticsId, energyTypeId:this.energyTypeId})
+				this.$refs.energyStatistics.init({
-      })
+					statisticsId: this.queryParams.statisticsId,
+					energyTypeId: this.energyTypeId,
+				});
+			});
 		},
 		selectChange(val) {
-      console.log(val)
+			console.log(val);
-      this.selectedList = val
+			this.selectedList = val;
 		},
 		// 批量删除
 		deleteAll() {
-      let arr = []
+			let arr = [];
 			if (this.selectedList.length === 0) {
-        this.$modal.msgWarning("请选勾选数据")
+				this.$modal.msgWarning('请选勾选数据');
-        return false
+				return false;
 			} else {
 				this.selectedList.map((item) => {
-          arr.push(item.id)
+					arr.push(item.id);
-        })
+				});
 			}
-      this.$modal.confirm('是否确认删除所有勾选的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除所有勾选的数据项?')
+				.then(function () {
 					return deleteMany(arr);
-        }).then(() => {
+				})
-          this.queryParams.pageNo = 1
+				.then(() => {
-          this.getList()
+					this.queryParams.pageNo = 1;
-          this.$modal.msgSuccess("删除成功")
+					this.getList();
-        }).catch(() => {})
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
 		},
 		handleCancel() {
-      this.$refs.energyStatistics.formClear()
+			this.$refs.energyStatistics.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.energyStatistics.submitForm()
+			this.$refs.energyStatistics.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		handleClick(val) {
-      this.handleDelete(val.data)
+			this.handleDelete(val.data);
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-      this.$modal.confirm('是否确认删除参数列名为"' + row.paramName + '"的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除参数列名为"' + row.paramName + '"的数据项?')
+				.then(function () {
 					return deleteEnergyStatisticsDet(row.id);
-        }).then(() => {
+				})
-          this.queryParams.pageNo = 1
+				.then(() => {
-          this.getList()
+					this.queryParams.pageNo = 1;
-          this.$modal.msgSuccess("删除成功")
+					this.getList();
-        }).catch(() => {})
+					this.$modal.msgSuccess('删除成功');
+				})
+				.catch(() => {});
 		},
 		closeD() {
-      this.$emit('closeDrawer')
+			this.$emit('closeDrawer');
 		},
-    closeDet() {  // 关闭新增框
+		closeDet() {
-      this.getList()
+			// 关闭新增框
-    }
+			this.getList();
-  }
+		},
-}
+	},
+};
 </script>
 <style lang="scss" scoped>
 .box {

src/views/energy/monitoring/energyStatistics/components/energyStatisticsDetAdd.vue

@@ -3,16 +3,15 @@
 		title="新增"
 		:visible.sync="centervisible"
 		size="60%"
-    @close='closeA'
+		@close="closeA"
-    :show-close='false'>
+		:show-close="false">
 		<div class="box">
 			<!-- 搜索工作栏 -->
 			<search-bar
 				:formConfigs="formConfig"
 				ref="searchBarForm"
-        :removeBlue='true'
+				:removeBlue="true"
-        @headBtnClick="buttonClick"
+				@headBtnClick="buttonClick" />
-      />
 			<!-- 列表 -->
 			<base-table
 				:page="queryParams.pageNo"
@@ -21,44 +20,44 @@
 				:table-data="list"
 				:max-height="tableH"
 				:selectWidth="55"
-        @selection-change="selectChange"
+				@selection-change="selectChange"></base-table>
-      >
-      </base-table>
 			<pagination
 				:page.sync="queryParams.pageNo"
 				:limit.sync="queryParams.pageSize"
 				:total="total"
-        @pagination="getList"
+				@pagination="getList" />
-      />
 		</div>
 	</el-drawer>
 </template>
 <script>
-import { addParamPage, createEnergyStatisticsDet } from '@/api/monitoring/energyStatisticsDet'
+import {
-import { publicFormatter } from '@/utils/dict'
+	addParamPage,
+	createEnergyStatisticsDet,
+} from '@/api/monitoring/energyStatisticsDet';
+import { publicFormatter } from '@/utils/dict';
 const tableProps = [
 	{
 		prop: 'objName',
-    label: '所属对象'
+		label: '所属对象',
 	},
 	{
 		prop: 'objCode',
-    label: '对象编码'
+		label: '对象编码',
 	},
 	{
 		prop: 'paramName',
-    label: '参数名称'
+		label: '参数名称',
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-    filter: publicFormatter('energy_unit')
+		filter: publicFormatter('unit_dict'),
 	},
 	{
 		prop: 'desc',
-    label: '描述'
+		label: '描述',
-  }
+	},
-]
+];
 export default {
 	name: 'EnergyStatisticsDetAdd',
 	data() {
@@ -71,30 +70,30 @@ export default {
 					selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE),
 					labelField: 'label',
 					valueField: 'value',
-          param: 'objType'
+					param: 'objType',
 				},
 				{
 					type: 'input',
 					label: '参数名称',
 					placeholder: '参数名称',
-          param: 'paramName'
+					param: 'paramName',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
 					type: 'button',
 					btnName: '关联',
 					name: 'add',
 					color: 'primary',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			queryParams: {
 				pageNo: 1,
@@ -102,75 +101,75 @@ export default {
 				energyTypeId: null,
 				statisticId: null,
 				paramName: '',
-        objType: ''
+				objType: '',
 			},
 			tableProps,
 			list: [],
 			total: 0,
 			tableH: this.tableHeight(260),
-      selectedList: []
+			selectedList: [],
-    }
+		};
 	},
 	methods: {
 		init(param) {
-      this.queryParams.statisticId = param.statisticsId
+			this.queryParams.statisticId = param.statisticsId;
-      this.queryParams.energyTypeId = param.energyTypeId
+			this.queryParams.energyTypeId = param.energyTypeId;
 			window.addEventListener('resize', () => {
-        this.tableH = this.tableHeight(260)
+				this.tableH = this.tableHeight(260);
-      })
+			});
-      this.centervisible = true
+			this.centervisible = true;
-      this.getList()
+			this.getList();
 		},
 		getList() {
 			addParamPage({ ...this.queryParams }).then((res) => {
-        this.list = res.data.list || []
+				this.list = res.data.list || [];
-        this.total = res.data.total
+				this.total = res.data.total;
-      })
+			});
 		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.queryParams.pageNo = 1;
-          this.queryParams.objType = val.objType
+					this.queryParams.objType = val.objType;
-          this.queryParams.paramName = val.paramName
+					this.queryParams.paramName = val.paramName;
-          this.getList()
+					this.getList();
-          break
+					break;
 				default:
 					// 关联
-          this.connectParam()
+					this.connectParam();
 			}
 		},
 		// 选中数据
 		selectChange(val) {
-      this.selectedList = val
+			this.selectedList = val;
 		},
 		// 关联
 		connectParam() {
 			let param = {
 				statisticsId: this.queryParams.statisticId,
-        plcParamIds: []
+				plcParamIds: [],
-      }
+			};
 			if (this.selectedList.length === 0) {
-        this.$modal.msgWarning("请选勾选数据")
+				this.$modal.msgWarning('请选勾选数据');
-        return false
+				return false;
 			} else {
 				this.selectedList.map((item) => {
-          param.plcParamIds.push(item.id)
+					param.plcParamIds.push(item.id);
-        })
+				});
 			}
 			createEnergyStatisticsDet({ ...param }).then((res) => {
 				if (res.code === 0) {
-          this.$modal.msgSuccess("操作成功");
+					this.$modal.msgSuccess('操作成功');
 					this.queryParams.pageNo = 1;
-          this.getList()
+					this.getList();
 				}
-      })
+			});
 		},
 		closeA() {
-      this.$emit('closeDet')
+			this.$emit('closeDet');
-    }
+		},
-  }
+	},
-}
+};
 </script>
 <style lang="scss" scoped>
 .box {

src/views/energy/monitoring/energyStatistics/index.vue

@@ -1,65 +1,93 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
 		<!-- 列表 -->
-    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+		<base-table
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-props="tableProps"
+			:table-data="list"
 			:max-height="tableH">
-      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="160"
+				label="操作"
+				:method-list="tableBtn"
 				@clickBtn="handleClick" />
 		</base-table>
-    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+		<pagination
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			:total="total"
 			@pagination="getList" />
 		<!-- 新增 -->
-    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
+		<base-dialog
-      @confirm="handleConfirm" :before-close="handleCancel">
+			:dialogTitle="addOrEditTitle"
-      <energy-statistics-add ref="energyStatistics" @successSubmit="successSubmit" />
+			:dialogVisible="centervisible"
+			@cancel="handleCancel"
+			@confirm="handleConfirm"
+			:before-close="handleCancel">
+			<energy-statistics-add
+				ref="energyStatistics"
+				@successSubmit="successSubmit" />
 		</base-dialog>
 		<!-- 参数绑定/查看 -->
-    <energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer"
+		<energy-statistics-det
+			ref="plcParam"
+			@closeDrawer="closeDrawer"
 			:energyTypeList="energyTypeList"></energy-statistics-det>
 	</div>
 </template>
 
 <script>
-import { getEnergyStatisticsPage, deleteEnergyStatistics } from "@/api/monitoring/energyStatistics";
+import {
-import { publicFormatter } from '@/utils/dict'
+	getEnergyStatisticsPage,
-import { getEnergyTypeListAll } from '@/api/base/energyType'
+	deleteEnergyStatistics,
-import EnergyStatisticsAdd from './components/energyStatisticsAdd'
+} from '@/api/monitoring/energyStatistics';
-import EnergyStatisticsDet from './components/energyStatisticsDet'
+import { publicFormatter } from '@/utils/dict';
+import { getEnergyTypeListAll } from '@/api/base/energyType';
+import EnergyStatisticsAdd from './components/energyStatisticsAdd';
+import EnergyStatisticsDet from './components/energyStatisticsDet';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'name',
-    label: '方案名称'
+		label: '方案名称',
 	},
 	{
 		prop: 'code',
 		label: '方案编码',
 		minWidth: 120,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'type',
 		label: '统计类型',
-    filter: publicFormatter('statistic_type')
+		filter: publicFormatter('statistic_type'),
 	},
 	{
-    prop: 'energyType',
+		prop: 'energyTypeLabel',
-    label: '能源类型'
+		label: '能源类型',
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'paramNum',
-    label: '统计参数数量'
+		label: '统计参数数量',
 	},
 	{
 		prop: 'remark',
-    label: '备注'
+		label: '备注',
-  }
+	},
-]
+];
 export default {
-  name: "EnergyStatistics",
+	name: 'EnergyStatistics',
 	components: { EnergyStatisticsAdd, EnergyStatisticsDet },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -67,156 +95,165 @@ export default {
 					type: 'input',
 					label: '方案名称',
 					placeholder: '方案名称',
-          param: 'name'
+					param: 'name',
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
 				},
 				{
-          type: 'separate'
+					type: 'separate',
 				},
 				{
-          type: this.$auth.hasPermi('monitoring:energy-statistics:create') ? 'button' : '',
+					type: this.$auth.hasPermi('monitoring:energy-statistics:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
-          plain: true
+					plain: true,
-        }
+				},
 			],
 			tableProps,
 			tableBtn: [
 				this.$auth.hasPermi('monitoring:energy-statistics:bind')
 					? {
 							type: 'connect',
-            btnName: '绑定'
+							btnName: '绑定',
 					  }
 					: undefined,
 				{
 					type: 'detail',
-          btnName: '详情'
+					btnName: '详情',
 				},
 				this.$auth.hasPermi('monitoring:energy-statistics:update')
 					? {
 							type: 'edit',
-            btnName: '编辑'
+							btnName: '编辑',
 					  }
 					: undefined,
 				this.$auth.hasPermi('monitoring:energy-statistics:delete')
 					? {
 							type: 'delete',
-            btnName: '删除'
+							btnName: '删除',
 					  }
-          : undefined
+					: undefined,
 			].filter((v) => v),
-      tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
 			list: [],
 			// 弹出层标题
-      addOrEditTitle: "",
+			addOrEditTitle: '',
 			// 是否显示弹出层
 			centervisible: false,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 20,
-        name: null
+				name: null,
 			},
-      energyTypeList: []
+			energyTypeList: [],
 		};
 	},
 	created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
 		this.getList();
 	},
 	mounted() {
 		// 获取能源列表
-    this.getEnergyTypeList()
+		this.getEnergyTypeList();
 	},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.queryParams.pageNo = 1;
-          this.queryParams.name = val.name
+					this.queryParams.name = val.name;
-          this.getList()
+					this.getList();
-          break
+					break;
 				default:
-          this.addOrEditTitle = '新增'
+					this.addOrEditTitle = '新增';
-          this.centervisible = true
+					this.centervisible = true;
 					this.$nextTick(() => {
-            this.$refs.energyStatistics.init()
+						this.$refs.energyStatistics.init();
-          })
+					});
 			}
 		},
 		/** 查询列表 */
 		getList() {
-      getEnergyStatisticsPage(this.queryParams).then(response => {
+			getEnergyStatisticsPage(this.queryParams).then((response) => {
 				let arr = response.data.list || [];
-        this.list = arr
+				arr.map((item) => {
+					this.getDictDatas('energy_type').map((subItem) => {
+						if (item.energyType === subItem.value) {
+							item.energyTypeLabel = subItem.label;
+						}
+					});
+				});
+				this.list = arr;
 				this.total = response.data.total;
 			});
 		},
 		handleClick(val) {
-      console.log(val)
+			console.log(val);
 			switch (val.type) {
 				case 'edit':
-          this.addOrEditTitle = '编辑'
+					this.addOrEditTitle = '编辑';
 					this.$nextTick(() => {
-            this.$refs.energyStatistics.init(val.data.id)
+						this.$refs.energyStatistics.init(val.data.id);
-          })
+					});
-          this.centervisible = true
+					this.centervisible = true;
-          break
+					break;
 				case 'delete':
-          this.handleDelete(val.data)
+					this.handleDelete(val.data);
-          break
+					break;
 				case 'detail':
 					this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'detail')
+						this.$refs.plcParam.init(val.data, 'detail');
-          })
+					});
-          break
+					break;
 				default:
 					this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'connect')
+						this.$refs.plcParam.init(val.data, 'connect');
-          })
+					});
 			}
 		},
 		handleCancel() {
-      this.$refs.energyStatistics.formClear()
+			this.$refs.energyStatistics.formClear();
-      this.centervisible = false
+			this.centervisible = false;
-      this.addOrEditTitle = ''
+			this.addOrEditTitle = '';
 		},
 		handleConfirm() {
-      this.$refs.energyStatistics.submitForm()
+			this.$refs.energyStatistics.submitForm();
 		},
 		successSubmit() {
-      this.handleCancel()
+			this.handleCancel();
-      this.getList()
+			this.getList();
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-      this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function () {
+			this.$modal
+				.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?')
+				.then(function () {
 					return deleteEnergyStatistics(row.id);
-      }).then(() => {
+				})
+				.then(() => {
 					this.queryParams.pageNo = 1;
 					this.getList();
-        this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-      }).catch(() => { });
+				})
+				.catch(() => {});
 		},
 		closeDrawer() {
-      this.getList()
+			this.getList();
 		},
 		getEnergyTypeList() {
 			getEnergyTypeListAll().then((res) => {
-        this.energyTypeList = res.data || []
+				this.energyTypeList = res.data || [];
-      })
+			});
-    }
+		},
-  }
+	},
 };
 </script>

src/views/energy/monitoring/orderEnergy/index.vue

@@ -5,8 +5,7 @@
 			<search-bar
 				:formConfigs="formConfig"
 				ref="searchBarForm"
-        @headBtnClick="buttonClick"
+				@headBtnClick="buttonClick" />
-      />
 		</div>
 		<div class="box2">
 			<div class="boxTitle">
@@ -14,27 +13,29 @@
 				<span>工单信息</span>
 			</div>
 			<el-row>
-        <el-col :span='4'>
+				<el-col :span="4">
 					<div class="blodTip">工单名称</div>
 					<div class="lightTip">{{ orderMsg.name }}</div>
 				</el-col>
-        <el-col :span='4'>
+				<el-col :span="4">
 					<div class="blodTip">产品名称</div>
 					<div class="lightTip">{{ orderMsg.productName }}</div>
 				</el-col>
-        <el-col :span='4'>
+				<el-col :span="4">
 					<div class="blodTip">计划完成数量</div>
 					<div class="lightTip">{{ orderMsg.planQuantity }}</div>
 				</el-col>
-        <el-col :span='4'>
+				<el-col :span="4">
 					<div class="blodTip">实际开始时间</div>
 					<div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
 				</el-col>
-        <el-col :span='4'>
+				<el-col :span="4">
 					<div class="blodTip">实际完成时间</div>
-          <div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div>
+					<div class="lightTip">
+						{{ parseTime(orderMsg.finishProduceTime) }}
+					</div>
 				</el-col>
-        <el-col :span='4'>
+				<el-col :span="4">
 					<div class="blodTip">实际加工数量</div>
 					<div class="lightTip">{{ orderMsg.actualQuantity }}</div>
 				</el-col>
@@ -46,8 +47,16 @@
 				<span>能耗信息</span>
 			</div>
 			<div class="toggleTabBox">
-        <div :class="{ active: activeModule === 'dataList' }" @click="toggleTab('dataList')">数据列表</div>
+				<div
-        <div :class="{ active: activeModule === 'barChart' }" @click="toggleTab('barChart')">柱状图</div>
+					:class="{ active: activeModule === 'dataList' }"
+					@click="toggleTab('dataList')">
+					数据列表
+				</div>
+				<div
+					:class="{ active: activeModule === 'barChart' }"
+					@click="toggleTab('barChart')">
+					柱状图
+				</div>
 			</div>
 			<div>
 				<div v-show="activeModule === 'dataList'">
@@ -57,12 +66,13 @@
 						:limit="queryParams.pageSize"
 						:table-props="tableProps"
 						:table-data="tableData"
-            :max-height="tableH"
+						:max-height="tableH" />
-          />
 				</div>
 				<!-- 图形 -->
 				<div v-show="activeModule === 'barChart'">
-          <bar-chart ref="orderEnergyChart" :chartData="chartData"/>
+					<bar-chart
+						ref="orderEnergyChart"
+						:chartData="chartData" />
 				</div>
 			</div>
 		</div>
@@ -72,35 +82,40 @@
 const tableProps = [
 	{
 		prop: 'objName',
-    label: '对象名称'
+		label: '对象名称',
 	},
 	{
 		prop: 'objCode',
-    label: '对象编码'
+		label: '对象编码',
 	},
 	{
 		prop: 'energyType',
-    label: '能源类型'
+		label: '能源类型',
 	},
 	{
 		prop: 'startNum',
-    label: '工单开始值'
+		label: '工单开始值',
 	},
 	{
 		prop: 'endNum',
-    label: '工单结束值/当前值'
+		label: '工单结束值/当前值',
 	},
 	{
 		prop: 'useNum',
-    label: '使用量'
+		label: '使用量',
-  }
+	},
-]
+];
-import { getEnergyTypeListAll } from '@/api/base/energyType'
+import { getEnergyTypeListAll } from '@/api/base/energyType';
-import { workOrderList } from '@/api/base/orderManage'
+import { workOrderList } from '@/api/base/orderManage';
-import { getWorkOrderMsg, getOrderEnergyData } from '@/api/monitoring/orderEnergy'
+import {
-import BarChart from "./components/barChart"
+	getWorkOrderMsg,
+	getOrderEnergyData,
+} from '@/api/monitoring/orderEnergy';
+import BarChart from './components/barChart';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 export default {
 	name: 'OrderEnergy',
+	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -109,16 +124,17 @@ export default {
 					label: '工单',
 					selectOptions: [],
 					param: 'workOrderId',
-          clearable: false
+					clearable: false,
 				},
 				{
 					type: 'select',
 					label: '能源类型',
 					selectOptions: [],
 					param: 'energyTypeId',
+					labelField: 'labelName',
 					filterable: true,
 					width: 120,
-          clearable: false
+					clearable: false,
 				},
 				{
 					type: 'select',
@@ -128,89 +144,88 @@ export default {
 					valueField: 'value',
 					param: 'objType',
 					width: 100,
-          clearable: false
+					clearable: false,
 				},
 				{
 					type: 'button',
 					btnName: '查询',
 					name: 'search',
-          color: 'primary'
+					color: 'primary',
-        }
+				},
 			],
 			tableProps,
 			tableData: [],
-      tableH: this.tableHeight(400),
+			heightNum: 400,
 			// 查询参数
 			queryParams: {
 				workOrderId: '',
 				objType: '',
-        energyTypeId: ''
+				energyTypeId: '',
 			},
 			orderMsg: {},
 			chartData: [],
-      activeModule: 'dataList'
+			activeModule: 'dataList',
-    }
+		};
 	},
 	components: { BarChart },
 	mounted() {
-    window.addEventListener('resize', () => {
+		this.getListArr();
-      this.tableH = this.tableHeight(400)
-    })
-    this.getListArr()
 	},
 	methods: {
 		getListArr() {
-      workOrderList().then(res => {
+			workOrderList().then((res) => {
-        this.formConfig[0].selectOptions = res.data || []
+				this.formConfig[0].selectOptions = res.data || [];
-      })
+			});
-      getEnergyTypeListAll().then(res => {
+			getEnergyTypeListAll().then((res) => {
-        this.formConfig[1].selectOptions = res.data || []
+				this.formConfig[1].selectOptions = res.data || [];
-      })
+			});
 		},
 		buttonClick(val) {
 			if (!val.workOrderId) {
-        this.$modal.msgWarning('工单不能为空')
+				this.$modal.msgWarning('工单不能为空');
-        return false
+				return false;
 			}
 			if (!val.energyTypeId) {
-        this.$modal.msgWarning('能源类型不能为空')
+				this.$modal.msgWarning('能源类型不能为空');
-        return false
+				return false;
 			}
 			if (!val.objType) {
-        this.$modal.msgWarning('对象维度不能为空')
+				this.$modal.msgWarning('对象维度不能为空');
-        return false
+				return false;
 			}
-      this.queryParams.workOrderId = val.workOrderId
+			this.queryParams.workOrderId = val.workOrderId;
-      this.queryParams.objType = val.objType
+			this.queryParams.objType = val.objType;
-      this.queryParams.energyTypeId = val.energyTypeId
+			this.queryParams.energyTypeId = val.energyTypeId;
-      getWorkOrderMsg({ ...this.queryParams }).then(res => {
+			getWorkOrderMsg({ ...this.queryParams }).then((res) => {
-        this.orderMsg = res.data || {}
+				this.orderMsg = res.data || {};
 				getOrderEnergyData({
 					...this.queryParams,
 					startProduceTime: res.data.startProduceTime || '',
-          finishProduceTime: res.data.finishProduceTime || ''
+					finishProduceTime: res.data.finishProduceTime || '',
-        }).then(result => {
+				}).then((result) => {
-          this.tableData = result.data || []
+					this.tableData = result.data || [];
-          this.chartData = result.data || []
+					this.chartData = result.data || [];
-        })
+				});
-      })
+			});
 		},
 		toggleTab(val) {
-      this.activeModule = val
+			this.activeModule = val;
 			if (this.activeModule === 'barChart') {
 				this.$nextTick((res) => {
-          this.$refs.orderEnergyChart.getChart()
+					this.$refs.orderEnergyChart.getChart();
-        })
+				});
 			}
 		},
-    headBtnClick() {}
+		headBtnClick() {},
-  }
+	},
-}
+};
 </script>
 <style lang='scss' scoped>
 .orderEnergyContainer {
 	background-color: rgb(242, 244, 249);
-  .box1, .box2, .box3 {
+	.box1,
+	.box2,
+	.box3 {
 		background-color: #fff;
 		border-radius: 9px;
 	}
@@ -230,6 +245,9 @@ export default {
 		.lightTip {
 			font-weight: 400;
 			color: rgba(102, 102, 102, 0.75);
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
 		}
 	}
 	.box3 {
@@ -246,7 +264,7 @@ export default {
 			}
 			.active {
 				color: rgba(0, 0, 0, 0.85);
-        border-bottom-color: #0B58FF;
+				border-bottom-color: #0b58ff;
 			}
 		}
 	}
@@ -262,7 +280,7 @@ export default {
 		display: inline-block;
 		width: 4px;
 		height: 18px;
-    background-color: #0B58FF;
+		background-color: #0b58ff;
 		border-radius: 1px;
 		margin-right: 8px;
 		vertical-align: bottom;

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

@@ -9,7 +9,8 @@
 			: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"
@@ -33,6 +34,7 @@ import {
 	getEqAnalysis,
 	exportEqAnalysisExcel,
 } from '@/api/equipment/analysis/statistics';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	// {
@@ -52,35 +54,49 @@ 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],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		const today = new Date();
 
@@ -110,7 +126,7 @@ export default {
 			tableBtn: [].filter((v) => v),
 			tableData: [],
 			listQuery: {
-				pageSize: 10,
+				pageSize: 20,
 				pageNo: 1,
 				total: 1,
 				recordTime: [

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

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