.env.dev

@@ -1,3 +1,10 @@
+###
+ # @Author: Do not edit
+ # @Date: 2023-08-29 09:40:39
+ # @LastEditTime: 2024-03-25 15:59:53
+ # @LastEditors: zhp
+ # @Description:
+###
 # 开发环境配置
 ENV = 'development'
 
@@ -5,18 +12,24 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# 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://192.168.1.20:48080'
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
-
+# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
-# socket地址(现场)
+# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
-# VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
-# socket地址(公司线上)
+# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# socket dcs地址(只有现场)
+# 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_Dcs_API = 'ws://10.70.180.10:8081'
 
+# 积木报表指向地址
+VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod

@@ -1,4 +1,11 @@
-# 生产环境配置（许昌现场）
+###
+ # @Author: zhp
+ # @Date: 2023-11-07 19:11:40
+ # @LastEditTime: 2023-11-16 16:40:59
+ # @LastEditors: zhp
+ # @Description:
+###
+# 生产环境配置
 ENV = 'production'
 
 # 页面标题

.env.stage

@@ -1,4 +1,4 @@
-# 公司线上环境（33服务器）
+# 生产环境配置
 ENV = 'production'
 
 # 页面标题
@@ -7,12 +7,15 @@ VUE_APP_TITLE = MES系统
 # 芋道管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
 
+# dcs地址
+VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
+# socket地址
+VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
+
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 # socket地址
 VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
-# dcs地址（只有现场的）
-VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
 
 # 根据服务器或域名修改

src/api/analysis/energyAnalysis.js

@@ -35,21 +35,3 @@ 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,27 +54,3 @@ 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,4 +68,3 @@ export function exportEnergyTypeExcel(query) {
     responseType: 'blob'
   })
 }
-

src/api/base/qualityHotMaterial.js

@@ -2,7 +2,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-06 15:38:12
- * @LastEditTime: 2024-04-11 14:57:02
+ * @LastEditTime: 2023-12-15 15:29:16
  * @LastEditors: zhp
  * @Description:
  */
@@ -94,7 +94,7 @@ export function getWorkerList(query) {
 
 export function getMaterialCheckList(query) {
   return request({
-    url: 'base/quality-hot-material-det/filterList',
+    url: '/base/core-hot-material-check/listByMaterial',
     method: 'get',
     params: query
   })
@@ -102,7 +102,7 @@ export function getMaterialCheckList(query) {
 
 export function createQualityHotMaterialDet(query){
    return request({
-    url: 'base/quality-hot-material-det/createBatch',
+    url: '/base/quality-hot-material-det/create',
     method: 'post',
     data: query
   })
@@ -110,7 +110,7 @@ export function createQualityHotMaterialDet(query){
 
 export function updateQualityHotMaterialDet(query){
    return request({
-    url: 'base/quality-hot-material-det/updateBatch',
+    url: '/base/quality-hot-material-det/listbyfilter',
     method: 'put',
     data: query
   })
@@ -118,7 +118,7 @@ export function updateQualityHotMaterialDet(query){
 
 export function getQualityHotMaterialDetList(query){
    return request({
-    url: '/base/quality-hot-material-det/filterList',
+    url: '/base/quality-hot-material-det/listbyfilter',
     method: 'get',
     params: query
   })

src/api/base/qualityScrapLog.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-07 15:02:37
- * @LastEditTime: 2024-04-09 15:14:42
+ * @LastEditTime: 2023-11-07 18:32:07
  * @LastEditors: zhp
  * @Description:
  */

src/api/monitoring/statisticalData.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-07 14:10:18
- * @LastEditTime: 2024-04-11 16:16:05
+ * @LastEditTime: 2023-11-16 17:49:52
  * @LastEditors: zhp
  * @Description:
  */
@@ -18,14 +18,14 @@ export function getStatisticalDataPage(query) {
 
 export function getWorkOrderList(query) {
   return request({
-    url: 'base/core-work-order/listbyfilter',
+    url: '/base/core-work-order/listbyfilter',
     method: 'get',
     params: query,
   })
 }
 export function getProductList(query) {
   return request({
-    url: 'base/core-product/listAll',
+    url: '/base/core-product/listAll',
     method: 'get',
     params: query,
   })

src/mixins/lb/tableHeightMixin.js

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

src/store/modules/dict.js

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

src/utils/dict.js

@@ -97,8 +97,6 @@ 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-04-03 10:54:53
+ * @LastEditTime: 2024-03-28 15:28:07
  * @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,16 +34,14 @@
         <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
           <base-container :beilv="1" :size="'eqStatus'" :title="'周转进度'" :title-icon="'order'" :back="'energy'">
             <div class="order" style="width:100%; overflow: hidden scroll;height: 350px;">
-              <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: .5em">
+              <el-row v-for="op in orderProcessList" :key="op.id" style="margin-bottom: 1em">
-                <!-- <p v-if="op.outRate === 1" class="now-secondary-title"
+                <p v-if="op.outRate === 1" class="now-secondary-title" style="color:#4679FD">
-                  style="font-size: 14px; opacity: calc(.6);color:#4679FD">
                   <i class="el-icon-check" />
                   {{ op.name }}
-                </p> -->
+                </p>
-                <!-- <p class="now-secondary-title">{{ op.name }}</p> -->
+                <p v-else 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: 935px;" text-color="rgba(255, 255, 255, .6)" :stroke-width="10"
+                  :percentage="op.outRate * 100" class="custom-progress-bar" />
-                  define-back-color="rgba(32, 57, 96, 1)" :percentage="op.outRate * 100" class="custom-progress-bar" />
               </el-row>
             </div>
           </base-container>
@@ -498,7 +496,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
@@ -532,6 +530,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
+
+
+
+
 .visual-container {
   width: 1920px;
   height: 1080px;
@@ -553,7 +556,7 @@ export default {
           top: 25px;
           color: rgba(255, 255, 255, 0.80);
           font-size: 20px;
-          letter-spacing: 1px;
+          letter-spacing: 0px;
         }
         .time {
           position: absolute;
@@ -561,7 +564,7 @@ export default {
             top: 25px;
           color: rgba(255, 255, 255, 0.80);
           font-size: 20px;
-          letter-spacing: .72px;
+          letter-spacing: 0px;
         }
     .title-button {
       color: #00fff0;
@@ -604,14 +607,6 @@ 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-04-11 09:55:04
+ * @LastEditTime: 2024-03-28 16:35:49
  * @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,13 +40,6 @@
               <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>
@@ -71,11 +64,11 @@
             </div> -->
             <!-- <el-row :gutter="9"> -->
             <!-- <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="24"> -->
-            <pile-bar-chart id=" 'one' " style="margin-top: -5px;" ref="firstPileChart" :height="80" />
+            <pile-bar-chart style="margin-bottom: -15px" ref="firstPileChart" :height="90" />
-            <second-pile-bar-chart id=" 'second' " ref="secondPileChart" :height="90" />
+            <second-pile-bar-chart style="margin-bottom: -15px" id=" 'second' " ref="secondPileChart" :height="90" />
-            <third-pile-bar-chart id=" 'third' " ref="thirdPileChart" :height="90" />
+            <third-pile-bar-chart style="margin-bottom: -15px" id=" 'third' " ref="thirdPileChart" :height="90" />
-            <fourth-pile-bar-chart id=" 'fourth' " ref="fourthPileChart" :height="90" />
+            <fourth-pile-bar-chart style="margin-bottom: -15px" id=" 'fourth' " ref="fourthPileChart" :height="90" />
-            <fifth-pile-bar-chart style="margin-top: -5px;" id=" 'fifth' " ref="fifthPileChart" :height="90" />
+            <fifth-pile-bar-chart style="margin-bottom: -15px" id=" 'fifth' " ref="fifthPileChart" :height="100" />
             <!-- <pile-bar-chart ref="secondPileChart"
               :height="90" />
             <pile-bar-chart ref="thirdPileChart"
@@ -251,7 +244,6 @@ export default {
       funWs: undefined,
       SJGws: undefined,
       funWsData: {},
-      coldDetData:[],
       SJGWsData: {},
       cxNameList:[],
       cxDataList:[],
@@ -310,7 +302,6 @@ export default {
       window.location.reload()
     }, 86400000)
     // this.getData()
-    // this.getReaiData()
   },
   destroyed() {
     this.CutWebsocketClose()
@@ -323,39 +314,16 @@ 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 =
-      this.coldDetData = [
+    let coldDetData = [
       {
         "first": 0.8834,
         "lineName": "Y61",
@@ -407,69 +375,45 @@ export default {
         "yield": 0.9133
       }
     ]
-      this.coldDetData.forEach((ele, index) => {
+    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('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
+      nameWasteList.push('缺陷面积:' + 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(0))
+      // yieldList.push((ele.yield * 100).toFixed(3))
     })
-      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
+      })()
+    }
   },
-    // getReaiData() {
+  methods: {
-    //   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 = [
     //     {
@@ -500,10 +444,8 @@ 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 );}
@@ -553,7 +495,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()
@@ -583,9 +525,10 @@ export default {
           ])
         }
         this.realEqConfig.data = this.realEqList
-        // this.$nextTick(() => {
+        this.$nextTick(() => {
           this.$refs['realEqScrollBoard'].updateRows(this.realEqList)
-        // })
+
+        })
       };
       // if (typeof (WebSocket) === 'undefined') {
       //   alert('您的浏览器不支持WebSocket')
@@ -617,23 +560,19 @@ export default {
         this.cutWsData = event?.data ? JSON.parse(event?.data) : {}
         if (this.cutWsData.type === 'cutting' && this.cutWsData.name === 'table') {
           let cutArr = this.cutWsData.productHourData.map((item, index) => [
-            `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
+            `<span style="color:rgba(255,255,255,0.7)" >${index + 1 || ''}
             </span>`,
-            `<span style="color:rgba(255,255,255,0.5)" >${item.lineName || ''}
+            `<span style="color:rgba(255,255,255,0.7)" >${item.lineName || ''}
             </span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${this.formatTime(item.time) || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.7)">${this.formatTime(item.time) || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${this.getSize(item.size) || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.7)">${this.getSize(item.size) || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.productArea) + '㎡' || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.7)">${item.productArea + '㎡' || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.wasteArea) + '㎡' || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</span>`,
-            `<div style = "${(item.product * 100).toFixed(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:#00FFF7' : '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>`
+           <div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</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 = []
@@ -642,25 +581,22 @@ 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('缺陷面积:' + this.NumFormat(ele.wastArea) + '㎡')
+            nameWasteList.push('缺陷面积:' + ele.wastArea)
             sumAreaList.push(ele.sumArea)
-            yieldList.push(parseFloat((ele.yield * 100).toFixed(0)))
+            yieldList.push(parseFloat((ele.yield * 100).toFixed(3)))
           })
-          this.$nextTick(() => {
           this.$refs.firstPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
           this.$refs.secondPileChart.initChart(nameList, [topNameList[1]], [nameWasteList[1]], [productList[1]], [wasteList[1]])
-            this.$refs.thirdPileChart.initChart(nameList, [topNameList[2]], [nameWasteList[2]], [productList[2]], [wasteList[2]])
+          this.$refs.thirdPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
-            this.$refs.fourthPileChart.initChart(nameList, [topNameList[3]], [nameWasteList[3]], [productList[3]], [wasteList[3]])
+          this.$refs.fourthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
-            this.$refs.fifthPileChart.initChart(nameList, [topNameList[4]], [nameWasteList[4]], [productList[4]], [wasteList[4]])
+          this.$refs.fifthPileChart.initChart(nameList, [topNameList[0]], [nameWasteList[0]], [productList[0]], [wasteList[0]])
           this.$refs.productChart.initChart(nameList, yieldList, sumAreaList)
-          })
         }
       };
       // if (typeof (WebSocket) === 'undefined') {
@@ -696,18 +632,17 @@ 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)">${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.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>`,
+                `<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.annealFunConfig.data = arr
-          // this.$nextTick(() => {
           this.$refs['annealFunScrollBoard'].updateRows(arr)
-          // })
         }
         if (this.funWsData.type === 'FanInfo') {
           let arr = []
@@ -715,16 +650,14 @@ export default {
           for (let i in this.funWsData.data.fanInfo) {
             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>`,
                 `<span style="color:rgba(255,255,255,0.5)" >${i || ''}</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)">${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.funConfig.data = arr
-          // this.$nextTick(() => {
           this.$refs['funScrollBoard'].updateRows(arr)
-          // })
         }
       };
       // if (typeof (WebSocket) === 'undefined') {
@@ -745,25 +678,6 @@ export default {
       //   this.funWebsocket.onclose = this.funWebsocketClose
       // }
     },
-    NumFormat(value) {
-      if (!value) return '0.00'
-      value = value.toFixed(2)
-      var intPart = Math.trunc(value) // 获取整数部分
-      // var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
-      var floatPart = '.00' // 预定义小数部分
-      var value2Array = value.split('.')
-      // =2表示数据有小数位
-      if (value2Array.length === 2) {
-        floatPart = value2Array[1].toString() // 拿到小数部分
-        if (floatPart.length === 1) {
-          return intPart + '.' + floatPart + '0'
-        } else {
-          return intPart + '.' + floatPart
-        }
-      } else {
-        return intPart + floatPart
-      }
-    },
     // funWebsocketOnOpen() {
     //   console.log('socket连接成功')
     //   this.SJGWebsocket.onmessage()
@@ -858,47 +772,7 @@ 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;
@@ -920,7 +794,7 @@ export default {
       top: 25px;
       color: rgba(255, 255, 255, 0.80);
       font-size: 20px;
-      letter-spacing: 1px;
+      letter-spacing: 0px;
       }
 
     .time {
@@ -929,7 +803,7 @@ export default {
       color: rgba(255, 255, 255, 0.80);
       top: 25px;
       font-size: 20px;
-      letter-spacing: .72px;
+      letter-spacing: 0px;
     }
 
     .title-button {

src/views/OperationalOverview/components/ISRAChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 13:45:56
- * @LastEditTime: 2024-04-11 11:02:53
+ * @LastEditTime: 2024-03-13 08:58:01
  * @LastEditors: zhp
  * @Description:
 -->
@@ -26,7 +26,7 @@ export default {
 		return {
 			chart: null,
 			// notMsg:true,
-      colors: ['#2760ff', '#518eec', '#49FBD6', '#ddb523'],
+			colors:['#2760ff', '#518eec', '#0ee8e4', '#ddb523'],
 			chartData: []
 		};
 	},
@@ -45,31 +45,6 @@ export default {
 				this.$emit('emitFun')
 			}
 		}
-  },
-  mounted() {
-    this.chartData = [
-      {
-        name: '细长泡',
-        num: 1112,
-        yield: 0.97,
-      },
-      {
-        name: '长泡',
-        num: 1112,
-        yield: 0.97,
-      },
-       {
-         name: '开口泡',
-        num: 1112,
-        yield: 0.97,
-      },
-       {
-         name: '结石',
-        num: 1112,
-        yield: 0.97,
-      }
-    ]
-    this.updateChart()
 	},
 	methods: {
 		updateChart() {
@@ -96,7 +71,7 @@ export default {
 				color:this.colors,
 				title:{
 					text: num,
-					subtext: '总数/片',
+					subtext: '总数',
 					top: '32%',
 					left: '49%',
 					textAlign: 'center',
@@ -114,7 +89,7 @@ export default {
 					left: 'center',
 					itemWidth: 12,
 					itemHeight:12,
-          icon: 'roundRect',
+          icon: 'rect',
 					textStyle: {
 						color: '#fff'
 					},
@@ -132,19 +107,7 @@ export default {
 						radius: ['45%', '70%'],
 						avoidLabelOverlap: true,
 						label: {
-              show: true,
+							show: false
-            normal: {
-              // 各分区的提示内容
-              // params: 即下面传入的data数组,通过自定义函数，展示你想要的内容和格式
-              formatter: function (params) {
-                console.log(params);
-                return params.value + " | " + params.percent.toFixed(0) + "%" + "\n\n" + params.name;
-              },
-              textStyle: {            // 提示文字的样式
-                // color: '#595959',
-                fontSize: 24.48
-              }
-            }
 						},
 						labelLine: {
 							show: true,
@@ -152,16 +115,13 @@ export default {
 						data: this.chartData && this.chartData.length > 0 && this.chartData.map((item, index) => ({
 						name:item.name,
 						value: item.num,
-            label: {
-              color: this.colors[index % 4]
-            },
 						itemStyle:{
 							color:{
 								type: 'linear',
-								x: 0,
+								x: 1,
-								y: 0,
+								y: 1,
 								x2: 0,
-								y2: 1,
+								y2: 0,
 								global: false,
 								colorStops:[
 									{offset: 0,color: this.colors[index%4]},

src/views/OperationalOverview/components/PieChart.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-21 14:43:06
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-03 16:33:24
+ * @LastEditTime: 2024-03-28 16:45:24
  * @Description:
 -->
 <template>
@@ -85,6 +85,7 @@ export default {
       defaultConfig: {
         // 默认的legend配置
         legend: {
+          orient: 'vertical',
           left: '75%',
           bottom: 0,
           itemHeight: 10,
@@ -157,9 +158,6 @@ export default {
   methods: {
     initChart() {
       this.chart = echarts.init(document.getElementById(this.id))
-      this.$nextTick(() => {
-        this.chart.resize();
-      });
       this.chart.setOption({
         title: this.showCenterTitle
           ? {
@@ -196,7 +194,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-29 14:47:29
+ * @LastEditTime: 2024-03-27 10:26:35
  * @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,8 +274,6 @@ 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-04-09 15:24:39
+ * @LastEditTime: 2024-03-25 18:34:58
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
-    <div :id="id" class="coldProductChart" :style="{ height:   '390px', width: width }" />
+    <div :id="id" class="productChart" :style="{ height:   '390px', width: width }" />
   </div>
 </template>
 
@@ -71,9 +71,9 @@ export default {
   mounted() {
     console.log('mounted')
     console.log('borderRadius: ', this.borderRadius)
-    this.$el.addEventListener('resize', () => {
+    // this.$nextTick(() => {
-      console.log('resziing.....');
+    //   this.initChart()
-    });
+    // })
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -100,9 +100,8 @@ export default {
                show: true,		//开启显示
                position: 'top',	//在上方显示
                textStyle: {	    //数值样式
-                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                 color: '#ced1d5',
-                 fontSize: 12,
+                 fontSize: 12
-                 fontWight: 'bolder'
                }
              },
             }
@@ -115,7 +114,6 @@ export default {
           name: '产线良品率',
           symbol: 'circle', //变为实心圆
           type: 'line',
-          // symbolSize: 7,
           yAxisIndex: 0,
           areaStyle: {
             opacity: 0.8,
@@ -143,16 +141,6 @@ 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: {
@@ -163,50 +151,38 @@ export default {
         },
         grid: {
           left: "3%",
-          right: "10%",
+          right: "5%",
           bottom: "3%",
           containLabel: true
         },
-        // legend: {
+        legend: {
-        //   itemWidth: 10,
+          itemWidth: 10,
-        //   itemHeight: 10,
+          itemHeight: 10,
-        //   top: '5',
+          top: '20',
           // right: '20px',
-        //   data: [
+          data: ['产线产量', '产线良品率'],
-        //     // { icon: 'rect', name: '直接访问' },
+          textStyle: {
-        //     { icon: 'roundRect', name: '产线产量' },
+            fontSize: 12 * this.beilv,
-        //     // {
+            color: '#ced1d5'
-        //     //   icon: 'circle', name: '产线良品率',
+          }
-        //     //   itemWidth: 7,
-        //     //   itemHeight: 7,
-        //     //  },
-        //   ],
-        //   textStyle: {
-        //     fontSize: 12 * this.beilv,
-        //     color: '#ced1d5'
-        //   }
-        // },
-        xAxis: {
-          axisTick: {
-            show: false
         },
+        xAxis: {
           type: 'category',
           axisLine: {
             lineStyle: {
               type: 'solid',
-              color: '#25528f', // 左边线的颜色
+              color: '#213259', // 左边线的颜色
               width: '1' // 坐标线的宽度
             }
           },
           axisLabel: {
             textStyle: {
-              align: 'center',
               color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
             }
           },
           splitLine: {
             lineStyle: {
-              color: '#25528f'
+              color: '#213259'
             }
           },
           data: nameList
@@ -225,13 +201,9 @@ export default {
             scale: true,
             type: 'value',
             name: '良品率/%',
-            max: 100,//最大值
-            min: 0,//最小值
-            interval: 20,//间隔
             nameTextStyle: {// y轴上方单位的颜色
-              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+              color: '#fff',
               align: "left",
-              padding: [0, 0, 0, 8]
             },
             position: 'right',
             alignTicks: true,
@@ -239,20 +211,19 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#25528f', // 左边线的颜色
+                color: '#213259', // 左边线的颜色
                 width: '1' // 坐标线的宽度
               }
             },
             axisLabel: {
               textStyle: {
-                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                color: '#ced1d5', // 坐标值得具体的颜色
-                formatter: '{value}%',
+                formatter: '{value}%'
-                align:'left',
               }
             },
             splitLine: {
               lineStyle: {
-                color: '#25528f'
+                color: '#213259'
               }
             }
             // type: 'value'
@@ -274,10 +245,9 @@ export default {
             type: 'value',
             name: '产量/㎡', // y轴上方的单位
             nameTextStyle: {
-              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+              color: "#fff",
               // fontSize: 10,
               align: "right",
-              padding:[0,4,0,0]
             },
             position: 'left',
             alignTicks: true,
@@ -285,21 +255,19 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#25528f', // 左边线的颜色
+                color: '#213259', // 左边线的颜色
                 width: '1' // 坐标线的宽度
               }
             },
             axisLabel: {
-              // padding: [0, 20, 0, 0],
               textStyle: {
-                margin: 60,
                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
                 formatter: '{value} 片'
               }
             },
             splitLine: {
               lineStyle: {
-                color: '#25528f'
+                color: '#213259'
               }
             }
             // type: 'value'
@@ -318,8 +286,7 @@ 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-04-09 15:24:28
+ * @LastEditTime: 2024-03-28 16:31:20
  * @LastEditors: zhp
  * @Description:
 -->
@@ -105,9 +105,8 @@ export default {
                show: true,		//开启显示
                position: 'top',	//在上方显示
                textStyle: {	    //数值样式
-                 color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                 color: '#ced1d5',
-                 fontSize: 12,
+                 fontSize: 12
-                 fontWight:'bolder'
                }
              },
             }
@@ -143,7 +142,7 @@ export default {
             }
           },
           // data: passRateList
-          data: passRateList
+          data: []
         }
       ]
       // const colors = ['#5470C6', '#91CC75', '#EE6666']
@@ -167,23 +166,19 @@ export default {
               type: 'cross'
             }
           },
-          grid: { top: 70, right: 20, bottom: 10, left: 10, containLabel: true },
+          grid: { top: 90, right: 60, bottom: 20, left: 20, containLabel: true },
-          // legend: {
+          legend: {
-          //   itemWidth: 10,
+            itemWidth: 10,
-          //   itemHeight: 10,
+            itemHeight: 10,
-          //   top: '2%',
+            top: '0%',
-          //   right: '30px',
+            right: '20px',
-          //   data: ['产线良品率', '产线产量'],
+            data: ['产线产量', '产线良品率'],
-          //   textStyle: {
+            textStyle: {
-          //     fontSize: 12 * this.beilv,
+              fontSize: 12 * this.beilv,
-          //     color: '#ced1d5',
+              color: '#ced1d5'
-          //     fontWight: 'bolder'
+            }
-          //   }
-          // },
-          xAxis: {
-            axisTick: {
-              show: false
           },
+          xAxis: {
             type: 'category',
             axisLine: {
               lineStyle: {
@@ -192,11 +187,8 @@ export default {
                 width: '1' // 坐标线的宽度
               }
             },
-            textStyle: {
-              fontWight: 'bolder'
-            },
             axisLabel: {
-              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+              color: "#fff",
               fontSize: 12,
               // formatter: '{value}'
               // textStyle: {
@@ -224,13 +216,9 @@ export default {
               scale: true,
               type: 'value',
               name: '良品率/%',
-              max: 100,//最大值
-              min: 0,//最小值
-              interval: 20,//间隔
               nameTextStyle: {// y轴上方单位的颜色
-                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                color: '#fff',
                 align: "left",
-                padding: [0, 0, 0, 2]
               },
               position: 'right',
               alignTicks: true,
@@ -243,7 +231,7 @@ export default {
                 }
               },
               axisLabel: {
-                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                color: "#fff",
                 fontSize: 12,
                 // formatter: '{value}'
                 formatter: '{value}%'
@@ -273,9 +261,8 @@ export default {
               type: 'value',
               name: '产量/片', // y轴上方的单位
               nameTextStyle: {
-                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                color: "#fff",
                 // fontSize: 10,
-                padding: [0, 4, 0, 0],
                 align: "right",
               },
               // position: 'left',
@@ -291,7 +278,7 @@ export default {
               axisLabel: {
                 // textStyle: {
                 // color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
-                color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                color: "#fff",
                 // show: true,
                 lineStyle: {
                   color: "#25528f",

src/views/OperationalOverview/components/linearBarChart.vue

@@ -111,9 +111,8 @@ export default {
                 show: true,		//开启显示
                 position: 'top',	//在上方显示
                 textStyle: {	    //数值样式
-                  color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+                  color: '#ced1d5',
-                  fontSize: 12,
+                  fontSize: 12
-                  fontWeight: 'normal'
                 }
               },
             }
@@ -133,7 +132,7 @@ export default {
               type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
             }
           },
-          grid: { top: 70, right: 40, bottom: 10, left: 40, containLabel: true },
+          grid: { top: 90, right: 60, bottom: 20, left: 30, containLabel: true },
           // legend: {
           //   itemWidth: 10,
           //   itemHeight: 10,
@@ -145,9 +144,6 @@ export default {
           //   }
           // },
           xAxis: {
-            axisTick: {
-              show: false
-            },
             type: 'category',
             axisLine: {
               lineStyle: {
@@ -156,11 +152,8 @@ export default {
                 width: '1' // 坐标线的宽度
               }
             },
-            textStyle: {
-              fontWeight: 'bolder'
-            },
             axisLabel: {
-              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+              color: "#fff",
               fontSize: 12,
               // formatter: '{value}'
             },
@@ -174,13 +167,13 @@ export default {
           yAxis: {
             name: '单位kwh',
             nameTextStyle: {
-              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+              color: '#fff',
-              fontSize: 12,
+              fontSize: 10,
               align: 'right',
             },
             type: 'value',
             axisLabel: {
-              color: 'rgba(255,255,255,0.5)', // 坐标值得具体的颜色
+              color: "#fff",
               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-04-03 18:12:18
+ * @LastEditTime: 2024-03-28 16:30:14
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
-    <div :id="id" :style="{ height:'75px', width: width }" />
+    <div :id="id" class="productChart" :style="{ height: height + 'px', width: width }" />
   </div>
 </template>
 
@@ -71,10 +71,7 @@ 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 = []
@@ -94,12 +91,6 @@ 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']
@@ -114,11 +105,8 @@ 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 = [
         '良品',
         '废品',
@@ -138,7 +126,7 @@ export default {
           // },
           color:colors[sid],
           data: rawData.length != 0 ? rawData[sid].map((d, did) =>
-            totalData[did] <= 0 ? 0 : (d / totalData[did]).toFixed(4)
+            totalData[did] <= 0 ? 0 : d / totalData[did]
           ) : []
         };
       });
@@ -149,17 +137,6 @@ 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) {
@@ -167,16 +144,15 @@ export default {
             let singleData = series.filter(function (item) {
               return item.name == name
             })
-            return name + parseFloat((singleData[0].data * 100).toFixed(0)) + '%'
+            return name + parseFloat((singleData[0].data * 100).toFixed(3)) + '%'
           },
           itemWidth: 12,
           itemHeight: 12,
           bottom: '20',
           left: '20',
-          icon: 'roundRect',
+          icon: 'rect',
           textStyle: {
-            color: 'rgba(255,255,255,.9)',
+            color: '#ffffff'
-            fontSize:12,
           }
         },
         grid: {
@@ -208,9 +184,9 @@ export default {
               splitNumber: 50,
               // boundaryGap: [20, 20],
               textStyle: {
-                color: 'rgba(255,255,255,.9)',
+                color: '#ffffff',
                 verticalAlign: 'bottom',
-                fontSize: 16,
+                fontSize: 12,
                 align: 'left',
                 padding: [0, 0, 10, -5]
               }
@@ -236,9 +212,9 @@ export default {
               splitNumber: 50,
               // boundaryGap: [20, 20],
               textStyle: {
-                color: 'rgba(255,255,255,.9)',
+                color: '#ffffff',
                 verticalAlign: 'bottom',
-                fontSize: 16,
+                fontSize: 12,
                 align: 'right',
                 padding: [0, 0, 10, -5]
               }
@@ -252,15 +228,10 @@ export default {
         },
         series:series
       })
-      this.$nextTick(() => {
+      this.chart.resize({
-        setTimeout(() => {
+        width: 'auto',
-          this.resize()
+        height: 90
-        },1000);
+      });;
-      })
-      // this.chart.resize({
-      //   width: 'auto',
-      //   height: 90
-      // });;
     }
   }
 }

src/views/base/coreAlarmLog/index.vue

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

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

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

src/views/base/coreCustomer/index.vue

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

src/views/base/coreDepartment/index.vue

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

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

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

src/views/base/coreEquipment/index.vue

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

src/views/base/coreEquipmentLineBind/index.vue

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

src/views/base/coreEquipmentType/index.vue

@@ -12,8 +12,7 @@
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
 			:table-data="list"
-			@emitFun="handleEmitFun"
+			@emitFun="handleEmitFun">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -51,7 +50,6 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 import {
 	createEquipmentType,
@@ -67,7 +65,7 @@ import {
 export default {
 	name: 'EquipmentType',
 	components: {},
-	mixins: [basicPageMixin, tableHeightMixin],
+	mixins: [basicPageMixin],
 	data() {
 		return {
 			searchBarKeys: ['name'],
@@ -90,7 +88,7 @@ export default {
 					prop: 'createTime',
 					label: '添加时间',
 					fixed: true,
-					minWidth: 180,
+					width: 180,
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
 				{ prop: 'name', label: '类型名称' },
@@ -111,8 +109,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-equipment-type:create')
+					type: 'separate',
-						? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-equipment-type:create')
@@ -174,7 +171,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
-				pageSize: 20,
+				pageSize: 10,
 				name: '',
 			},
 			// 表单参数

src/views/base/coreHotMaterial/index.vue

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

src/views/base/coreMajor/index.vue

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

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

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

src/views/base/coreProduct/index.vue

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

src/views/base/coreProductionLine/index.vue

@@ -9,12 +9,11 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:minWidth="120"
+				:width="120"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -30,7 +29,7 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			minWidth="50%">
+			width="50%">
 			<add-or-update
 				ref="addOrUpdate"
 				@refreshDataList="successSubmit"></add-or-update>
@@ -49,47 +48,34 @@ import {
 import { getStatus } from '@/api/core/base/productionLine';
 import codeFilter from '../../core/mixins/code-filter';
 import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
 		prop: 'createTime',
 		label: '添加时间',
-		filter: parseTime,
+		filter: parseTime
-		minWidth: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'factoryName',
-		label: '工厂',
+		label: '工厂'
-		minWidth: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'roomNameDict',
 		label: '车间名称',
-		filter: publicFormatter('workshop'),
+		filter: publicFormatter('workshop')
-		minWidth: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'name',
-		label: '产线名称',
+		label: '产线名称'
-		minWidth: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'code',
-		label: '产线编码',
+		label: '产线编码'
-		minWidth: 150,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'enabled',
 		label: '当前状态',
-		filter: codeFilter('lineStatus'),
+		filter: codeFilter('lineStatus')
-		minWidth: 120,
-		showOverflowtooltip: true
 	},
 	// {
 	// 	prop: 'tvalue',
@@ -97,20 +83,16 @@ const tableProps = [
 	// },
 	{
 		prop: 'description',
-		label: '描述',
+		label: '描述'
-		minWidth: 120,
-		showOverflowtooltip: true
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		minWidth: 120,
-		showOverflowtooltip: true
 	}
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -147,7 +129,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-production-line:create') ? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-production-line:create') ? 'button' : '',

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

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

src/views/base/coreSupplier/index.vue

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

src/views/base/coreWorkOrder/allocation.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-04-08 10:21:46
+ * @LastEditTime: 2024-03-22 08:53:20
  * @Description:
 -->
 <template>
@@ -214,9 +214,7 @@ 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-04-10 16:16:31
+ * @LastEditTime: 2024-03-21 16:52:46
  * @Description:
 -->
 <template>
@@ -182,8 +182,7 @@
 					: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"
@@ -201,7 +200,6 @@
 					@pagination="getList" /> -->
 			</div>
 
-			<div v-if="$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])">
 			<div class="card" style="padding-bottom: 16px;">
 				<div class="boxTitle">
 					<span class="blueTitle"></span>
@@ -211,8 +209,7 @@
 					: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"
@@ -221,7 +218,6 @@
 					:page-sizes="[5, 10, 15]"
 					@pagination="getList" /> -->
 			</div>
-			</div>
 
 			<!-- <div class="drawer-body__footer">
 				<el-button type="primary" @click="goback()">关闭</el-button>
@@ -239,7 +235,6 @@ 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 = [
 	{
@@ -297,11 +292,9 @@ const tableProps1 = [
 ];
 
 export default {
-	mixins: [tableHeightMixin],
 	components: { SmallTitle, topTabVue },
 	data() {
 		return {
-			heightNum: 380,
 			tableBtn,
 			tableProps,
 			tableProps1,
@@ -462,8 +455,8 @@ export default {
 				// this.listQuery.total = response.data.total;
 			});
 			// 获取预使用原料列表
-			console.log('111我看看', this.dataForm.materialMethod)
+			console.log()
-			if (this.dataForm.id && this.$auth.hasPermiAnd(['base:material-product-bom-det:query', 'extend:process-flow:query'])) {
+			if (this.dataForm.id) {
 				if (this.dataForm.materialMethod === 1) {
 					// 产品
 					getlistByProductId({

src/views/base/coreWorkOrder/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -63,7 +62,7 @@ import {
 	getCoreWOList
 } from '@/api/base/coreWorkOrder';
 import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 
 const tableProps = [
 	{
@@ -133,7 +132,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	components: {
 		AddWorkOrder,
 		AddOrUpdate,
@@ -157,8 +156,7 @@ export default {
 				// 			showTip: '预使用原料信息'
 				// 	  }
 				// 	: undefined,
-					this.$auth.hasPermi(`base:core-work-order:update`)
+					{
-					? {
 						type: 'active',
 						btnName: '激活',
 						showParam: {
@@ -176,10 +174,8 @@ export default {
 								}
 							]
 						}
-						}
+					},
-					: undefined,
+					{
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
 						type: 'pause',
 						btnName: '暂停',
 						showParam: {
@@ -192,10 +188,8 @@ export default {
 								}
 							]
 						}
-						}
+					},
-					: undefined,
+					{
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
 						type: 'nullify',
 						btnName: '作废',
 						showParam: {
@@ -208,10 +202,8 @@ export default {
 								}
 							]
 						}
-						}
+					},
-					: undefined,
+					{
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
 						type: 'finish',
 						btnName: '完成',
 						showParam: {
@@ -229,10 +221,8 @@ export default {
 								}
 							]
 						}
-						}
+					},
-					: undefined,
+					{
-					this.$auth.hasPermi(`base:core-work-order:update`)
-					? {
 						type: 'stop',
 						btnName: '终止',
 						showParam: {
@@ -250,12 +240,8 @@ export default {
 								}
 							]
 						}
-						}
+					},
-					: undefined,
+					this.$auth.hasPermi(`base:core-work-order:detail`)
-					this.$auth.hasPermiAnd([
-						'base:core-work-order:query',
-						'base:order:query'
-					])
 					? {
 							type: 'detail',
 							btnName: '查看详情',

src/views/base/coreWorker/index.vue

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

src/views/base/coreWorkshopSection/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -46,7 +45,6 @@ import {
 	getCWSectionPage,
 	deleteCWSection
 } from '@/api/base/coreWorkshopSection';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -72,13 +70,12 @@ const tableProps = [
 	},
 	{
 		prop: 'remark',
-		label: '备注',
+		label: '备注'
-		showOverflowtooltip: true
 	},
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -115,7 +112,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('base:core-workshop-section:create') ? 'button' : '',

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-04-11 16:22:19
+ * @LastEditTime: 2024-03-21 15:21:32
  * @Description:
 -->
 <template>
@@ -122,14 +122,14 @@
 				</el-form>
 			</div>
 			
-			<div class="attr-list" v-if="idAttrShow && this.$auth.hasPermi('base:material-attr:query')">
+			<div class="attr-list" v-if="idAttrShow">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					物料属性
 				</small-title>
 
-				<div v-if="!isdetail && this.$auth.hasPermi('base:material-attr:create')" class="action_btn">
+				<div v-if="!isdetail" class="action_btn">
           <template>
             <span style="display: inline-block;">
               <el-button type="text" @click="addNew()" icon="el-icon-plus">新增</el-button>
@@ -182,23 +182,16 @@ import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
 import { getDictDatas } from "@/utils/dict";
 
-// const tableBtn = [
+const tableBtn = [
-// 		this.$auth.hasPermiAnd([
+	{
-// 			'base:material-attr:create',
+		type: 'edit',
-// 			'base:material-attr:update'
+		btnName: '编辑',
-// 		]) ?
+	},
-// 		{
+	{
-// 			type: 'edit',
+		type: 'delete',
-// 			btnName: '编辑',
+		btnName: '删除',
-// 		}
+	},
-// 		: undefined,
+];
-// 	this.$auth.hasPermi('base:material-attr:delete') ? 
-// 		{
-// 			type: 'delete',
-// 			btnName: '删除',
-// 		}
-// 	: undefined,
-// ];
 const tableProps = [
 	{
 		prop: 'createTime',
@@ -220,23 +213,7 @@ export default {
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-			tableBtn: [
+			tableBtn,
-				this.$auth.hasPermiAnd([
-					'base:material-attr:create',
-					'base:material-attr:update'
-				]) ?
-				{
-					type: 'edit',
-					btnName: '编辑',
-				}
-				: undefined,
-			this.$auth.hasPermi('base:material-attr:delete') ? 
-				{
-					type: 'delete',
-					btnName: '删除',
-				}
-			: undefined,
-			],
 			tableProps,
 			addOrUpdateVisible: false,
 			urlOptions: {

src/views/base/material/index.vue

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

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

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-04-11 16:44:41
+ * @LastEditTime: 2024-03-21 14:39:52
  * @Description:
 -->
 <template>
@@ -56,14 +56,14 @@
 					</el-row>
 				</el-form>
 			</div>
-			<div class="attr-list" v-if="idAttrShow && $auth.hasPermiAnd(['base:material-product-bom:query', 'base:material-product-bom-det:query'])">
+			<div class="attr-list" v-if="idAttrShow">
 				<small-title
 					style="margin: 16px 0; padding-left: 8px"
 					:no-padding="true">
 					BOM明细
 				</small-title>
 
-				<div v-if="!isdetail && $auth.hasPermi('base:material-product-bom:create')" class="action_btn">
+				<div v-if="!isdetail" class="action_btn">
           <template>
             <span style="display: inline-block;">
               <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
@@ -116,16 +116,16 @@ import { parseTime } from '../../core/mixins/code-filter';
 import attrAdd from './attr-add';
 import { publicFormatter } from '@/utils/dict';
 
-// const tableBtn = [
+const tableBtn = [
-// 	{
+	{
-// 		type: 'edit',
+		type: 'edit',
-// 		btnName: '编辑',
+		btnName: '编辑',
-// 	},
+	},
-// 	{
+	{
-// 		type: 'delete',
+		type: 'delete',
-// 		btnName: '删除',
+		btnName: '删除',
-// 	},
+	},
-// ];
+];
 const tableProps = [
 	{
 		prop: 'createTime',
@@ -160,24 +160,7 @@ export default {
 	components: { SmallTitle, attrAdd },
 	data() {
 		return {
-			tableBtn: [
+			tableBtn,
-				this.$auth.hasPermiAnd([
-					'base:material-product-bom:update',
-					'base:material-product-bom-det:create',
-					'base:material-product-bom-det:update'
-				]) ?
-				{
-					type: 'edit',
-					btnName: '编辑',
-				}
-				: undefined,
-				this.$auth.hasPermi('base:material-product-bom:delete') ? 
-					{
-						type: 'delete',
-						btnName: '删除',
-					}
-				: undefined,
-			],
 			tableProps,
 			addOrUpdateVisible: false,
 			urlOptions: {

src/views/base/materialProductBom/index.vue

@@ -9,8 +9,7 @@
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
-			:table-data="tableData"
+			:table-data="tableData">
-			:max-height="tableH">
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
@@ -39,7 +38,6 @@ import {
 	getMaterialPBPage,
 	deleteMaterialPB
 } from '@/api/base/materialProductBom';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -57,7 +55,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage, tableHeightMixin],
+	mixins: [basicPage],
 	components: {
 		AddOrUpdate,
 	},
@@ -110,7 +108,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:material:create') ? 'separate' : '',
+					type: 'separate',
 				},
 				{
 					type: this.$auth.hasPermi('base:material:create') ? 'button' : '',

src/views/base/packagingPrintLog/index.vue

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

src/views/base/packagingPrintModel/index.vue

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

src/views/base/packagingPrintType/index.vue

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

src/views/choicePart/index.vue

@@ -2,28 +2,17 @@
   <div class="choicepart-container">
     <navbar />
     <div class="choicepart-wrapper">
-			<div
+      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1710px;height:538px;'" v-show="showItem">
-				class="choicepart-box"
-				id="choicepartBox"
-				:style="'transform:scale(' + scale + ')'"
-				style="width: 1710px; height: 538px"
-				v-show="showItem">
       <div class="choicepart-line1">
         <div
           v-for="(item, index) in menuArr1"
           :key="index"
           class="choicepart-item"
           @click="handelClick(item, item.choicepart)"
-						:style="{
+          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
-							opacity: item.visible ? 1 : 0.4,
+        >
-							pointerEvents: item.visible ? 'auto' : 'none',
-						}">
           <div>
-							<img
+            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
-								:src="
-									require(`../../assets/images/choicepart/${item.name}.png`)
-								"
-								alt="" />
           </div>
           <div class="choicepart-item-title">{{item.meta.title}}</div>
         </div>
@@ -34,16 +23,10 @@
           :key="index"
           class="choicepart-item"
           @click="handelClick(item, item.choicepart)"
-						:style="{
+          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
-							opacity: item.visible ? 1 : 0.4,
+        >
-							pointerEvents: item.visible ? 'auto' : 'none',
-						}">
           <div>
-							<img
+            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
-								:src="
-									require(`../../assets/images/choicepart/${item.name}.png`)
-								"
-								alt="" />
           </div>
           <div class="choicepart-item-title">{{item.meta.title}}</div>
         </div>
@@ -54,13 +37,14 @@
   </div>
 </template>
 <script>
-import Navbar from './components/Navbar';
+import Navbar from './components/Navbar'
-import { debounce } from '@/utils/debounce';
+import { debounce } from '@/utils/debounce'
 export default {
   components: { Navbar },
   name: 'choicePart',
   data() {
     return {
+      boxReset: '',
       scale: 1,
       menuArr1: [
         {
@@ -68,65 +52,65 @@ export default {
           title: '基础核心',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Order',
           title: '订单管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Equipment',
           title: '设备管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Group',
           title: '班组管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Quality',
           title: '质量管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Warehouse',
           title: '仓库管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Energy',
           title: '能源管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Packaging',
           title: '包装管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
-				},
+        }
       ],
       menuArr2: [
         {
@@ -134,16 +118,16 @@ export default {
           title: '物料管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Extend',
           title: '工艺管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         // {
         //   name: 'Delivery',
@@ -158,94 +142,91 @@ export default {
           title: '报表管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Cost',
           title: '成本管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'SafetyEnvironmental',
           title: '安环管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'Databoard',
           title: '数据驾驶舱',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
         },
         {
           name: 'System',
           title: '系统管理',
           visible: false,
           meta: {
-						title: '',
+            title: ''
-					},
+          }
-				},
+        }
       ],
-			showItem: false,
+      showItem: false
-		};
+    }
   },
   // computed:{
   //   ...mapGetters(['sidebarRouters'])
   // },
   mounted() {
-		this.getMsg();
+    this.getMsg()
-		this.boxReset();
+    this.boxReset = debounce(() => {
-		window.addEventListener('resize', this.boxReset);
+      this.resetSize()
-	},
+    }, 300)
-	destroyed() {
+    this.boxReset()
-		window.removeEventListener('resize', this.boxReset);
+    window.addEventListener('resize', () => {
+      this.boxReset()
+    })
   },
   methods: {
-		boxReset() {
-			debounce(() => {
-				this.resetSize();
-			}, 300)();
-		},
     getMsg() {
-			let menuList = this.$store.state.permission.sidebarRouters;
+      let menuList = this.$store.state.permission.sidebarRouters
-			console.log(menuList);
+      console.log(menuList)
       if (menuList.length > 0) {
         for (let i = 0; i < menuList.length; i ++) {
           for (let k = 0; k < 8; k++) {
             if (menuList[i].name === this.menuArr1[k].name) {
-							this.menuArr1[k].visible = true;
+              this.menuArr1[k].visible = true
-							this.menuArr1[k].id = menuList[i].id;
+              this.menuArr1[k].id = menuList[i].id
-							this.menuArr1[k].choicepart = i;
+              this.menuArr1[k].choicepart = i
-							this.menuArr1[k].children = menuList[i].children;
+              this.menuArr1[k].children = menuList[i].children
-							this.menuArr1[k].meta = menuList[i].meta;
+              this.menuArr1[k].meta = menuList[i].meta
             }
           }
           for (let j = 0; j < 7; j++) {
             if (menuList[i].name === this.menuArr2[j].name) {
-							this.menuArr2[j].visible = true;
+              this.menuArr2[j].visible = true
-							this.menuArr2[j].id = menuList[i].id;
+              this.menuArr2[j].id = menuList[i].id
-							this.menuArr2[j].choicepart = i;
+              this.menuArr2[j].choicepart = i
-							this.menuArr2[j].children = menuList[i].children;
+              this.menuArr2[j].children = menuList[i].children
-							this.menuArr2[j].meta = menuList[i].meta;
+              this.menuArr2[j].meta = menuList[i].meta
             }
           }
         }
       }
-			console.log(this.menuArr1);
+      console.log(this.menuArr1)
-			console.log(this.menuArr2);
+      console.log(this.menuArr2)
     },
     handelClick(item, index) {
       // this.$router.push({name: 'SystemUser'})
-			this.$store.dispatch('app/setChoicepart', index);
+      this.$store.dispatch('app/setChoicepart', index)
-			this.toRouter(item);
+      this.toRouter(item)
       // if (item.meta.unuse) {
       //   this.$message.warning(this.$t('暂无数据'))
       // } else {
@@ -253,36 +234,36 @@ export default {
       // }
     },
     toRouter(item) {
-			console.log(item);
+      console.log(item)
       if (item.children) {
-				this.toRouter(item.children[0]);
+        this.toRouter(item.children[0])
       } else {
-				this.$router.push({ name: item.name });
+        this.$router.push({ name: item.name })
       }
     },
     resetSize() {
-			let _this = this;
+      let _this = this
-			_this.showItem = false;
+      _this.showItem = false
-			_this.loading = true;
+      _this.loading = true
-			let choicepartBox = document.querySelector('#choicepartBox');
+      let choicepartBox = document.querySelector('#choicepartBox')
-			let rw = parseFloat(window.innerWidth);
+      let rw = parseFloat(window.innerWidth)
-			let rh = parseFloat(window.innerHeight);
+      let rh = parseFloat(window.innerHeight)
-			let bw = parseFloat(choicepartBox.style.width);
+      let bw = parseFloat(choicepartBox.style.width)
-			let bh = parseFloat(choicepartBox.style.height);
+      let bh = parseFloat(choicepartBox.style.height)
-			let wx = 0.82 / (bw / rw);
+      let wx = 0.82/(bw / rw)
-			let hx = 0.56 / (bh / rh);
+      let hx = 0.56/(bh / rh)
-			_this.scale = wx > hx ? hx : wx;
+      _this.scale = wx > hx ? hx : wx
-			setTimeout(_this.showItemFun, 700);
+      setTimeout(_this.showItemFun, 700)
     },
     showItemFun() {
-			this.loading = false;
+      this.loading = false
-			this.showItem = true;
+      this.showItem = true
-		},
+    }
   },
   beforeDestroy() {
-		this.showItem = false;
+    this.showItem = false
-	},
+  }
-};
+}
 </script>
 <style lang='scss' scoped>
 .choicepart-container {
@@ -315,8 +296,7 @@ export default {
     .choicepart-item {
       width: 184px;
       height: 224px;
-			background: url('../../assets/images/choicepart/choice-item-back.png')
+      background: url('../../assets/images/choicepart/choice-item-back.png') no-repeat;
-				no-repeat;
       background-size: 100% 100%;
       border-radius: 5px;
       overflow: hidden;
@@ -354,7 +334,7 @@ export default {
   .choicepart-footer {
     position: absolute;
     width: 100%;
-		color: #c7c7c7;
+    color: #C7C7C7;
     user-select: none;
     font-size: 12px;
     letter-spacing: 1px;

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

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

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

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

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

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

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

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

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

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

src/views/cost/energyCost/index.vue

@@ -32,7 +32,6 @@ import {
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -62,7 +61,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -71,6 +70,7 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -92,15 +92,13 @@ export default {
 					param: 'searchTime',
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-energy-search:query')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-energy-search:export')
+					type: this.$auth.hasPermi('cost:energyCost:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -113,6 +111,9 @@ 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,7 +32,6 @@ import {
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -72,7 +71,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -81,6 +80,7 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -116,15 +116,13 @@ export default {
 					defaultSelect: [],
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-enery-auto-report:query')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-enery-auto-report:export')
+					type: this.$auth.hasPermi('cost:energyCostHis:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -137,6 +135,9 @@ 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,7 +53,6 @@ import {
 } from '@/api/cost/costMaterialSet';
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -92,7 +91,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -100,14 +99,15 @@ export default {
 				deleteURL: deleteCostMaterialSet,
 			},
 			tableProps,
+      tableH: this.tableHeight(260),
 			tableBtn: [
-				this.$auth.hasPermi(`extend:cost-material-set:update`)
+				this.$auth.hasPermi(`cost:rawMaterialConfig:update`)
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi(`extend:cost-material-set:delete`)
+				this.$auth.hasPermi(`cost:rawMaterialConfig:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
@@ -124,22 +124,16 @@ export default {
 					filterable: true,
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-material-set:query')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type:
+					type: 'separate',
-						this.$auth.hasPermi('extend:cost-material-set:create') &&
-						this.$auth.hasPermi('extend:cost-material-set:query')
-							? 'separate'
-							: '',
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-material-set:create')
+					type: this.$auth.hasPermi('cost:rawMaterialConfig:create')
 						? 'button'
 						: '',
 					btnName: '新增',
@@ -154,6 +148,9 @@ 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,7 +32,6 @@ import {
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -67,7 +66,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -76,6 +75,7 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -97,15 +97,13 @@ export default {
 					param: 'searchTime',
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-material-search:query')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-material-search:export')
+					type: this.$auth.hasPermi('cost:rawMaterialCost:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -118,6 +116,9 @@ 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,7 +32,6 @@ import {
 import { getHotMaterialList } from '@/api/base/coreHotMaterial';
 import { publicFormatter } from '@/utils/dict';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 const tableProps = [
 	{
@@ -71,7 +70,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage],
 	data() {
 		return {
 			urlOptions: {
@@ -80,6 +79,7 @@ export default {
 			},
 			tableData: [],
 			tableProps,
+      tableH: this.tableHeight(260),
 			drawerVisible: false,
 			formConfig: [
 				{
@@ -115,15 +115,13 @@ export default {
 					defaultSelect: [],
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-material-auto-report:query')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('extend:cost-material-auto-report:export')
+					type: this.$auth.hasPermi('cost:rawMaterialCostHis:export')
 						? 'button'
 						: '',
 					btnName: '导出',
@@ -136,6 +134,9 @@ 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,17 +1,13 @@
 <template>
-	<div style="height: 370px">
+  <div style="height: 370px;">
     <NotMsg v-show="notMsg"/>
-		<div
+    <div id="numRateChart" class="num-rate-chart" style="width:900px;height:420px;" v-show='!notMsg'></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],
@@ -19,88 +15,65 @@ 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 = []
-			for (let i = 0; i < this.productline.length - 1; i++) {
+      this.productline && this.productline.length > 0 && this.productline.map(item => {
-				// 二次循环，注意：再减去外层的循环次数，向后依次两两相互比较转换；
+        if ((item.lineName).includes('D')) {
-				for (let j = 0; j < this.productline.length - i - 1; j++) {
+          xData.push(item.lineName)
-					// 当前一个值大于后一个值
+          outputNum.push(item.outputNum)
-					if (
+          passRate.push(item.passRate?item.passRate*100:null)
-						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,
@@ -110,32 +83,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: [
           {
@@ -147,20 +120,21 @@ 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',
@@ -171,22 +145,24 @@ export default {
               align: 'LEFT',
             },
             axisLabel: {
-							color: '#fff',
+              color: "#fff",
               fontSize: 12,
-							formatter: '{value}%',
+              formatter: () =>{
+                return value ? '{value} %': '-'
+              }
             },
           axisLine: {
             show: true,
             lineStyle: {
-								color: '#213259',
+              color: "#213259",
             },
           },
           splitLine: {
             lineStyle: {
-								color: '#213259a0',
+              color: "#213259a0",
-							},
-						},
             },
+          }
+          }
         ],
         series: [
           {
@@ -195,16 +171,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: '良品率',
@@ -213,31 +189,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,17 +1,9 @@
 <template>
-	<div style="flex: 1">
+  <div style="flex: 1;">
-		<Container
+    <Container name="各工序缺陷汇总" size="middle" style="">
-			name="各工序缺陷汇总"
+      <TimePrompt class="timeShow" :timestr="timestr" />
-			size="middle"
+      <div style="padding: 5px 10px;">
-			style="">
+        <dv-scroll-board :config="config" style="width:575px;height:380px" ref='defectScrollBoard'/>
-			<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>
@@ -19,14 +11,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 {
@@ -38,23 +30,14 @@ export default {
         evenRowBGC: 'rgba(14, 32, 62, 0.8)',
         columnWidth: [60],
         align: ['center'],
-				data: [
+        data: [],
-					//假数据
+        // data: [[1, 'Y61', '破损','10','气泡']],
-					[1, 'D61', '成型', '3片', '细长泡'],
+        rowNum: 10
-					[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: {
@@ -64,15 +47,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/deepProcessing/index.vue

@@ -1,11 +1,8 @@
 <template>
+	<div id='deepProcessingContainerB' ref='deepProcessingContainerB' style="width: 100%;height: 100%;">
 		<div
-		id="deepProcessingContainerB"
+			id='deepProcessingContainer'
-		ref="deepProcessingContainerB"
+			ref='deepProcessingContainer'
-		style="width: 100%; height: 100%">
-		<div
-			id="deepProcessingContainer"
-			ref="deepProcessingContainer"
 			class="deepProcessingBoard"
 			style="
 				position: absolute;
@@ -20,13 +17,14 @@
 				gap: 24px;
 			"
 			:style="{transform:'scale('+scaleNum+')'}">
-			<KHeader
+			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='深加工生产运行驾驶舱'/>
-				:isFullScreen="isFullScreen"
-				@screenfullChange="screenfullChange"
-				topTitle="深加工生产运行驾驶舱" />
 			<div
 				class="main-body"
-				style="display: grid; gap: 16px; grid-template-rows: 462px 462px">
+				style="
+					display: grid;
+					gap: 16px;
+					grid-template-rows: 462px 462px;
+				">
 				<TopThree />
 				<BottomTwo />
 			</div>
@@ -49,16 +47,16 @@
 import KHeader from '../components/Header';
 import TopThree from './TopThree';
 import BottomTwo from './BottomTwo';
-import screenfull from 'screenfull';
+import screenfull from 'screenfull'
-import { debounce } from '@/utils/debounce';
+import { debounce } from '@/utils/debounce'
-import { getDcsMsg, getMesMsg } from './../utils/wsInterface';
+import { getDcsMsg, getMesMsg } from './../utils/wsInterface'
 
 export default {
 	name: 'deepProcessingBoard',
 	components: {
 		KHeader,
 		TopThree,
-		BottomTwo,
+		BottomTwo
 	},
 	// provide() {
 	// 	return {
@@ -68,52 +66,43 @@ export default {
 	data() {
 		return {
 			isFullScreen: false,
-			scaleNum: 0.8,
+			scaleNum: 0.8
 		};
 	},
 	created() {
-		this.init();
+		this.init()
 	},
 	destroy() {
-		this.destroy();
+		this.destroy()
 	},
 	mounted() {
 		this.boxReset = debounce(() => {
-			this.resetSize();
+      this.resetSize()
-		}, 300);
+    }, 300)
-		this.boxReset();
+    this.boxReset()
     window.addEventListener('resize', () => {
-			this.boxReset();
+      this.boxReset()
-		});
+    })
 		// closeWebsocket()
 		// getDcsMsg()
 		// getMesMsg()
-	},
+		console.log('mounted...........')
-	mounted() {
-		this.boxReset();
-		window.addEventListener('resize', this.boxReset);
 	},
 	destroyed() {
-		window.removeEventListener('resize', this.boxReset);
+		console.log('destroyed...........')
-		this.destroy();
 	},
 	methods: {
-		boxReset() {
-			debounce(() => {
-				this.resetSize();
-			}, 300)();
-		},
 		change() {
-			this.isFullScreen = screenfull.isFullscreen;
+      this.isFullScreen = screenfull.isFullscreen
     },
     init() {
       if (screenfull.isEnabled) {
-				screenfull.on('change', this.change);
+        screenfull.on('change', this.change)
       }
     },
     destroy() {
       if (screenfull.isEnabled) {
-				screenfull.off('change', this.change);
+        screenfull.off('change', this.change)
       }
     },
 		// 全屏
@@ -121,37 +110,39 @@ export default {
       if (!screenfull.isEnabled) {
         this.$message({
           message: 'you browser can not work',
-					type: 'warning',
+          type: 'warning'
-				});
+        })
-				return false;
+        return false
       }
-			screenfull.toggle(this.$refs.deepProcessingContainerB);
+      screenfull.toggle(this.$refs.deepProcessingContainerB)
     },
 		resetSize() {
-			let deepProcessingContainer = document.getElementById(
+      let deepProcessingContainer = document.getElementById('deepProcessingContainer')
-				'deepProcessingContainer'
+      let rw = parseFloat(window.innerWidth)
-			);
+      let rh = parseFloat(window.innerHeight)
-			let rw = parseFloat(window.innerWidth);
+      let bw = parseFloat(deepProcessingContainer.style.width)
-			let rh = parseFloat(window.innerHeight);
+      let bh = parseFloat(deepProcessingContainer.style.height)
-			let bw = parseFloat(deepProcessingContainer.style.width);
+			let wx = 0
-			let bh = parseFloat(deepProcessingContainer.style.height);
+			let hx = 0
-			let wx = 0;
-			let hx = 0;
 			if (screenfull.isFullscreen) {
-				wx = rw / bw;
+				console.log('全屏')
-				hx = rh / bh;
+				wx = rw / bw
+				hx = rh / bh
+				console.log(this.scaleNum)
 			}else{
+				console.log('非全屏')
+				console.log(this.$store.state.app.sidebar.opened)
 				if (this.$store.state.app.sidebar.opened) {
-					wx = (rw - 280) / bw;
+					wx = (rw-280) / bw
-					hx = (rh - 116) / bh;
+					hx = (rh-116) / bh
 				}else{
-					wx = (rw - 85) / bw;
+					wx = (rw-85) / bw
-					hx = (rh - 116) / bh;
+					hx = (rh-116) / bh
+				}
+			}
+			this.scaleNum = wx
     }
 	}
-			this.scaleNum = wx;
-		},
-	},
 };
 </script>
 

src/views/databoard/kiln/MaterialCost.vue

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

src/views/databoard/kiln/index.vue

@@ -1,11 +1,8 @@
 <template>
+	<div id='kilnContainerB' ref='kilnContainerB' style="width: 100%;height: 100%;">
 		<div
-		id="kilnContainerB"
+			id='kilnContainer'
-		ref="kilnContainerB"
+			ref='kilnContainer'
-		style="width: 100%; height: 100%">
-		<div
-			id="kilnContainer"
-			ref="kilnContainer"
 			class="KilnDataBoard"
 			style="
 				position: absolute;
@@ -20,21 +17,14 @@
 				gap: 24px;
 			"
 			:style="{transform:'scale('+scaleNum+')'}">
-			<KHeader
+			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='窑炉生产运行驾驶舱'/>
-				:isFullScreen="isFullScreen"
-				@screenfullChange="screenfullChange"
-				topTitle="窑炉生产运行驾驶舱" />
 			<div
 				class="main-body"
 				style="flex: 1; display: flex; gap: 20px; padding: 0px 16px">
-				<div
+				<div class="left-side" style="flex: 2">
-					class="left-side"
-					style="flex: 2">
 					<LeftFour />
 				</div>
-				<div
+				<div class="right-side" style="flex: 1">
-					class="right-side"
-					style="flex: 1">
 					<RightTwo />
 				</div>
 			</div>
@@ -46,8 +36,8 @@
 import KHeader from '../components/Header';
 import LeftFour from './LeftFour';
 import RightTwo from './RightTwo.vue';
-import screenfull from 'screenfull';
+import screenfull from 'screenfull'
-import { debounce } from '@/utils/debounce';
+import { debounce } from '@/utils/debounce'
 
 export default {
 	name: 'Kiln',
@@ -59,7 +49,7 @@ export default {
 	computed:{
 		sidebarStatus() {
 			return this.$store.state.app.sidebar.opened;
-		},
+		}
 	},
 	// provide() {
 	// 	return {
@@ -69,44 +59,43 @@ export default {
 	data() {
 		return {
 			isFullScreen: false,
-			scaleNum: 0.8,
+			scaleNum: 0.8
 		};
 	},
 	watch: {
 		sidebarStatus() {
-			this.boxReset();
+			this.boxReset()
 		},
 	},
 	created() {
-		this.init();
+		this.init()
+	},
+	destroy() {
+		this.destroy()
 	},
 	mounted() {
-		this.boxReset();
+		this.boxReset = debounce(() => {
-		window.addEventListener('resize', this.boxReset);
+      this.resetSize()
-	},
+    }, 300)
-	destroyed() {
+    this.boxReset()
-		window.removeEventListener('resize', this.boxReset);
+    window.addEventListener('resize', () => {
-		this.destroy();
+      this.boxReset()
+    })
 	},
 	methods: {
-		boxReset() {
-			debounce(() => {
-				this.resetSize();
-			}, 300)();
-		},
 		change() {
-			this.isFullScreen = screenfull.isFullscreen;
+      this.isFullScreen = screenfull.isFullscreen
     },
 
     init() {
       if (screenfull.isEnabled) {
-				screenfull.on('change', this.change);
+        screenfull.on('change', this.change)
       }
     },
 
     destroy() {
       if (screenfull.isEnabled) {
-				screenfull.off('change', this.change);
+        screenfull.off('change', this.change)
       }
     },
 		// 全屏
@@ -114,35 +103,40 @@ export default {
       if (!screenfull.isEnabled) {
         this.$message({
           message: 'you browser can not work',
-					type: 'warning',
+          type: 'warning'
-				});
+        })
-				return false;
+        return false
       }
-			screenfull.toggle(this.$refs.kilnContainerB);
+      screenfull.toggle(this.$refs.kilnContainerB)
     },
 		resetSize() {
-			let kilnContainerBox = document.getElementById('kilnContainer');
+      let kilnContainerBox = document.getElementById('kilnContainer')
-			let rw = parseFloat(window.innerWidth);
+			console.log(kilnContainerBox)
-			let rh = parseFloat(window.innerHeight);
+      let rw = parseFloat(window.innerWidth)
-			let bw = parseFloat(kilnContainerBox.style.width);
+      let rh = parseFloat(window.innerHeight)
-			let bh = parseFloat(kilnContainerBox.style.height);
+      let bw = parseFloat(kilnContainerBox.style.width)
-			let wx = 0;
+      let bh = parseFloat(kilnContainerBox.style.height)
-			let hx = 0;
+			let wx = 0
+			let hx = 0
 			if (screenfull.isFullscreen) {
-				wx = rw / bw;
+				console.log('全屏')
-				hx = rh / bh;
+				wx = rw / bw
+				hx = rh / bh
+				console.log(this.scaleNum)
 			}else{
+				console.log('非全屏')
+				console.log(this.$store.state.app.sidebar.opened)
 				if (this.$store.state.app.sidebar.opened) {
-					wx = (rw - 280) / bw;
+					wx = (rw-280) / bw
-					hx = (rh - 116) / bh;
+					hx = (rh-116) / bh
 				}else{
-					wx = (rw - 85) / bw;
+					wx = (rw-85) / bw
-					hx = (rh - 116) / bh;
+					hx = (rh-116) / bh
+				}
+			}
+			this.scaleNum = wx
     }
 	}
-			this.scaleNum = wx;
-		},
-	},
 };
 </script>
 

src/views/databoard/wholePlant/index.vue

@@ -1,11 +1,8 @@
 <template>
+	<div id='wholePlantContainerB' ref='wholePlantContainerB' style="width: 100%;height: 100%;">
 		<div
-		id="wholePlantContainerB"
+			id='wholePlantContainer'
-		ref="wholePlantContainerB"
+			ref='wholePlantContainer'
-		style="width: 100%; height: 100%">
-		<div
-			id="wholePlantContainer"
-			ref="wholePlantContainer"
 			class="wholePlantBoard"
 			style="
 				position: absolute;
@@ -20,26 +17,17 @@
 				gap: 24px;
 			"
 			:style="{transform:'scale('+scaleNum+')'}">
-			<KHeader
+			<KHeader :isFullScreen='isFullScreen' @screenfullChange='screenfullChange' topTitle='全厂总览驾驶舱'/>
-				:isFullScreen="isFullScreen"
-				@screenfullChange="screenfullChange"
-				topTitle="全厂总览驾驶舱" />
 			<div
 				class="main-body"
 				style="flex: 1; display: flex; gap: 20px; padding: 0px 16px">
-				<div
+				<div class="left-side" style="flex: 1">
-					class="left-side"
-					style="flex: 1">
 					<LeftTwo />
 				</div>
-				<div
+				<div class="middle-side" style="flex: 1">
-					class="middle-side"
-					style="flex: 1">
 					<MiddleTwo />
 				</div>
-				<div
+				<div class="right-side" style="flex: 1">
-					class="right-side"
-					style="flex: 1">
 					<RightTwo />
 				</div>
 			</div>
@@ -52,8 +40,8 @@ import KHeader from '../components/Header';
 import LeftTwo from './LeftTwo';
 import MiddleTwo from './MiddleTwo';
 import RightTwo from './RightTwo';
-import screenfull from 'screenfull';
+import screenfull from 'screenfull'
-import { debounce } from '@/utils/debounce';
+import { debounce } from '@/utils/debounce'
 
 export default {
 	name: 'wholePlantBoard',
@@ -61,7 +49,7 @@ export default {
 		KHeader,
 		LeftTwo,
 		MiddleTwo,
-		RightTwo,
+		RightTwo
 	},
 	// provide() {
 	// 	return {
@@ -71,39 +59,40 @@ export default {
 	data() {
 		return {
 			isFullScreen: false,
-			scaleNum: 0.8,
+			scaleNum: 0.8
 		};
 	},
 	created() {
-		this.init();
+		this.init()
 	},
 	destroy() {
-		this.destroy();
+		this.destroy()
 	},
 	mounted() {
-		this.boxReset();
+		this.boxReset = debounce(() => {
-		window.addEventListener('resize', this.boxReset);
+      this.resetSize()
+    }, 300)
+    this.boxReset()
+    window.addEventListener('resize', () => {
+      this.boxReset()
+    })
+		console.log('mounted...........')
 	},
 	destroyed() {
-		window.removeEventListener('resize', this.boxReset);
+		console.log('destroyed...........')
 	},
 	methods: {
-		boxReset() {
-			debounce(() => {
-				this.resetSize();
-			}, 300)();
-		},
 		change() {
-			this.isFullScreen = screenfull.isFullscreen;
+      this.isFullScreen = screenfull.isFullscreen
     },
     init() {
       if (screenfull.isEnabled) {
-				screenfull.on('change', this.change);
+        screenfull.on('change', this.change)
       }
     },
     destroy() {
       if (screenfull.isEnabled) {
-				screenfull.off('change', this.change);
+        screenfull.off('change', this.change)
       }
     },
 		// 全屏
@@ -111,37 +100,39 @@ export default {
       if (!screenfull.isEnabled) {
         this.$message({
           message: 'you browser can not work',
-					type: 'warning',
+          type: 'warning'
-				});
+        })
-				return false;
+        return false
       }
-			screenfull.toggle(this.$refs.wholePlantContainerB);
+      screenfull.toggle(this.$refs.wholePlantContainerB)
     },
 		resetSize() {
-			let wholePlantContainerBox = document.getElementById(
+      let wholePlantContainerBox = document.getElementById('wholePlantContainer')
-				'wholePlantContainer'
+      let rw = parseFloat(window.innerWidth)
-			);
+      let rh = parseFloat(window.innerHeight)
-			let rw = parseFloat(window.innerWidth);
+      let bw = parseFloat(wholePlantContainerBox.style.width)
-			let rh = parseFloat(window.innerHeight);
+      let bh = parseFloat(wholePlantContainerBox.style.height)
-			let bw = parseFloat(wholePlantContainerBox.style.width);
+			let wx = 0
-			let bh = parseFloat(wholePlantContainerBox.style.height);
+			let hx = 0
-			let wx = 0;
-			let hx = 0;
 			if (screenfull.isFullscreen) {
-				wx = rw / bw;
+				console.log('全屏')
-				hx = rh / bh;
+				wx = rw / bw
+				hx = rh / bh
+				console.log(this.scaleNum)
 			}else{
+				console.log('非全屏')
+				console.log(this.$store.state.app.sidebar.opened)
 				if (this.$store.state.app.sidebar.opened) {
-					wx = (rw - 280) / bw;
+					wx = (rw-280) / bw
-					hx = (rh - 116) / bh;
+					hx = (rh-116) / bh
 				}else{
-					wx = (rw - 85) / bw;
+					wx = (rw-85) / bw
-					hx = (rh - 116) / bh;
+					hx = (rh-116) / bh
+				}
+			}
+			this.scaleNum = wx
     }
 	}
-			this.scaleNum = wx;
-		},
-	},
 };
 </script>
 

src/views/delivery/deliveryLog/index.vue

@@ -4,27 +4,31 @@
     <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"
@@ -32,10 +36,9 @@
 			@cancel="handleCancel"
 			@confirm="handleConfirm"
 			:before-close="handleCancel"
-			width="50%">
+			width="50%"
-			<add-or-update
+    >
-				ref="addOrUpdate"
+			<add-or-update ref="addOrUpdate" @successSubmit="successSubmit" />
-				@successSubmit="successSubmit" />
 		</base-dialog>
     <!-- 装车 -->
     <base-dialog
@@ -44,78 +47,73 @@
 			@cancel="handleCancel2"
 			@confirm="handleConfirm2"
 			:before-close="handleCancel2"
-			width="50%">
+			width="50%"
-			<loaded-page
+    >
-				ref="loadedPage"
+			<loaded-page ref="loadedPage" @successSubmit="successSubmit2" />
-				@successSubmit="successSubmit2" />
 		</base-dialog>
     <!-- 发货详情 -->
-		<delivery-log-detail
+    <delivery-log-detail ref='deliveryLogDetail' v-if='showDetail' />
-			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: [
@@ -123,38 +121,34 @@ 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')
+          type: this.$auth.hasPermi('extend:delivery-log:create') ? 'separate' : '',
-						? 'separate'
-						: '',
         },
         {
-					type: this.$auth.hasPermi('extend:delivery-log:create')
+          type: this.$auth.hasPermi('extend:delivery-log:create') ? 'button' : '',
-						? 'button'
-						: '',
           btnName: '新增',
           name: 'add',
           color: 'success',
-					plain: true,
+          plain: true
-				},
+        }
       ],
       // 查询参数
       queryParams: {
@@ -162,163 +156,158 @@ 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 && arr.map(item => {
-					arr.map((item) => {
+          item.principalCost = item.principalCost.toFixed(2)
-						item.principalCost = item.principalCost.toFixed(2);
+        })
-					});
+        this.list = arr
-				this.list = arr;
+        this.total = res.data.total || 0
-				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(
+            this.$refs.loadedPage.init(val.data.id, val.data.code, val.data.orderId)
-							val.data.id,
+          })
-							val.data.code,
+          break
-							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
+      this.$modal.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?').then(function() {
-				.confirm('是否确认删除发货单名为"' + val.name + '"的数据项?')
+          return deliveryLogDelete({ id: val.id })
-				.then(function () {
+        }).then(() => {
-					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,121 +4,127 @@
     <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,43 +2,44 @@
   <div 
     id="analysischartBar"
     style="width: 100%"
-		:style="{ height: chartHeight + 'px' }"></div>
+    :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: 'BarChart',
+  name: "BarChart",
   mixins: [resize],
   data() {
     return {
       chartDom: '',
       chart: '',
-			chartHeight: this.tableHeight(250) / 2,
+      chartHeight: this.tableHeight(214) - 70
-		};
+    }
   },
   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(250) / 2;
+      this.chartHeight = this.tableHeight(214) - 70
-		});
+    })
   },
   methods: {
     getChart() {
@@ -47,99 +48,101 @@ 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 = {
           name: this.chartData[i].objName + this.chartData[i].objCode,
           type: 'bar',
           barMaxWidth: 20,
-					data: [],
+          label: {
-				};
+            show: true,
-				legendData.push(this.chartData[i].objName + this.chartData[i].objCode);
+            position: 'top'
-				let temp = this.chartData[i].trendRespVOList;
+          },
-				for (let j = 0; j < temp.length; j++) {
+          data: []
-					let num = temp[j].useNum ? temp[j].useNum.toFixed(2) : '';
-					obj.data.push(num);
         }
-				yData.push(obj);
+        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: 'shadow',
+            type: 'shadow'
           },
           formatter: function(params) {
             return (
               params[0].axisValue + 
               `<br>` +
-							params
+              params.map((item) => {
-								.map((item) => {
+                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 str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`;
+                let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
-									let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`;
+						let value = item.value ? item.value : '-'
-									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>`
-									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

@@ -0,0 +1,126 @@
+<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,46 +1,28 @@
 <template>
-	<div
+  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
-		class="searchBarBox divHeight"
+    <el-form :inline="true" class="demo-form-inline">
-		ref="searchBarRef">
-		<el-form
-			:inline="true"
-			class="demo-form-inline">
       <span class="blue-block"></span>
-			<el-form-item
+      <el-form-item label="能源类型" required>
-				label="能源类型"
+        <el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small">
-				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.labelName"
+            :label="item.name"
-						:value="item.id"></el-option>
+            :value="item.id">
+          </el-option>
         </el-select>
       </el-form-item>
-			<el-form-item
+      <el-form-item label="时间维度" required>
-				label="时间维度"
+        <el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small">
-				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"></el-option>
+            :value="item.value">
+          </el-option>
         </el-select>
       </el-form-item>
-			<el-form-item
+      <el-form-item label="时间范围" required>
-				label="时间范围"
-				required>
         <div v-show="queryParams.timeDim === '1'">
           <el-date-picker
             v-model="timeValue"
@@ -54,8 +36,10 @@
             popper-class="noneMinute"
             @change="timeSelect"
             size="small"
-						style="width: 350px"
+            style='width:350px;'
-						:clearable="false"></el-date-picker>
+            :clearable="false"
+            >
+          </el-date-picker>
         </div>
         <div v-show="queryParams.timeDim === '2'">
           <el-date-picker
@@ -68,31 +52,34 @@
             :picker-options="pickerOptions"
             :clearable="false"
             size="small"
-						style="width: 350px"
+            style='width:350px;'
-						@change="timeSelect"></el-date-picker>
+            @change="timeSelect"
+            >
+          </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="选择周"></el-date-picker>
+            placeholder="选择周">
-					-
+          </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="选择周"></el-date-picker>
+            placeholder="选择周">
+          </el-date-picker>
         </div>
         <div v-show="queryParams.timeDim === '4'">
           <el-date-picker
@@ -105,12 +92,14 @@
             :clearable="false"
             :picker-options="pickerOptions"
             size="small"
-						style="width: 350px"
+            style='width:350px;'
-						@change="timeSelect"></el-date-picker>
+            @change="timeSelect"
+            >
+          </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"
@@ -118,10 +107,11 @@
             placeholder="选择年"
             @change="startYear"
             size="small"
-						:clearable="false"></el-date-picker>
+            :clearable="false"
-					-
+          >
+          </el-date-picker>-
           <el-date-picker
-						style="width: 170px"
+            style='width:170px;'
             v-model="yearValue2"
             type="year"
             :picker-options="pickerOptions"
@@ -129,88 +119,62 @@
             placeholder="选择年"
             @change="endYear"
             size="small"
-						:clearable="false"></el-date-picker>
+            :clearable="false"
+          >
+          </el-date-picker>
         </div>
       </el-form-item>
-			<el-form-item
+      <el-form-item label="对象维度" required>
-				v-if="energyType !== 0"
+        <el-select v-model="queryParams.objType" placeholder="请选择" style="width: 80px;" @change="selectObjs" size="small">
-				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"></el-option>
+            :value="item.value">
+          </el-option>
         </el-select>
       </el-form-item>
-			<el-form-item
+      <el-form-item label="对象选择" required>
-				label="对象选择"
+        <el-select v-model="queryParams.objIds" placeholder="请选择" multiple :multiple-limit='5' collapse-tags style="width: 200px;" size="small">
-				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">
+            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
-							{{ item.code }}
-						</span>
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-				<el-button
+        <el-button type="primary" size="small" @click="search">查询</el-button>
-					type="primary"
+        <span class="separateStyle"></span>
-					size="small"
+        <el-button size="small" @click="resetBtn">重置</el-button>
-					@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'>
+      {{ 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 { getFactoryList } from '@/api/core/base/factory';
+import { getEquipmentAll } from "@/api/base/equipment"
-import moment from 'moment';
+import moment from 'moment'
 export default {
   name: 'searchArea',
+  props: {
+    isFold: {// 多行模式（默认否）
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
     return {
+      isExpand: false, // 展开收起
       // 查询参数
       queryParams: {
         energyTypeId: null,
@@ -218,9 +182,8 @@ export default {
         objType: '',
         timeDim: null,
         startTime: null,
-				endTime: null,
+        endTime: null
       },
-			energyType: 0, //1电2非电
       timeValue: [],// 最大7天只能整点
       dateValue: [],// 最大30天
       weekValue1: null,//最多24周
@@ -232,285 +195,262 @@ 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.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
-			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':
-					getFactoryList().then((res) => {
+          getLineAll().then(res => {
-						this.objectList = res.data || [];
+            this.objectList = res.data || []
-						this.queryParams.objIds = [];
+            this.queryParams.objIds = []
-					});
+          })
           break;
         case '2':
-					getLineAll().then((res) => {
+          getWorkShopAll().then(res => {
-						this.objectList = res.data || [];
+            this.objectList = res.data || []
-						this.queryParams.objIds = [];
+            this.queryParams.objIds = []
-					});
+          })
           break;
         default:
-					getWorkShopAll().then((res) => {
+          getEquipmentAll().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 =
+            let a = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00'
-							moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00';
+            let b = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59'
-						let b =
+            this.queryParams.startTime = new Date(a).getTime()
-							moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59';
+            this.queryParams.endTime = new Date(b).getTime()
-						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.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
-				this.DICT_TYPE.TIME_DIM
+      this.queryParams.objIds = []
-			)[0].value; // 默认时
+      this.queryParams.objType = ''
-			this.queryParams.objIds = [];
+      this.timeValue = []
-			this.queryParams.objType = '';
+      this.dateValue = []
-			this.timeValue = [];
+      this.weekValue1 = null
-			this.dateValue = [];
+      this.weekValue2 = null
-			this.weekValue1 = null;
+      this.monthValue = []
-			this.weekValue2 = null;
+      this.yearValue1 = null
-			this.monthValue = [];
+      this.yearValue2 = null
-			this.yearValue1 = null;
-			this.yearValue2 = null;
     },
-		// 导出
+    transformTime(timeStamp) {// 本月最后一天
-		exportBtn() {
+      let year = moment(timeStamp).format('YYYY')
-			this.$emit('export');
+      let month = moment(timeStamp).format('MM')
+      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
+      let value = new Date(newData).getTime()
+      return value
     },
-		transformTime(timeStamp) {
+    transformYear(timeStamp) {// 本年最后一天
-			// 本月最后一天
+      let year = moment(timeStamp).format('YYYY')
-			let year = moment(timeStamp).format('YYYY');
+      let newData = year+'-12-31 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) {
+    switchMode() {// 展开和收起切换
-			// 本年最后一天
+      this.isExpand = !this.isExpand
-			let year = moment(timeStamp).format('YYYY');
+      const element = this.$refs.searchBarRef
-			let newData = year + '-12-31 23:59:59';
+      if (this.isExpand) {
-			let value = new Date(newData).getTime();
+        element.classList.remove('divHeight')
-			return value;
+      } else {
-		},
+        element.classList.add('divHeight')
-	},
+      }
-};
+    }
+  }
+}
 </script>
 <style lang='scss'>
 /* 时间整点 */
@@ -523,11 +463,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>
@@ -537,21 +477,32 @@ 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;
+  top: 14px;
+  right: 0;
+  cursor: pointer;
+  font-size: 12px;
+  color:#0B58FF;
+}
+.searchBarBox .foldClass .iconfont {
+  font-size: 14px;
+}
+.divHeight {
+  height: 45px;
+  overflow: hidden;
 }
 .separateStyle {
   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,120 +1,96 @@
 <template>
-	<div
+  <div class="app-container contrastAnalysisBox" id="contrastAnalysisBox">
-		class="app-container contrastAnalysisBox"
-		id="contrastAnalysisBox">
     <!-- 搜索工作栏 -->
-		<search-area
+    <search-area  :isFold="isFold" @submit="getList"/>
-			@submit="getList"
+    <el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'>
-			@export="exportExl" />
+      <el-tab-pane label="柱状图" name="bar">
-		<div v-show="chartData.length">
+        <bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim" />
-			<bar-chart
+      </el-tab-pane>
-				ref="analysisBarChart"
+      <el-tab-pane label="折线图" name="line">
-				:chartData="chartData"
+        <line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/>
-				:timeDim="timeDim" />
+      </el-tab-pane>
-			<base-table
+    </el-tabs>
-				:table-props="tableProps"
-				:table-data="list"
-				:max-height="tableH"
-				class="contrast-out-table" />
-		</div>
     <!-- 没有数据 -->
-		<div
+    <div class="no-data-bg" v-show='!chartData.length'></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 tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import LineChart from "./components/lineChart"
-import FileSaver from 'file-saver';
-import * as XLSX from 'xlsx/xlsx.mjs';
 // import moment from 'moment'
 export default {
   name: 'ContrastAnalysis',
-	components: { SearchArea, BarChart },
+  components: { SearchArea, BarChart, LineChart },
-	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)
+      // console.log(document.getElementById("contrastAnalysisBox").offsetWidth)
+    })
+    this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437)
   },
   methods: {
-		_setTableHeight() {
-			this.tableH = this.tableHeight(250) / 2;
-		},
     getList(params) {
-			this.timeDim = params.timeDim;
+      this.timeDim = params.timeDim
       getCompare({ ...params }).then((res) => {
+        console.log(res)
         if (res.code === 0) {
-					this.getTableList(res.data || []);
+          this.chartData = res.data || []
-					this.chartData = res.data || [];
         } else {
-					this.chartData = [];
+          this.chartData = []
         }
-			});
+      })
     },
-		getTableList(arr) {
+    switchChart() {
-			this.tableProps = [];
+      if (this.activeName === 'bar') {
-			this.list = [];
+        this.$nextTick((res) => {
-			let tempX = [];
+          this.$refs.analysisBarChart.getChart()
-			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('暂无数据导出');
+        this.$nextTick((res) => {
+          this.$refs.analysisLineChart.getChart()
+        })
+      }
+    }
+  }
 }
-		},
-	},
-};
 </script>
 <style lang='scss'>
 .contrastAnalysisBox {
-	.contrast-out-table {
+  .el-tabs__nav::after {
-		margin-top: 20px;
+    content: "";
+    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,44 +1,28 @@
 <template>
-	<el-form
+  <el-form :inline="true" class="demo-form-inline">
-		:inline="true"
-		class="demo-form-inline">
     <span class="blue-block"></span>
-		<el-form-item
+    <el-form-item label="对象选择" required>
-			label="对象选择"
+      <el-cascader
-			required>
+        v-model="objArr"
-			<el-select
+        :options="objList"
-				v-model="queryParams.objId"
+        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-				placeholder="请选择"
+        popper-class="cascaderParent"
-				style="width: 250px"
+        size="small"
-				filterable
+        style="width: 250px;"
-				size="small">
+        clearable></el-cascader>
-				<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
+    <el-form-item label="时间维度" required>
-			label="时间维度"
+      <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
-			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"></el-option>
+          :clearable="false">
+        </el-option>
       </el-select>
     </el-form-item>
-		<el-form-item
+    <el-form-item label="时间" required>
-			label="时间"
-			required>
       <div v-show="queryParams.type === 1">
         <el-date-picker
           v-model="monthValue"
@@ -47,7 +31,8 @@
           @change="selectTime"
           :clearable="false"
           size="small"
-					placeholder="选择月"></el-date-picker>
+          placeholder="选择月">
+        </el-date-picker>
       </div>
       <div v-show="queryParams.type === 2">
         <el-date-picker
@@ -58,7 +43,8 @@
           @change="selectTime"
           :clearable="false"
           size="small"
-					placeholder="选择周"></el-date-picker>
+          placeholder="选择周">
+        </el-date-picker>
       </div>
       <div v-show="queryParams.type === 3">
         <el-date-picker
@@ -68,37 +54,24 @@
           @change="selectTime"
           :clearable="false"
           size="small"
-					placeholder="选择日"></el-date-picker>
+          placeholder="选择日">
+        </el-date-picker>
       </div>
     </el-form-item>
     <el-form-item>
-			<el-button
+      <el-button type="primary" size="small" @click="search">查询</el-button>
-				type="primary"
-				size="small"
-				@click="search">
-				查询
-			</el-button>
     </el-form-item>
     <el-form-item>
-			<span
+      <span class="separateStyle"></span>
-				class="separateStyle"
-				v-hasPermi="['analysis:qoq-analysis:export']"></span>
     </el-form-item>
     <el-form-item>
-			<el-button
+      <el-button type="primary" size="small" @click="exportData" plain>导出</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/analysis/energyAnalysis';
+import { getTree } from '@/api/base/factory'
-import moment from 'moment';
+import moment from 'moment'
 export default {
   name: 'searchArea',
   data() {
@@ -107,126 +80,133 @@ 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.queryParams.objId) {
+      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]
       }
       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 =
+          let value = moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59'
-						moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59';
+          this.queryParams.searchTime = new Date(value).getTime()
-					this.queryParams.searchTime = new Date(value).getTime();
           break;
         default:
-					let value2 =
+           let value2 = moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59'
-						moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59';
+           this.queryParams.searchTime = new Date(value2).getTime()
-					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 year = moment(timeStamp).format('YYYY');
+      let month = moment(timeStamp).format('MM')
-			let month = moment(timeStamp).format('MM');
+      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
-			let newData =
+      let value = new Date(newData).getTime()
-				moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 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>
@@ -235,7 +215,7 @@ export default {
   display: inline-block;
   width: 1px;
   height: 24px;
-	background: #e8e8e8;
+  background: #E8E8E8;
   vertical-align: middle;
 }
 .demo-form-inline {
@@ -243,14 +223,10 @@ 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,34 +1,29 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-		<search-area
+    <search-area @submit="getList" @exportD="exportData"/>
-			@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
+        <line-chart ref="analysisLineChart" :chartData="chartData"/>
-					ref="analysisLineChart"
-					:chartData="chartData" />
       </div>
     </div>
     <!-- 没有数据 -->
-		<div
+    <div class="no-data-bg" v-show='!chartData.length'></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 },
@@ -36,90 +31,87 @@ 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(
+        var wb = XLSX.utils.table_to_book(document.querySelector(".qoq-out-table"))
-					document.querySelector('.qoq-out-table')
+        let fileName = val.name + "环比分析.xlsx"
-				);
-				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 {
@@ -132,7 +124,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,43 +2,44 @@
   <div 
     id="analysischartLine"
     style="width: 100%"
-		:style="{ height: chartHeight + 'px' }"></div>
+    :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(314),
+      chartHeight: this.tableHeight(214) - 70
-		};
+    }
   },
   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(314);
+      this.chartHeight = this.tableHeight(214) - 70
-		});
+    })
   },
   methods: {
     getChart() {
@@ -47,56 +48,56 @@ 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 = {
         color:['#288AFF'],
-				tooltip: {
+        // tooltip: {
-					trigger: 'axis',
+        //   trigger: 'axis'
-				},
+        // },
         grid: {
           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,78 +1,38 @@
 <template>
-	<div
+  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
-		class="searchBarBox"
+    <el-form :inline="true" class="demo-form-inline">
-		ref="searchBarRef">
-		<el-form
-			:inline="true"
-			class="demo-form-inline">
       <span class="blue-block"></span>
-			<el-form-item
+      <el-form-item label="能源类型" required>
-				label="能源类型"
+        <el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small">
-				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.labelName"
+            :label="item.name"
-						:value="item.id"></el-option>
+            :value="item.id">
+          </el-option>
         </el-select>
       </el-form-item>
-			<el-form-item
+      <el-form-item label="对象选择" required>
-				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
+      <el-form-item label="时间维度" required>
-				v-if="energyType === 2"
+        <el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small">
-				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"></el-option>
+            size="small">
+          </el-option>
         </el-select>
       </el-form-item>
-			<el-form-item
+      <el-form-item label="时间范围" required>
-				label="时间范围"
-				required>
         <div v-show="queryParams.timeDim === '1'">
           <el-date-picker
             v-model="timeValue"
@@ -86,7 +46,9 @@
             popper-class="noneMinute"
             @change="timeSelect"
             size="small"
-						style="width: 350px"></el-date-picker>
+            style='width:350px;'
+            >
+          </el-date-picker>
         </div>
         <div v-show="queryParams.timeDim === '2'">
           <el-date-picker
@@ -99,28 +61,31 @@
             :picker-options="pickerOptions"
             @change="timeSelect"
             size="small"
-						style="width: 350px"></el-date-picker>
+            style='width:350px;'
+            >
+          </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="选择周"></el-date-picker>
+            placeholder="选择周">
-					-
+          </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="选择周"></el-date-picker>
+            placeholder="选择周">
+          </el-date-picker>
         </div>
         <div v-show="queryParams.timeDim === '4'">
           <el-date-picker
@@ -132,79 +97,71 @@
             value-format="timestamp"
             :picker-options="pickerOptions"
             size="small"
-						style="width: 350px"
+            style='width:350px;'
-						@change="timeSelect"></el-date-picker>
+            @change="timeSelect"
+            >
+          </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"></el-date-picker>
+            @change="startYear"
-					-
+          >
+          </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"></el-date-picker>
+            @change="endYear"
+          >
+          </el-date-picker>
         </div>
       </el-form-item>
       <el-form-item>
-				<el-button
+        <el-button type="primary" size="small" @click="search">查询</el-button>
-					type="primary"
+        <span class="separateStyle"></span>
-					size="small"
+        <el-button size="small" @click="resetBtn">重置</el-button>
-					@click="handBtn('search')">
-					查询
-				</el-button>
-				<el-button
-					size="small"
-					@click="resetBtn">
-					重置
-				</el-button>
-				<span
-					class="separateStyle"
-					v-hasPermi="['analysis:energy-analysis:query']"></span>
-				<el-button
-					v-hasPermi="['analysis:energy-analysis:query']"
-					type="primary"
-					size="small"
-					plain
-					@click="handBtn('exportBtn')">
-					导出
-				</el-button>
       </el-form-item>
     </el-form>
+    <span v-if="isFold" class="foldClass" @click='switchMode'>
+      {{ isExpand ? '收起' : '展开' }}
+      <svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
+    </span>
   </div>
 </template>
 <script>
-import { getTree } from '@/api/analysis/energyAnalysis';
+import { getEnergyTypeListAll } from "@/api/base/energyType"
-import { getEnergyTypeListAll } from '@/api/base/energyType';
+import { getTree } from '@/api/base/factory'
-import moment from 'moment';
+import moment from 'moment'
 export default {
   name: 'searchArea',
+  props: {
+    isFold: {// 多行模式（默认否）
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
     return {
+      isExpand: false, // 展开收起
       // 查询参数
       queryParams: {
         energyTypeId: null,
         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天
@@ -213,290 +170,248 @@ 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.getEnergyList();
+    this.getTypeList()
-		this.getObjTree();
+    this.getObjTree()
-		this.queryParams.timeDim = this.getDictDatas(
+    this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
-			this.DICT_TYPE.TIME_DIM
+    this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000]
-		)[0].value; // 默认时
-		this.timeValue = [
-			moment().startOf('day'),
-			moment().endOf('day') - 59 * 61 * 1000,
-		];
   },
   methods: {
-		getObjTree() {
+    getTypeList() {
-			getTree().then((res) => {
-				this.objList = res.data || [];
-				if (this.objList.length > 0) {
-					this.objId = this.objList[0].id;
-				}
-			});
-		},
-		// 获取能源类型
-		getEnergyList() {
       getEnergyTypeListAll().then((res) => {
-				this.energyTypeList = res.data || [];
+        this.energyTypeList = res.data || []
-			});
+      })
     },
-		// 切换能源类型
+    getObjTree() {
-		chooseType(id) {
+      getTree().then(res => {
-			let val;
+        this.objList = res.data || []
-			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
         }
       }
     },
     // 查询
-		handBtn(val) {
+    search() {
       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 =
+            let a = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00'
-							moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00';
+            let b = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59'
-						let b =
+            this.queryParams.startTime = new Date(a).getTime()
-							moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59';
+            this.queryParams.endTime = new Date(b).getTime()
-						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 + ''
-			if (val === 'search') {
+      this.$emit('submit', this.queryParams)
-				this.$emit('submit', this.queryParams);
-			} else {
-				this.$emit('export', this.queryParams);
-			}
     },
     // 重置
     resetBtn() {
-			this.queryParams.energyTypeId = null;
+      this.queryParams.energyTypeId = null
-			this.energyType = 0;
+      this.queryParams.objId = null
-			this.queryParams.objId = null;
+      this.objArr = []
-			this.objId = null;
+      this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时
-			this.objType = 1;
+      this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000]
-			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 year = moment(timeStamp).format('YYYY');
+      let month = moment(timeStamp).format('MM')
-			let month = moment(timeStamp).format('MM');
+      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
-			let newData =
+      let value = new Date(newData).getTime()
-				moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59';
+      return value
-			let value = new Date(newData).getTime();
-			return value;
     },
-		transformYear(timeStamp) {
+    transformYear(timeStamp) {// 本年最后一天
-			// 本年最后一天
+      let year = moment(timeStamp).format('YYYY')
-			let year = moment(timeStamp).format('YYYY');
+      let newData = year+'-12-31 23:59:59'
-			let newData = year + '-12-31 23:59:59';
+      let value = new Date(newData).getTime()
-			let value = new Date(newData).getTime();
+      return value
-			return value;
     },
-	},
+    switchMode() {// 展开和收起切换
-};
+      this.isExpand = !this.isExpand
+      const element = this.$refs.searchBarRef
+      if (this.isExpand) {
+        element.classList.remove('divHeight')
+      } else {
+        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%;
@@ -507,11 +422,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>
@@ -521,21 +436,32 @@ 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;
+  top: 14px;
+  right: 0;
+  cursor: pointer;
+  font-size: 12px;
+  color:#0B58FF;
+}
+.searchBarBox .foldClass .iconfont {
+  font-size: 14px;
+}
+.divHeight {
+  height: 45px;
+  overflow: hidden;
 }
 .separateStyle {
   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,110 +1,94 @@
 <template>
-	<div
+  <div class="app-container trendAnalysisBox" id="trendAnalysisBox">
-		class="app-container trendAnalysisBox"
-		id="trendAnalysisBox">
     <!-- 搜索工作栏 -->
-		<search-area
+    <search-area :isFold="isFold" @submit="getList"/>
-			@submit="getList"
+    <el-tabs v-model="activeName" @tab-click="switchChart" v-show='chartData.length'>
-			@export="exportExl" />
+      <el-tab-pane label="柱状图" name="bar">
-		<div v-show="chartData.length">
+        <bar-chart ref="analysisBarChart" :chartData="chartData" :timeDim="timeDim"/>
-			<base-table
+      </el-tab-pane>
-				:table-props="tableProps"
+      <el-tab-pane label="折线图" name="line">
-				:table-data="list"
+        <line-chart ref="analysisLineChart" :chartData="chartData" :timeDim="timeDim"/>
-				class="trend-out-table" />
+      </el-tab-pane>
-			<line-chart
+    </el-tabs>
-				ref="analysisLineChart"
-				:chartData="chartData"
-				:timeDim="timeDim" />
-		</div>
     <!-- 没有数据 -->
-		<div
+    <div class="no-data-bg" v-show='!chartData.length'></div>
-			class="no-data-bg"
-			v-show="!chartData.length"></div>
   </div>
 </template>
 <script>
-import { getEnergyTrend, exportTrend } from '@/api/analysis/energyAnalysis';
+import { getEnergyTrend } from "@/api/analysis/energyAnalysis"
-import SearchArea from './components/searchArea';
+import SearchArea from "./components/searchArea"
-import LineChart from './components/lineChart';
+import BarChart from "./components/barChart"
+import LineChart from "./components/lineChart"
 // import moment from 'moment'
 export default {
   name: 'TrendAnalysis',
-	components: { SearchArea, LineChart },
+  components: { SearchArea, BarChart, LineChart },
   data() {
     return {
+      isFold: false,
+      activeName: 'bar',
       chartData: [],
-			timeDim: '',
+      timeDim: ''
-			tableProps: [],
+    }
-			list: [],
+  },
-		};
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+      this.isFold = this.searchBarWidth('trendAnalysisBox', 1263)
+    })
+    this.isFold = this.searchBarWidth('trendAnalysisBox', 1263)
   },
   methods: {
     getList(params) {
-			this.timeDim = params.timeDim;
+      this.timeDim = params.timeDim
       getEnergyTrend({ ...params }).then((res) => {
         if (res.code === 0) {
-					this.getTableList(res.data || []);
+          this.chartData = res.data
-					this.chartData = res.data || [];
         } else {
-					this.chartData = [];
+          this.chartData = []
         }
-			});
+      })
     },
-		getTableList(arr) {
+    switchChart() {
-			this.tableProps = [];
+      if (this.activeName === 'bar') {
-			this.list = [];
+        this.$nextTick((res) => {
-			let tempX = [];
+          this.$refs.analysisBarChart.getChart()
-			let listObj = { useNum: '消耗量' }; // 数据
+        })
-			for (let i = 0; i < arr.length; i++) {
-				let obj = {};
-				if (this.timeDim === '3') {
-					let fName = arr[i].time.slice(0, 4);
-					let lName = arr[i].time.slice(4, 6);
-					obj.label = fName + ' 第 ' + lName + ' 周';
       } else {
-					obj.label = arr[i].time;
+        this.$nextTick((res) => {
+          this.$refs.analysisLineChart.getChart()
+        })
+      }
+    }
   }
-				obj.prop = 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">
+<style lang='scss'>
 .trendAnalysisBox {
-	.trend-out-table {
+  .el-tabs__nav::after {
-		margin-bottom: 15px;
+    content: "";
+    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,40 +1,37 @@
 <template>
-	<div
+  <div id="analysischartLine" style="width: 100%;height: 100%;"></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(250) / 2,
+      chartHeight: this.tableHeight(214) - 70
-		};
+    }
   },
   props: {
     chartData: {
       type: Array,
       required: true,
       default: () => {
-				return [];
+        return []
-			},
+      }
-		},
+    }
   },
   watch: {
     chartData: function () {
-			this.getChart();
+      this.getChart()
-		},
+    }
   },
   mounted() {
     window.addEventListener('resize', () => {
-			this.chartHeight = this.tableHeight(250) / 2;
+      this.chartHeight = this.tableHeight(214) - 70
-		});
+    })
   },
   methods: {
     getChart() {
@@ -43,77 +40,63 @@ 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 (
+          if (keys[k].indexOf(arr[j] + '_上年同期') > -1 || keys[k].indexOf(arr[j] + '_能源消耗') > -1) {
-						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: [
+        color: ['#FFDC94', '#8EF0AB', '#63BDFF', '#288AFF', '#7164FF', '#FF6860', '#FF9747', '#B0EB42', '#D680FF', '#0043D2'],
-					'#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,44 +1,27 @@
 <template>
-	<el-form
+  <el-form :inline="true" class="demo-form-inline">
-		:inline="true"
-		class="demo-form-inline">
     <span class="blue-block"></span>
-		<el-form-item
+    <el-form-item label="对象选择" required>
-			label="对象选择"
+      <el-cascader
-			required>
+        v-model="objArr"
-			<el-select
+        :options="objList"
-				v-model="queryParams.objId"
+        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-				placeholder="请选择"
+        popper-class="cascaderParent"
-				style="width: 250px"
+        size="small"
-				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
+    <el-form-item label="时间维度" required>
-			label="时间维度"
+      <el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small">
-			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"></el-option>
+          :clearable="false">
+        </el-option>
       </el-select>
     </el-form-item>
-		<el-form-item
+    <el-form-item label="时间" required>
-			label="时间"
-			required>
       <div v-show="queryParams.type === 1 || queryParams.type === 2">
         <el-date-picker
           v-model="yearValue"
@@ -47,7 +30,8 @@
           @change="selectTime"
           :clearable="false"
           size="small"
-					placeholder="选择年"></el-date-picker>
+          placeholder="选择年">
+        </el-date-picker>
       </div>
       <div v-show="queryParams.type === 3">
         <el-date-picker
@@ -57,37 +41,24 @@
           @change="selectTime"
           :clearable="false"
           size="small"
-					placeholder="选择月"></el-date-picker>
+          placeholder="选择月">
+        </el-date-picker>
       </div>
     </el-form-item>
     <el-form-item>
-			<el-button
+      <el-button type="primary" size="small" @click="search">查询</el-button>
-				type="primary"
-				size="small"
-				@click="search">
-				查询
-			</el-button>
     </el-form-item>
     <el-form-item>
-			<span
+      <span class="separateStyle"></span>
-				class="separateStyle"
-				v-hasPermi="['analysis:yoy-analysis:export']"></span>
     </el-form-item>
     <el-form-item>
-			<el-button
+      <el-button type="primary" size="small" @click="exportData" plain>导出</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/analysis/energyAnalysis';
+import { getTree } from '@/api/base/factory'
-import moment from 'moment';
+import moment from 'moment'
 export default {
   name: 'searchArea',
   data() {
@@ -96,111 +67,119 @@ 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.queryParams.objId) {
+      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]
       }
       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 year = moment(timeStamp).format('YYYY');
+      let month = moment(timeStamp).format('MM')
-			let month = moment(timeStamp).format('MM');
+      let newData = moment(new Date(year,month,0)).format('YYYY-MM-DD') + ' 23:59:59'
-			let newData =
+      let value = new Date(newData).getTime()
-				moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59';
+      return value
-			let value = new Date(newData).getTime();
-			return value;
     },
-		transformYear(timeStamp) {
+    transformYear(timeStamp) {// 本年最后一天
-			// 本年最后一天
+      let year = moment(timeStamp).format('YYYY')
-			let year = moment(timeStamp).format('YYYY');
+      let newData = year+'-12-31 23:59:59'
-			let newData = year + '-12-31 23:59:59';
+      let value = new Date(newData).getTime()
-			let value = new Date(newData).getTime();
+      return value
-			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>
@@ -210,21 +189,17 @@ 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,36 +1,31 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-		<search-area
+    <search-area @submit="getList" @exportD="exportData"/>
-			@submit="getList"
+    <div v-show='chartData.length'>
-			@exportD="exportData" />
-		<div v-show="chartData.length">
       <div class="chartTitle">同比分析图</div>
-			<div style="width: 100%">
+      <div style='width: 100%;height: 400px;'>
-				<line-chart
+        <line-chart ref="analysisLineChart" :chartData="chartData"/>
-					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
+    <div class="no-data-bg" v-show='!chartData.length'></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 },
@@ -39,103 +34,98 @@ export default {
       chartData: [],
       tableProps: [],
       list: [],
-			tableH: this.tableHeight(250) / 2,
+      tableH: this.tableHeight(640)
-		};
+    }
   },
   mounted() {
     window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(250) / 2;
+      this.tableH = this.tableHeight(640)
-		});
+    })
   },
   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(
+        var wb = XLSX.utils.table_to_book(document.querySelector(".yoy-out-table"))
-					document.querySelector('.yoy-out-table')
+        let fileName = val.name + "同比分析.xlsx"
-				);
-				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;
@@ -145,7 +135,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,84 +1,63 @@
 <template>
   <div class="app-container">
+
     <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
     <!-- 列表 -->
-		<base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
       :max-height="tableH">
-			<method-btn
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="80"
-				label="操作"
-				:method-list="tableBtn"
         @clickBtn="handleClick" />
     </base-table>
-		<pagination
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
       @pagination="getList" />
     <!-- 新增 -->
-		<base-dialog
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-			:dialogTitle="addOrEditTitle"
+      @confirm="handleConfirm" :before-close="handleCancel">
-			:dialogVisible="centervisible"
+      <energy-plc-add ref="energyPlc" @successSubmit="successSubmit" />
-			@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 EnergyPlcAdd from './components/energyPlcAdd.vue';
+// import { publicFormatter } from '@/utils/dict'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import EnergyPlcAdd from './components/energyPlcAdd.vue'
 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: [
@@ -86,61 +65,65 @@ export default {
           type: 'input',
           label: '标识名',
           placeholder: '标识名',
-					param: 'name',
+          param: 'name'
         },
         {
-					type: this.$auth.hasPermi('base:energy-plc:query') ? 'button' : '',
+          type: 'button',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
         },
         {
-					type: this.$auth.hasPermi('base:energy-plc:create') ? '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: {
@@ -148,72 +131,67 @@ 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 && arr.map(item => {
-					arr.map((item) => {
+          this.collectionList.map(i => {
-						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
+      this.$modal.confirm('是否确认删除关联表名为"' + row.name + '"的数据项?').then(function () {
-				.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,50 +1,36 @@
 <template>
-	<el-form
+  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-		ref="form"
+    <el-form-item label="关联表名" prop="plcId">
-		:rules="rules"
+      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;" filterable>
-		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"></el-option>
+          :value="item.id">
+        </el-option>
       </el-select>
     </el-form-item>
-		<el-form-item
+    <el-form-item label="对象" prop="bindObjectId">
-			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 {
+import { getEnergyPlcConnect, updateEnergyPlcConnect, createEnergyPlcConnect } from '@/api/base/energyPlcConnect'
-	getEnergyPlcConnect,
+import { getEnergyPlcAll } from '@/api/base/energyPlc'
-	updateEnergyPlcConnect,
-	createEnergyPlcConnect,
-} from '@/api/base/energyPlcConnect';
-import { getEnergyPlcAll } from '@/api/base/energyPlc';
 export default {
   name: 'EnergyPlcConnectAdd',
   props: {
     objList: {
       type: Array,
-			default: () => [],
+      default: () => []
     },
   },
   data() {
@@ -53,70 +39,63 @@ export default {
         id: '',
         plcId: '',
         bindObjectId: '',
-				bindObjectType: '',
+        bindObjectType: ''
       },
       objIds: [],// 回显数组
       plcList: [],
       isEdit: false, //是否是编辑
       rules: {
-				plcId: [
+        plcId: [{ required: true, message: '关联表名不能为空', trigger: 'change' }],
-					{ required: true, message: '关联表名不能为空', trigger: 'change' },
+        bindObjectId: [{ 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.objIds = this.changeDetSelect(this.form.bindObjectId, this.objList)
-							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) => {
@@ -125,31 +104,36 @@ 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,37 +1,16 @@
 <template>
   <div>
-		<el-drawer
+    <el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'>
-			: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
+            <el-input v-model="plcTableName" size='small' readonly></el-input>
-							v-model="plcTableName"
-							size="small"
-							readonly
-							style="width: 250px"></el-input>
           </el-form-item>
           <el-form-item label="对象">
-						<el-input
+            <el-input v-model="objName" size='small' readonly></el-input>
-							v-model="objName"
-							size="small"
-							readonly
-							style="width: 250px"></el-input>
           </el-form-item>
-					<el-form-item
+          <el-form-item v-if="showBtn">
-						v-if="showBtn"
+            <el-button type="success" size='small' plain @click="addNew">新增</el-button>
-						v-hasPermi="['base:energy-plc-param:create']">
-						<el-button
-							type="success"
-							size="small"
-							plain
-							@click="addNew">
-							新增
-						</el-button>
           </el-form-item>
         </el-form>
         <base-table
@@ -39,20 +18,23 @@
           :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>
     <!-- 新增 -->
@@ -61,48 +43,43 @@
       :dialogVisible="centervisible"
       @cancel="handleCancel"
       @confirm="handleConfirm"
-			:before-close="handleCancel">
+      :before-close="handleCancel"
-			<energy-plc-param-add
+    >
-				ref="energyPlcParam"
+      <energy-plc-param-add ref="energyPlcParam" @successSubmit="successSubmit" />
-				@successSubmit="successSubmit" />
     </base-dialog>
   </div>
 </template>
 <script>
-import {
+import { getEnergyPlcParamPage, deleteEnergyPlcParam } from '@/api/base/energyPlcParam'
-	getEnergyPlcParamPage,
+import EnergyPlcParamAdd from './energyPlcParamAdd'
-	deleteEnergyPlcParam,
+import { publicFormatter } from '@/utils/dict'
-} 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('unit_dict'),
+    filter: publicFormatter('energy_unit')
   },
   {
     prop: 'collection',
-		label: '是否采集',
+    label: '是否采集'
   },
   {
     prop: 'description',
-		label: '描述',
+    label: '描述'
-	},
+  }
-];
+]
 export default {
   name: 'EnergyPlcParam',
   props: {
@@ -110,9 +87,9 @@ export default {
       type: Array,
       required: true,
       default: () => {
-				return [];
+        return []
-			},
+      }
-		},
+    }
   },
   data() {
     return {
@@ -126,136 +103,121 @@ 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 = [
-					this.$auth.hasPermi('base:energy-plc-param:update')
+          {
-						? {
             type: 'edit',
-								btnName: '编辑',
+            btnName: '编辑'
-						  }
+          },
-						: undefined,
+          {
-					this.$auth.hasPermi('base:energy-plc-param:delete')
-						? {
             type: 'delete',
-								btnName: '删除',
+            btnName: '删除'
           }
-						: undefined,
+        ]
-				].filter((v) => v);
       }
     },
     getList() {
       getEnergyPlcParamPage({...this.queryParams}).then((res) => {
-				let arr = res.data.list || [];
+        let arr = res.data.list || []
-				arr &&
+        arr&&arr.map(item => {
-					arr.map((item) => {
+          this.collectionList.map(i => {
-						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({
+        this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: ''})
-					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({
+            this.$refs.energyPlcParam.init({'connectId': this.queryParams.connectId, id: val.data.id})
-							connectId: this.queryParams.connectId,
+          })
-							id: val.data.id,
+          break
-						});
-					});
-					break;
         default:
-					this.handleDelete(val.data);
+          this.handleDelete(val.data)
       }
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-			this.$modal
+      this.$modal.confirm('是否确认删除参数列名为"' + row.plcParamName + '"的数据项?').then(function() {
-				.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,72 +1,51 @@
 <template>
-	<el-form
+  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-		ref="form"
-		:rules="rules"
-		label-width="100px"
-		:model="form">
     <el-row>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="能源类型" prop="typeId">
-					label="能源类型"
+          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;" filterable>
-					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.labelName"
+              :label="item.name"
-							:value="item.id"></el-option>
+              :value="item.id">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="参数列名" prop="plcParamName">
-					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
+        <el-form-item label="参数名称" prop="name">
-					label="参数名称"
-					prop="name">
           <el-input v-model="form.name"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="单位" prop="unit">
-					label="单位"
+          <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
-					prop="unit">
-					<el-select
-						v-model="form.unit"
-						placeholder="请选择"
-						style="width: 100%">
             <el-option
-							v-for="item in getDictDatas(DICT_TYPE.UNIT_DICT)"
+              v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)"
               :key="item.value"
               :label="item.label"
-							:value="item.value"></el-option>
+              :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="是否采集" prop="collection">
-					label="是否采集"
-					prop="collection">
           <el-switch v-model="form.collection"></el-switch>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="描述" prop="description">
-					label="描述"
-					prop="description">
           <el-input v-model="form.description"></el-input>
         </el-form-item>
       </el-col>
@@ -74,12 +53,8 @@
   </el-form>
 </template>
 <script>
-import {
+import { getEnergyPlcParam, updateEnergyPlcParam, createEnergyPlcParam } from '@/api/base/energyPlcParam'
-	getEnergyPlcParam,
+import { getEnergyTypeListAll } from '@/api/base/energyType'
-	updateEnergyPlcParam,
-	createEnergyPlcParam,
-} from '@/api/base/energyPlcParam';
-import { getEnergyTypeListAll } from '@/api/base/energyType';
 export default {
   name: 'EnergyPlcParamAdd',
   data() {
@@ -92,72 +67,66 @@ export default {
         unit: '',
         description: '',
         collection: true,
-				connectId: '',
+        connectId: ''
       },
       energyListType: [],
       isEdit: false, //是否是编辑
       rules: {
-				typeId: [
+        typeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
-					{ required: true, message: '能源类型不能为空', trigger: 'change' },
+        plcParamName: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
-				],
+        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,102 +1,68 @@
 <template>
   <div class="app-container">
+
     <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
     <!-- 列表 -->
-		<base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-			:page="queryParams.pageNo"
-			:limit="queryParams.pageSize"
-			:table-props="tableProps"
-			:table-data="list"
       :max-height="tableH">
-			<method-btn
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
-				v-if="tableBtn.length"
-				slot="handleBtn"
-				:width="160"
-				label="操作"
-				:method-list="tableBtn"
         @clickBtn="handleClick" />
     </base-table>
-		<pagination
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
       @pagination="getList" />
     <!-- 新增 -->
-		<base-dialog
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-			:dialogTitle="addOrEditTitle"
+      @confirm="handleConfirm" :before-close="handleCancel" width='30%'>
-			:dialogVisible="centervisible"
+      <energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" />
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			width="30%">
-			<energy-plc-connect-add
-				ref="energyPlcConnect"
-				:objList="objList"
-				@successSubmit="successSubmit" />
     </base-dialog>
     <!-- 参数绑定/查看 -->
-		<energy-plc-param
+    <energy-plc-param v-if="paramVisible" ref="plcParam" @closeDrawer="closeDrawer"
-			v-if="paramVisible"
-			ref="plcParam"
-			@closeDrawer="closeDrawer"
       :energyTypeList="energyTypeList"></energy-plc-param>
   </div>
 </template>
 
 <script>
-import {
+import { getEnergyPlcConnectPage, deleteEnergyPlcConnect } from "@/api/base/energyPlcConnect";
-	getEnergyPlcConnectPage,
-	deleteEnergyPlcConnect,
-} from '@/api/base/energyPlcConnect';
 // import { publicFormatter } from '@/utils/dict'
-import { getTree } from '@/api/analysis/energyAnalysis';
+import { getTree } from '@/api/base/factory'
-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: '对象编码',
-		minWidth: 150,
+    showOverflowtooltip: true
-		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: [
@@ -104,181 +70,167 @@ export default {
           type: 'input',
           label: '标识名',
           placeholder: '标识名',
-					param: 'cnName',
+          param: 'cnName'
         },
         {
-					type: this.$auth.hasPermi('base:energy-plc-connect:query')
+          type: 'button',
-						? 'button'
-						: '',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
         },
         {
-					type: this.$auth.hasPermi('base:energy-plc-connect:create')
+          type: 'separate'
-						? 'separate'
-						: '',
         },
         {
-					type: this.$auth.hasPermi('base:energy-plc-connect:create')
+          type: this.$auth.hasPermi('base:energy-plc-connect:create') ? 'button' : '',
-						? 'button'
-						: '',
           btnName: '新增',
           name: 'add',
           color: 'success',
-					plain: true,
+          plain: true
-				},
+        }
       ],
       tableProps,
       tableBtn: [
-				this.$auth.hasPermiAnd([
+        this.$auth.hasPermi('base:energy-plc-connect:bind')
-					'base:energy-plc-param:query',
-					'base:energy-type:query',
-				])
           ? {
             type: 'connect',
-							btnName: '绑定',
+            btnName: '绑定'
           }
           : undefined,
-				this.$auth.hasPermi('base:energy-plc-param:query')
+        {
-					? {
           type: 'detail',
-							btnName: '详情',
+          btnName: '详情'
-					  }
+        },
-					: undefined,
+        this.$auth.hasPermi('base:energy-plc-connect:update')
-				this.$auth.hasPermiAnd([
-					'base:energy-plc-connect:update',
-					'base:energy-plc-connect:query',
-				])
           ? {
             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
+      this.$modal.confirm('是否确认删除对象为"' + row.objName + '"的数据项?').then(function () {
-				.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

@@ -1,147 +0,0 @@
-<template>
-	<div class="energyQuantityManualAddTable">
-		<el-table
-			:data="renderData"
-			border
-			style="width: 100%"
-			:header-cell-style="{
-				background: '#F2F4F9',
-				color: '#606266',
-			}">
-			<el-table-column
-				prop="tableName"
-				label="表名*">
-				<template slot-scope="scope">
-					<div class="tableInner">
-						<el-select
-							v-model="scope.row.tableName"
-							placeholder="请选择"
-							style="width: 100%"
-							@change="changeSelect(scope.row, 'tableName')">
-							<el-option
-								v-for="item in tableNameList"
-								:key="item.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
-			v-show="!isEdit"
-			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 [];
-			},
-		},
-		isEdit: {
-			type: Boolean,
-			required: true,
-			default: () => {
-				return false;
-			},
-		},
-	},
-	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

@@ -0,0 +1,38 @@
+<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

@@ -0,0 +1,44 @@
+<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,63 +1,47 @@
 <template>
-	<el-form
+  <el-form ref="energyQuantityManualForm" :rules="rules" label-width="90px" :model="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
+        <el-form-item label="能源类型" prop="energyTypeId">
-					label="能源类型"
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
-					prop="energyTypeId">
+            <el-option v-for="item in this.energyTypeList" :key="item.id" :label="item.name" :value="item.id">
-					<el-select
+            </el-option>
-						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
+        <el-form-item label="抄表日期" prop="recordTime">
-					label="抄表日期"
+          <el-date-picker v-model="form.recordTime" type="date" format="yyyy-MM-dd" value-format="timestamp"
-					prop="recordTime">
+            placeholder="选择日期" style="width: 100%;">
-					<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'>
-				<add-table
+        <base-table border :table-props="tableProps" :table-data="tableData" :add-button-show="addButtonShow"
-					:table-data="tableData"
+          @emitFun="inputChange" @emitButtonClick="emitButtonClick" />
-					:table-name-list="tableNameList"
-					:isEdit="isEdit"
-					@emitFun="inputChange"
-					@emitButtonClick="emitButtonClick" />
       </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
-import {
+import { energyQuantityManualCreate, energyQuantityManualUpdate, energyQuantityManualGet } from '@/api/base/energyQuantityManual'
-	energyQuantityManualCreate,
+import moment from 'moment'
-	energyQuantityManualUpdate,
+import InputArea from './InputArea'
-	energyQuantityManualGet,
+import SelectArea from './SelectArea'
-} from '@/api/base/energyQuantityManual';
+const tableProps = [
-import moment from 'moment';
+  {
-import AddTable from './AddTable';
+    prop: 'tableName',
-import { energyTableGet } from '@/api/base/energyQuantityManual';
+    label: '表名*',
+    subcomponent: SelectArea
+  },
+  {
+    prop: 'readingQuantity',
+    label: '抄表数*',
+    subcomponent: InputArea
+  }
+]
 export default {
   name: 'EnergyQuantityManualAdd',
   props: {
@@ -65,108 +49,78 @@ export default {
       type: Array,
       required: true,
       default: () => {
-				return [];
+        return []
-			},
+      }
-		},
+    }
   },
   data() {
     return {
+      tableProps,
       tableData: [],
-			tableNameList: [], //表名list
       addButtonShow: '新增',
       form: {
         id: '',
         energyTypeId: '',
         unit: '',
-				recordTime: '',
+        recordTime: ''
       },
       rules: {
-				energyTypeId: [
+        energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
-					{ required: true, message: '能源类型不能为空', trigger: 'change' },
+        recordTime: [{ 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
-				this.selEnergyType(this.form.energyTypeId);
+        let obj = {}
-				let obj = {};
+        obj.tableName = params.tableName + ''
-				obj.tableName = params.tableName + '';
+        obj.readingQuantity = 0
-				obj.readingQuantity = 0;
+        this.tableData.push(obj)
-				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.selEnergyType(this.form.energyTypeId);
+            this.form.recordTime = res.data.recordTime ? res.data.recordTime : null
-						this.form.recordTime = res.data.recordTime
+            let obj = {}
-							? res.data.recordTime
+            obj.tableName = res.data.tableName ? res.data.tableName + '' : ''
-							: null;
+            obj.readingQuantity = res.data.readingQuantity
-						let obj = {};
+            this.tableData.push(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() {
-			if (!this.form.energyTypeId) {
+      let obj = {}
-				this.$modal.msgWarning('请先选择能源类型');
+      obj.tableName = ''
-				return false;
+      obj.readingQuantity = 0
-			}
+      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 (
+              if (!item.tableName || (!item.readingQuantity && item.readingQuantity !== 0)) {
-								!item.tableName ||
+                this.$modal.msgError("抄表数据有空值，请检查");
-								(!item.readingQuantity && item.readingQuantity !== 0)
+                return false
-							) {
-								this.$modal.msgError('抄表数据有空值，请检查');
-								return false;
               }
             }
           }
@@ -177,37 +131,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,336 +1,271 @@
 <template>
   <div class="app-container">
+
     <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
     <!-- 列表 -->
-		<base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-			:page="queryParams.pageNo"
+      :max-height="tableH" @selection-change="selectChange">
-			:limit="queryParams.pageSize"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-			: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
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			:total="total"
       @pagination="getList" />
     <!-- 新增 -->
-		<base-dialog
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-			:dialogTitle="addOrEditTitle"
+      @confirm="handleConfirm" :before-close="handleCancel">
-			:dialogVisible="centervisible"
+      <energy-quantity-manual-add ref="energyQuantityManualAdd" :energyTypeList="energyTypeList"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel">
-			<energy-quantity-manual-add
-				ref="energyQuantityManualAdd"
-				:energyTypeList="energyTypeList"
         @successSubmit="successSubmit" />
     </base-dialog>
   </div>
 </template>
 
 <script>
-import {
+import { energyQuantityManualPage, energyQuantityManualDelete, energyQuantityManualExport } from "@/api/base/energyQuantityManual"
-	energyQuantityManualPage,
+import { getEnergyTypeListAll } from "@/api/base/energyType"
-	energyQuantityManualDelete,
+import { publicFormatter } from '@/utils/dict'
-	energyQuantityManualExport,
+import { parseTime, parseTimeTable } from '@/utils/ruoyi'
-} from '@/api/base/energyQuantityManual';
+// import FileSaver from "file-saver"
-import { getEnergyTypeListAll } from '@/api/base/energyType';
+// import * as XLSX from 'xlsx/xlsx.mjs'
-import { publicFormatter } from '@/utils/dict';
+import EnergyQuantityManualAdd from './components/energyQuantityManualAdd'
-import { parseTimeTable } from '@/utils/ruoyi';
+import moment from 'moment'
-import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
-import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
   {
-		prop: 'energyTypeLabel',
+    prop: 'energyType',
     label: '能源类型',
     minWidth: 110,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
   },
   {
     prop: 'unit',
     label: '单位',
-		filter: publicFormatter('unit_dict'),
+    filter: publicFormatter('energy_unit'),
-		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: this.$auth.hasPermi('base:energy-quantity-manual:query')
+          type: 'button',
-						? 'button'
-						: '',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
         },
         {
-					type: this.$auth.hasPermiOr([
+          type: 'separate'
-						'base:energy-quantity-manual:export',
-						'base:energy-quantity-manual:create',
-					])
-						? 'separate'
-						: '',
         },
         {
-					type: this.$auth.hasPermi('base:energy-quantity-manual:export')
+          type: this.$auth.hasPermi('base:energy-quantity-manual:export') ? 'button' : '',
-						? 'button'
-						: '',
           btnName: '导出',
           name: 'export',
           color: 'primary',
-					plain: true,
+          plain: true
         },
         {
-					type: this.$auth.hasPermi('base:energy-quantity-manual:create')
+          type: this.$auth.hasPermi('base:energy-quantity-manual:create') ? 'button' : '',
-						? 'button'
-						: '',
           btnName: '新增',
           name: 'add',
           color: 'success',
-					plain: true,
+          plain: true
-				},
+        }
       ],
       tableProps,
+      tableH: this.tableHeight(260),
       // 总条数
       total: 0,
       // 班次基础信息列表
       list: [],
       tableBtn: [
-				this.$auth.hasPermiAnd([
+        this.$auth.hasPermi('base:energy-quantity-manual:create')
-					'base:energy-quantity-manual:query',
-					'base:energy-quantity-manual:create',
-				])
           ? {
             type: 'meterReading',
-							btnName: '抄表',
+            btnName: '抄表'
           }
           : undefined,
-				this.$auth.hasPermiAnd([
+        this.$auth.hasPermi('base:energy-quantity-manual:update')
-					'base:energy-quantity-manual:update',
-					'base:energy-quantity-manual:query',
-				])
           ? {
             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() {
-		let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
+    window.addEventListener('resize', () => {
-		let start = moment(
+      this.tableH = this.tableHeight(260)
-			moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
+    })
-		).valueOf();
+    let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf()
-		this.formConfig[1].defaultSelect = [start, end];
+    let start = moment(moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')).valueOf()
-		this.queryParams.recordTime[0] = start;
+    this.formConfig[1].defaultSelect = [start, end]
-		this.queryParams.recordTime[1] = end;
+    this.queryParams.recordTime[0] = start
+    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
+      this.queryParams.recordTime[0] = val.timeVal ? moment(moment(val.timeVal[0]).format('YYYY-MM-DD 00:00:00')).valueOf() : null
-				? moment(moment(val.timeVal[0]).format('YYYY-MM-DD 00:00:00')).valueOf()
+      this.queryParams.recordTime[1] = val.timeVal ? moment(moment(val.timeVal[1]).format('YYYY-MM-DD 23:59:59')).valueOf() : null
-				: 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
+          this.$modal.confirm('是否确认导出').then(() => {
-						.confirm('是否确认导出')
+            return energyQuantityManualExport({ energyTypeId: this.queryParams.energyTypeId, recordTime: this.queryParams.recordTime });
-						.then(() => {
+          }).then(response => {
-							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 && arr.map(item => {
-					arr.map((item) => {
+          item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : ''
-						item.amount = item.amount
+        })
-							? !isNaN(parseFloat(item.amount)) && isFinite(item.amount)
+        this.list = arr
-								? 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
+      this.$modal.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?').then(function () {
-				.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,116 +1,99 @@
 <template>
   <div class="app-container">
+
     <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
     <!-- 列表 -->
-		<base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-			:page="queryParams.pageNo"
+      :selectWidth="55" :max-height="tableH" @selection-change="selectChange" />
-			:limit="queryParams.pageSize"
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			: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: 'energyTypeLabel',
+    prop: 'energyTypeName',
     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: this.$auth.hasPermi('base:energy-quantity-realtime:query')
+          type: 'button',
-						? 'button'
-						: '',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
         },
         {
-					type: 'separate',
+          type: 'separate'
         },
         {
-					type: this.$auth.hasPermi('base:energy-quantity-realtime:export')
+          type: this.$auth.hasPermi('base:energy-quantity-realtime:export') ? 'button' : '',
-						? 'button'
-						: '',
           btnName: '导出',
           name: 'export',
           color: 'primary',
-					plain: true,
+          plain: true
-				},
+        }
       ],
       tableProps,
+      tableH: this.tableHeight(260),
       // 总条数
       total: 0,
       // 班次基础信息列表
@@ -121,97 +104,78 @@ 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 = [
+      this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
-				arr[0].split('=')[1],
-				arr[1].split('=')[1],
-			];
     } else {
-			this.formConfig[1].defaultSelect = [
+      this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()]
-				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 = [
+          this.formConfig[1].defaultSelect = [arr[0].split('=')[1], arr[1].split('=')[1]]
-						arr[0].split('=')[1],
-						arr[1].split('=')[1],
-					];
         } else {
-					this.formConfig[1].defaultSelect = [
+          this.formConfig[1].defaultSelect = [Date.now() - 7 * 24 * 3600000, Date.now()]
-						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 && arr.map(item => {
-					arr.map((item) => {
+          item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : ''
-						item.amount = item.amount
+        })
-							? !isNaN(parseFloat(item.amount)) && isFinite(item.amount)
+        this.list = arr
-								? 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() {
@@ -219,38 +183,38 @@ export default {
         let body = this.exportList.map((x) => [
           x.objName,
           x.objCode,
-					x.energyTypeLabel,
+          x.energyTypeName,
           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,161 +1,79 @@
 <template>
-	<el-form
+  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
-		ref="form"
-		:rules="rules"
-		label-width="100px"
-		:model="form">
     <el-row>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="能源类型" prop="name">
-					label="能源类型"
+          <el-input v-model="form.name"></el-input>
-					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
+        <el-form-item label="类型编码" prop="code">
-					label="类型编码"
+          <el-input v-model="form.code" disabled></el-input>
-					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
+        <el-form-item label="单位" prop="unit">
-					label="单位"
+          <el-select v-model="form.unit" placeholder="请选择" style="width: 100%;">
-					prop="unit">
+            <el-option v-for="item in getDictDatas(DICT_TYPE.ENERGY_UNIT)" :key="item.value" :label="item.label"
-					<el-select
+              :value="item.value">
-						v-model="form.unit"
+            </el-option>
-						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
+        <el-form-item label="计价方式" prop="pricingMethod">
-					label="计价方式"
+          <el-select v-model="form.pricingMethod" placeholder="请选择" style="width: 100%;">
-					prop="pricingMethod">
+            <el-option label="时间段" :value='0'></el-option>
-					<el-select
+            <el-option label="使用量" :value='1'></el-option>
-						v-model="form.pricingMethod"
+            <el-option label="固定价位" :value='2'></el-option>
-						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
+      <el-col :span="12" v-show="form.pricingMethod === 2">
-				:span="12"
+        <el-form-item label="单价(元)" prop="pricingMethod">
-				v-show="form.pricingMethod === 2">
+          <el-input-number v-model="form.singlePrice" :precision="2" :min="0" :max="999999999"
-				<el-form-item
+            style="width: 100%;"></el-input-number>
-					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
+      <el-col :span="12" v-show="form.pricingMethod === 1">
-				:span="12"
+        <el-form-item label="计量维度" prop="dim">
-				v-show="form.pricingMethod === 1">
+          <el-select v-model="form.dim" placeholder="请选择" style="width: 100%;">
-				<el-form-item
+            <el-option label="月" :value='4'></el-option>
-					label="计量维度"
+            <el-option label="年" :value='5'></el-option>
-					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
+      <el-col :span="24" v-show="form.pricingMethod === 0">
-				:span="24"
+        <el-form-item label="时间段" prop="pricingMethod">
-				v-show="form.pricingMethod === 0">
+          <base-table :key='timeKye' :table-props="tableProps1" :table-data="tableData1"
-				<el-form-item
+            :add-button-show="addButtonShow" @emitButtonClick="emitButtonClick1" @emitFun="inputChange1">
-					label="时间段"
+            <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-					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
+      <el-col :span="24" v-show="form.pricingMethod === 1">
-				:span="24"
+        <el-form-item label="使用量" prop="pricingMethod">
-				v-show="form.pricingMethod === 1">
+          <base-table :key='usedKye' :table-props="tableProps2" :table-data="tableData2"
-				<el-form-item
+            :add-button-show="addButtonShow" @emitButtonClick="emitButtonClick2" @emitFun="inputChange2">
-					label="使用量"
+            <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-					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="24">
+      <el-col :span="12">
-				<el-form-item
+        <el-form-item label="是否推送" prop="push">
-					label="描述"
+          <el-switch v-model="form.push"></el-switch>
-					prop="description">
+        </el-form-item>
+      </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>
@@ -163,31 +81,26 @@
   </el-form>
 </template>
 <script>
-import {
+import { getEnergyType, updateEnergyType, createEnergyType, getEnergyTypeCode } from '@/api/base/energyType'
-	getEnergyType,
+import inputArea from './InputArea.vue'
-	updateEnergyType,
+import timePickerArea from './TimePickerArea.vue'
-	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',
@@ -197,14 +110,14 @@ const tableProps2 = [
   {
     prop: 'endUsed',
     label: '上限量',
-		subcomponent: inputArea,
+    subcomponent: inputArea
   },
   {
     prop: 'price',
     label: '单价(元)',
-		subcomponent: inputArea,
+    subcomponent: inputArea
-	},
+  }
-];
+]
 export default {
   name: 'energyTypeAdd',
   data() {
@@ -217,16 +130,13 @@ export default {
         singlePrice: 0,
         pricingMethod: 2,
         dim: '',
-				description: '',
+        push: false,
+        description: ''
       },
       isEdit: false, //是否是编辑
       rules: {
-				name: [
+        name: [{ required: true, message: '能源类型不能为空', trigger: 'blur' }],
-					{ required: true, message: '能源类型不能为空', trigger: 'blur' },
+        pricingMethod: [{ required: true, message: '计价方式不能为空', trigger: 'change' }]
-				],
-				pricingMethod: [
-					{ required: true, message: '计价方式不能为空', trigger: 'change' },
-				],
       },
       timeKye: 0,
       usedKye: 0,
@@ -237,91 +147,92 @@ 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.description = res.data.description;
+            this.form.push = res.data.push ? true : false
+            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) => {
@@ -329,37 +240,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({
@@ -370,18 +281,16 @@ export default {
               pricingMethod: this.form.pricingMethod,
               description: this.form.description,
               dim: this.form.pricingMethod === 1 ? this.form.dim : '',
-							singlePrice:
+              singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
-								this.form.pricingMethod === 2 ? this.form.singlePrice : '',
+              segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [],
-							segPriceList:
+              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [],
-								this.form.pricingMethod === 0 ? this.tableData1 : [],
+              push: this.form.push ? 1 : 0
-							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,
@@ -390,33 +299,31 @@ export default {
               pricingMethod: this.form.pricingMethod,
               description: this.form.description,
               dim: this.form.pricingMethod === 1 ? this.form.dim : '',
-							singlePrice:
+              singlePrice: this.form.pricingMethod === 2 ? this.form.singlePrice : '',
-								this.form.pricingMethod === 2 ? this.form.singlePrice : '',
+              segPriceList: this.form.pricingMethod === 0 ? this.tableData1 : [],
-							segPriceList:
+              usedPriceList: this.form.pricingMethod === 1 ? this.tableData2 : [],
-								this.form.pricingMethod === 0 ? this.tableData1 : [],
+              push: this.form.push ? 1 : 0
-							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,195 +1,224 @@
 <template>
   <div class="app-container">
+
     <!-- 搜索工作栏 -->
     <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
-			:removeBlue="true"
+      @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"
+    />
     <!-- 新增 -->
     <base-dialog
       :dialogTitle="addOrEditTitle"
       :dialogVisible="centervisible"
       @cancel="handleCancel"
       @confirm="handleConfirm"
-			:before-close="handleCancel">
+      :before-close="handleCancel"
-			<energy-type-add
+    >
-				ref="energyType"
+      <energy-type-add ref="energyType" @successSubmit="successSubmit" />
-				@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: 'energyTypeLabel',
+    prop: 'name',
-		label: '能源类型',
+    label: '能源类型'
   },
   {
     prop: 'unit',
     label: '单位',
-		filter: publicFormatter('unit_dict'),
+    filter: publicFormatter('energy_unit')
   },
   {
     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),
-			heightNum: 220,
+      tableH: this.tableHeight(260),
       pricingMethodList: [
         {value: 0,label: '分时间段计价'},
         {value: 1,label: '分使用量计价'},
-				{ value: 2, label: '单一计价' },
+        {value: 2,label: '单一计价'}
       ],
       // 总条数
       total: 0,
       // 班次基础信息列表
       list: [],
       // 弹出层标题
-			addOrEditTitle: '',
+      addOrEditTitle: "",
       // 是否显示弹出层
       centervisible: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
-				pageSize: 100,
+        pageSize: 20,
-			},
+        name: null,
+        code: null
+      }
     };
   },
   created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
     this.getList();
   },
   methods: {
-		buttonClick() {
+    buttonClick(val) {
-			this.addOrEditTitle = '新增';
+      switch (val.btnName) {
-			this.centervisible = true;
+        case 'search':
+          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&&arr.map(item => {
-					arr.map((item) => {
+          this.pricingMethodList.map(i => {
-						this.pricingMethodList.map((i) => {
             if (item.pricingMethod === i.value) {
-								item.pricingMethod = i.label;
+              item.pricingMethod = i.label
             }
-						});
+          })
-						this.getDictDatas('energy_type').map((subItem) => {
+        })
-							if (item.name === subItem.value) {
+        this.list = arr
-								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) {
-			console.log(row);
+      this.$modal.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?').then(function() {
-			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

@@ -1,76 +0,0 @@
-<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

@@ -1,111 +0,0 @@
-<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.hasPermiAnd([
-					'base:energy-table:query',
-					'base:energy-table:update',
-				])
-					? {
-							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,160 +1,97 @@
 <template>
-	<el-form
+  <el-form ref="form" :rules="rules" label-width="110px" :model="form">
-		ref="form"
-		:rules="rules"
-		label-width="110px"
-		:model="form">
     <el-row>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="抄表方式" prop="method">
-					label="抄表方式"
+          <el-select v-model="form.method" placeholder="请选择" style="width: 100%;" @change="changeMethod">
-					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"></el-option>
+              :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-col>
-			<el-col
+      <el-col :span="12" v-if='form.method == 1'>
-				:span="12"
+        <el-form-item label="监控对象" prop="objectId">
-				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-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">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="监控能源类型" prop="energyTypeId">
-					label="监控能源类型"
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable @change="toggleType">
-					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"
+              :label="item.name"
-							:value="item.id"></el-option>
+              :value="item.id">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-col>
-			<el-col
+      <el-col :span="12" v-if='form.method == 1'>
-				:span="12"
+        <el-form-item label="监控模式" prop="type">
-				v-if="form.method == 2">
+          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
-				<el-form-item
+            <el-option label="合并" :value= "1" ></el-option>
-					label="能源表名"
+            <el-option label="详细" :value= "2" ></el-option>
-					prop="tableName">
-					<el-select
-						v-model="form.tableName"
-						placeholder="请选择"
-						style="width: 100%">
-						<el-option
-							v-for="item in tableNameList"
-							:key="item.value"
-							:label="item.label"
-							:value="item.value"></el-option>
           </el-select>
         </el-form-item>
       </el-col>
-			<el-col
+      <el-col :span="12" v-if='form.method == 1'>
-				:span="12"
+        <el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
-				v-if="form.method == 1">
+          <el-select v-model="form.plcParamId" placeholder="请选择" style="width: 100%;" @change="selectDetail">
-				<el-form-item
-					label="监控模式"
-					prop="type">
-					<el-select
-						v-model="form.type"
-						placeholder="请选择"
-						style="width: 100%"
-						@change="typeChange">
-						<el-option
-							label="合并"
-							:value="1"></el-option>
-						<el-option
-							label="详细"
-							:value="2"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col
-				:span="12"
-				v-if="form.method == 1">
-				<el-form-item
-					label="监控详细参数"
-					prop="type"
-					v-if="form.type === 2">
-					<el-select
-						v-model="form.plcParamId"
-						placeholder="请选择"
-						style="width: 100%"
-						@change="selectDetail">
             <el-option
               v-for="item in detailList"
               :key="item.id"
               :label="item.name"
-							:value="item.id"></el-option>
+              :value="item.id">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-				<el-form-item
+        <el-form-item label="指标类型" prop="limitType">
-					label="指标类型"
+          <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;" :disabled='form.method == 2'>
-					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"></el-option>
+              :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="消耗量阈值">
-					<el-input-number
+          <el-input-number v-model="form.minValue" placeholder="最小值" :max="9999999" style="width: 50%;"></el-input-number>
-						v-model="form.minValue"
+          <el-input-number v-model="form.maxValue" placeholder="最大值" :max="9999999" style="width: 50%;"></el-input-number>
-						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 {
+import { getEnergyLimit, updateEnergyLimit, createEnergyLimit, getEnergyParamList } from '@/api/monitoring/energyLimit'
-	getEnergyLimit,
-	updateEnergyLimit,
-	createEnergyLimit,
-	getEnergyParamList,
-} from '@/api/monitoring/energyLimit';
-import { energyTableGet } from '@/api/base/energyQuantityManual';
 export default {
   name: 'energyLimitAdd',
   props: {
@@ -162,13 +99,13 @@ export default {
       type: Array,
       required: true,
       default: () => {
-				return [];
+        return []
-			},
+      }
     },
     objList: {
       type: Array,
-			default: () => [],
+      default: () => []
-		},
+    }
   },
   data() {
     return {
@@ -182,190 +119,164 @@ export default {
         plcParamId: '',
         limitType: '',
         minValue: 0,
-				maxValue: 0,
+        maxValue: 0
-				tableName: '',
       },
       objIds: [],// 回显数组
       isEdit: false, //是否是编辑
       rules: {
-				method: [
+        method: [{ required: true, message: '抄表方式不能为空', trigger: 'change' }],
-					{ required: true, message: '抄表方式不能为空', trigger: 'change' },
+        objectId: [{ required: true, message: '监控对象不能为空', trigger: 'change' }],
-				],
+        energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }],
-				objectId: [
+        type: [{ required: true, message: '监控模式不能为空', trigger: 'change' }],
-					{ required: true, message: '监控对象不能为空', trigger: 'change' },
+        limitType: [{ required: true, message: '指标类型不能为空', trigger: 'change' }]
-				],
-				energyTypeId: [
-					{ required: true, message: '能源类型不能为空', trigger: 'change' },
-				],
-				type: [
-					{ required: true, message: '监控模式不能为空', trigger: 'change' },
-				],
-				limitType: [
-					{ required: true, message: '指标类型不能为空', trigger: 'change' },
-				],
       },
-			tableNameList: [],
+      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.tableName = this.form.tableName
+            this.form.method = this.form.method ? this.form.method + '' : ''
-							? this.form.tableName + ''
+            this.form.limitType = this.form.limitType ? this.form.limitType + '' : ''
-							: '';
+            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.method == 2) {
+      if (this.form.energyTypeId && this.form.type) {
-				this.form.tableName = '';
+        this.getDetailList()
-				this.getTableNameList(this.form.energyTypeId);
+        this.form.plcParamId = ''
       }
     },
-		// 获取能源表名list
-		getTableNameList(id) {
-			energyTableGet({ energyTypeId: id }).then((res) => {
-				this.tableNameList = res.data.tableObjs || [];
-				if (this.tableNameList.length === 0) {
-					this.$modal.msgWarning(
-						'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
-					);
-				}
-			});
-		},
     // 递归处理分类回显问题
     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;
+      this.form.objectType = val.length-1
       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,30 +1,35 @@
 <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"
@@ -32,56 +37,41 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
-			width="50%">
+      width='50%'
-			<energy-limit-add
+    >
-				ref="energyLimit"
+      <energy-limit-add ref="energyLimit" @successSubmit="successSubmit" :energyTypeList="energyTypeList" :objList="objList"/>
-				@successSubmit="successSubmit"
-				:energyTypeList="energyTypeList"
-				:objList="objList" />
     </base-dialog>
   </div>
 </template>
 
 <script>
-import {
+import { getEnergyLimitPage, deleteEnergyLimit } from "@/api/monitoring/energyLimit";
-	getEnergyLimitPage,
+import { getEnergyTypeListAll } from "@/api/base/energyType";
-	deleteEnergyLimit,
+import { getTree } from '@/api/base/factory'
-} from '@/api/monitoring/energyLimit';
+import { publicFormatter } from '@/utils/dict'
-import { getEnergyTypeListAll } from '@/api/base/energyType';
+import EnergyLimitAdd from './components/energyLimitAdd'
-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',
@@ -90,22 +80,21 @@ 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: [
@@ -113,8 +102,7 @@ export default {
           type: 'select',
           label: '能源类型',
           selectOptions: [],
-					labelField: 'labelName',
+          param: 'energyTypeId'
-					param: 'energyTypeId',
         },
         {
           type: 'select',
@@ -122,52 +110,47 @@ export default {
           selectOptions: this.getDictDatas(this.DICT_TYPE.MONITOR_INDEX_TYPE),
           labelField: 'label',
           valueField: 'value',
-					param: 'limitType',
+          param: 'limitType'
         },
         {
-					type: this.$auth.hasPermi('monitoring:energy-limit:query')
+          type: 'button',
-						? 'button'
-						: '',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
         },
         {
-					type: this.$auth.hasPermi('monitoring:energy-limit:create')
+          type: 'separate'
-						? 'separate'
-						: '',
         },
         {
-					type: this.$auth.hasPermi('monitoring:energy-limit:create')
+          type: this.$auth.hasPermi('monitoring:energy-limit:create') ? 'button' : '',
-						? '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,
       // 查询参数
@@ -175,115 +158,112 @@ 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&&arr.map(item => {
-					arr.map((item) => {
+          this.typeList.map(i => {
-						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) {
-			console.log(row);
+      this.$modal.confirm('是否确认删除监控对象为"' + row.objName + '"的数据项?').then(function() {
-			this.$modal
-				.confirm('是否确认删除第"' + row._pageIndex + '"条数据项?')
-				.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,139 +1,115 @@
 <template>
   <div class="app-container energyOverlimitLog">
+
     <!-- 搜索工作栏 -->
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-			:formConfigs="formConfig"
+    <el-tabs v-model="activeName" @tab-click="toggleTab">
-			ref="searchBarForm"
+      <el-tab-pane label="自动抄表" name="auto"></el-tab-pane>
-			@headBtnClick="buttonClick" />
+      <el-tab-pane label="手动抄表" name="manual"></el-tab-pane>
-		<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
+      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-				:page="queryParams.pageNo"
-				:limit="queryParams.pageSize"
-				:table-props="tableProps"
-				:table-data="list"
         :max-height="tableH" />
     </div>
     <div v-if="activeName === 'manual'">
-			<base-table
+      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps2"
-				:page="queryParams.pageNo"
+        :table-data="list2" :max-height="tableH" />
-				:limit="queryParams.pageSize"
-				:table-props="tableProps2"
-				:table-data="list2"
-				:max-height="tableH" />
     </div>
-		<pagination
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-			: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',
@@ -141,100 +117,102 @@ 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 && arr.map((item) => {
-					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;