AlertSystem 分页列表字段调整

src/components/CustomChart/index.vue

@@ -30,10 +30,9 @@ export default {
     this._chart.setOption(this.option, this.opts)
     this.initEventListener()
   },
-  beforeDestroy() {
+  destroyed() {
     if (this._chart) {
       this._chart.dispose()
-      this._chart = null
     }
   },
   methods: {

src/store/index.js

@@ -6,6 +6,7 @@ import user from './modules/user'
 import permission from './modules/permission'
 import enhance from './modules/enhance'
 import online from './modules/online'
+import sample from './modules/sample'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -17,6 +18,7 @@ export default new Vuex.Store({
     permission,
     enhance,
     online,
+    sample
   },
   state: {
 

src/store/modules/sample.js

@@ -0,0 +1,52 @@
+const sample = {
+  state: Object.freeze({
+    sampleList: [] // [{ inputFileName: String; data: Object; }]
+  }),
+  mutations: {
+    SET_SAMPLE_LIST: (state, sampleList) => {
+      state.sampleList = sampleList
+    },
+
+    ADD_SAMPLE_DATA: (state, sampleData) => {
+      const find = state.sampleList.find(item => item.inputFileName == sampleData.inputFileName)
+      if (find) {
+        find.data = sampleData.data
+      } else {
+        state.sampleList.push(sampleData)
+      }
+    },
+
+    UPDATE_SAMPLE_DATA: (state, { inputFileName, key, data }) => {
+      const find = state.sampleList.find(item => item.inputFileName == inputFileName)
+      if (find) {
+        find.data[key] = data
+      }
+    },
+    UPDATE_SAMPLE_DATA_ANALY: (state, { inputFileName, data }) => {
+      const find = state.sampleList.find(item => item.inputFileName == inputFileName)
+      if (find) {
+        data.DetailedInformation = find.data.DetailedInformation
+        find.data = data
+      }
+    },
+
+    REMOVE_SAMPLE_DATA: (state, inputFileName) => {
+      const findIndex = state.sampleList.findIndex(item => item.inputFileName == inputFileName)
+      if(-1 !== findIndex) {
+        state.sampleList.splice(findIndex, 1)
+      }
+    },
+
+    CLEAR_SAMPLE_DATA: (state) => {
+      state.sampleList = []
+    }
+  },
+  actions: {
+    GET_SAMPLE_DATA: ({ state }, inputFileName) => {
+      const find = state.sampleList.find(item => item.inputFileName == inputFileName)
+      return find ? find : null
+    }
+  }
+}
+
+export default sample

src/utils/SampleStore.js

@@ -1,84 +0,0 @@
-// 所有缓存的谱
-let sampleList = []
-
-/**
- * 重新设置缓存的谱
- * @param {Array} list
- */
-const setSampleList = list => {
-  sampleList = list
-}
-
-/**
- * 缓存一条谱数据
- * @param {*} sampleData
- */
-const addSampleData = sampleData => {
-  const find = sampleList.find(item => item.inputFileName == sampleData.inputFileName)
-  if (find) {
-    find.data = sampleData.data
-  } else {
-    sampleList.push(sampleData)
-  }
-}
-
-/**
- * 更新谱数据
- * @param {{ inputFileName: string; key: string; data: any; }} param0
- */
-const updateSampleData = ({ inputFileName, key, data }) => {
-  const find = sampleList.find(item => item.inputFileName == inputFileName)
-  if (find) {
-    find.data[key] = data
-  }
-}
-
-/**
- * 移除谱数据
- * @param {string} inputFileName
- */
-const removeSampleData = inputFileName => {
-  const findIndex = sampleList.findIndex(item => item.inputFileName == inputFileName)
-  if (-1 !== findIndex) {
-    sampleList.splice(findIndex, 1)
-  }
-}
-
-/**
- * 更新分析数据
- * @param {{ inputFileName: string; data: any; }} param0
- */
-const updateSampleDataAnaly = ({ inputFileName, data }) => {
-  const find = sampleList.find(item => item.inputFileName == inputFileName)
-  if (find) {
-    data.DetailedInformation = find.data.DetailedInformation
-    find.data = data
-  }
-}
-
-/**
- * 清理缓存列表
- */
-const clearSampleData = () => {
-  sampleList = []
-}
-
-/**
- * 根据文件名获取谱
- * @param {string} inputFileName
- */
-const getSampleData = inputFileName => {
-  const find = sampleList.find(item => item.inputFileName == inputFileName)
-  return find ? find : null
-}
-
-export {
-  sampleList,
-  setSampleList,
-  addSampleData,
-  updateSampleData,
-  removeSampleData,
-  updateSampleDataAnaly,
-  clearSampleData,
-  getSampleData
-}

src/views/spectrumAnalysis/beta-gamma-analysis.vue

@@ -121,7 +121,6 @@
 </template>
 
 <script>
-import { addSampleData, getSampleData, sampleList, setSampleList, updateSampleData } from '@/utils/SampleStore'
 import { getAction, postAction } from '../../api/manage'
 import BetaGammaChartContainer from './components/BetaGammaChartContainer.vue'
 import BetaGammaSpectrumChart from './components/BetaGammaSpectrumChart.vue'
@@ -190,10 +189,6 @@ export default {
     analyseCurrentSpectrum: {
       type: Object,
     },
-    sampleList: {
-      type: Array,
-      required: true,
-    },
   },
   data() {
     this.SampleType = SampleType
@@ -242,7 +237,7 @@ export default {
       this.qcFlagsVisible = true
     }, 100)
   },
-  beforeDestroy() {
+  destroyed() {
     this.cancelLastRequest()
     this.$bus.$off('ReAnalyses', this.handleReAnalyse)
 
@@ -328,7 +323,7 @@ export default {
           this.changeChartByType('sample')
           this.emitGetFiles(result)
 
-          addSampleData({
+          this.$store.commit('ADD_SAMPLE_DATA', {
             inputFileName,
             data: result,
             from: 'db',
@@ -374,12 +369,11 @@ export default {
           this.sampleDetail = result
           this.changeChartByType('sample')
 
-          addSampleData({
+          this.$store.commit('ADD_SAMPLE_DATA', {
             inputFileName: this.sample.sampleFileName,
             data: result,
             from: 'file',
           })
-
           this.isLoading = false
         } else {
           this.$message.error(message)
@@ -563,16 +557,6 @@ export default {
           })
           this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
           this.handleReAnalyse(res.result)
-          updateSampleData({
-            inputFileName: this.sample.inputFileName,
-            key: 'XeData',
-            data: res.result.XeData,
-          })
-          updateSampleData({
-            inputFileName: this.sample.inputFileName,
-            key: 'savedAnalysisResult',
-            data: res.result.savedAnalysisResult,
-          })
           if (res.result.bProcessed) {
             this.$message.success(res.result.message)
           } else {
@@ -584,78 +568,31 @@ export default {
         }
       })
     },
-    // 分析全部
+    getAnalyzeAllSpectrum() {
-    async getAnalyzeAllSpectrum() {
+      let params = {
-      const regExp = /^([A-Z]{1,}\d{1,})_/
+        dbNames: [this.sample.dbName],
-      const regMatched = this.sample.inputFileName.match(regExp)
+        sampleIds: [this.sample.sampleId ? this.sample.sampleId : ''],
-      const currStationName = regMatched[1]
+        sampleFileNames: [this.sample.inputFileName],
-      const dbNames = [],
+        gasFileNames: [this.sample.gasFileName],
-        sampleIds = [],
+        detFileNames: [this.sample.detFileName],
-        sampleFileNames = [],
+        qcFileNames: [this.sample.qcFileName],
-        gasFileNames = [],
-        detFileNames = [],
-        qcFileNames = []
-
-      const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName))
-      matchedSampleList.forEach(
-        ({ dbName, sampleId, inputFileName, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => {
-          dbNames.push(dbName || '')
-          sampleIds.push(sampleId || '')
-          sampleFileNames.push(sampleFileName || inputFileName || '')
-          gasFileNames.push(gasFileName || '')
-          detFileNames.push(detFileName || '')
-          qcFileNames.push(qcFileStatus ? qcFileName : '')
-        }
-      )
-
-      const params = {
-        dbNames,
-        sampleIds,
-        sampleFileNames,
-        gasFileNames,
-        detFileNames,
-        qcFileNames,
         currentFileName: this.sample.inputFileName,
       }
-      const { success, result, message } = await postAction('/spectrumAnalysis/analyseAllSpectrum', params)
+      postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
-      if (success) {
+        if (res.success) {
-        // 对所有已加载的谱中和本谱相似的谱（指台站和探测器相同）
+          // this.analyseCurrentSpectrum = res.result
-        Object.entries(result).forEach(([inputFileName, sampleInfo]) => {
+          this.$emit('sendXeData', res.result.XeData)
-          const { XeData, savedAnalysisResult, bProcessed, message } = sampleInfo
+          res.result.XeData.forEach((item) => {
-          XeData.forEach((item) => {
             item.conc = parseFloat(item.conc.toPrecision(6))
             item.concErr = parseFloat(item.concErr.toPrecision(6))
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-
+          this.$emit('reAnalyAll', true, res.result.XeData)
-          if (inputFileName == this.sample.inputFileName) {
-            this.$emit('sendXeData', XeData)
-            this.$emit('reAnalyAll', savedAnalysisResult, XeData)
-            this.handleReAnalyse(sampleInfo)
-
-            if (bProcessed) {
-              this.$message.success(message)
         } else {
-              this.$message.warning(message)
+          this.$message.warning(res.message)
         }
-          }
-
-          updateSampleData({
-            inputFileName,
-            key: 'XeData',
-            data: XeData,
       })
-
-          updateSampleData({
-            inputFileName,
-            key: 'savedAnalysisResult',
-            data: savedAnalysisResult,
-          })
-        })
-      } else {
-        this.$message.warning(message)
-      }
     },
 
     // 右下角放大镜
@@ -718,7 +655,7 @@ export default {
     sample: {
       async handler(newVal, oldVal) {
         this.resultDisplay = []
-        const sampleData = getSampleData(newVal.inputFileName)
+        const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName)
         if (sampleData) {
           this.cancelLastRequest()
           this.isLoading = false
@@ -736,7 +673,6 @@ export default {
             this.getSampleDetail_file()
           }
         }
-        await this.$nextTick()
         this.$refs.betaGammaChartRef.handleUnzoom()
       },
       immediate: true,
@@ -747,6 +683,11 @@ export default {
         // this.currResultDisplay = newVal.XeData
         this.resultDisplay = cloneDeep(newVal.XeData) || []
         this.sortResultDisplay()
+        this.$store.commit('UPDATE_SAMPLE_DATA', {
+          inputFileName: this.sample.inputFileName,
+          key: 'XeData',
+          data: newVal.XeData,
+        })
       },
       // immediate: true,
       deep: true,

src/views/spectrumAnalysis/clearSampleCache.js

@@ -1,5 +1,5 @@
 import { deleteAction } from '@/api/manage'
-import { removeSampleData } from '@/utils/SampleStore'
+import store from '@/store'
 import Vue from 'vue'
 
 /**
@@ -16,7 +16,7 @@ export const clearSampleCache = sampleList => {
       params = { sampleFileName: fileName }
     }
     deleteAction(url, params)
-    removeSampleData(fileName)
+    store.commit('REMOVE_SAMPLE_DATA', fileName)
     Vue.ls.remove(`CALIBRATION_GAMMA_${fileName}`)
     Vue.ls.remove(`CALIBRATION_BETA_${fileName}`)
   })

src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue

@@ -327,6 +327,7 @@ export default {
       },
     }
   },
+
   mounted() {
     this.opts.notMerge = true
     this.$nextTick(() => {
@@ -564,20 +565,13 @@ export default {
     // 3D 图表
     histogramDataDList: {
       handler(newVal) {
-        let maxCount = 0
+        const maxCount = Math.max(...newVal.map((item) => item.c))
-        const data = []
-        for (const item of newVal) {
-          const { b, g, c } = item // 耗时较多
-          if (c > maxCount) maxCount = c
-          data.push([b, g, c])
-        }
-
         this.threeDSurfaceOption.zAxis3D.max = Math.ceil(maxCount * 1.2)
-        this.threeDSurfaceOption.series.data = data // 设置3D surface数据 // 第一次设置耗时较多
+        this.threeDSurfaceOption.series.data = newVal.map((item) => [item.b, item.g, item.c]) // 设置3D surface数据
         this.threeDSurfaceOption.visualMap.max = maxCount
 
         this.threeDScatterOption.zAxis3D.max = Math.ceil(maxCount * 1.2)
-        this.threeDScatterOption.series.data = data // 设置3D scatter数据
+        this.threeDScatterOption.series.data = newVal.map((item) => [item.b, item.g, item.c]) // 设置3D scatter数据
         this.threeDScatterOption.visualMap.max = maxCount
       },
       immediate: true,

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

@@ -228,7 +228,6 @@ import { updateBaseLine } from '@/utils/WasmHelper'
 import RectList from './components/RectList.vue'
 import { isNullOrUndefined } from '@/utils/util'
 import { findNearPeak, getLineData, transformPointListData } from '@/utils/sampleHelper'
-import { getSampleData } from '@/utils/SampleStore'
 
 // 初始配置
 const initialOption = {
@@ -515,7 +514,7 @@ export default {
     }
   },
   methods: {
-    getInfo() {
+    async getInfo() {
       this.option.series = []
       this.thumbnailOption.series = []
       this.list = []
@@ -523,7 +522,7 @@ export default {
 
       const { inputFileName } = this.sampleData
 
-      const currSampleDetailInfo = getSampleData(inputFileName)
+      const currSampleDetailInfo = await this.$store.dispatch('GET_SAMPLE_DATA', inputFileName)
       const {
         data: { allData, shadowChannelChart, shapeChannelData, peak, BaseCtrls, barChart },
       } = currSampleDetailInfo
@@ -584,8 +583,8 @@ export default {
       this.handleResetChart()
     },
 
-    beforeModalOpen() {
+    async beforeModalOpen() {
-      this.getInfo()
+      await this.getInfo()
       this.reset()
     },
 

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue

@@ -629,7 +629,7 @@ export default {
     this.$bus.$on('betaRefresh', this.getData)
     this.getData()
   },
-  beforeDestroy() {
+  destroyed() {
     this.$bus.$off('betaRefresh', this.handleReset)
     this.$bus.$off('betaRefresh', this.getData)
   },

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue

@@ -50,7 +50,6 @@ import { postAction } from '@/api/manage'
 import BetaDetectorCalibration from './components/BetaDetectorCalibration.vue'
 import GammaDetectorCalibration from './components/GammaDetectorCalibration.vue'
 import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder.vue'
-import { removeSampleData } from '@/utils/SampleStore'
 export default {
   components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder },
   mixins: [ModalMixin, SampleDataMixin],
@@ -180,7 +179,8 @@ export default {
     // 清理相同台站的缓存
     clearSameStationCache(sampleList) {
       sampleList.forEach(({ inputFileName }) => {
-        removeSampleData(inputFileName)
+        console.log('inputFileName>>' + inputFileName)
+        this.$store.commit('REMOVE_SAMPLE_DATA', inputFileName)
       })
     },
     // 相同台站能谱缓存一样的Calibration数据 20231115：xiao

src/views/spectrumAnalysis/gamma-analysis.vue

@@ -136,7 +136,6 @@ import { readFile, zipFile } from '@/utils/file'
 import { findNearPeak } from '@/utils/sampleHelper'
 import { add, subtract } from 'xe-utils/methods'
 import { PHDParser, isSample, getSampleTypeIdentify } from '@/utils/phdHelper'
-import { addSampleData, getSampleData } from '@/utils/SampleStore'
 
 export default {
   props: {
@@ -191,8 +190,8 @@ export default {
       stripSumOrCutLine: null,
       stripReferenceLine: null,
     }
-    this.peakList = [] // Peak 列表（非点位）
+    ;(this.peakList = []), // Peak 列表（非点位）
-    this.baseCtrls = {} // BaseCtrls
+      (this.baseCtrls = {}) // BaseCtrls
 
     return {
       abc: false,
@@ -254,7 +253,7 @@ export default {
     window.addEventListener('keydown', this.handleKeyboardEvent)
     window.addEventListener('click', this.closePeakInfomationTooltip)
   },
-  beforeDestroy() {
+  destroyed() {
     this.cancelLastRequest()
 
     this.$bus.$off('gammaRefresh', this.handleRefresh)
@@ -264,16 +263,8 @@ export default {
     window.removeEventListener('click', this.closePeakInfomationTooltip)
 
     if (this.qcFlagsTimer) {
-      window.clearTimeout(this.qcFlagsTimer)
+      clearTimeout(this.qcFlagsTimer)
     }
-
-    this.closeWebSocket()
-
-    if (this.websocketTimer) {
-      window.clearTimeout(this.websocketTimer)
-    }
-
-    this.websock = null
   },
   deactivated() {
     // Object.keys(this.subOperatorsState).forEach(k => {
@@ -473,10 +464,10 @@ export default {
       let token = Vue.ls.get(ACCESS_TOKEN)
       this.websock = new WebSocket(url, [token])
       //update-end-author:taoyan date:2022-4-22 for:  v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278
-      this.websock.addEventListener('open', this.websocketOnopen)
+      this.websock.onopen = this.websocketOnopen
-      this.websock.addEventListener('error', this.websocketOnerror)
+      this.websock.onerror = this.websocketOnerror
-      this.websock.addEventListener('message', this.websocketOnmessage)
+      this.websock.onmessage = this.websocketOnmessage
-      this.websock.addEventListener('close', this.websocketOnclose)
+      this.websock.onclose = this.websocketOnclose
     },
     websocketOnopen: function () {
       // console.log('WebSocket连接成功1231')
@@ -502,25 +493,12 @@ export default {
       if (that.lockReconnect) return
       that.lockReconnect = true
       //没连接上会一直重连，设置延迟避免请求过多
-      this.websocketTimer = setTimeout(function () {
+      setTimeout(function () {
         console.info('尝试重连...')
         that.initWebSocket()
         that.lockReconnect = false
       }, 20000)
     },
-
-    // 关闭websocket
-    closeWebSocket() {
-      if (this.websock) {
-        this.websock.removeEventListener('open', this.websocketOnopen)
-        this.websock.removeEventListener('error', this.websocketOnerror)
-        this.websock.removeEventListener('message', this.websocketOnmessage)
-        this.websock.removeEventListener('close', this.websocketOnclose)
-        this.websock.close()
-        this.websock = null
-      }
-    },
-
     // 获取样品详情
     async getSampleDetail() {
       const { dbName, sampleId, analyst } = this.sample
@@ -601,7 +579,7 @@ export default {
     dataProcess(result, flag) {
       const { inputFileName } = this.sample
 
-      addSampleData({
+      this.$store.commit('ADD_SAMPLE_DATA', {
         inputFileName,
         data: result,
         from: flag,
@@ -2079,11 +2057,11 @@ export default {
       immediate: true,
     },
     sample: {
-      handler(newVal, oldVal) {
+      async handler(newVal, oldVal) {
         console.log('newValnewVal', newVal)
         this.graphAssistance.axisType = 'Channel'
         this.handleResetState()
-        const sampleData = getSampleData(newVal.inputFileName)
+        const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName)
         if (sampleData) {
           this.cancelLastRequest()
           this.isLoading = false

src/views/spectrumAnalysis/index.vue

@@ -63,7 +63,6 @@
         :sampleInfo="sampleInfo"
         :sample="sampleData"
         :analyseCurrentSpectrum="analyseCurrentSpectrumData"
-        :sampleList="sampleList"
       />
       <!-- Beta-Gamma 分析 -->
       <div v-else class="empty">Please Select a Sample</div>
@@ -282,7 +281,6 @@ import BGLogViewer from './components/Modals/BetaGammaModals/BGLogViewer.vue'
 
 import { saveAs } from 'file-saver'
 import CompareFromDbModal from './components/Modals/CompareFromDBModal.vue'
-import { clearSampleData, getSampleData, updateSampleDataAnaly } from '@/utils/SampleStore'
 
 // 分析类型
 const ANALYZE_TYPE = {
@@ -467,9 +465,9 @@ export default {
     window.addEventListener('beforeunload', this.handleCleanAll)
   },
 
-  beforeDestroy() {
+  destroyed() {
     this.$bus.$off('reanalyse', this.handleReanalyse)
-    clearSampleData()
+    this.$store.commit('CLEAR_SAMPLE_DATA')
     this.handleCleanAll()
     window.removeEventListener('beforeunload', this.handleCleanAll)
   },
@@ -480,10 +478,8 @@ export default {
       this.params_toDB.savedAnalysisResult = flag
       this.resultDisplayFlag = val
     },
-    getReAnalyAll(flag, val) {
+    getReAnalyAll(val) {
-      this.isReAnalyed_beta = flag
       this.resultDisplayFlag = val
-      this.params_toDB.savedAnalysisResult = flag
     },
     handleReAnalyed(val) {
       this.isReAnalyed_gamma = val
@@ -505,7 +501,6 @@ export default {
       }
       this.resultDisplayFlag = arg
       this.params_toDB.stationName = val
-      this.params_toDB.savedAnalysisResult = flag
       this.isReAnalyed_beta = this.isReAnalyed_beta ? this.isReAnalyed_beta : flag
     },
     getCheckFlag(val) {
@@ -610,13 +605,12 @@ export default {
       // B是beta-gamma  P G是gamma
       if (sample.sampleType == 'B') {
         this.analysisType = ANALYZE_TYPE.BETA_GAMMA
-        const sampleData = getSampleData(sample.inputFileName)
-        this.params_toDB.savedAnalysisResult = sampleData ? sampleData.data.savedAnalysisResult : false
       } else {
         this.analysisType = ANALYZE_TYPE.GAMMA
       }
       this.sampleData = this.newSampleData = sample
       this.currSampleDet = this.allSampleDet[sample.inputFileName]
+      this.params_toDB.savedAnalysisResult = sample.sampleId ? true : false
       this.params_toDB.comment = ''
     },
 
@@ -847,6 +841,7 @@ export default {
      * @param { 'all' | 'current' } type
      */
     handleSavePHDToFile(type) {
+      console.log('%c [ savePHDToFile ]-162', 'font-size:13px; background:pink; color:#bf2c9f;', type)
       if (this.isGamma) {
         if (type == 'current') {
           let params = {
@@ -906,7 +901,7 @@ export default {
         try {
           const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileNames[0]}`)
           if (success) {
-            updateSampleDataAnaly({
+            this.$store.commit('UPDATE_SAMPLE_DATA_ANALY', {
               inputFileName: fileNames[0],
               data: result,
             })

src/views/system/AlertSystem.vue

@@ -0,0 +1,190 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 搜索栏 -->
+    <search-form :items="formItems" v-model="queryParam" @search="searchQuery">
+      <a-space style="float: right" class="btn-group" slot="additional">
+        <a-button @click="handleAdd" type="primary">
+          <img src="@/assets/images/global/add.png" alt="" />
+          Add
+        </a-button>
+        <a-button @click="handleEdit" type="primary">
+          <img src="@/assets/images/global/edit.png" alt="" />
+          Edit
+        </a-button>
+        <a-button @click="onDel" type="primary">
+          <img src="@/assets/images/global/delete.png" alt="" />
+          Delete
+        </a-button>
+      </a-space>
+    </search-form>
+    <!-- 搜索栏结束 -->
+    <!-- 列表 -->
+    <div>
+      <custom-table
+        size="middle"
+        rowKey="id"
+        :columns="columns"
+        :list="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange"
+        :selectedRowKeys.sync="selectedRowKeys"
+        :scroll="{ y: 'calc(100vh - 370px)' }"
+      >
+      </custom-table>
+    </div>
+    <!-- 列表结束 -->
+    <!-- 新增/编辑 账号 -->
+    <custom-modal :title="isAdd ? 'Add' : 'Edit'" v-model="visible" :width="475" :okHandler="onSubmit">
+      <a-form-model
+        ref="form"
+        layout="horizontal"
+        :model="accountModel"
+        :rules="rules"
+        :labelCol="{ style: { width: '80px' } }"
+        :wrapperCol="{ style: { width: '300px' } }"
+        autocomplete="off"
+        :colon="false"
+      >
+        <a-form-model-item label="Type" prop="type">
+          <j-dict-select-tag v-model="accountModel.type" dictCode="Alert_System_Code"></j-dict-select-tag>
+        </a-form-model-item>
+        <a-form-model-item label="Code" prop="code">
+          <a-input type="text" v-model="accountModel.code"></a-input>
+        </a-form-model-item>
+        <a-form-model-item label="Content" prop="content">
+          <a-input type="text" v-model="accountModel.content"></a-input>
+        </a-form-model-item>
+      </a-form-model>
+    </custom-modal>
+    <!-- 新增/编辑 账号结束 -->
+  </a-card>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { postAction } from '@/api/manage'
+import { cloneDeep } from 'lodash'
+import FormMixin from '@/mixins/FormMixin'
+
+export default {
+  name: 'UserList',
+  mixins: [JeecgListMixin, FormMixin],
+  data() {
+    return {
+      queryParam: {},
+      columns: [
+        {
+          title: 'TYPE',
+          align: 'left',
+          dataIndex: 'typeStr',
+        },
+        {
+          title: 'CODE',
+          align: 'left',
+          dataIndex: 'code',
+        },
+        {
+          title: 'CONTENT',
+          align: 'left',
+          dataIndex: 'content',
+        },
+      ],
+      url: {
+        list: '/sys/alertSystem/list',
+        delete: '/sys/alertSystem/delete',
+      },
+      roleOptions: [],
+      visible: false,
+      isAdd: false,
+      accountModel: {},
+      rules: {
+        type: [{ required: true, message: 'Please Select Type' }],
+        code: [{ required: true, message: 'Please Enter Code' }],
+        content: [{ required: true, message: 'Please Enter Content' }],
+      },
+    }
+  },
+  created() {},
+  methods: {
+    handleAdd() {
+      this.visible = true
+      this.isAdd = true
+      this.accountModel = {}
+    },
+    handleEdit() {
+      if (this.selectedRowKeys && this.selectedRowKeys.length) {
+        this.visible = true
+        this.isAdd = false
+        const find = this.dataSource.find((item) => item.id === this.selectedRowKeys[0])
+        this.accountModel = {
+          type: find.type,
+          code: find.code,
+          content: find.content,
+        }
+      } else {
+        this.$message.warn('Please Select An Item To Edit')
+      }
+    },
+
+    // 提交
+    async onSubmit() {
+      await this.$refs.form.validate()
+      let params = { ...this.accountModel }
+      if (!this.isAdd) {
+        params.id = this.selectedRowKeys[0]
+      }
+      let { success, message } = await postAction('/sys/alertSystem/saveOrUpdate', params)
+      if (success) {
+        this.$message.success(`${this.isAdd ? 'Add' : 'Edit'} Success`)
+        this.loadData()
+      } else {
+        this.$message.error(`${message}`)
+      }
+    },
+    onDel() {
+      if (this.selectedRowKeys && this.selectedRowKeys.length) {
+        const find = this.dataSource.find((item) => item.id === this.selectedRowKeys[0])
+        this.$confirm({
+          title: `Are you sure to delete ${find.content}`,
+          okText: 'OK',
+          cancelText: 'Cancel',
+          onOk: () => {
+            this.handleDelete(this.selectedRowKeys[0])
+          },
+        })
+      } else {
+        this.$message.warn('Please Select An Item To Delete')
+      }
+    },
+  },
+  computed: {
+    formItems() {
+      return [
+        {
+          type: 'a-input',
+          label: 'Code',
+          name: 'code',
+          props: {
+            style: {
+              width: '220px',
+            },
+          },
+          style: {
+            width: 'auto',
+          },
+        },
+      ]
+    },
+  },
+}
+</script>
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+.btn-group {
+  img {
+    margin-right: 12px;
+    height: 18px;
+  }
+}
+</style>