From c5d177ad72fb412e2022fd18e352853962265e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Mon, 15 Jan 2024 16:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=87=E6=8D=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=90=8E=EF=BC=8C=E4=B8=8B=E6=8B=89=E6=A1=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=89=E9=A1=B9id=20=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../radionuclide/particulate/blankphd.vue     | 212 ------------------
 src/views/statistics/list.vue                 |  22 +-
 2 files changed, 9 insertions(+), 225 deletions(-)

diff --git a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
index bdafcd6..1ab6ad4 100644
--- a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
+++ b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue
@@ -1,35 +1,6 @@
 <template>
   <div style="height: 100%">
     <List :stationList="stationList" :columns="columns" :dataType="dataType" fileName="BLANKPHD" pageType="ACQ"></List>
-    <!-- <a-spin :spinning="spinning">
-      <a-card v-if="!isDetail" :bordered="false" style="margin-left: 20px">
-        <search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
-          <a-space style="float: right" class="btn-group" slot="additional">
-            <a-button @click="handleExcel" type="primary">
-              <img class="icon-edit" src="@/assets/images/global/edit.png" alt="" />
-              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>
@@ -82,113 +53,26 @@ 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) {
@@ -202,103 +86,7 @@ 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>
diff --git a/src/views/statistics/list.vue b/src/views/statistics/list.vue
index a1c5468..6a6bf48 100644
--- a/src/views/statistics/list.vue
+++ b/src/views/statistics/list.vue
@@ -77,18 +77,14 @@ export default {
   components: {
     Detail,
   },
-  // watch: {
-  //   fileName: {
-  //     handler: function (val) {
-  //       // if (val === 'QCPHD' || val === 'SPHDF' || val === 'SPHDP') {
-  //       this.$nextTick(() => {
-  //         this.queryParam.startTime = this.getBeforeDate(6)
-  //       })
-  //       // }
-  //     },
-  //     immediate: true,
-  //   },
-  // },
+  watch: {
+    stationList: {
+      handler(val) {
+        let arr = sessionStorage.getItem('selectedSta') ? sessionStorage.getItem('selectedSta').split(',') : []
+        this.queryParam.stationIds = arr.map((item) => Number(item))
+      },
+    },
+  },
   data() {
     return {
       excelLoading: false,
@@ -103,7 +99,7 @@ export default {
         endTime: sessionStorage.getItem('currEndDate')
           ? sessionStorage.getItem('currEndDate')
           : moment().format('YYYY-MM-DD'),
-        stationIds: sessionStorage.getItem('selectedSta') ? sessionStorage.getItem('selectedSta').split(',') : [],
+        stationIds: [],
         spectralQualifie: this.spectralQualifie,
       },
       url: {