Sfoglia il codice sorgente

- 供水页面修改

Kazerin 1 giorno fa
parent
commit
539095052d

+ 2 - 2
src/api/pipeNetwork/waterSupply.js

@@ -35,10 +35,10 @@ export const deleteThresholds = (ids) => request({ url: '/waterSupply/alarm/thre
 export const listDeviceLedger = (params) => get('/waterSupply/device/ledger/page', params)
 export const getDeviceTypeStatistics = () => get('/waterSupply/device/ledger/typeStatistics')
 export const listDeviceGisPoints = (params) => get('/waterSupply/device/ledger/gisPoints', params)
-export const exportDeviceLedger = (params) => request({ url: '/waterSupply/device/ledger/export', method: 'post', params })
+export const exportDeviceLedger = (params) => request({ url: '/waterSupply/device/ledger/export', method: 'post', params, responseType: 'blob' })
 export const listAbnormalDevices = (params) => get('/waterSupply/device/abnormal/page', params)
 export const listAbnormalGisPoints = (params) => get('/waterSupply/device/abnormal/gisPoints', params)
-export const exportAbnormalDevices = (params) => request({ url: '/waterSupply/device/abnormal/export', method: 'post', params })
+export const exportAbnormalDevices = (params) => request({ url: '/waterSupply/device/abnormal/export', method: 'post', params, responseType: 'blob' })
 export const createMaintainOrder = (data) => request({ url: '/waterSupply/device/maintain/order', method: 'post', data })
 export const createAbnormalOrder = (data) => request({ url: '/waterSupply/device/abnormal/order', method: 'post', data })
 export const listMaintainRecords = (params) => get('/waterSupply/device/maintain/record/page', params)

+ 1 - 1
src/views/subSystem/basic/waterSource/index.vue

@@ -5,7 +5,7 @@
       <el-button type="primary" link size="small" @click="retryRequest">重试</el-button>
     </div>
     <!-- 搜索区域 -->
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
       <el-form-item label="水源地ID" prop="sourceId">
         <el-input v-model="queryParams.sourceId" placeholder="请输入水源地ID" clearable size="small" @keyup.enter="handleQuery" />
       </el-form-item>

+ 1 - 1
src/views/subSystem/waterSupply/device/abnormal.vue

@@ -1 +1 @@
-<script setup>import Page from '../components/WaterDevicePage.vue'</script><template><Page title="设备异常管理" view="abnormal" /></template>
+<script setup>import Page from '../components/WaterDevicePage.vue'</script><template><Page title="设备异常管理" view="abnormal" subtitle="异常态势、处置跟踪与关联工单管理" /></template>

+ 1 - 1
src/views/subSystem/waterSupply/device/maintain.vue

@@ -1 +1 @@
-<script setup>import Page from '../components/WaterDevicePage.vue'</script><template><Page title="设备维修派单" view="dispatch" subtitle="异常设备维修派单与运维同步" /></template>
+<script setup>import Page from '../components/WaterDevicePage.vue'</script><template><Page title="设备维修派单" view="dispatch" subtitle="待派单设备队列与责任人派发" /></template>

+ 55 - 15
src/views/subSystem/waterSupply/facility/gis.vue

@@ -7,10 +7,10 @@
           <span>供水设施GIS一张图</span>
         </div>
         <div class="title-metrics">
-          <span class="metric metric-danger">水源地 {{ summaryStats.sourceCount }}处</span>
-          <span class="metric metric-primary">水厂 {{ summaryStats.plantCount }}座</span>
-          <span class="metric metric-warning">泵站 {{ summaryStats.pumpStationCount }}座</span>
-          <span class="metric">供水管网 {{ summaryStats.pipeCount }}条</span>
+          <span class="metric metric-source">水源地 {{ summaryStats.sourceCount }}处</span>
+          <span class="metric metric-plant">水厂 {{ summaryStats.plantCount }}座</span>
+          <span class="metric metric-pumpStation">泵站 {{ summaryStats.pumpStationCount }}座</span>
+          <span class="metric metric-pipe">供水管网 {{ summaryStats.pipeCount }}条</span>
         </div>
       </div>
       <div class="header-actions">
@@ -596,16 +596,31 @@ function handleFullscreenChange() {
 
 .title-metrics {
   display: flex;
-  align-items: center;
-  gap: 16px;
   flex-wrap: wrap;
+  gap: 16px;
+  margin: 8px 0;
+  align-items: center;
+  margin-bottom: 8px;
 }
 
 .metric {
-  position: relative;
-  padding-left: 14px;
-  color: #44546a;
-  font-size: 13px;
+  display: inline-flex;
+  align-items: center;      /* 垂直居中 */
+  padding: 12px 16px;          /* 左右内边距 */
+  height: auto;
+  min-height: 48px;
+  font-size: 16px;
+  line-height: 1.5;
+  border-radius: 8px;
+  min-width: 100px;
+  white-space: nowrap;
+  background: rgba(255, 255, 255, 0.06);
+  border: 1px solid rgba(255, 255, 255, 0.12);
+  color: #ecf6ff;
+  box-shadow: 0 1px 8px rgba(0, 0, 0, 0.25);
+  transition: all 0.25s ease;
+  cursor: default;          /* 如果希望可点击,可改 pointer */
+  backdrop-filter: blur(4px); /* 毛玻璃效果(可选,需浏览器支持) */
 }
 
 .metric::before {
@@ -619,9 +634,34 @@ function handleFullscreenChange() {
   transform: translateY(-50%);
 }
 
-.metric-danger::before { background: #e63946; }
-.metric-primary::before { background: #457b9d; }
-.metric-warning::before { background: #7f4f24; }
+/* 语义颜色强化 */
+.metric-source {
+  background: rgba(69, 123, 157, 0.8);
+  border-color: rgba(69, 123, 157, 0.6);
+  color: #F0F4F6;
+}
+.metric-plant {
+  background: rgba(42, 157, 143, 0.8);
+  border-color: rgba(42, 157, 143, 0.6);
+  color: #F0F4F6;
+}
+.metric-pumpStation {
+  background: rgba(231, 111, 81, 0.8);
+  border-color: rgba(231, 111, 81, 0.6);
+  color: #F0F4F6;
+}
+.metric-pipe {
+  background: rgba(252, 191, 73, 0.8);
+  border-color: rgba(252, 191, 73, 0.6);
+  color: #F0F4F6;
+}
+
+.metric:hover {
+  transform: translateY(-2px);
+  background: rgba(0, 149, 253, 0.5);
+  border-color: rgba(0, 149, 253, 0.5);
+  box-shadow: 0 6px 18px rgba(0, 0, 0, 0.4);
+}
 
 .header-actions {
   display: flex;
@@ -686,9 +726,9 @@ function handleFullscreenChange() {
 .legend-item {
   display: flex;
   align-items: center;
-  gap: 10px;
+  gap: 8px;
   color: #4e5969;
-  font-size: 13px;
+  font-size: 14px;
 }
 
 .legend-line {