Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue

@@ -127,6 +127,7 @@
                   <a-input-number
                     v-model="model.tolerance"
                     :step="0.1"
+                    :min="0"
                     @change="handleToleranceChange"
                   ></a-input-number>
                 </a-form-model-item>
@@ -762,6 +763,7 @@ export default {
     async getSelPosNuclide(row) {
       this.model.possibleNuclide = ''
       this.model.identifiedNuclide = ''
+      this.model.tolerance = 0.5
 
       if (!row._possible) {
         this.$set(row, '_loading', true)

src/views/stationOperation/index.vue

@@ -254,7 +254,7 @@ export default {
       try {
         this.isGettingDataList = true
         const res = await getAction('/jeecg-station-operation/stationOperation/findList')
-        res.forEach(item => {
+        res.forEach((item) => {
           const { stationId, stationName, stationType } = item
           item._stationId = `${stationId}${stationName}${stationType}`
         })
@@ -548,7 +548,10 @@ export default {
 
     // 地图图标点击
     onMarkerClick(stationInfo) {
-      this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo)
+      const { stationType } = stationInfo
+      if (stationType !== 'NRL' && stationType !== 'Nuclear Facility') {
+        this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo)
+      }
     },
 
     /**

src/views/statistics/imsData/met/index.vue

@@ -100,6 +100,7 @@ import { compareDate } from '../../commom'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction, getFileAction } from '../../../../api/manage'
 import dateFormat from '../../../../components/jeecg/JEasyCron/format-date'
+import moment from 'moment'
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
@@ -109,9 +110,9 @@ export default {
       isImmediate: true,
       columns,
       queryParam: {
-        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+        startTime: sessionStorage.getItem('currStartDate') || moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+        endTime: sessionStorage.getItem('currEndDate') || moment().format('YYYY-MM-DD'),
-        stationIds: [],
+        stationIds: sessionStorage.getItem('selectedSta').split(',') || [],
       },
       url: {
         list: '/webStatistics/findMetPage',

src/views/statistics/imsData/stateOfHealth/alerts.vue

@@ -80,6 +80,7 @@ import { compareDate } from '../../commom'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction, getFileAction } from '../../../../api/manage'
 import dateFormat from '../../../../components/jeecg/JEasyCron/format-date'
+import moment from 'moment'
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
@@ -89,9 +90,9 @@ export default {
       isImmediate: true,
       columns,
       queryParam: {
-        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+        startTime: sessionStorage.getItem('currStartDate') || moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+        endTime: sessionStorage.getItem('currEndDate') || moment().format('YYYY-MM-DD'),
-        stationIds: [],
+        stationIds: sessionStorage.getItem('selectedSta').split(',') || [],
       },
       url: {
         list: '/webStatistics/findAlertSohPage',

src/views/statistics/imsData/stateOfHealth/rmssoh.vue

@@ -78,6 +78,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction, getFileAction } from '../../../../api/manage'
 import dateFormat from '../../../../components/jeecg/JEasyCron/format-date'
 import FileDetail from '../../fileDetail.vue'
+import moment from 'moment'
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
@@ -90,9 +91,9 @@ export default {
       isImmediate: true,
       columns,
       queryParam: {
-        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+        startTime: sessionStorage.getItem('currStartDate') || moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+        endTime: sessionStorage.getItem('currEndDate') || moment().format('YYYY-MM-DD'),
-        stationIds: [],
+        stationIds: sessionStorage.getItem('selectedSta').split(',') || [],
       },
       url: {
         list: '/webStatistics/findSohPage',

src/views/statistics/list.vue

@@ -44,6 +44,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction, getFileAction } from '../../api/manage'
 import dateFormat from '../../components/jeecg/JEasyCron/format-date'
 import Detail from './detail.vue'
+import moment from 'moment'
 export default {
   name: 'menuTree',
   props: {
@@ -76,18 +77,18 @@ export default {
   components: {
     Detail,
   },
-  watch: {
+  // watch: {
-    fileName: {
+  //   fileName: {
-      handler: function (val) {
+  //     handler: function (val) {
-        if (val === 'QCPHD' || val === 'SPHDF' || val === 'SPHDP') {
+  //       // if (val === 'QCPHD' || val === 'SPHDF' || val === 'SPHDP') {
-          this.$nextTick(() => {
+  //       this.$nextTick(() => {
-            this.queryParam.startTime = this.getBeforeDate(6)
+  //         this.queryParam.startTime = this.getBeforeDate(6)
-          })
+  //       })
-        }
+  //       // }
-      },
+  //     },
-      immediate: true,
+  //     immediate: true,
-    },
+  //   },
-  },
+  // },
   data() {
     return {
       excelLoading: false,
@@ -96,9 +97,9 @@ export default {
       isDetail: false,
       queryParam: {
         dataType: this.dataType,
-        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+        startTime: sessionStorage.getItem('currStartDate') || moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+        endTime: sessionStorage.getItem('currEndDate') || moment().format('YYYY-MM-DD'),
-        stationIds: [],
+        stationIds: sessionStorage.getItem('selectedSta').split(',') || [],
         spectralQualifie: this.spectralQualifie,
       },
       url: {
@@ -185,6 +186,8 @@ export default {
       this.isDetail = flag
     },
     handleSelectChange(val) {
+      console.log(val)
+      window.sessionStorage.setItem('selectedSta', val)
       let length = this.stationList.length
       if (val.length === length) {
         this.allChecked = true
@@ -196,35 +199,44 @@ export default {
       this.allChecked = val
       if (val) {
         this.queryParam.stationIds = this.stationList.map((item) => item.value)
+        window.sessionStorage.setItem('selectedSta', vathis.queryParam.stationIdsl)
       } else {
         this.queryParam.stationIds = []
+        window.sessionStorage.setItem('selectedSta', [])
       }
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    // 获取n天前的日期
+    handleStartDateChange(date, dateString) {
-    getBeforeDate(n) {
+      console.log(date, dateString)
-      var n = n
+      window.sessionStorage.setItem('currStartDate', date)
-      var d = new Date()
-      var year = d.getFullYear()
-      var mon = d.getMonth() + 1
-      var day = d.getDate()
-      if (day <= n) {
-        if (mon > 1) {
-          mon = mon - 1
-        } else {
-          year = year - 1
-          mon = 12
-        }
-      }
-      d.setDate(d.getDate() - n)
-      year = d.getFullYear()
-      mon = d.getMonth() + 1
-      day = d.getDate()
-      var s = year + '-' + (mon < 10 ? '0' + mon : mon) + '-' + (day < 10 ? '0' + day : day)
-      return s
     },
+    handleEndDateChange(date) {
+      window.sessionStorage.setItem('currEndDate', date)
+    },
+    // // 获取n天前的日期
+    // getBeforeDate(n) {
+    //   var n = n
+    //   var d = new Date()
+    //   var year = d.getFullYear()
+    //   var mon = d.getMonth() + 1
+    //   var day = d.getDate()
+    //   if (day <= n) {
+    //     if (mon > 1) {
+    //       mon = mon - 1
+    //     } else {
+    //       year = year - 1
+    //       mon = 12
+    //     }
+    //   }
+    //   d.setDate(d.getDate() - n)
+    //   year = d.getFullYear()
+    //   mon = d.getMonth() + 1
+    //   day = d.getDate()
+    //   var s = year + '-' + (mon < 10 ? '0' + mon : mon) + '-' + (day < 10 ? '0' + day : day)
+    //   return s
+    // },
   },
   computed: {
     formItems() {
@@ -278,6 +290,9 @@ export default {
               width: '200px',
             },
           },
+          on: {
+            change: this.handleStartDateChange,
+          },
           style: {
             width: 'auto',
           },
@@ -294,6 +309,9 @@ export default {
               width: '200px',
             },
           },
+          on: {
+            change: this.handleEndDateChange,
+          },
           style: {
             width: 'auto',
           },