Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy

src/views/statistics/detail.vue

@@ -91,33 +91,33 @@
             </a-row>
           </template>
         </a-tab-pane>
-        <a-tab-pane key="energy" tab="ENERGY" v-if="allData.gEnergyBlock===null?false:true">
+        <a-tab-pane key="energy" tab="ENERGY" v-if="allData.genergyBlock===null?false:true" forceRender>
           <div class="pane-title" style="margin-bottom: 15px;">G ENERGY</div>
           <custom-table
             size="middle"
-            rowKey="sampleId"
+            :rowKey="getUid()"
             :columns="columnsEnergy"
             :list="dataSourceEnergy"
             :pagination="false"
           >
           </custom-table>
         </a-tab-pane>
-        <a-tab-pane key="resulution" tab="RESOLUTION" v-if="allData.gResolutionBlock===null?false:true">
+        <a-tab-pane key="resulution" tab="RESOLUTION" v-if="allData.gresolutionBlock===null?false:true" forceRender>
           <div class="pane-title" style="margin-bottom: 15px;">G RESOLUTION</div>
           <custom-table
             size="middle"
-            rowKey="sampleId"
+            :rowKey="getUid()"
             :columns="columnsResulution"
             :list="dataSourceResulution"
             :pagination="false"
           >
           </custom-table>
         </a-tab-pane>
-        <a-tab-pane key="efficiency" tab="EFFICIENCY" v-if="allData.gEfficiencyBlock===null?false:true">
+        <a-tab-pane key="efficiency" tab="EFFICIENCY" v-if="allData.gefficiencyBlock===null?false:true" forceRender>
           <div class="pane-title" style="margin-bottom: 15px;">GAMMA EFFICIENCY</div>
           <custom-table
             size="middle"
-            rowKey="sampleId"
+            :rowKey="getUid()"
             :columns="columnsEfficiency"
             :list="dataSourceEfficiency"
             :pagination="false"
@@ -138,7 +138,7 @@
           </div>
           <div class="gamma-spectrum-chart" id="spectrumChartRef"></div>
         </a-tab-pane>
-        <a-tab-pane key="certificate" tab="CERTIFICATE" v-if="allData.certificateBlock===null?false:true">
+        <a-tab-pane key="certificate" tab="CERTIFICATE" v-if="allData.certificateBlock===null?false:true" forceRender>
           <div class="pane-title" style="margin-bottom: 15px;">CERTIFICATE</div>
           <div class="certificate-row">
             <span class="span-key">Total Source Activity [ Bq ]：</span><span class="row-val">{{ allData.certificateBlock.totalSourceActivity }}</span>
@@ -147,7 +147,7 @@
           </div>
           <custom-table
             size="middle"
-            rowKey="sampleId"
+            :rowKey="getUid()"
             :columns="columnsCertificate"
             :list="dataSourceCertificate"
             :pagination="false"
@@ -160,7 +160,6 @@
 
 <script>
 import * as echarts from 'echarts'
-// import allData from "./data.json"
 export default {
     props: {
       allData: {
@@ -302,6 +301,9 @@ export default {
       this.dataSourceCertificate = this.allData.certificateBlock?this.allData.certificateBlock.certificateSubBlock:[]
     },
   methods: {
+    getUid() {
+      return (Math.random()+new Date().getTime()).toString(32).slice(0,8)
+    },
     yLogChange(e) {
       this.yAxisType = e.target.checked?"log":"value"
       this.spectrumChart.setOption({
@@ -341,10 +343,13 @@ export default {
       this.spectrumChart.setOption({
         tooltip: {
           trigger: 'axis',
-          formatter: '{a} <br/>{b} : {c}'
+          formatter: function (params) {
+            return `<div>${params[0].axisValueLabel}</div>
+              <div style="color:#0656ff">value：${params[0].value}</div>
+            `
+          }
         },
         xAxis: {
-          // type: 'time',
           splitLine: {
             show: true,
             lineStyle: {
@@ -367,7 +372,6 @@ export default {
         },
         yAxis: {
           type: this.yAxisType,
-          // type: 'log',
           splitLine: {
             show: true,
             lineStyle: {

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

@@ -0,0 +1,98 @@
+<template>
+  <div style="height: 100%;">
+    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+  </div>
+</template>
+
+<script>
+import List from "../../../../list.vue"
+import { getAction } from '../../../../../../api/manage'
+
+const columns = [
+  {
+    title: 'NO',
+    align: 'left',
+    scopedSlots: {
+      customRender: 'index',
+    },
+    customHeaderCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+    customCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+  },
+  {
+    title: 'STATION',
+    align: 'left',
+    dataIndex: 'stationName',
+  },
+  {
+    title: 'DETECTOR CODE',
+    align: 'left',
+    dataIndex: 'siteDetCode',
+  },
+  {
+    title: 'SPECTRAL QUALIFIER',
+    align: 'left',
+    dataIndex: 'spectralQualifie',
+  },
+  {
+    title: 'ACQUISITION START TIME',
+    align: 'left',
+    dataIndex: 'acquisitionStart',
+  },
+  {
+    title: 'ACQUISITION STOP TIME',
+    align: 'left',
+    dataIndex: 'acquisitionStop',
+  },
+  {
+    title: 'CALIB REPORTS',
+    align: 'left',
+    dataIndex: 'calibReports',
+  },
+]
+export default {
+  components: {
+    List,
+  },
+  data() {
+    return {
+      url: {
+        findStationList: '/webStatistics/findStationList',
+      },
+      stationList: [],
+      columns,
+      dataType:"C"
+    }
+  },
+  mounted() {
+    console.log(this.dataType);
+    this.findStationList();
+  },
+  methods: {
+    findStationList() {
+      getAction(this.url.findStationList, { menuName: 'Node Gas HPGe' }).then((res) => {
+        if (res.result.length>0) {
+          this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
+        } else {
+          this.stationList=[]
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

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

@@ -0,0 +1,93 @@
+<template>
+  <div style="height: 100%;">
+    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+  </div>
+</template>
+
+<script>
+import List from "../../../../list.vue"
+import { getAction } from '../../../../../../api/manage'
+
+const columns = [
+  {
+    title: 'NO',
+    align: 'left',
+    scopedSlots: {
+      customRender: 'index',
+    },
+    customHeaderCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+    customCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+  },
+  {
+    title: 'STATION',
+    align: 'left',
+    dataIndex: 'stationName',
+  },
+  {
+    title: 'DETECTOR CODE',
+    align: 'left',
+    dataIndex: 'siteDetCode',
+  },
+  {
+    title: 'SPECTRAL QUALIFIER',
+    align: 'left',
+    dataIndex: 'spectralQualifie',
+  },
+  {
+    title: 'ACQUISITION START TIME',
+    align: 'left',
+    dataIndex: 'acquisitionStart',
+  },
+  {
+    title: 'ACQUISITION STOP TIME',
+    align: 'left',
+    dataIndex: 'acquisitionStop',
+  }
+]
+export default {
+  components: {
+    List,
+  },
+  data() {
+    return {
+      url: {
+        findStationList: '/webStatistics/findStationList',
+      },
+      stationList: [],
+      columns,
+      dataType:"D"
+    }
+  },
+  mounted() {
+    console.log(this.dataType);
+    this.findStationList();
+  },
+  methods: {
+    findStationList() {
+      getAction(this.url.findStationList, { menuName: 'Node Gas HPGe' }).then((res) => {
+        if (res.result.length>0) {
+          this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
+        } else {
+          this.stationList=[]
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

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

@@ -0,0 +1,93 @@
+<template>
+  <div style="height: 100%;">
+    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+  </div>
+</template>
+
+<script>
+import List from "../../../../list.vue"
+import { getAction } from '../../../../../../api/manage'
+
+const columns = [
+  {
+    title: 'NO',
+    align: 'left',
+    scopedSlots: {
+      customRender: 'index',
+    },
+    customHeaderCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+    customCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+  },
+  {
+    title: 'STATION',
+    align: 'left',
+    dataIndex: 'stationName',
+  },
+  {
+    title: 'DETECTOR CODE',
+    align: 'left',
+    dataIndex: 'siteDetCode',
+  },
+  {
+    title: 'SPECTRAL QUALIFIER',
+    align: 'left',
+    dataIndex: 'spectralQualifie',
+  },
+  {
+    title: 'ACQUISITION START TIME',
+    align: 'left',
+    dataIndex: 'acquisitionStart',
+  },
+  {
+    title: 'ACQUISITION STOP TIME',
+    align: 'left',
+    dataIndex: 'acquisitionStop',
+  }
+]
+export default {
+  components: {
+    List,
+  },
+  data() {
+    return {
+      url: {
+        findStationList: '/webStatistics/findStationList',
+      },
+      stationList: [],
+      columns,
+      dataType:"Q"
+    }
+  },
+  mounted() {
+    console.log(this.dataType);
+    this.findStationList();
+  },
+  methods: {
+    findStationList() {
+      getAction(this.url.findStationList, { menuName: 'Node Gas HPGe' }).then((res) => {
+        if (res.result.length>0) {
+          this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
+        } else {
+          this.stationList=[]
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

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

@@ -0,0 +1,94 @@
+<template>
+  <div style="height: 100%;">
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
+  </div>
+</template>
+
+<script>
+import List from "../../../../list.vue"
+import { getAction } from '../../../../../../api/manage'
+
+const columns = [
+  {
+    title: 'NO',
+    align: 'left',
+    scopedSlots: {
+      customRender: 'index',
+    },
+    customHeaderCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+    customCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+  },
+  {
+    title: 'STATION',
+    align: 'left',
+    dataIndex: 'stationName',
+  },
+  {
+    title: 'DETECTOR CODE',
+    align: 'left',
+    dataIndex: 'siteDetCode',
+  },
+  {
+    title: 'SPECTRAL QUALIFIER',
+    align: 'left',
+    dataIndex: 'spectralQualifie',
+  },
+  {
+    title: 'COLLECTION START TIME',
+    align: 'left',
+    dataIndex: 'collectStart',
+  },
+  {
+    title: 'COLLECTION STOP TIME',
+    align: 'left',
+    dataIndex: 'collectStop',
+  }
+]
+export default {
+  components: {
+    List,
+  },
+  data() {
+    return {
+      url: {
+        findStationList: '/webStatistics/findStationList',
+      },
+      stationList: [],
+      columns,
+      dataType: "S",
+      spectralQualifie:"FULL"
+    }
+  },
+  mounted() {
+    console.log(this.dataType);
+    this.findStationList();
+  },
+  methods: {
+    findStationList() {
+      getAction(this.url.findStationList, { menuName: 'Node Gas HPGe' }).then((res) => {
+        if (res.result.length>0) {
+          this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
+        } else {
+          this.stationList=[]
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

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

@@ -0,0 +1,94 @@
+<template>
+  <div style="height: 100%;">
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
+  </div>
+</template>
+
+<script>
+import List from "../../../../list.vue"
+import { getAction } from '../../../../../../api/manage'
+
+const columns = [
+  {
+    title: 'NO',
+    align: 'left',
+    scopedSlots: {
+      customRender: 'index',
+    },
+    customHeaderCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+    customCell: () => {
+      return {
+        style: {
+          'padding-left': '26px !important',
+        },
+      }
+    },
+  },
+  {
+    title: 'STATION',
+    align: 'left',
+    dataIndex: 'stationName',
+  },
+  {
+    title: 'DETECTOR CODE',
+    align: 'left',
+    dataIndex: 'siteDetCode',
+  },
+  {
+    title: 'SPECTRAL QUALIFIER',
+    align: 'left',
+    dataIndex: 'spectralQualifie',
+  },
+  {
+    title: 'COLLECTION START TIME',
+    align: 'left',
+    dataIndex: 'collectStart',
+  },
+  {
+    title: 'COLLECTION STOP TIME',
+    align: 'left',
+    dataIndex: 'collectStop',
+  }
+]
+export default {
+  components: {
+    List,
+  },
+  data() {
+    return {
+      url: {
+        findStationList: '/webStatistics/findStationList',
+      },
+      stationList: [],
+      columns,
+      dataType: "S",
+      spectralQualifie:"PREL"
+    }
+  },
+  mounted() {
+    console.log(this.dataType);
+    this.findStationList();
+  },
+  methods: {
+    findStationList() {
+      getAction(this.url.findStationList, { menuName: 'Node Gas HPGe' }).then((res) => {
+        if (res.result.length>0) {
+          this.stationList = res.result.map((res) => ({ label: res.stationCode, value: res.stationId }))
+        } else {
+          this.stationList=[]
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

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

@@ -156,7 +156,7 @@ export default {
       })
     },
     handleDetail(record) {
-      getAction("webStatistics/findGeneratedReport", { sampleId: "1523651" }).then(res => {
+      getAction("webStatistics/findGeneratedReport", { sampleId: record.sampleId }).then(res => {
         if (res.success) {
           this.detailJson = res.result
           this.detailJson = JSON.parse(JSON.stringify(this.detailJson))

src/views/statistics/list.vue

@@ -85,6 +85,12 @@ export default {
       console.log("查询数据", this.queryParam);
       console.log(this.dataType);
       this.isImmediate = false
+      // this.queryParam = {
+      //   dataType: "S",
+      //   startTime: "2023-05-01",
+      //   endTime: "2023-05-07",
+      //   stationIds: [209, 211, 213]
+      // }
       let params = {
         ...this.queryParam,
         pageNo: 1,
@@ -101,7 +107,8 @@ export default {
     },
     handleDetail(record) {
       // 测试接口数据 record.sampleId
-      getAction("webStatistics/findGeneratedReport", { sampleId: "1523651" }).then(res => {
+      getAction("webStatistics/findGeneratedReport", { sampleId: record.sampleId }).then(res => {
+      // getAction("webStatistics/findGeneratedReport", { sampleId: "1523651" }).then(res => {
         if (res.success){
           this.detailJson = res.result
           this.detailJson = JSON.parse(JSON.stringify(this.detailJson))