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

@@ -187,11 +187,8 @@
 					@click="resetBtn">
 					重置
 				</el-button>
-				<span
+				<span class="separateStyle"></span>
-					class="separateStyle"
-					v-hasPermi="['analysis:contrast-analysis:export']"></span>
 				<el-button
-					v-hasPermi="['analysis:contrast-analysis:export']"
 					type="primary"
 					size="small"
 					plain

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

@@ -80,13 +80,10 @@
 			</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
-				v-hasPermi="['analysis:qoq-analysis:export']"
 				type="primary"
 				size="small"
 				@click="exportData"

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

@@ -170,11 +170,8 @@
 					@click="resetBtn">
 					重置
 				</el-button>
-				<span
+				<span class="separateStyle"></span>
-					class="separateStyle"
-					v-hasPermi="['analysis:trend-analysis:export']"></span>
 				<el-button
-					v-hasPermi="['analysis:trend-analysis:export']"
 					type="primary"
 					size="small"
 					plain

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

@@ -69,13 +69,10 @@
 			</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
-				v-hasPermi="['analysis:yoy-analysis:export']"
 				type="primary"
 				size="small"
 				@click="exportData"

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: 'button',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
         },
         {
-					type: 'separate',
+          type: 'separate'
         },
         {
           type: this.$auth.hasPermi('base:energy-plc:create') ? 'button' : '',
           btnName: '新增',
           name: 'add',
           color: 'success',
-					plain: true,
+          plain: true
-				},
+        }
       ],
       tableProps,
       tableBtn: [
         this.$auth.hasPermi('base:energy-plc:update')
           ? {
             type: 'edit',
-							btnName: '编辑',
+            btnName: '编辑'
           }
           : undefined,
         this.$auth.hasPermi('base:energy-plc:delete')
           ? {
             type: 'delete',
-							btnName: '删除',
+            btnName: '删除'
           }
-					: undefined,
+          : undefined
       ].filter((v) => v),
+      tableH: this.tableHeight(260),
       collectionList: [
         { value: 0, label: '否' },
-				{ value: 1, label: '是' },
+        { value: 1, label: '是' }
       ],
       // 总条数
       total: 0,
       // 班次基础信息列表
       list: [],
       // 弹出层标题
-			addOrEditTitle: '',
+      addOrEditTitle: "",
       // 是否显示弹出层
       centervisible: false,
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 20,
-				name: null,
+        name: null
-			},
+      }
     };
   },
   created() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+    })
     this.getList();
   },
   methods: {
@@ -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/energyPlcParam.vue

@@ -1,35 +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 v-if="showBtn">
-						<el-button
+            <el-button type="success" size='small' plain @click="addNew">新增</el-button>
-							type="success"
-							size="small"
-							plain
-							@click="addNew">
-							新增
-						</el-button>
           </el-form-item>
         </el-form>
         <base-table
@@ -37,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>
     <!-- 新增 -->
@@ -59,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: {
@@ -108,9 +87,9 @@ export default {
       type: Array,
       required: true,
       default: () => {
-				return [];
+        return []
-			},
+      }
-		},
+    }
   },
   data() {
     return {
@@ -124,132 +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 = [
           {
             type: 'edit',
-						btnName: '编辑',
+            btnName: '编辑'
           },
           {
             type: 'delete',
-						btnName: '删除',
+            btnName: '删除'
-					},
+          }
-				];
+        ]
       }
     },
     getList() {
       getEnergyPlcParamPage({...this.queryParams}).then((res) => {
-				let arr = res.data.list || [];
+        let arr = res.data.list || []
-				arr &&
+        arr&&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/index.vue

@@ -57,18 +57,14 @@ import { getTree } from '@/api/analysis/energyAnalysis';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import EnergyPlcConnectAdd from './components/energyPlcConnectAdd';
 import EnergyPlcParam from './components/energyPlcParam';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'objName',
 		label: '对象',
-		minWidth: 130,
-		showOverflowtooltip: true,
 	},
 	{
 		prop: 'objCode',
 		label: '对象编码',
-		minWidth: 150,
 		showOverflowtooltip: true,
 	},
 	{
@@ -90,13 +86,11 @@ const tableProps = [
 	{
 		prop: 'varNum',
 		label: '绑定参数数量',
-		width: 110,
 	},
 ];
 export default {
 	name: 'EnergyPlcConnect',
 	components: { EnergyPlcConnectAdd, EnergyPlcParam },
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -150,6 +144,7 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
+			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -170,6 +165,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		this.getList();
 	},
 	mounted() {

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

@@ -20,9 +20,9 @@
 							@change="changeSelect(scope.row, 'tableName')">
 							<el-option
 								v-for="item in tableNameList"
-								:key="item.value"
+								:key="item.id"
 								:label="item.label"
-								:value="item.value"></el-option>
+								:value="item.id"></el-option>
 						</el-select>
 					</div>
 				</template>

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

@@ -40,10 +40,18 @@
 		<el-row :gutter="20">
 			<el-col :span="24">
 				<add-table
+					:table-props="tableProps"
 					:table-data="tableData"
 					:table-name-list="tableNameList"
 					@emitFun="inputChange"
 					@emitButtonClick="emitButtonClick" />
+				<!-- <base-table
+					border
+					:table-props="tableProps"
+					:table-data="tableData"
+					:add-button-show="addButtonShow"
+					@emitFun="inputChange"
+					@emitButtonClick="emitButtonClick" /> -->
 			</el-col>
 		</el-row>
 	</el-form>
@@ -56,7 +64,21 @@ import {
 } from '@/api/base/energyQuantityManual';
 import moment from 'moment';
 import AddTable from './AddTable';
+import InputArea from './InputArea';
+import SelectArea from './SelectArea';
 import { energyTableGet } from '@/api/base/energyQuantityManual';
+const tableProps = [
+	{
+		prop: 'tableName',
+		label: '表名*',
+		subcomponent: SelectArea,
+	},
+	{
+		prop: 'readingQuantity',
+		label: '抄表数*',
+		subcomponent: InputArea,
+	},
+];
 export default {
 	name: 'EnergyQuantityManualAdd',
 	props: {
@@ -70,6 +92,7 @@ export default {
 	},
 	data() {
 		return {
+			tableProps,
 			tableData: [],
 			tableNameList: [], //表名list
 			addButtonShow: '新增',
@@ -99,7 +122,6 @@ export default {
 			} else if (params.type === 'meterReading') {
 				this.isEdit = false;
 				this.form.energyTypeId = params.energyTypeId;
-				this.selEnergyType(this.form.energyTypeId);
 				let obj = {};
 				obj.tableName = params.tableName + '';
 				obj.readingQuantity = 0;
@@ -111,7 +133,6 @@ export default {
 				energyQuantityManualGet({ id: this.form.id }).then((res) => {
 					if (res.code === 0) {
 						this.form.energyTypeId = res.data.energyTypeId;
-						this.selEnergyType(this.form.energyTypeId);
 						this.form.recordTime = res.data.recordTime
 							? res.data.recordTime
 							: null;
@@ -143,11 +164,6 @@ export default {
 			this.tableNameList = [];
 			energyTableGet({ energyTypeId: id }).then((res) => {
 				this.tableNameList = res.data.tableObjs || [];
-				if (this.tableNameList.length === 0) {
-					this.$modal.msgWarning(
-						'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
-					);
-				}
 			});
 		},
 		submitForm() {

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

@@ -52,18 +52,18 @@ import { publicFormatter } from '@/utils/dict';
 import { parseTimeTable } from '@/utils/ruoyi';
 import EnergyQuantityManualAdd from './components/energyQuantityManualAdd';
 import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
-		prop: 'energyTypeLabel',
+		prop: 'energyType',
 		label: '能源类型',
 		minWidth: 110,
+		filter: publicFormatter('energy_type'),
 		showOverflowtooltip: true,
 	},
 	{
 		prop: 'unit',
 		label: '单位',
-		filter: publicFormatter('unit_dict'),
+		filter: publicFormatter('energy_unit'),
 		minWidth: 110,
 	},
 	{
@@ -142,6 +142,7 @@ export default {
 				},
 			],
 			tableProps,
+			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -180,8 +181,10 @@ export default {
 		};
 	},
 	components: { EnergyQuantityManualAdd },
-	mixins: [tableHeightMixin],
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		let end = moment(moment().format('YYYY-MM-DD 23:59:59')).valueOf();
 		let start = moment(
 			moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
@@ -241,11 +244,6 @@ export default {
 								? 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;
@@ -307,7 +305,7 @@ export default {
 		handleDelete(row) {
 			console.log(row.id);
 			this.$modal
-				.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
+				.confirm('是否确认删除能源类型为"' + row.energyType + '"的数据项?')
 				.then(function () {
 					return energyQuantityManualDelete({ id: row.id });
 				})

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

@@ -1,114 +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: '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,
       // 班次基础信息列表
@@ -119,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() {
@@ -217,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/index.vue

@@ -40,7 +40,6 @@ import { getEnergyTypePage, deleteEnergyType } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import InnerTable from './components/InnerTable';
 import EnergyTypeAdd from './components/energyTypeAdd';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'code',
@@ -49,8 +48,9 @@ const tableProps = [
 		minWidth: 150,
 	},
 	{
-		prop: 'energyTypeLabel',
+		prop: 'name',
 		label: '能源类型',
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'unit',
@@ -70,7 +70,6 @@ const tableProps = [
 export default {
 	name: 'EnergyType',
 	components: { EnergyTypeAdd },
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -97,7 +96,7 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
-			heightNum: 220,
+			tableH: this.tableHeight(220),
 			pricingMethodList: [
 				{ value: 0, label: '分时间段计价' },
 				{ value: 1, label: '分使用量计价' },
@@ -119,6 +118,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(220);
+		});
 		this.getList();
 	},
 	methods: {
@@ -140,11 +142,6 @@ export default {
 								item.pricingMethod = i.label;
 							}
 						});
-						this.getDictDatas('energy_type').map((subItem) => {
-							if (item.name === subItem.value) {
-								item.energyTypeLabel = subItem.label;
-							}
-						});
 					});
 				this.list = arr;
 				this.total = response.data.total;
@@ -177,9 +174,8 @@ export default {
 		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
-			console.log(row);
 			this.$modal
-				.confirm('是否确认删除能源类型为"' + row.energyTypeLabel + '"的数据项?')
+				.confirm('是否确认删除能源类型为"' + row.name + '"的数据项?')
 				.then(function () {
 					return deleteEnergyType(row.id);
 				})

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

@@ -32,7 +32,6 @@
 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',
@@ -64,11 +63,10 @@ export default {
 				pageNo: 1,
 				pageSize: 100,
 			},
-			heightNum: 165,
+			tableH: this.tableHeight(165),
 			centervisible: false,
 		};
 	},
-	mixins: [tableHeightMixin],
 	created() {
 		this.getList();
 	},

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

@@ -182,7 +182,6 @@ export default {
 				limitType: '',
 				minValue: 0,
 				maxValue: 0,
-				tableName: '',
 			},
 			objIds: [], // 回显数组
 			isEdit: false, //是否是编辑
@@ -215,9 +214,6 @@ export default {
 					if (res.code === 0) {
 						this.form = res.data;
 						this.form.plcParamId = res.data.plcParamId || '';
-						this.form.tableName = this.form.tableName
-							? this.form.tableName + ''
-							: '';
 						this.form.method = this.form.method ? this.form.method + '' : '';
 						this.form.limitType = this.form.limitType
 							? this.form.limitType + ''

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

@@ -51,7 +51,6 @@ import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { getTree } from '@/api/analysis/energyAnalysis';
 import { publicFormatter } from '@/utils/dict';
 import EnergyLimitAdd from './components/energyLimitAdd';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'method',
@@ -105,7 +104,6 @@ const tableProps = [
 export default {
 	name: 'EnergyLimit',
 	components: { EnergyLimitAdd },
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -158,6 +156,7 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
+			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -182,6 +181,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		this.getList();
 		this.getTypeList();
 		// 获取对象树形结构

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

@@ -45,7 +45,6 @@ import { getEnergyOverlimitLogPage } from '@/api/monitoring/energyOverlimitLog';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import { publicFormatter } from '@/utils/dict';
 import { parseTime } from '@/utils/ruoyi';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'objName',
@@ -124,7 +123,6 @@ const tableProps2 = [
 ];
 export default {
 	name: 'EnergyOverlimitLog',
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -153,10 +151,10 @@ export default {
 			activeName: 'auto',
 			tableProps,
 			tableProps2,
+			tableH: this.tableHeight(260),
 			total: 0,
 			list: [],
 			list2: [],
-			heightNum: 300,
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
@@ -172,6 +170,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		this.getList();
 		this.getTypeList();
 	},

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

@@ -72,7 +72,7 @@ const tableProps = [
 	},
 ];
 export default {
-	name: 'EnergyReport',
+	name: 'EnergyLimit',
 	data() {
 		return {
 			isFold: false,
@@ -181,7 +181,7 @@ export default {
 							return energyReportPageExportAuto({ ...this.queryParams });
 						})
 						.then((response) => {
-							this.$download.excel(response, '能耗统计报表.xls');
+							this.$download.excel(response, '能源统计报表.xls');
 						})
 						.catch(() => {});
 			}

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

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

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

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

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

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

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

@@ -53,7 +53,6 @@ import { publicFormatter } from '@/utils/dict';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
 import EnergyStatisticsAdd from './components/energyStatisticsAdd';
 import EnergyStatisticsDet from './components/energyStatisticsDet';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 const tableProps = [
 	{
 		prop: 'name',
@@ -71,9 +70,9 @@ const tableProps = [
 		filter: publicFormatter('statistic_type'),
 	},
 	{
-		prop: 'energyTypeLabel',
+		prop: 'energyType',
 		label: '能源类型',
-		showOverflowtooltip: true,
+		filter: publicFormatter('energy_type'),
 	},
 	{
 		prop: 'paramNum',
@@ -87,7 +86,6 @@ const tableProps = [
 export default {
 	name: 'EnergyStatistics',
 	components: { EnergyStatisticsAdd, EnergyStatisticsDet },
-	mixins: [tableHeightMixin],
 	data() {
 		return {
 			formConfig: [
@@ -141,6 +139,7 @@ export default {
 					  }
 					: undefined,
 			].filter((v) => v),
+			tableH: this.tableHeight(260),
 			// 总条数
 			total: 0,
 			// 班次基础信息列表
@@ -159,6 +158,9 @@ export default {
 		};
 	},
 	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
 		this.getList();
 	},
 	mounted() {
@@ -185,13 +187,6 @@ export default {
 		getList() {
 			getEnergyStatisticsPage(this.queryParams).then((response) => {
 				let arr = response.data.list || [];
-				arr.map((item) => {
-					this.getDictDatas('energy_type').map((subItem) => {
-						if (item.energyType === subItem.value) {
-							item.energyTypeLabel = subItem.label;
-						}
-					});
-				});
 				this.list = arr;
 				this.total = response.data.total;
 			});

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

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

@@ -1,47 +1,21 @@
 <template>
   <div class="app-container orderMonitoring">
     <!-- 搜索工作栏 -->
-		<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="dataList"></el-tab-pane>
-			@headBtnClick="buttonClick" />
+      <el-tab-pane label="环形图" name="barChart"></el-tab-pane>
-		<el-tabs
-			v-model="activeName"
-			@tab-click="toggleTab">
-			<el-tab-pane
-				label="数据列表"
-				name="dataList"></el-tab-pane>
-			<el-tab-pane
-				label="环形图"
-				name="barChart"></el-tab-pane>
     </el-tabs>
     <!-- 表 -->
     <div v-if="activeName === 'dataList'">
-			<base-table
+      <base-table :page="1" :limit="1000000000000" :table-props="tableProps" :table-data="list" :max-height="tableH"
-				:page="1"
+        row-key="id" :tree-props="{ children: 'orderMonitorVOS', hasChildren: 'hasChildren' }">
-				:limit="1000000000000"
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
-				:table-props="tableProps"
-				:table-data="list"
-				:max-height="tableH"
-				row-key="id"
-				:tree-props="{
-					children: 'orderMonitorVOS',
-					hasChildren: 'hasChildren',
-				}">
-				<method-btn
-					v-if="tableBtn.length"
-					slot="handleBtn"
-					:width="100"
-					label="操作"
-					:method-list="tableBtn"
           @clickBtn="handleClick" />
       </base-table>
     </div>
     <!-- 图 -->
-		<monitoring-ring-charts
+    <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList' />
-			ref="monitoringRingCharts"
-			v-else
-			:chart-list="chartList" />
     <!-- <pagination
       :page.sync="queryParams.pageNo"
       :limit.sync="queryParams.pageSize"
@@ -51,94 +25,94 @@
   </div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi';
+import { parseTime } from '@/utils/ruoyi'
-import { publicFormatter } from '@/utils/dict';
+import { publicFormatter } from '@/utils/dict'
-import { orderGroupMonitor } from '@/api/base/orderGroup';
+import { orderGroupMonitor } from '@/api/base/orderGroup'
-import MonitoringRingCharts from './../components/monitoringRingCharts';
+import MonitoringRingCharts from './../components/monitoringRingCharts'
-import moment from 'moment';
+import moment from "moment"
 const tableProps = [
   {
     prop: 'name',
     label: '订单名称',
     minWidth: 140,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
   },
   {
     prop: 'orderType',
-		label: '订单类型',
+    label: '订单类型'
   },
   {
     prop: 'customerName',
-		label: '客户',
+    label: '客户'
   },
   {
     prop: 'productname',
     label: '产品',
     minWidth: 200,
-		showOverflowtooltip: true,
+    showOverflowtooltip: true
   },
   {
     prop: 'planStartTime',
     label: '计划开始时间',
     filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
   },
   {
     prop: 'planFinishTime',
     label: '计划完成时间',
     filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
   },
   {
     prop: 'status',
     label: '订单状态',
-		filter: publicFormatter('order_status'),
+    filter: publicFormatter('order_status')
   },
   {
     prop: 'startProduceTime',
     label: '实际开始时间',
     filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
   },
   {
     prop: 'finishProduceTime',
     label: '实际完成时间',
     filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
   },
   {
     prop: 'deliveTime',
     label: '交货时间',
     filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
   },
   {
     prop: 'lineNames',
     label: '加工线',
-		filter: (val) => (val ? val.join(',') : ''),
+    filter: (val) => val ? val.join(',') : '',
-		minWidth: 180,
+    minWidth: 180
   },
   {
     prop: 'planQuantity',
     label: '计划生产量',
-		width: 100,
+    width: 100
   },
   {
     prop: 'actualquantity',
     label: '实际产出量',
-		width: 100,
+    width: 100
   },
   {
     prop: 'completeRate',
     label: '订单完成率',
-		width: 100,
+    width: 100
   },
   {
     prop: 'orderNum',
     label: '关联订单/工单数量',
-		width: 110,
+    width: 110
-	},
+  }
-];
+]
 export default {
   name: 'OrderCompletionMonitoring',
   data() {
@@ -147,33 +121,33 @@ export default {
         {
           type: 'input',
           label: '集团订单名称',
-					param: 'name',
+          param: 'name'
         },
         {
           type: 'datePicker',
           label: '时间段',
           dateType: 'daterange',
           format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd',
+          valueFormat: "yyyy-MM-dd",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'timeVal',
           defaultSelect: [],
-					width: 250,
+          width: 250
         },
         {
           type: 'button',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
-				},
+        }
       ],
       activeName: 'dataList',
       // 查询参数
       queryParams: {
         name: null,
-				deliveTime: [],
+        deliveTime: []
       },
       tableProps,
       list: [],
@@ -191,10 +165,10 @@ export default {
                 {
                   type: 'more',
                   name: 'orderNum',
-										value: 1,
+                  value: 1
-									},
+                }
-								],
+              ]
-							},
+            }
           }
           : undefined,
         this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
@@ -208,17 +182,17 @@ export default {
                 {
                   type: 'more',
                   name: 'orderNum',
-										value: 1,
+                  value: 1
                 },
                 {
                   type: 'unequal',
                   name: 'woIdString',
-										value: '',
+                  value: ''
-									},
-								],
-							},
                 }
-					: undefined,
+              ]
+            }
+          }
+          : undefined
         // this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
         //     ? {
         //         type: 'sendOutDetail',
@@ -237,124 +211,111 @@ export default {
         //       }
         //     : undefined
       ].filter((v) => v),
-			chartList: [],
+      chartList: []
-		};
+    }
   },
   components: { MonitoringRingCharts },
   mounted() {
     window.addEventListener('resize', () => {
-			this.tableH = this.tableHeight(260);
+      this.tableH = this.tableHeight(260)
-		});
+    })
-		let start = moment().subtract(30, 'days').format('yyyy-MM-DD');
+    let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
-		let end = moment().format('yyyy-MM-DD');
+    let end = moment().format('yyyy-MM-DD')
-		this.formConfig[1].defaultSelect = [start, end];
+    this.formConfig[1].defaultSelect = [start, end]
-		this.queryParams.deliveTime[0] = start + ' 00:00:00';
+    this.queryParams.deliveTime[0] = start + ' 00:00:00'
-		this.queryParams.deliveTime[1] = end + ' 23:59:59';
+    this.queryParams.deliveTime[1] = end + ' 23:59:59'
-		this.getPage();
+    this.getPage()
   },
   methods: {
     getPage() {
-			orderGroupMonitor({ ...this.queryParams }).then((res) => {
+      orderGroupMonitor({ ...this.queryParams }).then(res => {
-				let arr = res.data || [];
+        let arr = res.data || []
         if (arr.length > 0) {
-					let color = ['#7164FF', '#288AFF', '#63BDFF', '#8EF0AB', '#FFCE6A'];
+          let color = ['#7164FF', '#288AFF', '#63BDFF', '#8EF0AB', '#FFCE6A']
-					let arr2 = [];
+          let arr2 = []
-					arr.map((item) => {
+          arr.map(item => {
-						item.orderType = '集团订单'; //前端写死订单类型
+            item.orderType = '集团订单'//前端写死订单类型
-						let woIdString = ''; //集团订单层添加工单str跳转质量用
+            let woIdString = ''//集团订单层添加工单str跳转质量用
             //=========图数据
-						let arr3 = [];
+            let arr3 = []
-						let obj = {};
+            let obj = {}
-						obj.orderGroupName = item.name;
+            obj.orderGroupName = item.name
-						obj.id = item.id;
+            obj.id = item.id
-						obj.num = item.planQuantity || 0;
+            obj.num = item.planQuantity || 0
-						let sunNum = 0;
+            let sunNum = 0
             if (item.orderMonitorVOS && item.orderMonitorVOS.length > 0) {
               for (let i = 0; i < item.orderMonitorVOS.length; i++) {
-								item.orderMonitorVOS[i].orderType = '厂务订单'; //前端写死订单类型
+                item.orderMonitorVOS[i].orderType = '厂务订单'//前端写死订单类型
-								item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid;
+                item.orderMonitorVOS[i].id = item.orderMonitorVOS[i].orderid
-								item.orderMonitorVOS[i].orderNum =
+                item.orderMonitorVOS[i].orderNum = item.orderMonitorVOS[i].workOrderNum
-									item.orderMonitorVOS[i].workOrderNum;
+                woIdString += item.orderMonitorVOS[i].woIdString ? item.orderMonitorVOS[i].woIdString : ''
-								woIdString += item.orderMonitorVOS[i].woIdString
-									? item.orderMonitorVOS[i].woIdString + ','
-									: '';
                 //==============图数据
-								let subObj = {};
+                let subObj = {}
-								subObj.value = item.orderMonitorVOS[i].actualquantity;
+                subObj.value = item.orderMonitorVOS[i].actualquantity
-								subObj.name = item.orderMonitorVOS[i].name;
+                subObj.name = item.orderMonitorVOS[i].name
                 if (i < 5) {
-									subObj.color = color[i];
+                  subObj.color = color[i]
                 } else {
-									subObj.color = color[i % 5];
+                  subObj.color = color[i % 5]
                 }
-								sunNum += item.orderMonitorVOS[i].actualquantity || 0;
+                sunNum += (item.orderMonitorVOS[i].actualquantity || 0)
-								arr3.push(subObj);
+                arr3.push(subObj)
               }
-							woIdString = woIdString.slice(0, -1);
             }
-						item.woIdString = woIdString;
+            item.woIdString = woIdString
             arr3.push({
-							value:
+              value: item.planQuantity - sunNum > 0 ? item.planQuantity - sunNum : 0,
-								item.planQuantity - sunNum > 0 ? item.planQuantity - sunNum : 0,
               name: '未生产',
-							color: '#F5F5F5',
+              color: '#F5F5F5'
-						});
+            })
-						obj.sunNum = sunNum;
+            obj.sunNum = sunNum
-						obj.order = arr3;
+            obj.order = arr3
-						arr2.push(obj);
+            arr2.push(obj)
-					});
+          })
-					this.chartList = arr2;
+          this.chartList = arr2
           if (this.activeName === 'barChart' && this.chartList.length > 0) {
             this.$nextTick(() => {
-							this.$refs.monitoringRingCharts.initChart();
+              this.$refs.monitoringRingCharts.initChart()
-						});
+            })
           }
         } else {
           // 显示无数据的图片
-					this.chartList = [];
+          this.chartList = []
         }
-				console.log(arr);
+        console.log(arr)
-				this.list = arr;
+        this.list = arr
-			});
+      })
     },
     // 查询
     buttonClick(val) {
-			this.queryParams.name = val.name;
+      this.queryParams.name = val.name
       if (val.timeVal && val.timeVal.length > 0) {
-				this.queryParams.deliveTime[0] = val.timeVal[0] + ' 00:00:00';
+        this.queryParams.deliveTime[0] = val.timeVal[0] + ' 00:00:00'
-				this.queryParams.deliveTime[1] = val.timeVal[1] + ' 23:59:59';
+        this.queryParams.deliveTime[1] = val.timeVal[1] + ' 23:59:59'
       } else {
-				this.queryParams.deliveTime = [];
+        this.queryParams.deliveTime = []
       }
-			this.getPage();
+      this.getPage()
     },
     handleClick(val) {
-			console.log(val);
+      console.log(val)
       switch (val.type) {
         case 'orderDetail':
           if (val.data.orderType === '集团订单') {
-						this.$router.push({
+            this.$router.push({// 去厂务订单详情
-							// 去厂务订单详情
+              path: '/order/base/order-manage/order-detail-data?orderIdString=' + val.data.orderIds.join(',')
-							path:
+            })
-								'/order/base/order-manage/order-detail-data?orderIdString=' +
-								val.data.orderIds.join(','),
-						});
           } else {
-						this.$router.push({
+            this.$router.push({// 去工单详情
-							// 去工单详情
+              path: '/core/core-work-order-detail?woIdString=' + val.data.woIdString
-							path:
+            })
-								'/core/core-work-order-detail?woIdString=' +
-								val.data.woIdString,
-						});
           }
-					break;
+          break
         case 'qualityDetail':
           this.$router.push({
-						path:
+            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString=' + val.data.woIdString
-							'/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString=' +
+          })
-							val.data.woIdString,
+          break
-					});
-					break;
         default:
         // this.$router.push({
         //   path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
@@ -364,17 +325,17 @@ export default {
     toggleTab() {
       if (this.activeName === 'barChart' && this.chartList.length > 0) {
         this.$nextTick(() => {
-					this.$refs.monitoringRingCharts.initChart();
+          this.$refs.monitoringRingCharts.initChart()
-				});
+        })
+      }
+    }
+  }
 }
-		},
-	},
-};
 </script>
 <style lang='scss'>
 .orderMonitoring {
   .el-tabs__nav::after {
-		content: '';
+    content: "";
     position: absolute;
     left: 0;
     bottom: 0;
@@ -420,7 +381,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;