Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

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

@@ -517,7 +517,7 @@ export default {
       }
     },
     getItems(val) {
-      getAction('/alarmRule/getItems', { sourceId: val }).then((res) => {
+      getAction('/alarmRule/getItems', { sourceId: val, sourceType: this.form.sourceType }).then((res) => {
         if (res.success) {
           this.itemOptions = res.result.map((item) => {
             return {
@@ -636,7 +636,7 @@ export default {
             .catch((err) => {
               this.$message.warning('This operation fails. Contact your system administrator')
             })
-          getAction('/alarmRule/getItems', { sourceId: res.result.sourceId })
+          getAction('/alarmRule/getItems', { sourceId: res.result.sourceId, sourceType: this.form.sourceType })
             .then((res) => {
               if (res.success) {
                 this.itemOptions = res.result.map((item) => {

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

@@ -1,10 +1,13 @@
 <template>
-  <div style="height: 100%;">
+  <div style="height: 100%">
-    <a-card :bordered="false" style="height:100%;margin-left: 20px;">
+    <a-card :bordered="false" style="height: 100%; margin-left: 20px">
       <a-tabs default-active-key="monitor" @change="handleTabChange">
         <a-tab-pane key="monitor" tab="MONITOR">
           <Monitor></Monitor>
         </a-tab-pane>
+        <a-tab-pane key="table" tab="TABLE">
+          <Table></Table>
+        </a-tab-pane>
         <a-tab-pane key="tableSpace" tab="TABLESPACE">
           <TableSpace></TableSpace>
         </a-tab-pane>
@@ -14,22 +17,23 @@
 </template>
 
 <script>
-import TableSpace from './tableSpace.vue';
+import Table from './table.vue'
-import Monitor from './monitor.vue';
+import TableSpace from './tableSpace.vue'
+import Monitor from './monitor.vue'
 export default {
   components: {
     Monitor,
+    Table,
     TableSpace,
   },
   methods: {
     handleTabChange(key) {
-      console.log(key);
+      console.log(key)
     },
   },
 }
 </script>
 
 <style lang="less" scoped>
-  @import "~@/assets/less/TabMenu.less";
+@import '~@/assets/less/TabMenu.less';
-
 </style>

src/views/abnormalAlarm/databaseMonitor/instances/table.vue

@@ -0,0 +1,282 @@
+<template>
+  <div style="height: 100%">
+    <div class="monitor-search">
+      <a-row type="flex" :gutter="10">
+        <a-col flex="305px">
+          <span class="item-label">DataSource</span>
+          <a-select
+            style="width: 180px"
+            v-model="name"
+            placeholder="select..."
+            :filter-option="filterOption"
+            show-arrow
+            allowClear
+            :options="DbOptions"
+            @change="onDbChange"
+          >
+            <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
+          </a-select>
+        </a-col>
+        <a-col flex="335px">
+          <span class="item-label">DB Name</span>
+          <a-select
+            style="width: 180px"
+            v-model="dbName"
+            placeholder="select..."
+            show-arrow
+            allowClear
+            :options="dbNameOptions"
+            @change="ondbNameChange"
+          >
+            <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
+          </a-select>
+        </a-col>
+      </a-row>
+      <div class="monitor-search-btns">
+        <a-button class="monitor-search-btns-ant">
+          <img class="icon-add" src="@/assets/images/global/reset-pwd.png" alt="" />
+          <span style="margin-left: 10px"> Refresh </span>
+        </a-button>
+      </div>
+    </div>
+
+    <div class="tableSpace-main">
+      <TableList
+        size="middle"
+        rowKey="id"
+        :columns="columns"
+        :list="dataSource"
+        :loading="loading"
+        :pagination="false"
+        :canSelect="false"
+        :scroll="{ y: 900 }"
+      >
+        <!-- <template slot="space" slot-scope="{ text }">
+          <div class="space">
+            <div :class="['space-bar', `space-bar-${text > 80 ? 'r' : text > 50 ? 'y' : 'g'}`]">
+              <div
+                :class="['space-bar-progress', `space-bar-progress-${text > 80 ? 'r' : text > 50 ? 'y' : 'g'}`]"
+                :style="{ width: `${2.6 * text}px` }"
+              ></div>
+            </div>
+            <div
+              class="space-text"
+              :style="{ color: text > 80 ? 'red' : text > 50 ? 'yellow' : '', 'margin-left': '30px' }"
+            >
+              {{ text.toFixed(3) }}%
+            </div>
+          </div>
+        </template> -->
+      </TableList>
+    </div>
+  </div>
+</template>
+
+<script>
+import TableList from '../../components/tableList.vue'
+import { getAction, postAction, httpAction, deleteAction } from '@/api/manage'
+const columns = [
+  {
+    title: 'TABLE NAME',
+    align: 'center',
+    dataIndex: 'tableName',
+    width: 300,
+  },
+  {
+    title: 'TABLE ROWS',
+    align: 'center',
+    dataIndex: 'numRow',
+    width: 200,
+  },
+  // {
+  //   title: 'TABLE SPACE',
+  //   align: 'center',
+  //   dataIndex: 'used',
+  //   // scopedSlots: {
+  //   //   customRender: 'space',
+  //   // },
+  // },
+  {
+    title: 'DATA SIZE(MB)',
+    align: 'center',
+    dataIndex: 'dataSize',
+    width: 200,
+  },
+  {
+    title: 'INDEX SIZE(MB)',
+    align: 'center',
+    dataIndex: 'indexSize',
+    width: 200,
+  },
+]
+export default {
+  components: {
+    TableList,
+  },
+  data() {
+    return {
+      columns,
+      dataSource: [],
+      loading: false,
+      name: undefined,
+      dbName: undefined,
+      DbOptions: [],
+      dbNameOptions: [],
+      currId: '',
+    }
+  },
+  watch: {
+    name(newValue, oldValue) {
+      this.currId = newValue
+    },
+  },
+  mounted() {
+    this.getDbList()
+  },
+  methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
+    getDbList() {
+      getAction('/sysDatabase/sourceList').then((res) => {
+        if (res.success) {
+          this.name = this.$route.query.id || res.result[0].sourceId
+          this.getDbNameList()
+          this.DbOptions = res.result.map((item) => {
+            return {
+              label: item.sourceName,
+              value: item.sourceId,
+            }
+          })
+        } else {
+          this.$message.warning('This operation fails. Contact your system administrator')
+        }
+      })
+    },
+    getDbNameList() {
+      let params = {
+        sourceId: this.name,
+      }
+      getAction('/sysDatabase/dbNames', params).then((res) => {
+        if (res.success) {
+          console.log(res)
+          this.dbNameOptions = res.result.map((item) => {
+            return {
+              label: item,
+              value: item,
+            }
+          })
+        } else {
+          this.$message.warning('This operation fails. Contact your system administrator')
+        }
+      })
+    },
+    onDbChange(val) {
+      this.name = val
+      this.dbName = undefined
+      this.dataSource = []
+      this.getDbNameList()
+    },
+    ondbNameChange(val) {
+      this.loading = true
+      let params = {
+        sourceId: this.name,
+        dbName: val,
+      }
+      getAction('/sysDatabase/dbInfo', params).then((res) => {
+        this.loading = false
+        if (res.success) {
+          this.dataSource = res.result
+        } else {
+          this.$message.warning('This operation fails. Contact your system administrator')
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.tableSpace-main {
+  width: 100%;
+  height: calc(100% - 50px);
+  overflow: hidden;
+  padding-top: 15px;
+  position: relative;
+}
+.ant-pagination {
+  position: absolute;
+  left: 50%;
+  bottom: 0;
+  transform: translateX(-50%);
+}
+.monitor-search {
+  height: 50px;
+  border-top: 1px solid rgba(13, 235, 201, 0.3);
+  border-bottom: 1px solid rgba(13, 235, 201, 0.3);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 10px;
+  background: rgba(12, 235, 201, 0.05);
+  .ant-row-flex {
+    flex-flow: nowrap;
+  }
+  /deep/ .ant-calendar-range-picker-separator {
+    color: white;
+  }
+  .item-label {
+    display: inline-block;
+    font-size: 16px;
+    font-family: ArialMT;
+    color: #ade6ee;
+    line-height: 32px;
+    height: 32px;
+    margin-right: 10px;
+  }
+  &-btns {
+    &-ant {
+      background: #1397a3;
+      border: none;
+    }
+  }
+}
+.space {
+  width: 350px;
+  height: 16px;
+  display: inline-block;
+  position: relative;
+  &-bar {
+    width: 260px;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    &-progress {
+      height: 100%;
+    }
+    &-progress-g {
+      background: url(~@/assets/images/abnormalAlarm/green.png) repeat;
+    }
+    &-progress-y {
+      background: url(~@/assets/images/abnormalAlarm/yellow.png) repeat;
+    }
+    &-progress-r {
+      background: url(~@/assets/images/abnormalAlarm/red.png) repeat;
+    }
+  }
+  &-bar-g {
+    background: url(~@/assets/images/abnormalAlarm/green-bg.png) repeat;
+  }
+  &-bar-y {
+    background: url(~@/assets/images/abnormalAlarm/yellow-bg.png) repeat;
+  }
+  &-bar-r {
+    background: url(~@/assets/images/abnormalAlarm/red-bg.png) repeat;
+  }
+  &-text {
+    position: absolute;
+    right: 0;
+    top: -3px;
+  }
+}
+</style>

src/views/abnormalAlarm/databaseMonitor/instances/tableSpace.vue

@@ -17,20 +17,6 @@
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
           </a-select>
         </a-col>
-        <a-col flex="335px">
-          <span class="item-label">DB Name</span>
-          <a-select
-            style="width: 180px"
-            v-model="dbName"
-            placeholder="select..."
-            show-arrow
-            allowClear
-            :options="dbNameOptions"
-            @change="ondbNameChange"
-          >
-            <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
-          </a-select>
-        </a-col>
       </a-row>
       <div class="monitor-search-btns">
         <a-button class="monitor-search-btns-ant">
@@ -63,7 +49,7 @@
               class="space-text"
               :style="{ color: text > 80 ? 'red' : text > 50 ? 'yellow' : '', 'margin-left': '30px' }"
             >
-              {{ text.toFixed(3) }}%
+              {{ text }}%
             </div>
           </div>
         </template>
@@ -74,40 +60,40 @@
 
 <script>
 import TableList from '../../components/tableList.vue'
-import { getAction, postAction, httpAction, deleteAction } from '@/api/manage'
+import { getAction } from '@/api/manage'
 const columns = [
   {
-    title: 'TABLE NAME',
+    title: 'SPACE NAME',
     align: 'center',
-    dataIndex: 'tableName',
+    dataIndex: 'spaceName',
     width: 300,
   },
   {
-    title: 'TABLE ROWS',
+    title: 'TOTAL(MB)',
     align: 'center',
-    dataIndex: 'numRow',
+    dataIndex: 'total',
     width: 200,
   },
   {
-    title: 'TABLE SPACE',
+    title: 'FREE(MB)',
+    align: 'center',
+    dataIndex: 'free',
+    width: 200,
+  },
+  {
+    title: 'USAGE(MB)',
+    align: 'center',
+    dataIndex: 'usage',
+    width: 200,
+  },
+  {
+    title: 'USED',
     align: 'center',
     dataIndex: 'used',
     scopedSlots: {
       customRender: 'space',
     },
   },
-  {
-    title: 'DATA SIZE(MB)',
-    align: 'center',
-    dataIndex: 'dataSize',
-    width: 200,
-  },
-  {
-    title: 'INDEX SIZE(MB)',
-    align: 'center',
-    dataIndex: 'indexSize',
-    width: 200,
-  },
 ]
 export default {
   components: {
@@ -119,9 +105,7 @@ export default {
       dataSource: [],
       loading: false,
       name: undefined,
-      dbName: undefined,
       DbOptions: [],
-      dbNameOptions: [],
       currId: '',
     }
   },
@@ -157,15 +141,10 @@ export default {
       let params = {
         sourceId: this.name,
       }
-      getAction('/sysDatabase/dbNames', params).then((res) => {
+      getAction('/sysDatabase/spaceInfo', params).then((res) => {
         if (res.success) {
           console.log(res)
-          this.dbNameOptions = res.result.map((item) => {
+          this.dataSource = res.result
-            return {
-              label: item,
-              value: item,
-            }
-          })
         } else {
           this.$message.warning('This operation fails. Contact your system administrator')
         }
@@ -173,24 +152,8 @@ export default {
     },
     onDbChange(val) {
       this.name = val
-      this.dbName = undefined
       this.getDbNameList()
     },
-    ondbNameChange(val) {
-      this.loading = true
-      let params = {
-        sourceId: this.name,
-        dbName: val,
-      }
-      getAction('/sysDatabase/dbInfo', params).then((res) => {
-        this.loading = false
-        if (res.success) {
-          this.dataSource = res.result
-        } else {
-          this.$message.warning('This operation fails. Contact your system administrator')
-        }
-      })
-    },
   },
 }
 </script>

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

@@ -83,7 +83,7 @@
             v-decorator="[
               'name',
               {
-                rules: [{ required: nameRequired, message: 'Please input name!' }],
+                rules: [{ required: true, message: 'Please input name!' }],
                 initialVale: this.formVal.name,
               },
             ]"
@@ -237,7 +237,6 @@ export default {
   },
   data() {
     return {
-      nameRequired: false,
       loading: false,
       isAdd: true,
       visible: false,
@@ -444,8 +443,7 @@ export default {
       this.currentId = ''
     },
     onTest() {
-      this.nameRequired = false
+      this.form.validateFields(['dbType', 'dbDriver', 'dbUrl', 'dbUsername', 'dbPassword'], (err, values) => {
-      this.form.validateFields((err, values) => {
         if (!err) {
           let loading = this.$message.loading('连接中……', 0)
           postAction('/online/cgreport/api/testConnection', values)
@@ -462,10 +460,6 @@ export default {
       })
     },
     onSave() {
-      this.nameRequired = true
-      this.$nextTick(() => {
-        this.form.validateFields(['name'], { force: true })
-      })
       this.form.validateFields((err, values) => {
         if (!err) {
           if (this.isAdd) {

src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue

@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" :width="1200" :title="type == 1 || type == 3 ? 'ARR' : 'RRR'">
     <a-spin :spinning="isLoading">
-      <a-textarea v-model="content" :readonly="type == 1 || type == 2"></a-textarea>
+      <a-textarea style="font-family: 宋体" v-model="content" :readonly="type == 1 || type == 2"></a-textarea>
     </a-spin>
     <div slot="custom-footer" style="text-align: center">
       <a-space :size="20">

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue

@@ -12,6 +12,7 @@
 <script>
 import { getAction, getFileAction } from '@/api/manage'
 import ModalMixin from '@/mixins/ModalMixin'
+import { fetchAndDownload } from '@/utils/file'
 import { saveAs } from 'file-saver'
 import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 
@@ -31,7 +32,7 @@ const columns = [
     dataIndex: 'value',
     align: 'center',
     customRender: (text) => {
-      if (text !== 'Match' && text !== 'UnMatch') {
+      if (text !== 'Match' && text !== 'UnMatch' && text !== 'None') {
         return parseFloat(Number(text).toPrecision(6))
       } else {
         return text
@@ -142,37 +143,21 @@ export default {
       this.list = []
       this.getData()
     },
-    SaveText() {
+    async SaveText() {
-      this.fileName = ''
+      let url = '/spectrumAnalysis/exportQCResultTXT'
-      this.text = `#QC RESULT\n${this.columns[0].title}                  ${this.columns[1].title}                  ${this.columns[2].title}                  ${this.columns[3].title}\n`
+      const { sampleId, inputFileName: fileName, dbName, detFileName, gasFileName } = this.newSampleData
-      this.list.forEach((item) => {
+      let params = {
-        let str = ''
+        sampleId: sampleId || '',
-        str += `${item.qcFlags}                  `
+        dbName,
-        str += `${item.evaluationMetrics}                  `
+        sampleFileName: fileName,
-        str += `${item.value}                  `
+        gasFileName,
-        str += `${item.status}                  \n`
+        detFileName,
-        this.text += str
+      }
-      })
+      try {
-      let name = this.newSampleData.inputFileName.split('.')[0]
+        await fetchAndDownload(url, params, 'get')
-      let strData = new Blob([this.text], { type: 'text/plain;charset=utf-8' })
+      } catch (error) {
-      saveAs(strData, `${name}_QC Result.txt`)
+        console.error(error)
-      // let _this = this
+      }
-      // this.$confirm({
-      //   title: 'Please enter file name',
-      //   content: (h) => <a-input v-model={_this.fileName} />,
-      //   okText: 'Cancle',
-      //   cancelText: 'Save',
-      //   okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } },
-      //   cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } },
-      //   onOk() {
-      //     console.log('Cancel')
-      //   },
-      //   onCancel() {
-      //     if (_this.fileName) {
-      //       saveAs(strData, `${_this.fileName}.txt`)
-      //     }
-      //   },
-      // })
     },
     // 导出到Excel
     handleExportToExcel() {
@@ -195,34 +180,6 @@ export default {
             saveAs(blob, `${name}_QC Result`)
           }
         })
-        // let _this = this
-        // this.$confirm({
-        //   title: 'Please enter file name',
-        //   content: (h) => <a-input v-model={_this.fileName_excel} />,
-        //   okText: 'Cancle',
-        //   cancelText: 'Save',
-        //   okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } },
-        //   cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } },
-        //   onOk() {
-        //     console.log('Cancel')
-        //   },
-        //   onCancel() {
-        //     if (_this.fileName_excel) {
-        //       let params = {
-        //         sampleId: sampleId || '',
-        //         fileName,
-        //       }
-        //       getFileAction('/spectrumAnalysis/exportQCResult', 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' })
-        //           saveAs(blob, `${_this.fileName_excel}`)
-        //         }
-        //       })
-        //     }
-        //   },
-        // })
       } else {
         this.$message.warning('No downloadable data')
       }

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue

@@ -159,6 +159,7 @@ const initialOption = {
     top: 20,
     bottom: 60,
   },
+  tooltip: {},
   legend: {
     show: false,
     orient: 'vertical',
@@ -339,7 +340,6 @@ export default {
             const { allDate, allList } = result
             this.option.xAxis.data = allDate
             this.option.legend.show = true
-
             this.option.series = allList.map((item) => {
               let newSeries = []
               if(item.m_Keys) {
@@ -358,6 +358,7 @@ export default {
                   color: item.m_GraphPen,
                 },
                 symbol: 'circle',
+                symbolSize: 8,
               }
             })
           } else {