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

src/components/dict/JDictSelectTag.vue

@@ -1,16 +1,33 @@
 <template>
-  <a-radio-group v-if="tagType=='radio'" @change="handleInput" :value="getValueSting" :disabled="disabled">
+  <a-radio-group v-if="tagType == 'radio'" @change="handleInput" :value="getValueSting" :disabled="disabled">
     <a-radio v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text }}</a-radio>
   </a-radio-group>
 
-  <a-radio-group v-else-if="tagType=='radioButton'"  buttonStyle="solid" @change="handleInput" :value="getValueSting" :disabled="disabled">
+  <a-radio-group
+    v-else-if="tagType == 'radioButton'"
+    buttonStyle="solid"
+    @change="handleInput"
+    :value="getValueSting"
+    :disabled="disabled"
+  >
     <a-radio-button v-for="(item, key) in dictOptions" :key="key" :value="item.value">{{ item.text }}</a-radio-button>
   </a-radio-group>
 
-  <a-select v-else-if="tagType=='select'" :getPopupContainer = "getPopupContainer" :placeholder="placeholder" :disabled="disabled" :value="getValueSting" :allowClear="allowClear" @change="handleInput">
+  <a-select
+    v-else-if="tagType == 'select'"
+    :getPopupContainer="getPopupContainer"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :value="getValueSting"
+    :allowClear="allowClear"
+    show-arrow
+    :mode="modeType"
+    :maxTagCount="1"
+    @change="handleInput"
+  >
     <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
     <a-select-option v-for="(item, key) in dictOptions" :key="key" :value="item.value">
-      <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+      <span style="display: inline-block; width: 100%" :title="item.text || item.label">
         {{ item.text || item.label }}
       </span>
     </a-select-option>
@@ -18,97 +35,100 @@
 </template>
 
 <script>
-  import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
+import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
 
-  export default {
+export default {
-    name: "JDictSelectTag",
+  name: 'JDictSelectTag',
-    props: {
+  props: {
-      dictCode: String,
+    modeType: String,
-      placeholder: String,
+    dictCode: String,
-      disabled: Boolean,
+    placeholder: String,
-      value: [String, Number],
+    disabled: Boolean,
-      type: String,
+    value: [String, Number, Array],
-      getPopupContainer:{
+    type: String,
-        type: Function,
+    getPopupContainer: {
-        default: (node) => node.parentNode
+      type: Function,
-      },
+      default: (node) => node.parentNode,
-      allowClear: {
-        type: Boolean,
-        default: true
-      }
     },
-    data() {
+    allowClear: {
-      return {
+      type: Boolean,
-        dictOptions: [],
+      default: true,
-        tagType:""
-      }
     },
-    watch:{
+  },
-      dictCode:{
+  data() {
-        immediate:true,
+    return {
-        handler() {
+      dictOptions: [],
-          this.initDictData()
+      tagType: '',
-        },
-      }
-    },
-    created() {
-      // console.log(this.dictCode);
-      if(!this.type || this.type==="list"){
-        this.tagType = "select"
-      }else{
-        this.tagType = this.type
-      }
-      //获取字典数据
-      // this.initDictData();
-    },
-    computed: {
-      getValueSting(){
-        // update-begin author:wangshuai date:20200601 for: 不显示placeholder的文字 ------
-        // 当有null或“” placeholder不显示
-        return this.value != null ? this.value.toString() : undefined;
-        // update-end author:wangshuai date:20200601 for: 不显示placeholder的文字 ------
-      },
-    },
-    methods: {
-      initDictData() {
-        //优先从缓存中读取字典配置
-        if(getDictItemsFromCache(this.dictCode)){
-          this.dictOptions = getDictItemsFromCache(this.dictCode);
-          return
-        }
-
-        //根据字典Code, 初始化字典数组
-        ajaxGetDictItems(this.dictCode, null).then((res) => {
-          if (res.success) {
-//                console.log(res.result);
-            this.dictOptions = res.result;
-          }
-        })
-      },
-      handleInput(e='') {
-        let val;
-        if(Object.keys(e).includes('target')){
-          val = e.target.value
-        }else{
-          val = e
-        }
-        console.log(val);
-        this.$emit('change', val? val: undefined);
-        //LOWCOD-2146 【菜单】数据规则，选择自定义SQL 规则值无法输入空格
-        this.$emit('input', val? val: undefined);
-      },
-      setCurrentDictOptions(dictOptions){
-        this.dictOptions = dictOptions
-      },
-      getCurrentDictOptions(){
-        return this.dictOptions
-      }
-    },
-    model:{
-      prop: 'value',
-      event: 'change'
     }
-  }
+  },
+  watch: {
+    dictCode: {
+      immediate: true,
+      handler() {
+        this.initDictData()
+      },
+    },
+  },
+  created() {
+    // console.log(this.dictCode);
+    if (!this.type || this.type === 'list') {
+      this.tagType = 'select'
+    } else {
+      this.tagType = this.type
+    }
+    //获取字典数据
+    // this.initDictData();
+  },
+  computed: {
+    getValueSting() {
+      // update-begin author:wangshuai date:20200601 for: 不显示placeholder的文字 ------
+      // 当有null或“” placeholder不显示
+      // return this.value != null ? this.value.toString() : undefined
+      return Array.isArray(this.value) ? this.value : this.value != null ? this.value.toString() : undefined
+      // update-end author:wangshuai date:20200601 for: 不显示placeholder的文字 ------
+    },
+  },
+  methods: {
+    initDictData() {
+      //优先从缓存中读取字典配置
+      if (getDictItemsFromCache(this.dictCode)) {
+        this.dictOptions = getDictItemsFromCache(this.dictCode)
+        return
+      }
+
+      //根据字典Code, 初始化字典数组
+      ajaxGetDictItems(this.dictCode, null).then((res) => {
+        if (res.success) {
+          //                console.log(res.result);
+          this.dictOptions = res.result
+        }
+      })
+    },
+    handleInput(e = '') {
+      console.log('qweq', e)
+      let val
+      if (Object.keys(e).includes('target')) {
+        val = e.target.value
+      } else {
+        val = e
+      }
+      console.log(val)
+      this.$emit('change', val ? val : undefined)
+      //LOWCOD-2146 【菜单】数据规则，选择自定义SQL 规则值无法输入空格
+      this.$emit('input', val ? val : undefined)
+    },
+    setCurrentDictOptions(dictOptions) {
+      this.dictOptions = dictOptions
+    },
+    getCurrentDictOptions() {
+      return this.dictOptions
+    },
+  },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+}
 </script>
 
 <style scoped>

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

@@ -209,7 +209,7 @@ import TableList from '../../components/tableList.vue'
 import { getAction, postAction, httpAction, deleteAction } from '@/api/manage'
 const columns = [
   {
-    title: 'STATION',
+    title: 'STATION CODE',
     align: 'center',
     dataIndex: 'stationList',
     width: 160,
@@ -231,7 +231,7 @@ const columns = [
     width: 200,
   },
   {
-    title: 'DATA SOURCES ',
+    title: 'DATA SOURCE ',
     align: 'center',
     dataIndex: 'sourceList',
     width: 180,

src/views/abnormalAlarm/components/searchBar.vue

@@ -4,87 +4,92 @@
       <a-col flex="190px">
         <a-input placeholder="search..." />
       </a-col>
-      <a-col flex="310px" v-if="type=='alarmCenter'">
+      <a-col flex="310px" v-if="type == 'alarmCenter'">
         <a-form-model-item label="Type">
-          <a-select 
+          <a-select
-            :value="queryParams.types" 
+            :value="queryParams.types"
-            mode="multiple" 
+            mode="multiple"
-            :maxTagCount="1" 
+            :maxTagCount="1"
-            :options="typeOptions" 
+            :options="typeOptions"
-            show-arrow 
+            show-arrow
             allowClear
             @change="onTypeChange"
           >
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
             <div slot="dropdownRender" slot-scope="menu">
               <v-nodes :vnodes="menu" />
-              <a-divider style="margin: 0;" />
+              <a-divider style="margin: 0" />
-              <div
+              <div style="padding: 4px 12px; cursor: pointer" @mousedown="(e) => e.preventDefault()">
-                style="padding: 4px 12px; cursor: pointer;"
+                <a-checkbox v-model="allVal" @change="handleAllClickBox"
-                @mousedown="e => e.preventDefault()"
+                  ><span @click.prevent="handleAllClick">ALL</span></a-checkbox
-              >
+                >
-                <a-checkbox v-model="allVal" @change="handleAllClickBox"><span @click.prevent="handleAllClick">ALL</span></a-checkbox>
               </div>
             </div>
           </a-select>
         </a-form-model-item>
       </a-col>
-      <a-col flex="310px" v-if="type!=='alarmCenter' && type!=='analysisMonitor'&& type!=='alarmAnalysis'">
+      <a-col flex="310px" v-if="type !== 'alarmCenter' && type !== 'analysisMonitor' && type !== 'alarmAnalysis'">
         <a-form-model-item label="Name">
-          <a-select 
+          <a-select
-            :value="queryParams.names" 
+            :value="queryParams.names"
-            mode="multiple" 
+            mode="multiple"
             placeholder="select..."
-            :maxTagCount="1" 
+            :maxTagCount="1"
-            show-arrow 
+            show-arrow
             allowClear
-            :options="options" 
+            :options="options"
             @change="onNameChange"
           >
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
             <div slot="dropdownRender" slot-scope="menu">
               <v-nodes :vnodes="menu" />
-              <a-divider style="margin: 0;" />
+              <a-divider style="margin: 0" />
-              <div
+              <div style="padding: 4px 12px; cursor: pointer" @mousedown="(e) => e.preventDefault()">
-                style="padding: 4px 12px; cursor: pointer;"
+                <a-checkbox v-model="allVal_name" @change="handleAllClickBox_Name"
-                @mousedown="e => e.preventDefault()"
+                  ><span @click.prevent="handleAllClick_Name">ALL</span></a-checkbox
-              >
+                >
-                <a-checkbox v-model="allVal_name" @change="handleAllClickBox_Name"><span @click.prevent="handleAllClick_Name">ALL</span></a-checkbox>
               </div>
             </div>
           </a-select>
         </a-form-model-item>
       </a-col>
-      <a-col flex="270px" v-if="type ==='analysisMonitor'">
+      <a-col flex="270px" v-if="type === 'analysisMonitor'">
         <a-form-model-item label="Station">
-          <a-select style="width:180px"
+          <a-select
-            :value="queryParams.stations" 
+            style="width: 180px"
-            mode="multiple" 
+            :value="queryParams.stations"
+            mode="multiple"
             placeholder="select..."
-            :maxTagCount="1" 
+            :maxTagCount="1"
             :filter-option="filterOption"
-            show-arrow 
+            show-arrow
             allowClear
-            :options="options" 
+            :options="options"
             @change="onStationChange"
           >
             <img slot="suffixIcon" src="@/assets/images/global/select-down.png" alt="" />
             <div slot="dropdownRender" slot-scope="menu">
               <v-nodes :vnodes="menu" />
-              <a-divider style="margin: 0;" />
+              <a-divider style="margin: 0" />
-              <div
+              <div style="padding: 4px 12px; cursor: pointer" @mousedown="(e) => e.preventDefault()">
-                style="padding: 4px 12px; cursor: pointer;"
+                <a-checkbox v-model="allVal_station" @change="handleAllClickBox_station"
-                @mousedown="e => e.preventDefault()"
+                  ><span @click.prevent="handleAllClick_station">ALL</span></a-checkbox
-              >
+                >
-                <a-checkbox v-model="allVal_station" @change="handleAllClickBox_station"><span @click.prevent="handleAllClick_station">ALL</span></a-checkbox>
               </div>
             </div>
           </a-select>
         </a-form-model-item>
       </a-col>
-      <a-col flex="310px" v-if="type ==='analysisMonitor'">
+      <a-col flex="375px" v-if="type === 'analysisMonitor'">
         <a-form-model-item label="Data Sources">
-          <a-select style="width:180px"
+          <j-dict-select-tag
+            placeholder="select..."
+            :value="queryParams.sources"
+            dict-code="alarm_analyse_rule_source"
+            modeType="multiple"
+            @change="onSourceChange"
+          />
+          <!-- <a-select style="width:180px"
             :value="queryParams.sources" 
             mode="multiple" 
             placeholder="select..."
@@ -105,7 +110,7 @@
                 <a-checkbox v-model="allVal_source" @change="handleAllClickBox_source"><span @click.prevent="handleAllClick_source">ALL</span></a-checkbox>
               </div>
             </div>
-          </a-select>
+          </a-select> -->
         </a-form-model-item>
       </a-col>
       <a-col flex="380px">
@@ -113,7 +118,7 @@
           <a-range-picker
             dropdownClassName="asd"
             :default-value="[moment(queryParams.startDate), moment(queryParams.endDate)]"
-            @change="onRangeDateChange" 
+            @change="onRangeDateChange"
           />
         </a-form-model-item>
       </a-col>
@@ -129,17 +134,17 @@
 
 <script>
 import dateFormat from '@/components/jeecg/JEasyCron/format-date'
-import moment from 'moment';
+import moment from 'moment'
 export default {
   props: {
     type: {
       type: String,
-      default: ''
+      default: '',
     },
     options: {
       type: Array,
-      default:()=>[]
+      default: () => [],
-    }
+    },
   },
   components: {
     VNodes: {
@@ -155,36 +160,36 @@ export default {
       allVal_source: false,
       typeOptions: [
         {
-          label: "Server",
+          label: 'Server',
-          value: "Server"
+          value: 'Server',
         },
         {
-          label: "Database",
+          label: 'Database',
-          value: "Database"
+          value: 'Database',
         },
         {
-          label: "E-MAIL",
+          label: 'E-MAIL',
-          value: "Email"
+          value: 'Email',
         },
       ],
       sourceOptions: [
         {
-          label: "IDC",
+          label: 'IDC',
-          value: "idc"
+          value: 'idc',
         },
         {
-          label: "ARMD",
+          label: 'ARMD',
-          value: "armd"
+          value: 'armd',
-        }
+        },
       ],
       queryParams: {
-        types: ["Server","Database","Email"],
+        types: ['Server', 'Database', 'Email'],
         names: undefined,
         stations: undefined,
         sources: undefined,
         startDate: dateFormat(new Date(), 'yyyy-MM-dd'),
-        endDate: dateFormat(new Date(), 'yyyy-MM-dd')
+        endDate: dateFormat(new Date(), 'yyyy-MM-dd'),
-      }
+      },
     }
   },
   methods: {
@@ -199,7 +204,7 @@ export default {
     },
     setSelectVal() {
       if (this.allVal) {
-        this.queryParams.types = this.typeOptions.map(item => item.value)
+        this.queryParams.types = this.typeOptions.map((item) => item.value)
       } else {
         this.queryParams.types = []
       }
@@ -214,7 +219,7 @@ export default {
     },
     setSelectVal_name() {
       if (this.allVal_name) {
-        this.queryParams.names = this.options.map(item => item.value)
+        this.queryParams.names = this.options.map((item) => item.value)
       } else {
         this.queryParams.names = []
       }
@@ -229,15 +234,13 @@ export default {
     },
     setSelectVal_station() {
       if (this.allVal_station) {
-        this.queryParams.stations = this.options.map(item => item.value)
+        this.queryParams.stations = this.options.map((item) => item.value)
       } else {
         this.queryParams.stations = []
       }
     },
     filterOption(input, option) {
-      return (
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      );
     },
     handleAllClickBox_source(e) {
       this.allVal_source = e.target.checked
@@ -249,7 +252,7 @@ export default {
     },
     setSelectVal_source() {
       if (this.allVal_source) {
-        this.queryParams.sources = this.sourceOptions.map(item => item.value)
+        this.queryParams.sources = this.sourceOptions.map((item) => item.value)
       } else {
         this.queryParams.sources = []
       }
@@ -282,6 +285,7 @@ export default {
       }
     },
     onSourceChange(val) {
+      console.log(val)
       this.queryParams.sources = val
       let length = this.sourceOptions.length
       if (val.length === length) {
@@ -295,14 +299,14 @@ export default {
       this.queryParams.endDate = dateString[1]
     },
     onSearch() {
-      this.$emit("search",this.queryParams)
+      this.$emit('search', this.queryParams)
-    }
+    },
   },
 }
 </script>
 
 <style lang="less" scoped>
-.search-bar{
+.search-bar {
   height: 50px;
   border-top: 1px solid rgba(13, 235, 201, 0.3);
   border-bottom: 1px solid rgba(13, 235, 201, 0.3);
@@ -310,13 +314,13 @@ export default {
   padding: 8px 10px;
   background: rgba(12, 235, 201, 0.05);
 }
-.ant-input{
+.ant-input {
   width: 166px;
 }
-.ant-select{
+.ant-select {
   width: 240px;
 }
-.ant-calendar-picker{
+.ant-calendar-picker {
   width: 270px;
 }
 .search-btn {
@@ -331,7 +335,8 @@ export default {
   .ant-form-item {
     display: flex;
     margin-bottom: 0;
-    .ant-form-item-label,.ant-form-item-control {
+    .ant-form-item-label,
+    .ant-form-item-control {
       line-height: 32px;
       height: 32px;
     }
@@ -347,12 +352,12 @@ export default {
         }
       }
     }
-    .ant-calendar-range-picker-separator{
+    .ant-calendar-range-picker-separator {
       color: white;
     }
     .ant-form-item-control-wrapper {
       width: 100%;
-      overflow: hidden;
+      // overflow: hidden;
     }
   }
 }
@@ -366,7 +371,7 @@ export default {
     }
   }
 }
-.ant-select-dropdown-content{
+.ant-select-dropdown-content {
   position: relative;
   background: #03353f;
 }

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

@@ -187,6 +187,7 @@ import { graphic } from 'echarts'
 import { isNullOrUndefined } from '@/utils/util'
 import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 import axios from 'axios'
+import { add } from 'xe-utils/methods'
 
 const initialBetaGammaChartOption = {
   grid: {
@@ -680,7 +681,7 @@ export default {
         // 设置 gamma-gated beta spectrum
         const yAxis = parseInt(point[1].toFixed())
 
-        this.currEnergy = parseFloat(this.gammaEnergy[yAxis][0].toFixed(2)) // 设置当前选中位置的Energy
+        this.currEnergy = this.gammaEnergy[yAxis][0].toPrecision(6) // 设置当前选中位置的Energy
         this.channelAndEnergyModel = {
           channel: undefined,
           energy: undefined,
@@ -783,7 +784,9 @@ export default {
         }
         this.tooltipVisible = true
         this.channelAndEnergyModel.channel = xAxis
-        this.channelAndEnergyModel.energy = this.currEnergy
+        if(!isNullOrUndefined(this.currEnergy)) {
+          this.channelAndEnergyModel.energy = add(661.657, -this.currEnergy)
+        }
       }
     },
 

src/views/spectrumAnalysis/gamma-analysis.vue

@@ -1433,13 +1433,17 @@ export default {
     },
 
     // 显示比较弹窗
-    showCompareModal(isStrip) {
+    showCompareModal(isStrip, isOperating) {
       if (this.isLoading) {
         this.$message.warn('Sample is Loading')
         return
       }
       this.handleResetChart()
       this.clearCompareLine()
+      if(isOperating) {
+        return
+      }
+
       this.isStrip = isStrip
       if (FilePicker.canUse()) {
         this.chooseFileFromFS()
@@ -1512,6 +1516,8 @@ export default {
           this.$nextTick(() => {
             this.thumbnailOption.yAxis.max = getAxisMax(this.getChart(), 'yAxis')
           })
+
+          this.$emit('compareSuccess', this.isStrip)
         } else {
           this.$message.error(message)
         }

src/views/spectrumAnalysis/index.vue

@@ -18,7 +18,13 @@
             <template v-for="(child, index) in operation.children">
               <component v-if="child.show !== false" :is="child.type" :key="index" v-bind="child.attrs" v-on="child.on">
                 <template v-for="item in child.children">
-                  <component v-if="item.show !== false" :is="item.type" :key="item.title" @click="item.handler">
+                  <component
+                    v-if="item.show !== false"
+                    :is="item.type"
+                    :key="item.title"
+                    v-bind="item.attrs"
+                    @click="item.handler"
+                  >
                     {{ item.title }}
                   </component>
                 </template>
@@ -40,6 +46,7 @@
         :currSampleDet="currSampleDet"
         :updateFlag="updateFlag"
         @reAnalyed="handleReAnalyed"
+        @compareSuccess="handleCompareSuccess"
       />
       <!-- Gamma 分析 -->
 
@@ -430,6 +437,9 @@ export default {
       analysedFileName: '', //分析完成的文件名称
       currSampleDet: [], // DetailedInformation
       allSampleDet: {}, // DetailedInformation all
+
+      isComparing: false,
+      isStriping: false,
     }
   },
   created() {
@@ -963,6 +973,16 @@ export default {
       this.colorConfig = colorConfig
       this.$refs.gammaAnalysisRef.handleColorChange(colorConfig)
     },
+
+    // Compare 或 Strip 了
+    handleCompareSuccess(isStrip) {
+      console.log('%c [ isStrip ]-973', 'font-size:13px; background:pink; color:#bf2c9f;', isStrip)
+      if (isStrip) {
+        this.isStriping = true
+      } else {
+        this.isComparing = true
+      }
+    },
   },
   computed: {
     // 顶部菜单栏配置
@@ -988,13 +1008,35 @@ export default {
                   type: 'a-menu-item',
                   title: 'Compare',
                   show: this.isGamma,
-                  handler: () => this.$refs.gammaAnalysisRef.showCompareModal(false),
+                  handler: () => {
+                    this.isStriping = false
+                    this.$refs.gammaAnalysisRef.showCompareModal(false, this.isComparing)
+                    if (this.isComparing) {
+                      this.isComparing = false
+                    }
+                  },
+                  attrs: {
+                    style: {
+                      color: this.isComparing ? 'red' : '#fff',
+                    },
+                  },
                 },
                 {
                   type: 'a-menu-item',
                   title: 'Strip',
                   show: this.isGamma,
-                  handler: () => this.$refs.gammaAnalysisRef.showCompareModal(true),
+                  handler: () => {
+                    this.isComparing = false
+                    this.$refs.gammaAnalysisRef.showCompareModal(true, this.isStriping)
+                    if (this.isStriping) {
+                      this.isStriping = false
+                    }
+                  },
+                  attrs: {
+                    style: {
+                      color: this.isStriping ? 'red' : '#fff',
+                    },
+                  },
                 },
                 {
                   type: 'a-menu-item',