去除换热站数据模型绑定、能耗分析对接

src/api/energyAnalysis/index.ts

@@ -0,0 +1,14 @@
+import { get, post, del, put } from '/@/utils/request';
+
+export default {
+  // loop: {
+  //   getList: (params: object) => get('/region/loop/list', params),
+  //   add: (data: object) => post('/region/loop/add', data),
+  //   edit: (data: object) => put('/region/loop/edit', data),
+  //   del: (id: number) => del('/region/loop/del', { id }),
+  //   detail: (id: number) => get('/region/loop/getInfoById', { id }),
+  // },
+  getStationInfoList: (params?: object) => get('/energy/station/info/list', params), // 换热站基础数据(分析报表数据)
+  getEnergyWaterLossList: (params?: object) => get('/energy/water/loss/list', params), // 换热站失水分析条形图列表
+  getEnergyWaterLossLineChart: (params?: object) => get('/energy/water/loss/line/chart', params), // 换热站失水分析折现图列表
+}

src/views/developTool/codeGeneration/index.vue

@@ -29,11 +29,11 @@
       <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="ID" align="center" prop="tableId" width="60" />
-	    	<el-table-column label="表名称" prop="tableName" :show-overflow-tooltip="true" />
-	    	<el-table-column label="表描述" prop="tableComment" :show-overflow-tooltip="true" />
-	    	<el-table-column label="模型名称" prop="className" :show-overflow-tooltip="true" />
-	    	<el-table-column label="创建时间" prop="createTime" min-width="100"/>
-	    	<el-table-column label="更新时间" prop="updateTime" min-width="100"/>
+	    	<el-table-column label="表名称" prop="tableName" min-width="120" :show-overflow-tooltip="true" />
+	    	<el-table-column label="表描述" prop="tableComment" min-width="120" :show-overflow-tooltip="true" />
+	    	<el-table-column label="模型名称" prop="className" min-width="120" :show-overflow-tooltip="true" />
+	    	<el-table-column label="创建时间" prop="createTime" width="180"/>
+	    	<el-table-column label="更新时间" prop="updateTime" width="180"/>
 				<el-table-column label="操作" width="280" align="center" fixed="right">
           <template #default="scope">
 			 			<el-button size="small" text type="primary" @click="operate('preview', scope.row)">预览</el-button>

src/views/energyAnalysis/analysisReport/index.vue

@@ -23,7 +23,9 @@ import { ref, reactive, watch, nextTick, onMounted } from 'vue';
 import * as echarts from 'echarts';
 import { useStore } from '/@/store/index';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
-import api from '/@/api/heatingDistrict';
+import api from '/@/api/energyAnalysis';
+import heatApi from '/@/api/heatStation';
+import datahubApi from '/@/api/datahub';
 
 let global: any = {
 	lineChart: null,
@@ -38,10 +40,59 @@ const state = reactive({
 		bgColor: '',
 		color: '#303133',
 	},
+	heatList: []
 })
 const lineChartRef = ref()
 const checkList = ref([])
 
+
+// 获取供热监测数据
+const getStatisticsChartData = () => {
+	api.statistics.getStatisticsChartData({tableNo:17}).then((res:any) => {
+		console.log(res)
+		const data = res.Info
+		// "huanLuNo": "D00140-4", //换热站编号
+		// "huanLuName": "8#楼高区", //换热站名称
+		// "inPressure1": 0, //一网供水压力
+		// "inPressure2": 0, //二网供水压力
+		// "inTemperature1": 0, //一网供水温度
+		// "inTemperature2": 0, //二网供水温度
+		// "outPressure1": 0, //一网回水压力
+		// "outPressure2": 0, //二网回水压力
+		// "outTemperature1": 0, //一网回水温度
+		// "outTemperature2": 0 //二网回水温度
+
+		// <el-checkbox label="一网供水温度" />
+		// <el-checkbox label="一网回水温度" />
+		// <el-checkbox label="二网供回水温差" />
+		// <el-checkbox label="二网供回水压差" />
+		// <el-checkbox label="压力值" />
+		// state.statisticsChartXAxisData = [];
+		// state.inTemperature1 = [];
+		// state.outTemperature1 = [];
+		// data.forEach((i:object) => {
+		// 	state.statisticsChartXAxisData.push(i.huanLuName);
+		// 	state.inTemperature1.push(i.inTemperature1);
+		// 	state.outTemperature1.push(i.outTemperature1);
+		// });
+
+		// nextTick(() => {
+		// 	initBarChart();
+		// });
+
+	});
+};
+const queryTree = () => {
+	heatApi.heatStation.getList({
+		name: '',
+		code: '',
+		status: -1
+	})
+	.then((res: any) => {
+		state.heatList = res || [];
+	});
+};
+
 // 初始化图标
 const initLineChart = () => {
 	if (!global.dispose.some((b: any) => b === global.lineChart)) global.lineChart.dispose();
@@ -104,6 +155,8 @@ const initEchartsResize = () => {
 };
 // 页面加载时
 onMounted(() => {
+	queryTree()
+	getStatisticsChartData()
 	initEchartsResize();
 });
 

src/views/energyAnalysis/heatStationWaterAnalysis/index.vue

@@ -2,8 +2,8 @@
   <div class="system-dic-container">
     <el-card shadow="hover">
       <div class="system-user-search mb15">
-        <el-form :model="searchParams" ref="queryRef" :inline="true" label-width="120px">
-          <el-form-item label="环路名称" prop="plotId">
+        <el-form :model="state.param" ref="queryRef" :inline="true" label-width="120px">
+          <!-- <el-form-item label="环路名称" prop="plotId">
             <el-select v-model="searchParams.plotId" placeholder="选择环路名称" filterable clearable size="default">
 							<el-option
 								v-for="item in []"
@@ -12,10 +12,10 @@
 								:value="item.id">
 							</el-option>
 						</el-select>
-          </el-form-item>
-					<el-form-item label="所属换热站" prop="heatStaId">
+          </el-form-item> -->
+					<el-form-item label="所属换热站" prop="stationId">
 						<el-tree-select
-							v-model="searchParams.heatStaId"
+							v-model="state.param.stationId"
 							:data="state.heatList"
 							:props="{
 								label: 'name',
@@ -30,8 +30,8 @@
 							:render-after-expand="true"
 						/>
 					</el-form-item>
-          <el-form-item label="负责人" prop="plotId">
-            <el-select v-model="searchParams.plotId" placeholder="选择负责人" filterable clearable size="default">
+          <el-form-item label="负责人" prop="principal">
+            <el-select v-model="state.param.principal" placeholder="选择负责人" filterable clearable size="default">
 							<el-option
 								v-for="item in []"
 								:key="item.id"
@@ -40,31 +40,25 @@
 							</el-option>
 						</el-select>
           </el-form-item>
-          <el-form-item label="时间间隔(秒)" prop="plotId">
-            <el-input-number v-model="searchParams.xx"></el-input-number>
+          <el-form-item label="时间间隔(秒)" prop="interval">
+            <el-input-number v-model="state.param.interval"></el-input-number>
           </el-form-item>
-          <el-form-item label="流量限值" prop="plotId">
-            <el-input-number v-model="searchParams.xx"></el-input-number>
+          <el-form-item label="流量限值" prop="flow">
+            <el-input-number v-model="state.param.flow"></el-input-number>
           </el-form-item>
           <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="queryList">
+            <el-button size="default" type="primary" class="ml10" @click="initPage">
               <el-icon>
                 <ele-Search />
               </el-icon>
               查询
             </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
+            <!-- <el-button size="default" @click="resetQuery(queryRef)">
               <el-icon>
                 <ele-Refresh />
               </el-icon>
               重置
-            </el-button>
-            <el-button size="default" type="success" class="ml10" @click="onOpenDialog()">
-              <el-icon>
-                <ele-FolderAdd />
-              </el-icon>
-              导入
-            </el-button>
+            </el-button> -->
           </el-form-item>
         </el-form>
       </div>
@@ -80,7 +74,7 @@ import { toRefs, reactive, onMounted, ref, watch, nextTick } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import * as echarts from 'echarts';
 import { useStore } from '/@/store/index';
-import api from '/@/api/heatingDistrict';
+import api from '/@/api/energyAnalysis';
 import heatApi from '/@/api/heatStation';
 
 let global: any = {
@@ -92,9 +86,6 @@ let global: any = {
 const queryRef = ref();
 const barChartRef = ref();
 const lineChartRef = ref();
-const searchParams = ref({
-
-})
 const store = useStore();
 const state = reactive({
 	myCharts: [],
@@ -103,23 +94,40 @@ const state = reactive({
 		bgColor: '',
 		color: '#303133',
 	},
-	
+	param: {
+		stationId: '',
+		principal: '',
+		interval: '',
+		flow: ''
+	},
 	heatList: []
 });
 
 const queryTree = () => {
 	heatApi.heatStation.getList({
-			name: '',
-			code: '',
-			status: -1
-		})
-		.then((res: any) => {
-			state.heatList = res || [];
-		});
+		name: '',
+		code: '',
+		status: -1
+	})
+	.then((res: any) => {
+		state.heatList = res || [];
+	});
+};
+
+const queryLineChart = () => {
+	api.getEnergyWaterLossLineChart(state.param).then((res: any) => {
+		console.log(res);
+	});
+};
+const queryChart = () => {
+	api.getEnergyWaterLossList(state.param).then((res: any) => {
+		console.log(res);
+	});
 };
 // 页面加载时
 onMounted(() => {
 	queryTree()
+	// queryLineChart()
 });
 /** 重置按钮操作 */
 const resetQuery = (formEl: FormInstance | undefined) => {
@@ -127,6 +135,14 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 	formEl.resetFields();
 	// queryList();
 };
+const initPage = () => {
+	if (!state.param.stationId) {
+		ElMessage.warning('请选择换热站')
+		return
+	}
+	queryChart()
+	// queryLineChart()
+}
 
 
 // 初始化图表
@@ -254,10 +270,10 @@ watch(
 			state.charts.theme = isIsDark ? 'transparent' : '';
 			state.charts.bgColor = isIsDark ? 'transparent' : '';
 			state.charts.color = isIsDark ? '#dadada' : '#303133';
-			setTimeout(() => {
-				initBarChart();
-				initLineChart();
-			}, 500)
+			// setTimeout(() => {
+				// initBarChart();
+				// initLineChart();
+			// }, 500)
 		});
 	},
 	{

src/views/heatStation/heatStation/component/edit.vue

@@ -38,7 +38,7 @@
 					<el-radio v-model="ruleForm.status" :label="1">在线</el-radio>
 					<el-radio v-model="ruleForm.status" :label="0">不在线</el-radio>
 				</el-form-item>
-				<el-form-item label="数据模型" prop="dataTemplateIds">
+				<!-- <el-form-item label="数据模型" prop="dataTemplateIds">
 					<el-select v-model="ruleForm.dataTemplateIds" multiple clearable style="width: 100%;" placeholder="请选择">
 						<el-option
 							v-for="item in dataHubList"
@@ -47,7 +47,7 @@
 							:value="item.id">
 						</el-option>
 					</el-select>
-				</el-form-item>
+				</el-form-item> -->
         <el-form-item label="地图展示" prop="decade">
 					<div>
 						<span>经度：{{ ruleForm.lnt ? `${ruleForm.lnt}，` : '' }}</span>
@@ -122,7 +122,7 @@ export default defineComponent({
 		// 打开弹窗
 		const openDialog = (row: any, tree: any) => {
 			resetForm()
-			queryDataHubList()
+			// queryDataHubList()
 			queryUserList()
 			state.treeData = tree
 
@@ -136,12 +136,12 @@ export default defineComponent({
 			state.dialogVisible = true
 		}
 		
-		const queryDataHubList = () => {
-			datahubApi.template.allList({})
-				.then((res: any) => {
-					state.dataHubList = res.list || [];
-				});
-		};
+		// const queryDataHubList = () => {
+		// 	datahubApi.template.allList({})
+		// 		.then((res: any) => {
+		// 			state.dataHubList = res.list || [];
+		// 		});
+		// };
 		const queryUserList = () => {
 			userApi.user.getAllList({})
 				.then((res: any) => {

src/views/heatStation/loop/component/edit.vue

@@ -71,7 +71,7 @@
 					<el-radio v-model="ruleForm.status" :label="1">在线</el-radio>
 					<el-radio v-model="ruleForm.status" :label="0">不在线</el-radio>
 				</el-form-item>
-				<el-form-item label="数据模型" prop="dataTemplateIds">
+				<!-- <el-form-item label="数据模型" prop="dataTemplateIds">
 					<el-select v-model="ruleForm.dataTemplateIds" multiple clearable style="width: 100%;" placeholder="请选择">
 						<el-option
 							v-for="item in dataHubList"
@@ -80,7 +80,7 @@
 							:value="item.id">
 						</el-option>
 					</el-select>
-				</el-form-item>
+				</el-form-item> -->
         <el-form-item label="编辑路线信息" prop="">
 					<div class="mb10">
 						<el-button type="primary" @click="onAddPoint">添加途经点</el-button>
@@ -180,7 +180,7 @@ export default defineComponent({
 		const openDialog = (row: RuleFormState | null) => {
 			resetForm()
 			queryTree()
-			queryDataHubList()
+			// queryDataHubList()
 			nextTick(() => {
 				initMap()
 			})
@@ -227,12 +227,12 @@ export default defineComponent({
 					state.treeData = res || [];
 				});
 		};
-		const queryDataHubList = () => {
-			datahubApi.template.allList({})
-				.then((res: any) => {
-					state.dataHubList = res.list || [];
-				});
-		};
+		// const queryDataHubList = () => {
+		// 	datahubApi.template.allList({})
+		// 		.then((res: any) => {
+		// 			state.dataHubList = res.list || [];
+		// 		});
+		// };
 		const getDetail = () => {
 			api.loop.detail(state.ruleForm.id)
 				.then((res: any) => {