src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue

@@ -18,7 +18,6 @@
         <CustomChart
           ref="chartRef"
           :option="twoDOption"
-          :opts="opts"
           @zr:mousemove="handleMouseMove"
           @zr:mousedown="handleMouseDown"
           @zr:mouseup="handleMouseUp"
@@ -133,16 +132,24 @@ const twoDOption = {
     max: 256,
     interval: 64
   },
-  series: [
+  series: {
-    {
+    type: 'scatterGL',
-      type: 'scatterGL',
+    symbolSize: 4,
-      symbolSize: 4,
+    data: [],
+    itemStyle: {
+      color: '#fff'
+    },
+    markLine: {
+      silent: true,
+      symbol: 'none',
       data: [],
-      itemStyle: {
+      animation: false,
-        color: '#fff'
+      lineStyle: {
+        type: 'solid',
+        width: 2
       }
     }
-  ],
+  },
   brush: {},
   animation: false
 }
@@ -321,19 +328,12 @@ export default {
       twoDOption,
       threeDSurfaceOption,
       threeDScatterOption,
-      showROI: true,
+      showROI: true
-      opts: {
-        notMerge: false
-      }
     }
   },
 
   mounted() {
-    this.opts.notMerge = true
+    this.twoDOption.brush = { toolbox: [] }
-    this.$nextTick(() => {
-      this.opts.notMerge = false
-      this.twoDOption.brush = { toolbox: [] }
-    })
   },
 
   methods: {
@@ -357,6 +357,8 @@ export default {
       this.twoDOption.yAxis.max = 256
 
       this.emitRangeChange([0, 256, 0, 256])
+      this.reDrawRect()
+
       this.buildScatterList()
     },
 
@@ -434,6 +436,9 @@ export default {
         this.twoDOption.yAxis.max = rangeNumberFunc(y2)
 
         this.emitRangeChange([x1, x2, y1, y2])
+
+        this.reDrawRect()
+
         this.buildScatterList()
       }
 
@@ -447,14 +452,14 @@ export default {
         yAxis: { min: minY, max: maxY }
       } = this.twoDOption
 
-      this.twoDOption.series[0].data = this.histogramDataDList
+      this.twoDOption.series.data = this.histogramDataDList
         .filter(({ b, g, c }) => c && b >= minX && b <= maxX && g >= minY && g <= maxY)
         .map(({ b, g, c }) => this.buildScatterItem(b, g, c))
     },
 
     // 构造一个scatter 的点
     buildScatterItem(xAxis, yAxis, count) {
-      const { r, g, b } = this.interpolateColor(1 - count / this.currCount)
+      const { r, g, b } = this.interpolateColor(1 - (count / this.currCount))
       return {
         value: [xAxis, yAxis],
         itemStyle: {
@@ -483,6 +488,7 @@ export default {
         this.twoDOption.yAxis.max = x2
       }
 
+      this.reDrawRect()
       this.buildScatterList()
     },
 
@@ -492,44 +498,217 @@ export default {
 
       if (this.showROI) {
         this.boundaryData.forEach(({ minX, maxX, minY, maxY, color }) => {
-          // rect 遵循 左下 右下 右上 左上 左下 的顺序
+          // rect 遵循 左下 右下 右上 左上 的顺序
           const rect = [
             [minX, minY],
             [maxX, minY],
             [maxX, maxY],
-            [minX, maxY],
+            [minX, maxY]
-            [minX, minY]
           ]
 
-          rectList.push(this.drawOneRect(rect, color))
+          rectList.push(...this.drawOneRect(rect, color))
         })
       }
-      const lineSeries = rectList.map(rect => ({
+      this.twoDOption.series.markLine.data = rectList
-        type: 'line',
-        ...rect,
-        zlevel: 11
-      }))
-
-      this.opts.notMerge = true
-      this.twoDOption.series.splice(1, this.twoDOption.series.length - 1, ...lineSeries)
-      this.$nextTick(() => {
-        this.opts.notMerge = false
-        this.twoDOption.brush = { toolbox: [] }
-      })
     },
 
     /**
      * 绘制一个矩形框区域
-     * @param {*} rect  左下 右下 右上 左上 左下 的顺序
+     * 矩形框在这里的实现是由几条线段围起来的，但由于线段在超出图表区域显示有问题，故作了以下处理
+     * @param {*} rect  左下 右下 右上 左上 的顺序
      */
     drawOneRect(rect, color) {
-      return {
+      const rectList = []
-        data: rect,
+      const {
-        symbol: 'none',
+        xAxis: { min: minX, max: maxX },
-        itemStyle: {
+        yAxis: { min: minY, max: maxY }
-          color
+      } = this.twoDOption
+
+      const inchartPoints = this.getInChartPoints(rect)
+      const outchartPoints = rect.filter(pointItem => !inchartPoints.includes(pointItem))
+      // 如果框选范围内只有俩点
+      if (inchartPoints.length == 2) {
+        const [point1, point2] = inchartPoints
+        const isVerticleLine = this.isVerticleLine(point1, point2)
+        // 如果是纵向标记线，判断另两个点是在左边还是右边
+        if (isVerticleLine) {
+          const find = outchartPoints.find(outcharPoint => point1[1] == outcharPoint[1]) // 找出纵坐标相同的在图表外面的点
+          // 判断在图表外的这个点是在左边还是右边
+          const isLeft = find[0] <= point1[0]
+          /**
+           * 如果在左边，推入左边俩点构成矩形
+           * y
+           * |________________
+           * |                |
+           * |________________|
+           * |
+           * |——————————————————— x
+           **/
+
+          if (isLeft) {
+            inchartPoints.forEach(point => {
+              rectList.push(this.generateLineDataByTwoPoints([minX, point[1]], point))
+            })
+
+            rectList.push(this.generateLineDataByTwoPoints(point1, point2))
+          }
+          // 如果是右边，同理，推入右边俩点构成矩形
+          else {
+            inchartPoints.forEach(point => {
+              rectList.push(this.generateLineDataByTwoPoints([maxX, point[1]], point))
+            })
+            rectList.push(this.generateLineDataByTwoPoints(point1, point2))
+          }
+        }
+        // 如果是纵向标记线，判断另两个点是在上边还是下边
+        else {
+          const find = outchartPoints.find(outcharPoint => point1[0] == outcharPoint[0]) // 找出横坐标相同的在图表外面的点
+          // 判断在图表外的这个点是在上边还是右边
+          const isBottom = find[1] <= point1[1]
+          /**
+           * 如果在下边，推入下边俩点构成矩形
+           **/
+
+          if (isBottom) {
+            inchartPoints.forEach(point => {
+              rectList.push(this.generateLineDataByTwoPoints([point[0], minY], point))
+            })
+
+            rectList.push(this.generateLineDataByTwoPoints(point1, point2))
+          }
+          // 如果是上边，同理，推入上边俩点构成矩形
+          else {
+            inchartPoints.forEach(point => {
+              rectList.push(this.generateLineDataByTwoPoints([point[0], maxY], point))
+            })
+
+            rectList.push(this.generateLineDataByTwoPoints(point1, point2))
+          }
         }
       }
+      // 只有一个点在范围内，则是选中了矩形的一个角
+      else if (inchartPoints.length == 1) {
+        const point = inchartPoints[0]
+        const isLeft = !!outchartPoints.find(outPoint => outPoint[0] < point[0])
+        const isBottom = !!outchartPoints.find(outPoint => outPoint[1] < point[1])
+        // 截取的右上角
+        if (isLeft && isBottom) {
+          rectList.push(this.generateLineDataByTwoPoints(point, [minX, point[1]]))
+          rectList.push(this.generateLineDataByTwoPoints(point, [point[0], minY]))
+        }
+        // 截取的右下角
+        if (isLeft && !isBottom) {
+          rectList.push(this.generateLineDataByTwoPoints(point, [minX, point[1]]))
+          rectList.push(this.generateLineDataByTwoPoints(point, [point[0], maxY]))
+        }
+        // 截取的左下角
+        if (!isLeft && !isBottom) {
+          rectList.push(this.generateLineDataByTwoPoints(point, [maxX, point[1]]))
+          rectList.push(this.generateLineDataByTwoPoints(point, [point[0], maxY]))
+        }
+        // 截取的左上角
+        if (!isLeft && isBottom) {
+          rectList.push(this.generateLineDataByTwoPoints(point, [maxX, point[1]]))
+          rectList.push(this.generateLineDataByTwoPoints(point, [point[0], minY]))
+        }
+      }
+      // 全在里面
+      else if (inchartPoints.length == 4) {
+        // 按顺序挨个连起来，并且尾部连到头部
+        rect.forEach((point, index) => {
+          if (index == rect.length - 1) {
+            rectList.push(this.generateLineDataByTwoPoints(point, rect[0]))
+          } else {
+            rectList.push(this.generateLineDataByTwoPoints(point, rect[index + 1]))
+          }
+        })
+      }
+      // 全不在里面
+      else {
+        // 筛选出所有的在框选范围内的横坐标
+        const xAxisList = rect.map(item => item[0]).filter(xAxis => xAxis > minX && xAxis < maxX)
+        const leftBottomPoint = rect[0]
+        const rightBottomPoint = rect[1]
+        const rightTopPoint = rect[3]
+        const minYAxis = rightBottomPoint[1]
+        const maYAxis = rightTopPoint[1]
+        // 需要显示左右两侧的框线
+        if (xAxisList.length == 4 && minYAxis < minY && maYAxis > maxY) {
+          const minAxis = Math.min(...xAxisList)
+          const maxAxis = Math.max(...xAxisList)
+          rectList.push(this.generateLineDataByTwoPoints([minAxis, minY], [minAxis, maxY]))
+          rectList.push(this.generateLineDataByTwoPoints([maxAxis, minY], [maxAxis, maxY]))
+        }
+        // 需要显示左右其中一条框线
+        else if (xAxisList.length == 2 && minYAxis < minY && maYAxis > maxY) {
+          const xAxis = xAxisList[0]
+          rectList.push(this.generateLineDataByTwoPoints([xAxis, minY], [xAxis, maxY]))
+        }
+
+        // 筛选出所有的在框选范围内的横坐标
+        const yAxisList = rect.map(item => item[1]).filter(xAxis => xAxis > minY && xAxis < maxY)
+        const minXAxis = leftBottomPoint[0]
+        const maxXAxis = rightBottomPoint[0]
+        // 需要显示上下两侧的框线
+        if (yAxisList.length == 4 && minXAxis < minX && maxXAxis > maxX) {
+          const minAxis = Math.min(...yAxisList)
+          const maxAxis = Math.max(...yAxisList)
+          rectList.push(this.generateLineDataByTwoPoints([minX, minAxis], [maxX, minAxis]))
+          rectList.push(this.generateLineDataByTwoPoints([minX, maxAxis], [maxX, maxAxis]))
+        }
+        // 需要显示左右其中一条框线
+        else if (yAxisList.length == 2 && minXAxis < minX && maxXAxis > maxX) {
+          const yAxis = yAxisList[0]
+          rectList.push(this.generateLineDataByTwoPoints([minX, yAxis], [maxX, yAxis]))
+        }
+      }
+      // 补齐颜色
+      rectList.forEach(item => {
+        item[0].lineStyle = {
+          color
+        }
+      })
+      return rectList
+    },
+
+    /**
+     * 获取在框选范围内的点列表
+     * @param { Array<Array<number>> } rectInfo
+     */
+    getInChartPoints(rectInfo) {
+      const {
+        xAxis: { min: minX, max: maxX },
+        yAxis: { min: minY, max: maxY }
+      } = this.twoDOption
+
+      return rectInfo.filter(point => {
+        const [xAxis, yAxis] = point
+        return xAxis >= minX && xAxis <= maxX && yAxis >= minY && yAxis <= maxY
+      })
+    },
+
+    /**
+     * 根据俩点判断是横向还是纵向
+     * x坐标相同，则是纵向，否则横向
+     */
+    isVerticleLine(point1, point2) {
+      return point1[0] == point2[0] ? true : false
+    },
+
+    /**
+     * 根据两个点生成一个markLine直线
+     */
+    generateLineDataByTwoPoints(point1, point2) {
+      return [
+        {
+          xAxis: point1[0],
+          yAxis: point1[1]
+        },
+        {
+          xAxis: point2[0],
+          yAxis: point2[1]
+        }
+      ]
     },
 
     // 随机颜色算法
@@ -580,7 +759,7 @@ export default {
     boundary: {
       handler(newVal) {
         newVal.forEach((item, index) => {
-          item.color = rectColorList[index % 5]
+          item.color = rectColorList[index%5]
         })
         this.boundaryData = newVal
         this.reDrawRect()

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

@@ -127,7 +127,6 @@
                   <a-input-number
                     v-model="model.tolerance"
                     :step="0.1"
-                    :min="0"
                     @change="handleToleranceChange"
                   ></a-input-number>
                 </a-form-model-item>
@@ -763,7 +762,6 @@ 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,10 +548,7 @@ export default {
 
     // 地图图标点击
     onMarkerClick(stationInfo) {
-      const { stationType } = stationInfo
+      this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo)
-      if (stationType !== 'NRL' && stationType !== 'Nuclear Facility') {
-        this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo)
-      }
     },
 
     /**

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

@@ -99,7 +99,7 @@ const columns = [
 import { compareDate } from '../../commom'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction, getFileAction } from '../../../../api/manage'
-import moment from 'moment'
+import dateFormat from '../../../../components/jeecg/JEasyCron/format-date'
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
@@ -109,12 +109,8 @@ export default {
       isImmediate: true,
       columns,
       queryParam: {
-        startTime: sessionStorage.getItem('currStartDate_sta')
+        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          ? sessionStorage.getItem('currStartDate_sta')
+        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          : moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: sessionStorage.getItem('currEndDate_sta')
-          ? sessionStorage.getItem('currEndDate_sta')
-          : moment().format('YYYY-MM-DD'),
         stationIds: [],
       },
       url: {
@@ -188,19 +184,13 @@ export default {
       getAction(this.url.findStationList, { menuName: '' }).then((res) => {
         if (res.result.length > 0) {
           this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
-          // 进入页面自动查询
-          let arr = sessionStorage.getItem('selectedSta_sta')
-            ? sessionStorage.getItem('selectedSta_sta').split(',')
-            : []
-          this.queryParam.stationIds = arr.map((item) => Number(item))
-          this.searchQueryData()
         } else {
           this.stationList = []
         }
       })
     },
     handleSelectChange(val) {
-      window.sessionStorage.setItem('selectedSta_sta', val)
+      console.log(val)
       let length = this.stationList.length
       if (val.length === length) {
         this.allChecked = true
@@ -212,39 +202,31 @@ export default {
       this.allChecked = val
       if (val) {
         this.queryParam.stationIds = this.stationList.map((item) => item.value)
-        window.sessionStorage.setItem('selectedSta_sta', this.queryParam.stationIds)
       } else {
         this.queryParam.stationIds = []
-        window.sessionStorage.setItem('selectedSta_sta', [])
       }
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    handleStartDateChange(date) {
-      window.sessionStorage.setItem('currStartDate_sta', date)
-    },
-    handleEndDateChange(date) {
-      window.sessionStorage.setItem('currEndDate_sta', date)
-    },
   },
   computed: {
     formItems() {
       return [
-        // {
+        {
-        //   type: 'a-input',
+          type: 'a-input',
-        //   label: '',
+          label: '',
-        //   name: 'search',
+          name: 'search',
-        //   props: {
+          props: {
-        //     placeholder: 'search...',
+            placeholder: 'search...',
-        //     style: {
+            style: {
-        //       width: '166px',
+              width: '166px',
-        //     },
+            },
-        //   },
+          },
-        //   style: {
+          style: {
-        //     width: 'auto',
+            width: 'auto',
-        //   },
+          },
-        // },
+        },
         {
           type: 'custom-all-select',
           label: 'Stations',
@@ -280,9 +262,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleStartDateChange,
-          },
           style: {
             width: 'auto',
           },
@@ -299,9 +278,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleEndDateChange,
-          },
           style: {
             width: 'auto',
           },

src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/calibphd.vue

@@ -1,25 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="CALIBPHD" pageType="CALIB"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="CALIBPHD"
-      pageType="CALIB"
-      menuType="beta"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -80,25 +73,26 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'C',
+      dataType:"C"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas Beta-Gamma' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
+        
       })
     },
   },
@@ -106,4 +100,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/detbkphd.vue

@@ -1,25 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="DETBKPHD" pageType="ACQ"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="DETBKPHD"
-      pageType="ACQ"
-      menuType="beta"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -62,7 +55,7 @@ const columns = [
     title: 'ACQUISITION STOP TIME',
     align: 'left',
     dataIndex: 'acquisitionStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -75,24 +68,24 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'D',
+      dataType:"D"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas Beta-Gamma' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -101,4 +94,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/qcphd.vue

@@ -1,25 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="QCPHD" pageType="ACQ"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="QCPHD"
-      pageType="ACQ"
-      menuType="beta"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -62,7 +55,7 @@ const columns = [
     title: 'ACQUISITION STOP TIME',
     align: 'left',
     dataIndex: 'acquisitionStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -75,24 +68,24 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'Q',
+      dataType:"Q"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas Beta-Gamma' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -101,4 +94,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdf.vue

@@ -1,26 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDF" pageType="COLL"></List>
-      :stationList="stationList"
-      :spectralQualifie="spectralQualifie"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="SPHDF"
-      pageType="COLL"
-      menuType="beta"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -63,7 +55,7 @@ const columns = [
     title: 'COLLECTION STOP TIME',
     align: 'left',
     dataIndex: 'collectStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -76,25 +68,25 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'S',
+      dataType: "S",
-      spectralQualifie: 'FULL',
+      spectralQualifie:"FULL"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas Beta-Gamma' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -103,4 +95,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/betaGamma/sphdp.vue

@@ -1,26 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDP" pageType="COLL"></List>
-      :stationList="stationList"
-      :spectralQualifie="spectralQualifie"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="SPHDP"
-      pageType="COLL"
-      menuType="beta"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -63,7 +55,7 @@ const columns = [
     title: 'COLLECTION STOP TIME',
     align: 'left',
     dataIndex: 'collectStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -76,25 +68,25 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'S',
+      dataType: "S",
-      spectralQualifie: 'PREL',
+      spectralQualifie:"PREL"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas Beta-Gamma' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -103,4 +95,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue

@@ -1,25 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="CALIBPHD" pageType="CALIB"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="CALIBPHD"
-      pageType="CALIB"
-      menuType="gamma"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -80,24 +73,24 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'C',
+      dataType:"C"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas HPGe' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -106,4 +99,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue

@@ -1,25 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="DETBKPHD" pageType="ACQ"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="DETBKPHD"
-      pageType="ACQ"
-      menuType="gamma"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -62,7 +55,7 @@ const columns = [
     title: 'ACQUISITION STOP TIME',
     align: 'left',
     dataIndex: 'acquisitionStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -75,24 +68,24 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'D',
+      dataType:"D"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas HPGe' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -101,4 +94,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue

@@ -1,25 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="QCPHD" pageType="ACQ"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="QCPHD"
-      pageType="ACQ"
-      menuType="gamma"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -62,7 +55,7 @@ const columns = [
     title: 'ACQUISITION STOP TIME',
     align: 'left',
     dataIndex: 'acquisitionStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -75,24 +68,24 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'Q',
+      dataType:"Q"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas HPGe' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -101,4 +94,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue

@@ -1,26 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDF" pageType="COLL"></List>
-      :stationList="stationList"
-      :spectralQualifie="spectralQualifie"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="SPHDF"
-      pageType="COLL"
-      menuType="gamma"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -63,7 +55,7 @@ const columns = [
     title: 'COLLECTION STOP TIME',
     align: 'left',
     dataIndex: 'collectStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -76,25 +68,25 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'S',
+      dataType: "S",
-      spectralQualifie: 'FULL',
+      spectralQualifie:"FULL"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas HPGe' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -103,4 +95,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue

@@ -1,26 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDP" pageType="COLL"></List>
-      :stationList="stationList"
-      :spectralQualifie="spectralQualifie"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="SPHDP"
-      pageType="COLL"
-      menuType="gamma"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../../list.vue'
+import List from "../../../../list.vue"
 import { getAction } from '../../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -63,7 +55,7 @@ const columns = [
     title: 'COLLECTION STOP TIME',
     align: 'left',
     dataIndex: 'collectStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -76,25 +68,25 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'S',
+      dataType: "S",
-      spectralQualifie: 'PREL',
+      spectralQualifie:"PREL"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Noble Gas HPGe' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -103,4 +95,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/particulate/blankphd.vue

@@ -1,13 +1,35 @@
 <template>
   <div style="height: 100%">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="BLANKPHD" pageType="ACQ"></List>
-      :stationList="stationList"
+    <!-- <a-spin :spinning="spinning">
-      :columns="columns"
+      <a-card v-if="!isDetail" :bordered="false" style="margin-left: 20px">
-      :dataType="dataType"
+        <search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
-      fileName="BLANKPHD"
+          <a-space style="float: right" class="btn-group" slot="additional">
-      pageType="ACQ"
+            <a-button @click="handleExcel" type="primary">
-      menuType="par"
+              <img class="icon-edit" src="@/assets/images/global/edit.png" alt="" />
-    ></List>
+              Excel
+            </a-button>
+          </a-space>
+        </search-form>
+        <custom-table
+          size="middle"
+          rowKey="sampleId"
+          :columns="columns"
+          :list="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          @change="handleTableChange"
+          @detail="handleDetail"
+          :selectedRowKeys.sync="selectedRowKeys"
+          :scroll="{ y: 'calc(100vh - 306px)' }"
+        >
+          <template slot="index" slot-scope="{ index }">
+            {{ index + 1 }}
+          </template>
+        </custom-table>
+      </a-card>
+    </a-spin>
+    <Detail v-if="isDetail" type="BLANKPHD" :sampleId="currSampleId" :allData="detailJson" @back="handleBack"></Detail> -->
   </div>
 </template>
 <script>
@@ -60,26 +82,113 @@ const columns = [
     dataIndex: 'acquisitionStop',
   },
 ]
+// import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction, getFileAction } from '../../../../../api/manage'
 import List from '../../../list.vue'
+// import dateFormat from '../../../../../components/jeecg/JEasyCron/format-date'
+// import Detail from '../../../detail.vue'
 export default {
+  // name: 'menuTree',
+  // mixins: [JeecgListMixin],
   components: {
     List,
   },
   data() {
     return {
+      // spinning: false,
+      // isImmediate: true,
+      // isDetail: false,
       columns,
       dataType: 'B',
+      // queryParam: {
+      //   dataType: 'B',
+      //   startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+      //   endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+      //   stationIds: [],
+      //   spectralQualifie: '',
+      // },
       url: {
+        // list: '/webStatistics/findParticulatePage',
         findStationList: '/webStatistics/findStationList',
       },
       stationList: [],
+      // dataSource: [],
+      // detailJson: {},
+      // strIds: '',
+      // allChecked: false,
+      // currSampleId: '',
+      // pageType: 'ACQ',
     }
   },
   created() {
     this.findStationList()
   },
   methods: {
+    // handleExcel() {
+    //   if (this.dataSource.length>0) {
+    //     let params = {
+    //       ...this.queryParam,
+    //       pageType:this.pageType
+    //     }
+    //     getFileAction("/webStatistics/radionuclideExport", params).then(res => {
+    //       if (res.code && res.code == 500) {
+    //         this.$message.warning("This operation fails. Contact your system administrator")
+    //       } else {
+    //         const blob = new Blob([res], { type: "application/vnd.ms-excel" })
+    //         let link = document.createElement('a')
+    //         link.href = window.URL.createObjectURL(blob)
+    //         link.download = "BLANKPHD"
+    //         document.body.appendChild(link)
+    //         link.click()
+    //         URL.revokeObjectURL(link.href)
+    //         document.body.removeChild(link)
+    //       }
+    //     })
+    //   } else {
+    //     this.$message.warning("No downloadable data")
+    //   }
+    // },
+    // searchQueryData() {
+    //   this.isImmediate = false
+    //   this.loading = true
+    //   let params = {
+    //     ...this.queryParam,
+    //     pageNo: 1,
+    //     pageSize: 10
+    //   }
+    //   getAction(this.url.list, params).then((res) => {
+    //     this.loading = false
+    //     if (res.success) {
+    //       this.ipagination.current = res.result.current
+    //       this.ipagination.pageSize = res.result.size
+    //       this.ipagination.total = res.result.total
+    //       this.dataSource = res.result.records
+    //     } else {
+    //       this.$message.warning("This operation fails. Contact your system administrator")
+    //     }
+    //   })
+    // },
+    // handleDetail(record) {
+    //   this.spinning = true
+    //   this.currSampleId = record.sampleId
+    //   getAction('webStatistics/findGeneratedReport', { sampleId: record.sampleId })
+    //     .then((res) => {
+    //       this.spinning = false
+    //       if (res.success) {
+    //         this.detailJson = res.result
+    //         this.detailJson = JSON.parse(JSON.stringify(this.detailJson))
+    //         this.isDetail = true
+    //       } else {
+    //         this.$message.warning('This operation fails. Contact your system administrator')
+    //       }
+    //     })
+    //     .catch((err) => {
+    //       this.spinning = false
+    //     })
+    // },
+    // handleBack(flag) {
+    //   this.isDetail = flag
+    // },
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Particulate' }).then((res) => {
         if (res.success) {
@@ -93,7 +202,103 @@ export default {
         }
       })
     },
+    // handleSelectChange(val) {
+    //   let length = this.stationList.length
+    //   if (val.length === length) {
+    //     this.allChecked = true
+    //   } else {
+    //     this.allChecked = false
+    //   }
+    // },
+    // handleSelectChangeAll(val) {
+    //   this.allChecked = val
+    //   if (val) {
+    //     this.queryParam.stationIds = this.stationList.map(item => item.value)
+    //   } else {
+    //     this.queryParam.stationIds =[]
+    //   }
+    // },
+    // filterOption(input, option) {
+    //   return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    // },
   },
+  // computed: {
+  //   formItems() {
+  //     return [
+  //       {
+  //         type: 'a-input',
+  //         label: '',
+  //         name: 'search',
+  //         props: {
+  //           placeholder: 'search...',
+  //           style: {
+  //             width: '166px',
+  //           },
+  //         },
+  //         style: {
+  //           width: 'auto',
+  //         },
+  //       },
+  //       {
+  //         type: 'custom-all-select',
+  //         label: 'Stations',
+  //         name: 'stationIds',
+  //         props: {
+  //           allChecked: this.allChecked,
+  //           filterOption:this.filterOption,
+  //           placeholder: 'select stations',
+  //           mode: 'multiple',
+  //           maxTagCount: 1,
+  //           options: [
+  //             ...this.stationList,
+  //           ],
+  //           style: {
+  //             width: '200px',
+  //           },
+  //         },
+  //         on: {
+  //           change: this.handleSelectChange,
+  //           changeAll: this.handleSelectChangeAll
+  //         },
+  //         style: {
+  //           width: 'auto',
+  //         },
+  //       },
+  //       {
+  //         label: 'Start date',
+  //         type: 'custom-date-picker',
+  //         name: 'startTime',
+  //         props: {
+  //           format: 'YYYY-MM-DD',
+  //           valueFormat: 'YYYY-MM-DD',
+  //           style: {
+  //             minWidth: 'auto',
+  //             width: '200px',
+  //           },
+  //         },
+  //         style: {
+  //           width: 'auto',
+  //         },
+  //       },
+  //       {
+  //         label: 'End date',
+  //         type: 'custom-date-picker',
+  //         name: 'endTime',
+  //         props: {
+  //           format: 'YYYY-MM-DD',
+  //           valueFormat: 'YYYY-MM-DD',
+  //           style: {
+  //             minWidth: 'auto',
+  //             width: '200px',
+  //           },
+  //         },
+  //         style: {
+  //           width: 'auto',
+  //         },
+  //       },
+  //     ]
+  //   },
+  // },
 }
 </script>
 <style lang="less" scoped>

src/views/statistics/imsData/radionuclide/particulate/calibphd.vue

@@ -1,25 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="CALIBPHD" pageType="CALIB"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="CALIBPHD"
-      pageType="CALIB"
-      menuType="par"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../list.vue'
+import List from "../../../list.vue"
 import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -80,24 +73,24 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'C',
+      dataType:"C"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Particulate' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -106,4 +99,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/particulate/detbkphd.vue

@@ -1,13 +1,6 @@
 <template>
   <div style="height: 100%">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="DETBKPHD" pageType="ACQ"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="DETBKPHD"
-      pageType="ACQ"
-      menuType="par"
-    ></List>
   </div>
 </template>
 

src/views/statistics/imsData/radionuclide/particulate/qcphd.vue

@@ -1,25 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="QCPHD" pageType="ACQ"></List>
-      :stationList="stationList"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="QCPHD"
-      pageType="ACQ"
-      menuType="par"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../list.vue'
+import List from "../../../list.vue"
 import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -75,24 +68,24 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'Q',
+      dataType:"Q"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Particulate' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -101,4 +94,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/particulate/sphdf.vue

@@ -1,26 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDF" pageType="COLL"></List>
-      :stationList="stationList"
-      :spectralQualifie="spectralQualifie"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="SPHDF"
-      pageType="COLL"
-      menuType="par"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../list.vue'
+import List from "../../../list.vue"
 import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -76,25 +68,25 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'S',
+      dataType: "S",
-      spectralQualifie: 'FULL',
+      spectralQualifie:"FULL"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Particulate' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -103,4 +95,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

src/views/statistics/imsData/radionuclide/particulate/sphdp.vue

@@ -1,26 +1,18 @@
 <template>
-  <div style="height: 100%">
+  <div style="height: 100%;">
-    <List
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType" fileName="SPHDP" pageType="COLL"></List>
-      :stationList="stationList"
-      :spectralQualifie="spectralQualifie"
-      :columns="columns"
-      :dataType="dataType"
-      fileName="SPHDP"
-      pageType="COLL"
-      menuType="par"
-    ></List>
   </div>
 </template>
 
 <script>
-import List from '../../../list.vue'
+import List from "../../../list.vue"
 import { getAction } from '../../../../../api/manage'
 
 const columns = [
   {
     title: 'NO',
     align: 'left',
-    width: 80,
+    width:80,
     scopedSlots: {
       customRender: 'index',
     },
@@ -63,7 +55,7 @@ const columns = [
     title: 'COLLECTION STOP TIME',
     align: 'left',
     dataIndex: 'collectStop',
-  },
+  }
 ]
 export default {
   components: {
@@ -76,25 +68,25 @@ export default {
       },
       stationList: [],
       columns,
-      dataType: 'S',
+      dataType: "S",
-      spectralQualifie: 'PREL',
+      spectralQualifie:"PREL"
     }
   },
   mounted() {
-    console.log(this.dataType)
+    console.log(this.dataType);
-    this.findStationList()
+    this.findStationList();
   },
   methods: {
     findStationList() {
       getAction(this.url.findStationList, { menuName: 'Particulate' }).then((res) => {
         if (res.success) {
-          if (res.result.length > 0) {
+          if (res.result.length>0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
           } else {
-            this.stationList = []
+            this.stationList=[]
           }
         } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
+          this.$message.warning("This operation fails. Contact your system administrator")
         }
       })
     },
@@ -103,4 +95,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
+
 </style>

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

@@ -79,7 +79,7 @@ const columns = [
 import { compareDate } from '../../commom'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { getAction, getFileAction } from '../../../../api/manage'
-import moment from 'moment'
+import dateFormat from '../../../../components/jeecg/JEasyCron/format-date'
 export default {
   name: 'menuTree',
   mixins: [JeecgListMixin],
@@ -89,12 +89,8 @@ export default {
       isImmediate: true,
       columns,
       queryParam: {
-        startTime: sessionStorage.getItem('currStartDate_sta')
+        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          ? sessionStorage.getItem('currStartDate_sta')
+        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          : moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: sessionStorage.getItem('currEndDate_sta')
-          ? sessionStorage.getItem('currEndDate_sta')
-          : moment().format('YYYY-MM-DD'),
         stationIds: [],
       },
       url: {
@@ -116,6 +112,11 @@ export default {
     handleExcel() {
       if (this.dataSource.length > 0) {
         this.excelLoading = true
+        // this.queryParam = {
+        //   startTime: "2023-07-17",
+        //   endTime: "2023-07-17",
+        //   stationIds: [1]
+        // }
         let params = {
           ...this.queryParam,
         }
@@ -143,6 +144,11 @@ export default {
       let days = compareDate(this.queryParam.startTime, this.queryParam.endTime)
       if (days <= 10) {
         this.isImmediate = false
+        // this.queryParam = {
+        //   startTime: "2023-01-01",
+        //   endTime: "2023-07-10",
+        //   stationIds: [209, 210]
+        // }
         let params = {
           ...this.queryParam,
           pageNo: 1,
@@ -169,12 +175,6 @@ export default {
         if (res.success) {
           if (res.result.length > 0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
-            // 进入页面自动查询
-            let arr = sessionStorage.getItem('selectedSta_sta')
-              ? sessionStorage.getItem('selectedSta_sta').split(',')
-              : []
-            this.queryParam.stationIds = arr.map((item) => Number(item))
-            this.searchQueryData()
           } else {
             this.stationList = []
           }
@@ -184,7 +184,7 @@ export default {
       })
     },
     handleSelectChange(val) {
-      window.sessionStorage.setItem('selectedSta_sta', val)
+      console.log(val)
       let length = this.stationList.length
       if (val.length === length) {
         this.allChecked = true
@@ -196,39 +196,31 @@ export default {
       this.allChecked = val
       if (val) {
         this.queryParam.stationIds = this.stationList.map((item) => item.value)
-        window.sessionStorage.setItem('selectedSta_sta', this.queryParam.stationIds)
       } else {
         this.queryParam.stationIds = []
-        window.sessionStorage.setItem('selectedSta_sta', [])
       }
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    handleStartDateChange(date) {
-      window.sessionStorage.setItem('currStartDate_sta', date)
-    },
-    handleEndDateChange(date) {
-      window.sessionStorage.setItem('currEndDate_sta', date)
-    },
   },
   computed: {
     formItems() {
       return [
-        // {
+        {
-        //   type: 'a-input',
+          type: 'a-input',
-        //   label: '',
+          label: '',
-        //   name: 'search',
+          name: 'search',
-        //   props: {
+          props: {
-        //     placeholder: 'search...',
+            placeholder: 'search...',
-        //     style: {
+            style: {
-        //       width: '166px',
+              width: '166px',
-        //     },
+            },
-        //   },
+          },
-        //   style: {
+          style: {
-        //     width: 'auto',
+            width: 'auto',
-        //   },
+          },
-        // },
+        },
         {
           type: 'custom-all-select',
           label: 'Stations',
@@ -264,9 +256,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleStartDateChange,
-          },
           style: {
             width: 'auto',
           },
@@ -283,9 +272,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleEndDateChange,
-          },
           style: {
             width: 'auto',
           },

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

@@ -78,7 +78,6 @@ 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],
@@ -91,12 +90,8 @@ export default {
       isImmediate: true,
       columns,
       queryParam: {
-        startTime: sessionStorage.getItem('currStartDate_sta')
+        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          ? sessionStorage.getItem('currStartDate_sta')
+        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          : moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: sessionStorage.getItem('currEndDate_sta')
-          ? sessionStorage.getItem('currEndDate_sta')
-          : moment().format('YYYY-MM-DD'),
         stationIds: [],
       },
       url: {
@@ -155,6 +150,11 @@ export default {
       let days = compareDate(this.queryParam.startTime, this.queryParam.endTime)
       if (days <= 10) {
         this.isImmediate = false
+        // this.queryParam = {
+        //   startTime: "2023-01-01",
+        //   endTime: "2023-07-10",
+        //   stationIds: [209, 210]
+        // }
         let params = {
           ...this.queryParam,
           pageNo: 1,
@@ -181,12 +181,6 @@ export default {
         if (res.success) {
           if (res.result.length > 0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
-            // 进入页面自动查询
-            let arr = sessionStorage.getItem('selectedSta_sta')
-              ? sessionStorage.getItem('selectedSta_sta').split(',')
-              : []
-            this.queryParam.stationIds = arr.map((item) => Number(item))
-            this.searchQueryData()
           } else {
             this.stationList = []
           }
@@ -196,7 +190,7 @@ export default {
       })
     },
     handleSelectChange(val) {
-      window.sessionStorage.setItem('selectedSta_sta', val)
+      console.log(val)
       let length = this.stationList.length
       if (val.length === length) {
         this.allChecked = true
@@ -208,39 +202,31 @@ export default {
       this.allChecked = val
       if (val) {
         this.queryParam.stationIds = this.stationList.map((item) => item.value)
-        window.sessionStorage.setItem('selectedSta_sta', this.queryParam.stationIds)
       } else {
         this.queryParam.stationIds = []
-        window.sessionStorage.setItem('selectedSta_sta', [])
       }
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    handleStartDateChange(date) {
-      window.sessionStorage.setItem('currStartDate_sta', date)
-    },
-    handleEndDateChange(date) {
-      window.sessionStorage.setItem('currEndDate_sta', date)
-    },
   },
   computed: {
     formItems() {
       return [
-        // {
+        {
-        //   type: 'a-input',
+          type: 'a-input',
-        //   label: '',
+          label: '',
-        //   name: 'search',
+          name: 'search',
-        //   props: {
+          props: {
-        //     placeholder: 'search...',
+            placeholder: 'search...',
-        //     style: {
+            style: {
-        //       width: '166px',
+              width: '166px',
-        //     },
+            },
-        //   },
+          },
-        //   style: {
+          style: {
-        //     width: 'auto',
+            width: 'auto',
-        //   },
+          },
-        // },
+        },
         {
           type: 'custom-all-select',
           label: 'Stations',
@@ -276,9 +262,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleStartDateChange,
-          },
           style: {
             width: 'auto',
           },
@@ -295,9 +278,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleEndDateChange,
-          },
           style: {
             width: 'auto',
           },

src/views/statistics/imsProducts/arr/index.vue

@@ -72,22 +72,12 @@ const columns = [
     align: 'left',
     dataIndex: 'sampleId',
   },
-  {
-    title: 'Qualifie',
-    align: 'left',
-    dataIndex: 'spectralQualifie',
-  },
-  {
-    title: 'Analyst',
-    align: 'left',
-    dataIndex: 'analyst',
-  },
 ]
 import { compareDate } from '../../commom'
 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],
@@ -100,14 +90,9 @@ export default {
       isImmediate: true,
       columns,
       queryParam: {
-        startTime: sessionStorage.getItem('currStartDate_pro')
+        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          ? sessionStorage.getItem('currStartDate_pro')
+        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          : moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: sessionStorage.getItem('currEndDate_pro')
-          ? sessionStorage.getItem('currEndDate_pro')
-          : moment().format('YYYY-MM-DD'),
         stationIds: [],
-        qualifie: undefined,
       },
       url: {
         list: '/radionuclide/findAutoPage',
@@ -124,7 +109,7 @@ export default {
     }
   },
   created() {
-    // this.queryParam.startTime = this.getBeforeDate(9)
+    this.queryParam.startTime = this.getBeforeDate(9)
     this.findStationList()
   },
   methods: {
@@ -165,6 +150,11 @@ export default {
       let days = compareDate(this.queryParam.startTime, this.queryParam.endTime)
       if (days <= 10) {
         this.isImmediate = false
+        // this.queryParam = {
+        //   startTime: "2023-01-01",
+        //   endTime: "2023-07-10",
+        //   stationIds: [209, 210]
+        // }
         let params = {
           ...this.queryParam,
           pageNo: 1,
@@ -192,13 +182,8 @@ export default {
           if (res.result.length > 0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
             // 进入页面自动查询
-            let arr = sessionStorage.getItem('selectedSta_pro')
+            this.queryParam.stationIds = this.stationList.map((item) => item.value)
-              ? sessionStorage.getItem('selectedSta_pro').split(',')
+            this.allChecked = true
-              : []
-            this.queryParam.stationIds = arr.map((item) => Number(item))
-            this.queryParam.qualifie = sessionStorage.getItem('qualifie')
-              ? sessionStorage.getItem('qualifie')
-              : undefined
             this.searchQueryData()
           } else {
             this.stationList = []
@@ -209,7 +194,7 @@ export default {
       })
     },
     handleSelectChange(val) {
-      window.sessionStorage.setItem('selectedSta_pro', val)
+      console.log(val)
       let length = this.stationList.length
       if (val.length === length) {
         this.allChecked = true
@@ -221,22 +206,10 @@ export default {
       this.allChecked = val
       if (val) {
         this.queryParam.stationIds = this.stationList.map((item) => item.value)
-        window.sessionStorage.setItem('selectedSta_pro', this.queryParam.stationIds)
       } else {
         this.queryParam.stationIds = []
-        window.sessionStorage.setItem('selectedSta_pro', [])
       }
     },
-    handleQualifieChange(val) {
-      this.queryParam.qualifie = val
-      sessionStorage.setItem('qualifie', val)
-    },
-    handleStartDateChange(date) {
-      window.sessionStorage.setItem('currStartDate_pro', date)
-    },
-    handleEndDateChange(date) {
-      window.sessionStorage.setItem('currEndDate_pro', date)
-    },
     getBeforeDate(n) {
       var n = n
       var d = new Date()
@@ -265,7 +238,7 @@ export default {
   computed: {
     formItems() {
       return [
-        /*{
+        {
           type: 'a-input',
           label: '',
           name: 'search',
@@ -278,7 +251,7 @@ export default {
           style: {
             width: 'auto',
           },
-        },*/
+        },
         {
           type: 'custom-all-select',
           label: 'Stations',
@@ -314,9 +287,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleStartDateChange,
-          },
           style: {
             width: 'auto',
           },
@@ -333,31 +303,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleEndDateChange,
-          },
-          style: {
-            width: 'auto',
-          },
-        },
-        {
-          type: 'a-select',
-          label: 'Qualifie',
-          name: 'qualifie',
-          props: {
-            allowClear: true,
-            placeholder: 'Select qualifie',
-            options: [
-              { label: 'FULL', value: 'FULL' },
-              { label: 'PREL', value: 'PREL' },
-            ],
-            style: {
-              width: '200px',
-            },
-          },
-          on: {
-            change: this.handleQualifieChange,
-          },
           style: {
             width: 'auto',
           },

src/views/statistics/imsProducts/rrr/index.vue

@@ -72,22 +72,12 @@ const columns = [
     align: 'left',
     dataIndex: 'sampleId',
   },
-  {
-    title: 'Qualifie',
-    align: 'left',
-    dataIndex: 'spectralQualifie',
-  },
-  {
-    title: 'Analyst',
-    align: 'left',
-    dataIndex: 'analyst',
-  },
 ]
 import { compareDate } from '../../commom'
 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],
@@ -100,14 +90,9 @@ export default {
       isImmediate: true,
       columns,
       queryParam: {
-        startTime: sessionStorage.getItem('currStartDate_pro')
+        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          ? sessionStorage.getItem('currStartDate_pro')
+        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-          : moment().subtract(6, 'days').format('YYYY-MM-DD'),
-        endTime: sessionStorage.getItem('currEndDate_pro')
-          ? sessionStorage.getItem('currEndDate_pro')
-          : moment().format('YYYY-MM-DD'),
         stationIds: [],
-        qualifie: undefined,
       },
       url: {
         list: '/radionuclide/findReviewedPage',
@@ -124,7 +109,7 @@ export default {
     }
   },
   created() {
-    // this.queryParam.startTime = this.getBeforeDate(9)
+    this.queryParam.startTime = this.getBeforeDate(9)
     this.findStationList()
   },
   methods: {
@@ -197,13 +182,8 @@ export default {
           if (res.result.length > 0) {
             this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
             // 进入页面自动查询
-            let arr = sessionStorage.getItem('selectedSta_pro')
+            this.queryParam.stationIds = this.stationList.map((item) => item.value)
-              ? sessionStorage.getItem('selectedSta_pro').split(',')
+            this.allChecked = true
-              : []
-            this.queryParam.stationIds = arr.map((item) => Number(item))
-            this.queryParam.qualifie = sessionStorage.getItem('qualifie')
-              ? sessionStorage.getItem('qualifie')
-              : undefined
             this.searchQueryData()
           } else {
             this.stationList = []
@@ -214,7 +194,7 @@ export default {
       })
     },
     handleSelectChange(val) {
-      window.sessionStorage.setItem('selectedSta_pro', val)
+      console.log(val)
       let length = this.stationList.length
       if (val.length === length) {
         this.allChecked = true
@@ -226,22 +206,10 @@ export default {
       this.allChecked = val
       if (val) {
         this.queryParam.stationIds = this.stationList.map((item) => item.value)
-        window.sessionStorage.setItem('selectedSta_pro', this.queryParam.stationIds)
       } else {
         this.queryParam.stationIds = []
-        window.sessionStorage.setItem('selectedSta_pro', [])
       }
     },
-    handleQualifieChange(val) {
-      this.queryParam.qualifie = val
-      sessionStorage.setItem('qualifie', val)
-    },
-    handleStartDateChange(date) {
-      window.sessionStorage.setItem('currStartDate_pro', date)
-    },
-    handleEndDateChange(date) {
-      window.sessionStorage.setItem('currEndDate_pro', date)
-    },
     getBeforeDate(n) {
       var n = n
       var d = new Date()
@@ -270,7 +238,7 @@ export default {
   computed: {
     formItems() {
       return [
-        /*{
+        {
           type: 'a-input',
           label: '',
           name: 'search',
@@ -283,7 +251,7 @@ export default {
           style: {
             width: 'auto',
           },
-        },*/
+        },
         {
           type: 'custom-all-select',
           label: 'Stations',
@@ -319,9 +287,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleStartDateChange,
-          },
           style: {
             width: 'auto',
           },
@@ -338,31 +303,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleEndDateChange,
-          },
-          style: {
-            width: 'auto',
-          },
-        },
-        {
-          type: 'a-select',
-          label: 'Qualifie',
-          name: 'qualifie',
-          props: {
-            allowClear: true,
-            placeholder: 'Select qualifie',
-            options: [
-              { label: 'FULL', value: 'FULL' },
-              { label: 'PREL', value: 'PREL' },
-            ],
-            style: {
-              width: '200px',
-            },
-          },
-          on: {
-            change: this.handleQualifieChange,
-          },
           style: {
             width: 'auto',
           },

src/views/statistics/list.vue

@@ -44,7 +44,6 @@ 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: {
@@ -72,34 +71,24 @@ export default {
       type: String,
       default: '',
     },
-    menuType: {
-      type: String,
-      default: '',
-    },
   },
   mixins: [JeecgListMixin],
   components: {
     Detail,
   },
   watch: {
-    stationList: {
+    fileName: {
-      handler(val) {
+      handler: function (val) {
-        let arr = sessionStorage.getItem(`selectedSta_${this.menuType}`)
+        if (val === 'QCPHD' || val === 'SPHDF' || val === 'SPHDP') {
-          ? sessionStorage.getItem(`selectedSta_${this.menuType}`).split(',')
+          this.$nextTick(() => {
-          : []
+            this.queryParam.startTime = this.getBeforeDate(6)
-        this.queryParam.stationIds = arr.map((item) => Number(item))
+          })
-        ;(this.queryParam.startTime = sessionStorage.getItem(`currStartDate_${this.menuType}`)
+        }
-          ? sessionStorage.getItem(`currStartDate_${this.menuType}`)
-          : moment().subtract(6, 'days').format('YYYY-MM-DD')),
-          (this.queryParam.endTime = sessionStorage.getItem(`currEndDate_${this.menuType}`)
-            ? sessionStorage.getItem(`currEndDate_${this.menuType}`)
-            : moment().format('YYYY-MM-DD')),
-          this.loadData()
       },
+      immediate: true,
     },
   },
   data() {
-    this.disableMixinCreated = true
     return {
       excelLoading: false,
       spinning: false,
@@ -107,8 +96,8 @@ export default {
       isDetail: false,
       queryParam: {
         dataType: this.dataType,
-        startTime: '',
+        startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-        endTime: '',
+        endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
         stationIds: [],
         spectralQualifie: this.spectralQualifie,
       },
@@ -196,8 +185,6 @@ export default {
       this.isDetail = flag
     },
     handleSelectChange(val) {
-      console.log(val)
-      window.sessionStorage.setItem(`selectedSta_${this.menuType}`, val)
       let length = this.stationList.length
       if (val.length === length) {
         this.allChecked = true
@@ -209,20 +196,34 @@ export default {
       this.allChecked = val
       if (val) {
         this.queryParam.stationIds = this.stationList.map((item) => item.value)
-        window.sessionStorage.setItem(`selectedSta_${this.menuType}`, this.queryParam.stationIds)
       } else {
         this.queryParam.stationIds = []
-        window.sessionStorage.setItem(`selectedSta_${this.menuType}`, [])
       }
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    handleStartDateChange(date) {
+    // 获取n天前的日期
-      window.sessionStorage.setItem(`currStartDate_${this.menuType}`, date)
+    getBeforeDate(n) {
-    },
+      var n = n
-    handleEndDateChange(date) {
+      var d = new Date()
-      window.sessionStorage.setItem(`currEndDate_${this.menuType}`, 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: {
@@ -277,9 +278,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleStartDateChange,
-          },
           style: {
             width: 'auto',
           },
@@ -296,9 +294,6 @@ export default {
               width: '200px',
             },
           },
-          on: {
-            change: this.handleEndDateChange,
-          },
           style: {
             width: 'auto',
           },

src/views/system/DetectorInfo.vue

@@ -43,92 +43,52 @@
     </div>
     <!-- 列表结束 -->
     <!-- 新增/编辑 -->
-    <custom-modal :title="isAdd ? 'Add' : 'Edit'" v-model="visible" :width="650" :okHandler="submit">
+    <custom-modal :title="isAdd ? 'Add' : 'Edit'" v-model="visible" :width="475" :okHandler="submit">
       <a-form-model
         ref="form"
+        layout="horizontal"
         :model="model"
         :rules="rules"
         :colon="false"
         :labelCol="{ style: { width: '115px' } }"
-        :wrapperCol="{ style: { width: '150px' } }"
+        :wrapperCol="{ style: { width: '300px' } }"
       >
-        <a-row :gutter="24">
+        <a-form-model-item label="Detector Id" prop="detectorId">
-<!--          <a-col :span="12">
+          <a-input v-model="model.detectorId" type="number"></a-input>
-            <a-form-model-item label="Detector Id" prop="detectorId">
+        </a-form-model-item>
-              <a-input :disabled='!isAdd' v-model="model.detectorId" type="number"></a-input>
+        <a-form-model-item label="Detector Code" prop="detectorCode">
-            </a-form-model-item>
+          <a-input v-model="model.detectorCode"></a-input>
-          </a-col>-->
+        </a-form-model-item>
-          <a-col :span="12">
+        <a-form-model-item label="Lon" prop="lon">
-            <a-form-model-item label="Station" prop="stationId">
+          <a-input v-model="model.lon" type="number"></a-input>
-              <a-select showSearch allowClear
+        </a-form-model-item>
-                        :disabled='!isAdd'
+        <a-form-model-item label="Lat" prop="lat">
-                        :filterOption = this.filterOption
+          <a-input v-model="model.lat" type="number"></a-input>
-                        :options="stationOptions"
+        </a-form-model-item>
-                        v-model="model.stationId">
+        <a-form-model-item label="Type" prop="type">
-              </a-select>
+          <a-input v-model="model.type"></a-input>
-            </a-form-model-item>
+        </a-form-model-item>
-          </a-col>
+        <a-form-model-item label="Channels" prop="channels">
-          <a-col :span="12">
+          <a-input v-model="model.channels" type="number"></a-input>
-            <a-form-model-item label="Detector Code" prop="detectorCode">
+        </a-form-model-item>
-              <a-input :disabled='!isAdd' @input='enterCode' v-model="model.detectorCode"></a-input>
+        <a-form-model-item label="Rated Efficiency" prop="ratedEfficiency">
-            </a-form-model-item>
+          <a-input v-model="model.ratedEfficiency" type="number"></a-input>
-          </a-col>
+        </a-form-model-item>
-        </a-row>
+        <a-form-model-item label="Rated Resolution" prop="ratedResolution">
-        <a-row :gutter="24">
+          <a-input v-model="model.ratedResolution" type="number"></a-input>
-          <a-col :span="12">
+        </a-form-model-item>
-            <a-form-model-item label="Status" prop="status">
+        <a-form-model-item label="Ecal Range Max" prop="ecalRangeMax">
-              <j-dict-select-tag v-model="model.status" dictCode="STATION_STATUS"></j-dict-select-tag>
+          <a-input v-model="model.ecalRangeMax" type="number"></a-input>
-            </a-form-model-item>
+        </a-form-model-item>
-          </a-col>
+        <a-form-model-item label="Description" prop="description">
-          <a-col :span="12">
+          <a-textarea v-model="model.description" :rows="3"></a-textarea>
-            <a-form-model-item label="Type" prop="type">
+        </a-form-model-item>
-              <a-input v-model="model.type"></a-input>
+        <a-form-model-item label="Moddate" prop="moddate">
-            </a-form-model-item>
+          <a-date-picker v-model="model.moddate" :rows="3"></a-date-picker>
-          </a-col>
+        </a-form-model-item>
-        </a-row>
+        <a-form-model-item label="Status" prop="status">
-        <a-row :gutter="24">
+          <j-dict-select-tag v-model="model.status" dictCode="STATION_STATUS"></j-dict-select-tag>
-          <a-col :span="12">
+        </a-form-model-item>
-            <a-form-model-item label="Lon" prop="lon">
-              <a-input v-model="model.lon" type="number"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-model-item label="Lat" prop="lat">
-              <a-input v-model="model.lat" type="number"></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-model-item label="Channels" prop="channels">
-              <a-input v-model="model.channels" type="number"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-model-item label="Rated Efficiency" prop="ratedEfficiency">
-              <a-input v-model="model.ratedEfficiency" type="number"></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-model-item label="Rated Resolution" prop="ratedResolution">
-              <a-input v-model="model.ratedResolution" type="number"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-model-item label="Ecal Range Max" prop="ecalRangeMax">
-              <a-input v-model="model.ecalRangeMax" type="number"></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-model-item label="Description" prop="description" :wrapperCol="{ style: { width: '77%' } }">
-              <a-textarea v-model="model.description" :rows="2"></a-textarea>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
       </a-form-model>
     </custom-modal>
     <!-- 新增/编辑 结束 -->
@@ -238,28 +198,23 @@ export default {
   data() {
     this.columns = columns
     const validateDetectorCode = (_, value, callback) => {
-      if(this.model.stationId){
+      if (!value) {
-        if (value) {
+        callback(new Error('Please Enter Detector Code'))
-          if (value.length > 9) {
+      } else {
-            callback(new Error('Detector Code Limit 9'))
+        if (value.length > 9) {
-          } else {
+          callback(new Error('Detector Code Limit 9'))
-            callback()
-          }
         } else {
-          callback(new Error('Please Enter Code'))
+          callback()
         }
-      }else {
-        callback('Select Station First');
       }
     }
 
     return {
       queryParam: {},
       rules: {
-        // detectorId: [{ required: true, message: 'Please Enter Id' }, { validator: this.checkId }],
+        detectorId: [{ required: true, message: 'Please Enter Detector Id' }],
         detectorCode: [{ required: true, validator: validateDetectorCode }],
-        stationId: [{ required: true, message: 'Please Select Station' }],
+        moddate: [{ required: true, message: 'Please Select Moddate' }]
-        status: [{ required: true, message: 'Please Select Status' }]
       },
       url: {
         list: '/gardsDetectors/findPage',
@@ -267,8 +222,7 @@ export default {
         add: '/gardsDetectors/create',
         edit: '/gardsDetectors/update'
       },
-      typeList: [],
+      typeList: []
-      stationOptions: [],
     }
   },
   created() {
@@ -277,7 +231,7 @@ export default {
   methods: {
     async getTypeList() {
       try {
-        const res = await getAction( '/gardsDetectors/findType')
+        const res = await getAction('/gardsDetectors/findType')
         this.typeList = res.filter(item => item).map(item => ({ label: item, value: item }))
       } catch (error) {
         console.error(error)
@@ -290,15 +244,13 @@ export default {
 
     onAdd() {
       this.isAdd = true
-      this.model = { status: 'Operating' }
+      this.model = {}
-      this.getStationList()
       this.visible = true
     },
     onEdit() {
       if (this.selectedRowKeys && this.selectedRowKeys.length) {
         this.isAdd = false
         this.visible = true
-        this.getStationList()
         const find = this.dataSource.find(item => item.detectorId === this.selectedRowKeys[0])
         this.model = cloneDeep(find)
       } else {
@@ -322,43 +274,6 @@ export default {
 
     beforeSubmit() {
       this.model.moddate = moment(this.model.moddate).format('yyyy-MM-DD HH:mm:ss')
-    },
-
-    async getStationList() {
-      await getAction('/webStatistics/findStationList', { menuName: '' }).then((res) => {
-        if (res.success) {
-          if (res.result.length > 0) {
-            this.stationOptions = res.result.map((item) => {
-              return {
-                label: item.stationCode,
-                value: item.stationId,
-              }
-            })
-          } else {
-            this.stationOptions = []
-          }
-        } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
-        }
-      })
-    },
-
-    enterCode(){
-      let stationId = this.model.stationId
-      if (stationId){
-        let current = this.model.detectorCode
-        let stationCode = this.stationOptions.find(option => option.value === stationId).label;
-        let prefix = stationCode + "_"
-        if (!current.startsWith(prefix)){
-          this.model.detectorCode = prefix + current
-        }else {
-          if (prefix === current){
-            this.model.detectorCode = ''
-          }
-        }
-      }else {
-        this.model.detectorCode = ''
-      }
     }
   },
   computed: {