- 污水修改

src/views/dataBoard/smartSewage/components/detailDialog.vue

@@ -9,7 +9,7 @@
     <div class="dialog-content-summary">
       <div>
         设计处理总能力
-        <span>{{ mathRound(detail.designSewageWaterAll || 0) }}吨/日</span>
+        <span>{{ mathRound(detail.designSewageWaterAll || gisData['污水设计处理能力'] || 0) }}吨/日</span>
       </div>
       <div>
         昨日处理水量
@@ -27,9 +27,9 @@
       <div class="dialog-content-base-content" v-else>
         <div><span>员工：</span>{{ detail.userCount || 0 }}人</div>
         <div><span>设备：</span>{{ detail.deviceCount || 0 }}台</div>
-        <div><span>处理工艺：</span>{{ info.handleCraft || '-' }}</div>
-        <div><span>污水处理级别：</span>{{ info.level || '-' }}</div>
-        <div><span>地址：</span>{{ info.location || '-' }}</div>
+        <div><span>处理工艺：</span>{{ info.handleCraft || gisData['处理工艺'] ||'-' }}</div>
+        <div><span>污水处理级别：</span>{{ info.level ||'-' }}</div>
+        <div><span>地址：</span>{{ info.location || gisData['地址'] ||'-' }}</div>
       </div>
     </div>
     <div class="dialog-content-warn" v-if="isCompany">
@@ -117,11 +117,12 @@ export default {
             loading: { detail: false },
             yearText: { year: moment().format('YYYY'), last: moment().format('YYYY-MM') },
             detail: {},
+            //
+            gisData: {}
         }
     },
     watch: {
         current() {
-            console.log('当前变化', this.current)
             const { id } = this.current || {}
             if (!id) return
             this.loading.detail = true
@@ -133,8 +134,12 @@ export default {
         }
     },
     methods: {
-        showDialog() {
+        showDialog(data) {
           this.visible = true
+          Object.keys(data).forEach(key => {
+            data[key] = data[key] == "Null" ? '' : data[key]
+          })
+          this.gisData = data
         },
         mathRound(value) {
             return mathRound(value)

src/views/dataBoard/smartSewage/index.vue

@@ -41,7 +41,7 @@
         <div class="tl-1">
           <div class="tl-statis">
             <div class="text">全年污水处理量总计</div>
-            <div class="number">{{ total.total || 13641 }}</div>
+            <div class="number">{{ total.total || 10985 }}</div>
             <div class="unit">(吨)</div>
           </div>
           <div class="tl-sum">
@@ -49,14 +49,14 @@
               <img :src="require('@/views/dataBoard/img/ws.png')" alt="">
               <div>
                 <div class="title">上月污水处理总量</div>
-                <div><span class="num-y">{{ total.num || 1216 }}</span><span class="unit">吨</span></div>
+                <div><span class="num-y">{{ total.num || 10011 }}</span><span class="unit">吨</span></div>
               </div>
             </div>
             <div class="box">
               <img :src="require('@/views/dataBoard/img/zb.png')" alt="">
               <div>
                 <div class="title">全年占比</div>
-                <div><span class="num-b">{{ total.ratio || 9.14 }}</span><span class="unit">%</span></div>
+                <div><span class="num-b">{{ total.ratio || 91.14 }}</span><span class="unit">%</span></div>
               </div>
             </div>
           </div>
@@ -325,7 +325,7 @@ export default {
   mounted() {
     this.getScreenData()
     this.getMonitorData()
-    // this.timer = setInterval(this.getMonitorData, this.intervalTime)
+    this.timer = setInterval(this.getMonitorData, this.intervalTime)
   },
   destroyed() {
     this.timer && clearInterval(this.timer)
@@ -348,7 +348,7 @@ export default {
             name: attributes['污水处理设施名称'] || '',
             id: sewage['id']
           }
-          this.$refs.dialog.showDialog()
+          this.$refs.dialog.showDialog(attributes)
         })
       }
     },

src/views/dataBoard/smartTech/index.vue

@@ -396,7 +396,7 @@ $size1920_5px: 5px;
               div:nth-child(1) {
                 letter-spacing: 1.2px;
                 color: #ccc;
-                width: 110px;
+                width: 140px;
                 margin-right: 10px;
                 text-align: left;
                 white-space: pre-wrap;
@@ -407,7 +407,7 @@ $size1920_5px: 5px;
                 color: #5991ff;
               }
               div:nth-child(3) {
-                width: 120px;
+                width: 90px;
                 text-align: right;
                 color: #6d9ac0;
                 font-size: 12px;

src/views/swgReport/repWaterIn/widget.vue

@@ -139,18 +139,18 @@ export default {
             dateData[i.scadaTimeDay].push({ value: i.itVal, time: i.scadaTime, code: i.indexCode })  
           })
           //
-          const preData = dateData[`${this.searchForm.censusTime}-01`] ? dateData[`${this.searchForm.censusTime}-01`][0] : 0
+          const preData = dateData[`${this.searchForm.censusTime}-01`] ? dateData[`${this.searchForm.censusTime}-01`][0].value : 0
           const preMonth = { type: 'data', date: '上月末累计读数', waterS: preData, waterD: '-', person: '-', remark: '-' }
           let month = this.$moment().daysInMonth()
           this.tableData = Array.from({ length: month }).map((_, i) => {
             let data = { type: 'data', date: i + 1, person: '-', remark: '-' }
             this.indexs.forEach(i => {
               const dateArr = dateData[`${this.searchForm.censusTime}-${String(data.date).padStart(2, '0')}`]
-              const preDateArr = dateData[`${this.searchForm.censusTime}-${String(data.date - 1).padStart(2, '0')}`]
+              const nextDateArr = dateData[`${this.searchForm.censusTime}-${String(data.date + 1).padStart(2, '0')}`]
               if(i.prop === 'waterD') {
                 let tDay = dateArr ? dateArr[0].value : 0
-                let pDay = preDateArr ? preDateArr[0].value : 0
-                data[i.prop] = tDay - pDay <= 0 ? 0 : tDay - pDay // 不小于 0
+                let nDay = nextDateArr ? nextDateArr[0].value : 0
+                data[i.prop] = nDay - tDay <= 0 ? 0 : (nDay - tDay).toFixed(3) // 不小于 0
               } else {
                 data[i.prop] = dateArr ? dateArr[0].value : 0
               }

src/views/swgReport/repWaterOut/widget.vue

@@ -132,24 +132,25 @@ export default {
           this.loading.table = false
           //
           const data = res.result.filter(i => this.indexs.filter(i => i.index).map(i => i.index).includes(i.indexCode))
+          console.log('查询的数据', data)
           const dateData = {}
           data.forEach(i => {
             dateData[i.scadaTimeDay] = dateData[i.scadaTimeDay] || []
             dateData[i.scadaTimeDay].push({ value: i.itVal, time: i.scadaTime, code: i.indexCode })  
           })
           //
-          const preData = dateData[`${this.searchForm.censusTime}-01`] ? dateData[`${this.searchForm.censusTime}-01`][0] : 0
+          const preData = dateData[`${this.searchForm.censusTime}-01`] ? dateData[`${this.searchForm.censusTime}-01`][0].value : 0
           const preMonth = { type: 'data', date: '上月末累计读数', waterS: preData, waterD: '-', person: '-', remark: '-' }
           let month = this.$moment().daysInMonth()
           this.tableData = Array.from({ length: month }).map((_, i) => {
             let data = { type: 'data', date: i + 1, person: '-', remark: '-' }
             this.indexs.forEach(i => {
               const dateArr = dateData[`${this.searchForm.censusTime}-${String(data.date).padStart(2, '0')}`]
-              const preDateArr = dateData[`${this.searchForm.censusTime}-${String(data.date - 1).padStart(2, '0')}`]
+              const nextDateArr = dateData[`${this.searchForm.censusTime}-${String(data.date + 1).padStart(2, '0')}`]
               if(i.prop === 'waterD') {
                 let tDay = dateArr ? dateArr[0].value : 0
-                let pDay = preDateArr ? preDateArr[0].value : 0
-                data[i.prop] = tDay - pDay <= 0 ? 0 : tDay - pDay // 不小于 0
+                let nDay = nextDateArr ? nextDateArr[0].value : 0
+                data[i.prop] = nDay - tDay <= 0 ? 0 : (nDay - tDay).toFixed(3) // 不小于 0
               } else {
                 data[i.prop] = dateArr ? dateArr[0].value : 0
               }

src/views/swgReport/repWaterQualityS/widget.vue

@@ -192,12 +192,9 @@ export default {
     // 监测历史数据
     getSewageIndexHis() {
       return new Promise(resolve => {
-        const currDate = '2024-12-13'
         const params = {
-          startDate: `${currDate} 00:00:00`,
-          endDate: `${currDate} 23:59:59`,
-          // startDate: this.$moment(this.searchForm.censusTime).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
-          // endDate: this.$moment(this.searchForm.censusTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
+          startDate: this.$moment(this.searchForm.censusTime).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+          endDate: this.$moment(this.searchForm.censusTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
           isHistory: 1,
           stationIds: this.sewage.id
         }