Browse Source

修复环路监管页面的跳转链接

yanglzh 2 years ago
parent
commit
ceccf296ff

+ 55 - 52
src/views/heating/monitor/loopSupervision/heatStationDetail.vue

@@ -1,55 +1,46 @@
 <template>
-  <div class="system-dic-container">
-    <el-card shadow="hover">
-      <div class="system-user-search">
-        <el-form :model="searchParams" ref="queryRef" :inline="true" label-width="100px">
-          <el-form-item label="换热站名称" prop="name">
-            <el-input v-model="searchParams.name" placeholder="换热站名称" clearable size="default"></el-input>
-          </el-form-item>
-          <el-form-item label="换热站编号" prop="name">
+	<div class="system-dic-container">
+		<el-card shadow="hover">
+			<div class="system-user-search">
+				<el-form :model="searchParams" ref="queryRef" :inline="true" label-width="100px">
+					<el-form-item label="换热站名称" prop="name">
+						<el-input v-model="searchParams.name" placeholder="换热站名称" clearable size="default"></el-input>
+					</el-form-item>
+					<el-form-item label="换热站编号" prop="name">
 						<el-input v-model="searchParams.name" placeholder="换热站编号" clearable size="default"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
-              <el-icon>
-                <ele-Refresh />
-              </el-icon>
-              重置
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+						<el-button size="default" @click="resetQuery(queryRef)">
+							<el-icon>
+								<ele-Refresh />
+							</el-icon>
+							重置
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</el-card>
 		<el-row :gutter="15" class="home-card-one mt15">
-			<el-col
-				:xs="24"
-				:sm="12"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="(v, k) in dataOne"
-				:key="k"
-				:class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }"
-			>
+			<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-for="(v, k) in dataOne" :key="k" :class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }">
 				<div class="home-card-item">
 					<div class="item-header">
-						<img :src="isIsDark?v.iconDark:v.icon" alt="">
-						<span>{{v.title}}</span>
+						<img :src="isIsDark ? v.iconDark : v.icon" alt="">
+						<span>{{ v.title }}</span>
 					</div>
 					<div class="item-content w100" :class="` home-one-animation${k}`">
 						<p>
-							<span>{{v.contentTitle1}}</span>
-							<span>{{v.val1+v.unit1}}</span>
+							<span>{{ v.contentTitle1 }}</span>
+							<span>{{ v.val1 + v.unit1 }}</span>
 						</p>
 						<p>
-							<span>{{v.contentTitle2}}</span>
-							<span>{{v.val2+v.unit2}}</span>
+							<span>{{ v.contentTitle2 }}</span>
+							<span>{{ v.val2 + v.unit2 }}</span>
 						</p>
 					</div>
 				</div>
@@ -75,7 +66,7 @@
 				</div>
 			</el-col>
 		</el-row>
-  </div>
+	</div>
 </template>
 
 <script lang="ts">
@@ -168,17 +159,17 @@ export default defineComponent({
 		});
 
 		const goDetail = () => {
-			router.push('/monitor/loopSupervision/list/heatStationHistory')
+			router.push('/heating/monitor/loopSupervision/list/heatStationHistory')
 		}
 
 		// 折线图
-		const initLineChart  = () => {
+		const initLineChart = () => {
 			if (!global.dispose.some((b: any) => b === global.homeCharThree)) global.homeCharThree.dispose();
 			global.homeCharThree = <any>echarts.init(homeLineRef.value, state.charts.theme);
 			const option = {
 				backgroundColor: state.charts.bgColor,
 				tooltip: { trigger: 'axis' },
-				legend: {  },
+				legend: {},
 				grid: { top: 40, right: 40, bottom: 40, left: 40 },
 				xAxis: [
 					{
@@ -217,7 +208,7 @@ export default defineComponent({
 			(<any>global.homeCharThree).setOption(option);
 			(<any>state.myCharts).push(global.homeCharThree);
 		};
-		
+
 		// 批量设置 echarts resize
 		const initEchartsResizeFun = () => {
 			nextTick(() => {
@@ -235,12 +226,12 @@ export default defineComponent({
 
 		// 页面加载时
 		onMounted(() => {
-			
+
 			initLineChart();
 			initEchartsResize();
 		});
 
-		
+
 		/** 重置按钮操作 */
 		const resetQuery = (formEl: FormInstance | undefined) => {
 			if (!formEl) return;
@@ -276,6 +267,7 @@ $homeNavLengh: 8;
 		}
 	}
 }
+
 .home-card-one .home-card-item {
 	width: 100%;
 	border-radius: 4px;
@@ -284,13 +276,16 @@ $homeNavLengh: 8;
 	background: var(--el-color-white);
 	color: var(--el-text-color-primary);
 	border: 1px solid var(--next-border-color-light);
+
 	&:hover {
 		box-shadow: 0 2px 12px var(--next-color-dark-hover);
 		transition: all ease 0.3s;
 	}
+
 	&.p20 {
 		padding: 20px;
 	}
+
 	.item-header {
 		display: flex;
 		justify-content: center;
@@ -300,35 +295,43 @@ $homeNavLengh: 8;
 		border-bottom: 1px solid var(--next-border-color-light);
 		font-size: 20px;
 		font-weight: bold;
+
 		img {
 			margin-right: 32px;
 			width: 24px;
-			height: 24px;;
+			height: 24px;
+			;
 			margin-top: 3px;
 		}
 	}
+
 	.item-content {
 		padding: 26px;
+
 		p {
 			display: flex;
 			justify-content: space-between;
 			align-content: center;
+
 			span:nth-child(1) {
 				// padding-top: 4px;
-				line-height: 33px;;
+				line-height: 33px;
+				;
 				font-size: 14px;
 			}
+
 			span:nth-child(2) {
 				color: #101010;
 				font-weight: bold;
 				font-size: 22px;
 			}
 		}
+
 		p:nth-child(2) {
 			margin-top: 26px;
 		}
 	}
-	
+
 	&-title {
 		font-size: 15px;
 		font-weight: bold;

+ 78 - 78
src/views/heating/monitor/loopSupervision/index.vue

@@ -1,77 +1,77 @@
 <template>
-  <div class="system-dic-container">
-    <el-card shadow="hover">
-      <div class="system-user-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-          <el-form-item label="" prop="">
-            <el-radio-group v-model="radioValue" size="default">
-              <el-radio-button label="换热站" />
-              <el-radio-button label="环路" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="环路名称" prop="name">
-            <el-select v-model="tableData.param.name" placeholder="环路名称" clearable size="default" style="width: 240px">
-              <el-option label="已发布" :value="1" />
-              <el-option label="未发布" :value="0" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="环路编号" prop="name">
-            <el-select v-model="tableData.param.name" placeholder="环路编号" clearable size="default" style="width: 240px">
-              <el-option label="已发布" :value="1" />
-              <el-option label="未发布" :value="0" />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="typeList">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
-              <el-icon>
-                <ele-Refresh />
-              </el-icon>
-              重置
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
-        <el-table-column type="index" width="55" align="center" />
-        <el-table-column label="日期" prop="key" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column :label="radioValue === '换热站' ? '换热站' : '环路名称'" prop="name" :show-overflow-tooltip="true">
-          <template #default="{ row }">
-            <el-button type="text" @click="goPage(row)">
-              {{ radioValue === '换热站' ? '换热站' : '环路名称' }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column :label="radioValue === '换热站' ? '换热站编号' : '环路编号'" prop="name" min-width="120" :show-overflow-tooltip="true">
-          <template #default>
-            {{ radioValue === '换热站' ? '换热站编号' : '环路编号' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="一网供水流量" prop="value" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="一网供水压力" prop="value" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="一网供水温度" prop="value" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="一网回水流量" prop="value" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="一网回水压力" prop="value" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="一网回水温度" prop="value" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="二网供水流量" prop="value" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column label="二网供水压力" prop="value" min-width="120" :show-overflow-tooltip="true" />
+	<div class="system-dic-container">
+		<el-card shadow="hover">
+			<div class="system-user-search mb15">
+				<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+					<el-form-item label="" prop="">
+						<el-radio-group v-model="radioValue" size="default">
+							<el-radio-button label="换热站" />
+							<el-radio-button label="环路" />
+						</el-radio-group>
+					</el-form-item>
+					<el-form-item label="环路名称" prop="name">
+						<el-select v-model="tableData.param.name" placeholder="环路名称" clearable size="default" style="width: 240px">
+							<el-option label="已发布" :value="1" />
+							<el-option label="未发布" :value="0" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="环路编号" prop="name">
+						<el-select v-model="tableData.param.name" placeholder="环路编号" clearable size="default" style="width: 240px">
+							<el-option label="已发布" :value="1" />
+							<el-option label="未发布" :value="0" />
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="typeList">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+						<el-button size="default" @click="resetQuery(queryRef)">
+							<el-icon>
+								<ele-Refresh />
+							</el-icon>
+							重置
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
+				<!-- <el-table-column type="selection" width="55" align="center" /> -->
+				<el-table-column type="index" width="55" align="center" />
+				<el-table-column label="日期" prop="key" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column :label="radioValue === '换热站' ? '换热站' : '环路名称'" prop="name" :show-overflow-tooltip="true">
+					<template #default="{ row }">
+						<el-button type="text" @click="goPage(row)">
+							{{ radioValue === '换热站' ? '换热站' : '环路名称' }}
+						</el-button>
+					</template>
+				</el-table-column>
+				<el-table-column :label="radioValue === '换热站' ? '换热站编号' : '环路编号'" prop="name" min-width="120" :show-overflow-tooltip="true">
+					<template #default>
+						{{ radioValue === '换热站' ? '换热站编号' : '环路编号' }}
+					</template>
+				</el-table-column>
+				<el-table-column label="一网供水流量" prop="value" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column label="一网供水压力" prop="value" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column label="一网供水温度" prop="value" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column label="一网回水流量" prop="value" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column label="一网回水压力" prop="value" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column label="一网回水温度" prop="value" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column label="二网供水流量" prop="value" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column label="二网供水压力" prop="value" min-width="120" :show-overflow-tooltip="true" />
 
-        <!-- <el-table-column prop="status" label="状态" width="100" align="center">
+				<!-- <el-table-column prop="status" label="状态" width="100" align="center">
           <template #default="scope">
             <el-tag type="success" size="small" v-if="scope.row.status">已发布</el-tag>
             <el-tag type="info" size="small" v-else>未发布</el-tag>
           </template>
         </el-table-column> -->
-      </el-table>
-      <pagination v-show="tableData.total>0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
-    </el-card>
-  </div>
+			</el-table>
+			<pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts">
@@ -113,9 +113,9 @@ export default defineComponent({
 		const addDicRef = ref();
 		const editDicRef = ref();
 		const queryRef = ref();
-    const router = useRouter()
+		const router = useRouter()
 		const state = reactive({
-      radioValue: '换热站',
+			radioValue: '换热站',
 			ids: [],
 			tableData: {
 				data: [{ name: '换热站', key: '2022-10-25', value: 1 }],
@@ -174,7 +174,7 @@ export default defineComponent({
 						typeList();
 					});
 				})
-				.catch(() => {});
+				.catch(() => { });
 		};
 		// 页面加载时
 		onMounted(() => {
@@ -191,13 +191,13 @@ export default defineComponent({
 			// state.ids = selection.map((item) => item.id);
 		};
 
-    const goPage = (row: TableDataRow) => {
-      if (state.radioValue === '换热站') {
-        router.push('/monitor/loopSupervision/list/heatStationDetail')
-      } else {
-        router.push('/monitor/loopSupervision/list/loopDetail')
-      }
-    }
+		const goPage = (row: TableDataRow) => {
+			if (state.radioValue === '换热站') {
+				router.push('/heating/monitor/loopSupervision/list/heatStationDetail')
+			} else {
+				router.push('/heating/monitor/loopSupervision/list/loopDetail')
+			}
+		}
 		return {
 			addDicRef,
 			editDicRef,
@@ -209,7 +209,7 @@ export default defineComponent({
 			resetQuery,
 			handleSelectionChange,
 			...toRefs(state),
-      goPage
+			goPage
 		};
 	},
 });

+ 58 - 55
src/views/heating/monitor/loopSupervision/loopDetail.vue

@@ -1,58 +1,49 @@
 <template>
-  <div class="system-dic-container">
-    <el-card shadow="hover">
-      <div class="system-user-search">
-        <el-form :model="searchParams" ref="queryRef" :inline="true" label-width="100px">
-          <el-form-item label="环路名称" prop="name">
-            <el-input v-model="searchParams.name" placeholder="环路名称" clearable size="default"></el-input>
-          </el-form-item>
-          <el-form-item label="环路编号" prop="name">
+	<div class="system-dic-container">
+		<el-card shadow="hover">
+			<div class="system-user-search">
+				<el-form :model="searchParams" ref="queryRef" :inline="true" label-width="100px">
+					<el-form-item label="环路名称" prop="name">
+						<el-input v-model="searchParams.name" placeholder="环路名称" clearable size="default"></el-input>
+					</el-form-item>
+					<el-form-item label="环路编号" prop="name">
 						<el-input v-model="searchParams.name" placeholder="环路编号" clearable size="default"></el-input>
-          </el-form-item>
-          <el-form-item label="所属换热站" prop="name">
+					</el-form-item>
+					<el-form-item label="所属换热站" prop="name">
 						<el-input v-model="searchParams.name" placeholder="所属换热站" clearable size="default"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
-              <el-icon>
-                <ele-Refresh />
-              </el-icon>
-              重置
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+						<el-button size="default" @click="resetQuery(queryRef)">
+							<el-icon>
+								<ele-Refresh />
+							</el-icon>
+							重置
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</el-card>
 		<el-row :gutter="15" class="home-card-one mt15">
-			<el-col
-				:xs="24"
-				:sm="12"
-				:md="12"
-				:lg="6"
-				:xl="6"
-				v-for="(v, k) in dataOne"
-				:key="k"
-				:class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }"
-			>
+			<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-for="(v, k) in dataOne" :key="k" :class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }">
 				<div class="home-card-item">
 					<div class="item-header">
-						<img :src="isIsDark?v.iconDark:v.icon" alt="">
-						<span>{{v.title}}</span>
+						<img :src="isIsDark ? v.iconDark : v.icon" alt="">
+						<span>{{ v.title }}</span>
 					</div>
 					<div class="item-content w100" :class="` home-one-animation${k}`">
 						<p>
-							<span>{{v.contentTitle1}}</span>
-							<span>{{v.val1+v.unit1}}</span>
+							<span>{{ v.contentTitle1 }}</span>
+							<span>{{ v.val1 + v.unit1 }}</span>
 						</p>
 						<p>
-							<span>{{v.contentTitle2}}</span>
-							<span>{{v.val2+v.unit2}}</span>
+							<span>{{ v.contentTitle2 }}</span>
+							<span>{{ v.val2 + v.unit2 }}</span>
 						</p>
 					</div>
 				</div>
@@ -78,7 +69,7 @@
 				</div>
 			</el-col>
 		</el-row>
-  </div>
+	</div>
 </template>
 
 <script lang="ts">
@@ -171,17 +162,17 @@ export default defineComponent({
 		});
 
 		const goDetail = () => {
-			router.push('/monitor/loopSupervision/list/loopHistory')
+			router.push('/heating/monitor/loopSupervision/list/loopHistory')
 		}
 
 		// 折线图
-		const initLineChart  = () => {
+		const initLineChart = () => {
 			if (!global.dispose.some((b: any) => b === global.homeCharThree)) global.homeCharThree.dispose();
 			global.homeCharThree = <any>echarts.init(homeLineRef.value, state.charts.theme);
 			const option = {
 				backgroundColor: state.charts.bgColor,
 				tooltip: { trigger: 'axis' },
-				legend: {  },
+				legend: {},
 				grid: { top: 40, right: 40, bottom: 40, left: 40 },
 				xAxis: [
 					{
@@ -220,7 +211,7 @@ export default defineComponent({
 			(<any>global.homeCharThree).setOption(option);
 			(<any>state.myCharts).push(global.homeCharThree);
 		};
-		
+
 		// 批量设置 echarts resize
 		const initEchartsResizeFun = () => {
 			nextTick(() => {
@@ -238,12 +229,12 @@ export default defineComponent({
 
 		// 页面加载时
 		onMounted(() => {
-			
+
 			initLineChart();
 			initEchartsResize();
 		});
 
-		
+
 		/** 重置按钮操作 */
 		const resetQuery = (formEl: FormInstance | undefined) => {
 			if (!formEl) return;
@@ -279,6 +270,7 @@ $homeNavLengh: 8;
 		}
 	}
 }
+
 .home-card-one .home-card-item {
 	width: 100%;
 	border-radius: 4px;
@@ -287,13 +279,16 @@ $homeNavLengh: 8;
 	background: var(--el-color-white);
 	color: var(--el-text-color-primary);
 	border: 1px solid var(--next-border-color-light);
+
 	&:hover {
 		box-shadow: 0 2px 12px var(--next-color-dark-hover);
 		transition: all ease 0.3s;
 	}
+
 	&.p20 {
 		padding: 20px;
 	}
+
 	.item-header {
 		display: flex;
 		justify-content: center;
@@ -303,35 +298,43 @@ $homeNavLengh: 8;
 		border-bottom: 1px solid var(--next-border-color-light);
 		font-size: 20px;
 		font-weight: bold;
+
 		img {
 			margin-right: 32px;
 			width: 24px;
-			height: 24px;;
+			height: 24px;
+			;
 			margin-top: 3px;
 		}
 	}
+
 	.item-content {
 		padding: 26px;
+
 		p {
 			display: flex;
 			justify-content: space-between;
 			align-content: center;
+
 			span:nth-child(1) {
 				// padding-top: 4px;
-				line-height: 33px;;
+				line-height: 33px;
+				;
 				font-size: 14px;
 			}
+
 			span:nth-child(2) {
 				color: #101010;
 				font-weight: bold;
 				font-size: 22px;
 			}
 		}
+
 		p:nth-child(2) {
 			margin-top: 26px;
 		}
 	}
-	
+
 	&-title {
 		font-size: 15px;
 		font-weight: bold;
@@ -341,6 +344,6 @@ $homeNavLengh: 8;
 }
 
 // :deep(.el-form-item--default) {
-	// margin-bottom: 0;
+// margin-bottom: 0;
 // }
 </style>