能源类型

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

@@ -33,11 +33,28 @@
 						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">
+				<el-form-item
+					label="监控能源类型"
+					prop="energyTypeId">
+					<el-select
+						v-model="form.energyTypeId"
+						placeholder="请选择"
+						style="width: 100%"
+						filterable
+						@change="toggleType">
+						<el-option
+							v-for="item in this.energyTypeList"
+							:key="item.id"
+							:label="item.labelName"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
 			<el-col
 				:span="12"
 				v-if="form.method == 2">
@@ -56,24 +73,6 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="监控能源类型"
-					prop="energyTypeId">
-					<el-select
-						v-model="form.energyTypeId"
-						placeholder="请选择"
-						style="width: 100%"
-						filterable
-						@change="toggleType">
-						<el-option
-							v-for="item in this.energyTypeList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
 			<el-col
 				:span="12"
 				v-if="form.method == 1">
@@ -353,8 +352,3 @@ export default {
 	},
 };
 </script>
-<style>
-.cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
-	display: none;
-}
-</style>

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

@@ -48,7 +48,7 @@ import {
 	deleteEnergyLimit,
 } from '@/api/monitoring/energyLimit';
 import { getEnergyTypeListAll } from '@/api/base/energyType';
-import { getTree } from '@/api/base/factory';
+import { getTree } from '@/api/analysis/energyAnalysis';
 import { publicFormatter } from '@/utils/dict';
 import EnergyLimitAdd from './components/energyLimitAdd';
 const tableProps = [
@@ -60,20 +60,27 @@ const tableProps = [
 	{
 		prop: 'objName',
 		label: '监控对象',
+		minWidth: 100,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'objCode',
 		label: '对象编码',
+		minWidth: 140,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'tableName',
 		label: '能源表名',
 		filter: publicFormatter('table_name'),
+		minWidth: 120,
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'energyType',
 		label: '能源类型',
 		filter: publicFormatter('energy_type'),
+		showOverflowtooltip: true,
 	},
 	{
 		prop: 'type',
@@ -104,6 +111,7 @@ export default {
 					type: 'select',
 					label: '能源类型',
 					selectOptions: [],
+					labelField: 'labelName',
 					param: 'energyTypeId',
 				},
 				{