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

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

@@ -98,7 +98,8 @@ export default {
         dataType: 'B',
         startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
         endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-        stationIds:[]
+        stationIds: [],
+        spectralQualifie:""
       },
       url: {
         list: '/webStatistics/findParticulatePage',

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

@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
   </div>
 </template>
 
@@ -67,7 +67,8 @@ export default {
       },
       stationList: [],
       columns,
-      dataType:"FULL"
+      dataType: "S",
+      spectralQualifie:"FULL"
     }
   },
   mounted() {

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

@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%;">
-    <List :stationList="stationList" :columns="columns" :dataType="dataType"></List>
+    <List :stationList="stationList" :spectralQualifie="spectralQualifie" :columns="columns" :dataType="dataType"></List>
   </div>
 </template>
 
@@ -67,7 +67,8 @@ export default {
       },
       stationList: [],
       columns,
-      dataType:"PREL"
+      dataType: "S",
+      spectralQualifie:"PREL"
     }
   },
   mounted() {

src/views/statistics/list.vue

@@ -4,7 +4,7 @@
       <search-form :items="formItems" v-model="queryParam" @search="searchQueryData">
         <a-space style="float: right" class="btn-group" slot="additional">
           <a-button @click="handleEdit" type="primary">
-            <img src="@/assets/images/global/edit.png" alt="" />
+            <img class="icon-edit" src="@/assets/images/global/edit.png" alt="" />
             Excel
           </a-button>
         </a-space>
@@ -49,6 +49,10 @@ export default {
     dataType: {
       type: String,
       default:""
+    },
+    spectralQualifie: {
+      type: String,
+      default:""
     }
   },
   mixins: [JeecgListMixin],
@@ -63,7 +67,8 @@ export default {
         dataType: this.dataType,
         startTime: dateFormat(new Date(), 'yyyy-MM-dd'),
         endTime: dateFormat(new Date(), 'yyyy-MM-dd'),
-        stationIds:[]
+        stationIds: [],
+        spectralQualifie:this.spectralQualifie
       },
       url: {
         list: '/webStatistics/findParticulatePage',
@@ -208,6 +213,8 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-
+.icon-edit{
+  margin-right: 10px;
+}
 </style>