From 94977a59c711e0d12cb2aa711c02a326bf5bd925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 6 Mar 2024 11:39:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=B8=ADAlarm=20Analysis=20=E9=A1=B5=E9=9D=A2Station=20Alarm?=
 =?UTF-8?q?=20number=E5=92=8CAnaysis=20Sources=20Alarms=20=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysisMonitor/alarmAnalysis/index.vue   | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue
index ba9886e..cda0882 100644
--- a/src/views/abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue
@@ -1,19 +1,21 @@
 <template>
   <div style="height: 100%">
     <SearchBar type="alarmAnalysis" @search="handleSearch"></SearchBar>
-    <a-spin :spinning="spinning">
-      <div class="chart-layout" id="analysisChartBar"></div>
-      <div class="chart-box">
-        <div class="chart-box-left">
-          <BoxTitle title="Station Alarm number"></BoxTitle>
-          <div class="chart-box-left-bar" id="chartLeft"></div>
+    <div style="width: 100%; height: calc(100% - 50px)">
+      <a-spin :spinning="spinning">
+        <div class="chart-layout" id="analysisChartBar"></div>
+        <div class="chart-box">
+          <div class="chart-box-left">
+            <BoxTitle title="Station Alarm number"></BoxTitle>
+            <div class="chart-box-left-bar" id="chartLeft"></div>
+          </div>
+          <div class="chart-box-right">
+            <BoxTitle title="Anaysis Sources Alarms"></BoxTitle>
+            <div class="chart-box-right-pie" id="chartRight"></div>
+          </div>
         </div>
-        <div class="chart-box-right">
-          <BoxTitle title="Anaysis Sources Alarms"></BoxTitle>
-          <div class="chart-box-right-pie" id="chartRight"></div>
-        </div>
-      </div>
-    </a-spin>
+      </a-spin>
+    </div>
   </div>
 </template>
 
@@ -314,12 +316,18 @@ export default {
 </script>
 
 <style lang="less" scoped>
+::v-deep.ant-spin-nested-loading {
+  height: 100%;
+  .ant-spin-container {
+    height: 100%;
+  }
+}
 .chart-layout {
   height: 400px;
   margin-left: 20px;
 }
 .chart-box {
-  height: calc(100% - 450px);
+  height: calc(100% - 400px);
   margin-left: 20px;
   display: flex;
   justify-content: space-between;

From a20853ad51edcfb8ab25937b265eaa2b657f8407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 6 Mar 2024 13:36:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=84=E7=90=86Anaysis=20Sources=20Alarm?=
 =?UTF-8?q?s=20=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E7=9A=84=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue
index cda0882..cf03f68 100644
--- a/src/views/abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue
+++ b/src/views/abnormalAlarm/analysisMonitor/alarmAnalysis/index.vue
@@ -109,9 +109,11 @@ export default {
         .then((res) => {
           this.spinning = false
           if (res.success) {
-            this.pieData = res.result.pieData
-            this.pieTotal = res.result.pieTotal
-            this.drawRightChart()
+            if (res.result.pieTotal > 0) {
+              this.pieData = res.result.pieData
+              this.pieTotal = res.result.pieTotal
+              this.drawRightChart()
+            }
           } else {
             this.$message.warning('This operation fails. Contact your system administrator')
           }

From ada699cc133c797b0b21342c0602ddd1a8c4bac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 6 Mar 2024 15:41:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8F=B0=E7=AB=99=E9=83=A8=E5=88=86=20=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E4=BF=AE=E6=94=B9=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=20status=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8C=20=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC=E5=8F=8A=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dict/JDictSelectTag.vue |  2 -
 src/views/system/stationList.vue       | 98 ++++++++++++++------------
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue
index 5918142..1826980 100644
--- a/src/components/dict/JDictSelectTag.vue
+++ b/src/components/dict/JDictSelectTag.vue
@@ -105,14 +105,12 @@ export default {
       })
     },
     handleInput(e = '') {
-      console.log('qweq', e)
       let val
       if (Object.keys(e).includes('target')) {
         val = e.target.value
       } else {
         val = e
       }
-      console.log(val)
       this.$emit('change', val ? val : undefined)
       //LOWCOD-2146 【菜单】数据规则，选择自定义SQL 规则值无法输入空格
       this.$emit('input', val ? val : undefined)
diff --git a/src/views/system/stationList.vue b/src/views/system/stationList.vue
index 55e4d1b..9be17a9 100644
--- a/src/views/system/stationList.vue
+++ b/src/views/system/stationList.vue
@@ -79,7 +79,11 @@
           <a-textarea v-model="model.description" :rows="3"></a-textarea>
         </a-form-model-item>
         <a-form-model-item label="Status" prop="status">
-          <j-dict-select-tag v-model="model.status" dictCode="STATION_STATUS"></j-dict-select-tag>
+          <j-dict-select-tag
+            v-model="model.status"
+            dictCode="STATION_STATUS"
+            @change="handleStatus"
+          ></j-dict-select-tag>
         </a-form-model-item>
       </a-form-model>
     </custom-modal>
@@ -99,76 +103,76 @@ const columns = [
     align: 'left',
     width: 100,
     scopedSlots: {
-      customRender: 'index'
+      customRender: 'index',
     },
     customHeaderCell: () => {
       return {
         style: {
-          'padding-left': '60px !important'
-        }
+          'padding-left': '60px !important',
+        },
       }
     },
     customCell: () => {
       return {
         style: {
-          'padding-left': '60px !important'
-        }
+          'padding-left': '60px !important',
+        },
       }
-    }
+    },
   },
   {
     title: 'STATION ID',
     align: 'left',
     dataIndex: 'stationId',
-    width: 100
+    width: 100,
   },
   {
     title: 'STATION CODE',
     align: 'left',
     width: 100,
-    dataIndex: 'stationCode'
+    dataIndex: 'stationCode',
   },
   {
     title: 'COUNTRY CODE',
     align: 'left',
     width: 100,
-    dataIndex: 'countryCode'
+    dataIndex: 'countryCode',
   },
   {
     title: 'TYPE',
     align: 'left',
     width: 100,
-    dataIndex: 'type'
+    dataIndex: 'type',
   },
   {
     title: 'LON',
     align: 'left',
     width: 100,
-    dataIndex: 'lon'
+    dataIndex: 'lon',
   },
   {
     title: 'LAT',
     align: 'left',
     width: 100,
-    dataIndex: 'lat'
+    dataIndex: 'lat',
   },
   {
     title: 'ELEVATION',
     width: 100,
-    dataIndex: 'elevation'
+    dataIndex: 'elevation',
   },
   {
     title: 'DESCRIPTION',
     width: 100,
     dataIndex: 'description',
-    ellipsis: true
+    ellipsis: true,
   },
   {
     title: 'STATUS',
     align: 'left',
     width: 100,
-    dataIndex: 'status'
-  }
+    dataIndex: 'status',
+  },
 ]
 
 export default {
@@ -188,10 +192,9 @@ export default {
     }
 
     const validateCountryCode = (_, value, callback) => {
-      if(!value) {
+      if (!value) {
         callback(new Error('Please Enter Country Code'))
-      }
-      else if (value.length > 2) {
+      } else if (value.length > 2) {
         callback(new Error('Country Code Limit 2 Char'))
       } else {
         callback()
@@ -202,27 +205,34 @@ export default {
       rules: {
         stationId: [{ required: true, message: 'Please Enter Station Id' }],
         stationCode: [{ required: true, validator: validateStationCode }],
-        countryCode: [{ required: true, validator: validateCountryCode }]
+        countryCode: [{ required: true, validator: validateCountryCode }],
+        status: [{ required: true, message: 'Please Select Status', trigger: 'change' }],
       },
       url: {
         list: '/gardsStations/findPage',
         delete: '/gardsStations/deleteById',
         add: '/gardsStations/create',
-        edit: '/gardsStations/update'
+        edit: '/gardsStations/update',
       },
       countryCodeList: [],
-      typeList: []
+      typeList: [],
     }
   },
   created() {
     this.getTypeList()
     this.getCountryCodeList()
   },
+  mounted() {
+    this.$set(this.model, 'status', 'Operating')
+  },
   methods: {
+    handleStatus(val) {
+      this.model.status = val
+    },
     async getTypeList() {
       try {
         const res = await getAction('/gardsStations/findType')
-        this.typeList = res.filter(item => item).map(item => ({ label: item, value: item }))
+        this.typeList = res.filter((item) => item).map((item) => ({ label: item, value: item }))
       } catch (error) {
         console.error(error)
       }
@@ -231,7 +241,7 @@ export default {
     async getCountryCodeList() {
       try {
         const res = await getAction('/gardsStations/findCountryCode')
-        this.countryCodeList = res.filter(item => item).map(item => ({ label: item, value: item }))
+        this.countryCodeList = res.filter((item) => item).map((item) => ({ label: item, value: item }))
       } catch (error) {
         console.error(error)
       }
@@ -243,14 +253,14 @@ export default {
 
     onAdd() {
       this.isAdd = true
-      this.model = {}
+      // this.model = {}
       this.visible = true
     },
     onEdit() {
       if (this.selectedRowKeys && this.selectedRowKeys.length) {
         this.isAdd = false
         this.visible = true
-        const find = this.dataSource.find(item => item.stationId === this.selectedRowKeys[0])
+        const find = this.dataSource.find((item) => item.stationId === this.selectedRowKeys[0])
         this.model = cloneDeep(find)
       } else {
         this.$message.warn('Please Select An Item To Edit')
@@ -264,12 +274,12 @@ export default {
           cancelText: 'Cancel',
           onOk: () => {
             this.handleDelete(this.selectedRowKeys[0], 'stationId')
-          }
+          },
         })
       } else {
         this.$message.warn('Please Select An Item To Delete')
       }
-    }
+    },
   },
   computed: {
     formItems() {
@@ -284,12 +294,12 @@ export default {
             showSearch: true,
             filterOption: this.filterOption,
             style: {
-              width: '261px'
-            }
+              width: '261px',
+            },
           },
           style: {
-            width: 'auto'
-          }
+            width: 'auto',
+          },
         },
         {
           label: 'Type',
@@ -301,12 +311,12 @@ export default {
             showSearch: true,
             filterOption: this.filterOption,
             style: {
-              width: '261px'
-            }
+              width: '261px',
+            },
           },
           style: {
-            width: 'auto'
-          }
+            width: 'auto',
+          },
         },
         {
           label: 'Status',
@@ -318,16 +328,16 @@ export default {
               return document.body
             },
             style: {
-              width: '261px'
-            }
+              width: '261px',
+            },
           },
           style: {
-            width: 'auto'
-          }
-        }
+            width: 'auto',
+          },
+        },
       ]
-    }
-  }
+    },
+  },
 }
 </script>
 

From 1c1e5d2f26ee9ebdb9f125b7ba547813e213cb17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 6 Mar 2024 16:25:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8F=B0=E7=AB=99=E9=83=A8=E5=88=86=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0CATEGORY=E5=AD=97=E6=AE=B5=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0/sys/dict/getltems=E6=8E=A5=E5=8F=A3=E5=8F=8A=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=20=E4=BF=9D=E5=AD=98=E5=92=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/stationList.vue | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/views/system/stationList.vue b/src/views/system/stationList.vue
index 9be17a9..2053e38 100644
--- a/src/views/system/stationList.vue
+++ b/src/views/system/stationList.vue
@@ -85,6 +85,18 @@
             @change="handleStatus"
           ></j-dict-select-tag>
         </a-form-model-item>
+        <a-form-model-item label="Category" prop="category">
+          <a-select
+            v-model="model.category"
+            :options="categoryOptions"
+            show-arrow
+            allowClear
+            placeholder="select..."
+            @change="onCategoryChange"
+          >
+            <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
+          </a-select>
+        </a-form-model-item>
       </a-form-model>
     </custom-modal>
     <!-- 新增/编辑 结束 -->
@@ -201,12 +213,14 @@ export default {
       }
     }
     return {
+      categoryOptions: [],
       queryParam: {},
       rules: {
         stationId: [{ required: true, message: 'Please Enter Station Id' }],
         stationCode: [{ required: true, validator: validateStationCode }],
         countryCode: [{ required: true, validator: validateCountryCode }],
         status: [{ required: true, message: 'Please Select Status', trigger: 'change' }],
+        category: [{ required: true, message: 'Please Select Category', trigger: 'change' }],
       },
       url: {
         list: '/gardsStations/findPage',
@@ -226,6 +240,23 @@ export default {
     this.$set(this.model, 'status', 'Operating')
   },
   methods: {
+    async getCategoryItem() {
+      try {
+        const res = await getAction('/sys/dict/getItems', { dictCode: 'Station Category' })
+        console.log(res)
+        this.categoryOptions = res.map((item) => {
+          return {
+            label: item.text,
+            value: item.value,
+          }
+        })
+      } catch (error) {
+        console.error(error)
+      }
+    },
+    onCategoryChange(val) {
+      console.log(val)
+    },
     handleStatus(val) {
       this.model.status = val
     },
@@ -252,15 +283,20 @@ export default {
     },
 
     onAdd() {
+      this.getCategoryItem()
       this.isAdd = true
       // this.model = {}
       this.visible = true
     },
     onEdit() {
+      this.getCategoryItem()
       if (this.selectedRowKeys && this.selectedRowKeys.length) {
         this.isAdd = false
         this.visible = true
         const find = this.dataSource.find((item) => item.stationId === this.selectedRowKeys[0])
+        if (find) {
+          find.category = find.category.toString()
+        }
         this.model = cloneDeep(find)
       } else {
         this.$message.warn('Please Select An Item To Edit')