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

src/views/abnormalAlarm/RouteView.vue

@@ -200,6 +200,8 @@ export default {
     .ant-menu-submenu > .ant-menu-submenu-title,
     .ant-menu-item {
       font-size: 20px;
+      height: 43px;
+      line-height: 43px;
     }
     .ant-menu-sub.ant-menu-inline > .ant-menu-submenu > .ant-menu-submenu-title {
       font-size: 18px;
@@ -262,26 +264,26 @@ export default {
   //菜单打开状态/\箭头左\
   .ant-menu-submenu-open.ant-menu-submenu[menuindex] > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before {
     width: 0px;
-    transform: rotate(45deg) translateX(4.5px);
+    // transform: rotate(45deg) translateX(4.5px);
   }
   //菜单打开状态/\箭头右\
   .ant-menu-submenu-open.ant-menu-submenu[menuindex] > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after {
     content: url(~@/assets/images/station-operation/toggle.png);
     width: 0px;
-    transform: rotate(-90deg) translateX(-6.5px) translateY(-8.5px);;
+    transform: rotate(90deg) translateX(-9.5px) translateY(-19.5px);
   }
   //菜单收起状态\/箭头左\
   .ant-menu-inline-collapsed .ant-menu-submenu-arrow::before,
   .ant-menu-submenu[menuindex] > .ant-menu-submenu-title .ant-menu-submenu-arrow::before {
     width: 0px;
-    transform: rotate(-45deg) translateX(4.5px);
+    // transform: rotate(-45deg) translateX(4.5px);
   }
   //菜单收起状态\/箭头右/
   .ant-menu-inline-collapsed .ant-menu-submenu-arrow::after,
   .ant-menu-submenu[menuindex] > .ant-menu-submenu-title .ant-menu-submenu-arrow::after {
     content: url(~@/assets/images/station-operation/toggle.png);
     width: 0px;
-    transform: rotate(90deg) translateX(-5.5px) translateY(-19.5px);
+    transform: rotate(-90deg) translateX(-3.5px) translateY(-11.5px);
   }
 
   .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {

src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue

@@ -68,19 +68,19 @@ import * as echarts from 'echarts'
 const columns = [
   {
     title: 'NAME',
-    align: 'left',
+    align: 'center',
     dataIndex: 'name',
     width: 250,
   },
   {
     title: 'TYPE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'sourceType',
     width: 150,
   },
   {
     title: 'ALARM START DATE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'alarmStartDate',
     width: 200,
   },

src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue

@@ -10,9 +10,9 @@
           :list="dataSource"
           :loading="loading"
           :pagination="false"
-          :selectRowClick="rowClick"
+          @selectRowClick="rowClick"
         >
-          <template slot="station" slot-scope="{ text }">
+          <template slot="stationList" slot-scope="{ text }">
             <a-tooltip placement="topLeft">
               <template slot="title">
                 {{ text.join("、") }}
@@ -20,7 +20,7 @@
               {{ text.join("、") }}
             </a-tooltip>
           </template>
-          <template slot="dataSource" slot-scope="{ text }">
+          <template slot="sourceList" slot-scope="{ text }">
             <a-tooltip placement="topLeft">
               <template slot="title">
                 {{ text.join("、") }}
@@ -35,6 +35,7 @@
                   :columns="columns_info"
                   :dataSource="record.nuclideList"
                   :pagination="false"
+                  rowKey="nuclide"
                 ></a-table>
               </template>
               {{ text }}
@@ -70,65 +71,65 @@
             <a-col :span="13">
               <a-row>
                 <a-col :span="12" class="info-key">Site Code:</a-col>
-                <a-col :span="12" class="info-val">ARPO1</a-col>
+                <a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.siteCode }}</a-col>
               </a-row>
             </a-col>
             <a-col :span="11">
               <a-row>
                 <a-col :span="14" class="info-key">Sample Geometry:</a-col>
-                <a-col :span="10" class="info-val">DISK 50X5_3M</a-col>
+                <a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.sampleGeometry }}</a-col>
               </a-row></a-col>
           </a-row>
           <a-row>
             <a-col :span="13">
               <a-row>
                 <a-col :span="12" class="info-key">Detector Code:</a-col>
-                <a-col :span="12" class="info-val">ARPO1 001</a-col>
+                <a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.detectorCode }}</a-col>
               </a-row>
             </a-col>
             <a-col :span="11">
               <a-row>
                 <a-col :span="14" class="info-key">Spectrum Qualifier:</a-col>
-                <a-col :span="10" class="info-val">FULL</a-col>
+                <a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.spectrumQualifier }}</a-col>
               </a-row></a-col>
           </a-row>
           <a-row>
             <a-col :span="13">
               <a-row>
                 <a-col :span="12" class="info-key">System Type:</a-col>
-                <a-col :span="12" class="info-val">P</a-col>
+                <a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.systemType }}</a-col>
               </a-row>
             </a-col>
             <a-col :span="11">
               <a-row>
                 <a-col :span="14" class="info-key">Sample Reference Identification:</a-col>
-                <a-col :span="10" class="info-val">01888888880003</a-col>
+                <a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.sampleReferenceIdentification }}</a-col>
               </a-row></a-col>
           </a-row>
           <a-row>
             <a-col :span="13">
               <a-row>
                 <a-col :span="12" class="info-key">Measurement Identification:</a-col>
-                <a-col :span="12" class="info-val">ARP01_001-2023 / 03 / 21-14 : 10 : 55.0</a-col>
+                <a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.measurementIdentification }}</a-col>
               </a-row>
             </a-col>
             <a-col :span="11">
               <a-row>
                 <a-col :span="14" class="info-key">Gas Background Measurement Identification:</a-col>
-                <a-col :span="10" class="info-val">asdfasdf</a-col>
+                <a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.gasBackgroundMeasurementId }}</a-col>
               </a-row></a-col>
           </a-row>
           <a-row>
             <a-col :span="13">
               <a-row>
                 <a-col :span="12" class="info-key">Detector Background Measurement Identification:</a-col>
-                <a-col :span="12" class="info-val">ARP01_001-2019 / 01 / 11-19 : 09 : 42.02</a-col>
+                <a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.detectorBackgroundMeasurementId }}</a-col>
               </a-row>
             </a-col>
             <a-col :span="11">
               <a-row>
                 <a-col :span="14" class="info-key">Transmit Time:</a-col>
-                <a-col :span="10" class="info-val">2023 / 03 / 21 14:30:01</a-col>
+                <a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.transmitDate }}</a-col>
               </a-row></a-col>
           </a-row>
         </div>
@@ -138,7 +139,7 @@
             <a-col :span="13">
               <a-row>
                 <a-col :span="12" class="info-key">Acquisition Time:</a-col>
-                <a-col :span="12" class="info-val">2023 / 03 / 21 14:10:55</a-col>
+                <a-col :span="12" class="info-val">{{ sampleInfo.acquisitionBlock.acquisitionLiveTime }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -146,7 +147,7 @@
             <a-col :span="13">
               <a-row>
                 <a-col :span="12" class="info-key">Acquisition Real Time:</a-col>
-                <a-col :span="12" class="info-val">938</a-col>
+                <a-col :span="12" class="info-val">{{ sampleInfo.acquisitionBlock.acquisitionRealTime }}</a-col>
               </a-row>
             </a-col>
           </a-row>
@@ -154,28 +155,18 @@
             <a-col :span="13">
               <a-row>
                 <a-col :span="12" class="info-key">Acquisition Live Time:</a-col>
-                <a-col :span="12" class="info-val">900</a-col>
+                <a-col :span="12" class="info-val">{{ sampleInfo.acquisitionBlock.acquisitionStartDate }}</a-col>
               </a-row>
             </a-col>
           </a-row>
         </div>
         <a-table
           size="middle"
-          rowKey="id"
+          :columns="columns_info"
-          :columns="columns_acq"
+          :dataSource="dataSourceDetailNuclide"
-          :list="dataSource_acq"
-        >
-        </a-table>
-        <!-- <TableList
-          size="middle"
-          rowKey="id"
-          :columns="columns_acq"
-          :list="dataSource_acq"
-          :loading="false"
           :pagination="false"
-          :canSelect="false"
+          rowKey="nuclide"
-        >
+        ></a-table>
-        </TableList> -->
       </div>
     </div>
   </div>
@@ -188,31 +179,31 @@ import TableList from '../../components/tableList.vue';
 import { getAction, postAction, httpAction, deleteAction } from '@/api/manage'
 const columns = [{
     title: 'STATION',
-    align: 'left',
+    align: 'center',
-    dataIndex: 'station',
+    dataIndex: 'stationList',
     width: 160,
     ellipsis: true,
     scopedSlots: {
-      customRender: 'station',
+      customRender: 'stationList',
     }
 },{
     title: 'COLLECTION START',
-    align: 'left',
+    align: 'center',
-    dataIndex: 'collectionStartTime',
+    dataIndex: 'collectionDate',
     width: 200,
   },{
     title: 'ALARM TIME',
-    align: 'left',
+    align: 'center',
     dataIndex: 'alarmStartDate',
     width: 200,
   },{
     title: 'DATA SOURCES ',
-    align: 'left',
+    align: 'center',
-    dataIndex: 'dataSource',
+    dataIndex: 'sourceList',
     width: 180,
     ellipsis: true,
     scopedSlots: {
-      customRender: 'dataSource',
+      customRender: 'sourceList',
     }
   },{
     title: 'ALARM INFO',
@@ -234,41 +225,47 @@ const columns_info = [{
   },{
     title: 'ARMDARR',
     align: 'left',
-    dataIndex: 'ARMDARR'
+    dataIndex: 'ARMDARR',
+    customRender: (val) => {
+      if(!val){
+        return "--"
+      } else{
+        return val
+      }
+    }
   },{
     title: 'ARMDRRR',
     align: 'left',
-    dataIndex: 'ARMDRRR'
+    dataIndex: 'ARMDRRR',
+    customRender: (val) => {
+      if(!val){
+        return "--"
+      } else{
+        return val
+      }
+    }
   },{
     title: 'IDCARR',
     align: 'left',
-    dataIndex: 'IDCARR'
+    dataIndex: 'IDCARR',
+    customRender: (val) => {
+      if(!val){
+        return "--"
+      } else{
+        return val
+      }
+    }
   },{
     title: 'IDCRRR',
     align: 'left',
-    dataIndex: 'IDCRRR'
+    dataIndex: 'IDCRRR',
-  }
+    customRender: (val) => {
-]
+      if(!val){
-const columns_acq = [{
+        return "--"
-    title: 'NUCLIDE',
+      } else{
-    align: 'center',
+        return val
-    dataIndex: 'nuclide',
+      }
-    width:"25%"
+    }
-  },{
-    title: 'THRESHOLD ',
-    align: 'center',
-    dataIndex: 'threshold',
-    width:"25%"
-  },{
-    title: 'IDC',
-    align: 'center',
-    dataIndex: 'idc',
-    width:"25%"
-  },{
-    title: 'ARMD',
-    align: 'center',
-    dataIndex: 'armd',
-    width:"25%"
   }
 ]
 export default {
@@ -282,32 +279,7 @@ export default {
       paramsArg: {},
       columns,
       columns_info,
-      dataSource: [
+      dataSource: [],
-        {
-          name: "ARP01、ARP02测试报警规则名称",
-          station: [ "ARP01", "ARP02","ARP01","ARP01","ARP01","ARP01","ARP01","ARP01" ],
-          collectionStartTime: "2023-07-25 16:27:03",
-          alarmStartDate: "2023-07-25 16:27:03",
-          alarmInfo: "Ce141核素首次出现；Ce141、Cs134、Cs137核素浓度高于历史平均值",
-          nuclideList: [
-            { nuclide: "Cs132", threshold: 1.3, ARMDARR: 2.2, ARMDRRR: null, IDCARR: null, IDCRRR: null },
-            { nuclide: "Cs132", threshold: 1.3, ARMDARR: 2.2, ARMDRRR: null, IDCARR: 2.2, IDCRRR: null }
-          ],
-          dataSource: [ "ARMDARR", "IDCARR","ARMDARR","ARMDARR" ]
-        },
-        {
-          name: "UPS02测试报警规则名称",
-          station: [ "UPS02" ],
-          collectionStartTime: "2023-07-25 16:37:03",
-          alarmStartDate: "2023-07-25 16:27:03",
-          alarmInfo: "Pb210、Pb212核素浓度高于历史平均值",
-          nuclideList: [
-            { nuclide: "Pb210", threshold: 1.3, ARMDARR: 2.2, ARMDRRR: 3.21393, IDCARR: -0.34512, IDCRRR: null },
-            { nuclide: "Pb212", threshold: 1.3, ARMDARR: 2.2, ARMDRRR: -3.2323, IDCARR: 2.2, IDCRRR: null }
-          ],
-          dataSource: [ "ARMDARR", "ARMDRRR" ]
-        }
-      ],
       loading: false,
       ipagination:{
         current: 1,
@@ -321,13 +293,19 @@ export default {
         showSizeChanger: true,
         total: 0
       },
-      isDetail: true,
+      isDetail: false,
-      columns_acq,
+      dataSourceDetailNuclide:[],
-      dataSource_acq:[]
+      url: { 
+        list: "/alarmAnalysisLog/findPage",
+        sampleInfo: "/webStatistics/sampleInfo"
+      },
+      selectRow: {},
+      sampleInfo: {}
     }
   },
   mounted () {
     this.getStationList();
+    this.getPageData();
   },
   methods: {
     getStationList() {
@@ -348,28 +326,58 @@ export default {
         }
       })
     },
+    getPageData() {
+      this.loading = true;
+      let param = {
+        source: this.paramsArg.sources, 
+        stations: this.paramsArg.stations, 
+        nuclides: this.paramsArg.nuclides,
+        startDate: this.paramsArg.startDate,
+        endDate: this.paramsArg.endDate,
+        pageNo: this.ipagination.current,
+        pageSize: this.ipagination.pageSize
+      }
+      getAction(this.url.list, param).then(res => {
+        this.loading = false;
+        if (res.success) {
+          this.dataSource = res.result.records
+          this.ipagination.total = res.result.total
+        } else {
+          this.$message.warning("This operation fails. Contact your system administrator")
+        }
+      })
+    },
+    async getSampleInfo() {
+      await getAction(this.url.sampleInfo, { sampleId: this.selectRow.sampleId}).then(res=> {
+        this.sampleInfo = res.result;
+        this.loading = false;
+      })
+    },
     handleSearch({ startDate, endDate, stations, sources }) {
-      console.log(startDate, endDate, stations, sources);
       this.paramsArg = {
         startDate,
         endDate,
         stations,
         sources
       }
-      // this.getServerAlarmHistory({ startDate, endDate, names })
+      this.getPageData()
     },
-    rowClick(record) {
+    async rowClick(record) {
+      this.loading = true;
+      this.selectRow = record;
+      this.dataSourceDetailNuclide = record.nuclideList
+      await this.getSampleInfo();
       this.isDetail = true
     },
     handlePageChange(page, pageSize) {
       this.ipagination.current = page
       this.ipagination.pageSize = pageSize
-      // this.getServerAlarmHistory(this.paramsArg)
+      this.getPageData()
     },
     handleSizeChange(current, size) {
       this.ipagination.current = current
       this.ipagination.pageSize = size
-      // this.getServerAlarmHistory(this.paramsArg)
+      this.getPageData()
     },
     handleback() {
       this.isDetail = false

src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue

@@ -40,12 +40,12 @@ import TableList from '../../components/tableList.vue';
 import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
 const columns = [{
     title: 'NAME',
-    align: 'left',
+    align: 'center',
     dataIndex: 'name',
     width: 250,
   },{
     title: 'ALARM START DATE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'alarmStartDate',
     width: 300,
   },{

src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue

@@ -40,12 +40,12 @@ import TableList from '../../components/tableList.vue';
 import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
 const columns = [{
     title: 'NAME',
-    align: 'left',
+    align: 'center',
     dataIndex: 'name',
     width: 250,
   },{
     title: 'ALARM START DATE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'alarmStartDate',
     width: 300,
   },{

src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue

@@ -40,12 +40,12 @@ import TableList from '../../components/tableList.vue';
 import { getAction,postAction,httpAction,deleteAction } from '@/api/manage'
 const columns = [{
     title: 'NAME',
-    align: 'left',
+    align: 'center',
     dataIndex: 'name',
     width: 250,
   },{
     title: 'ALARM START DATE',
-    align: 'left',
+    align: 'center',
     dataIndex: 'alarmStartDate',
     width: 300,
   },{