Merge branch 'master-dev' into feature-Beta-dev-renpy

src/components/page/GlobalLayout.vue

@@ -839,6 +839,6 @@ body {
 </style>
 <style lang="less" scoped>
 .ant-menu {
-  width: 1750px;
+  max-width: calc(100% - 200px);
 }
 </style>

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

@@ -521,7 +521,7 @@ export default {
         if (res.success) {
           this.itemOptions = res.result.map((item) => {
             return {
-              label: item.name,
+              label: item.units ? `${item.name}(${item.units})` : item.name,
               value: item.itemId,
               units: item.units,
               valueType: item.valueType,

src/views/abnormalAlarm/components/searchBar.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="search-bar">
     <a-row type="flex">
-      <a-col flex="190px">
+      <!-- <a-col flex="190px">
         <a-input placeholder="search..." />
-      </a-col>
+      </a-col> -->
       <a-col flex="310px" v-if="type == 'alarmCenter'">
         <a-form-model-item label="Type">
           <a-select

src/views/abnormalAlarm/serverMonitor/instances/createRules.vue

@@ -292,7 +292,7 @@ export default {
           if (res.success) {
             this.itemOptions = res.result.map((item) => {
               return {
-                label: item.name,
+                label: item.units ? `${item.name}(${item.units})` : item.name,
                 value: item.itemId,
                 units: item.units,
                 valueType: item.valueType,

src/views/logManage/index.vue

@@ -57,9 +57,10 @@
     <!-- 日志列表结束 -->
     <custom-modal title="Log" :width="950" v-model="visible" :footer="null">
       <a-spin class="log-detail" :spinning="isGettingDetail">
-        <div style="font-family: 宋体" v-for="(logItem, index) in logInfo" :key="index">
+        <pre style="font-family: 仿宋">{{ logInfo }}</pre>
+        <!-- <div style="font-family: 宋体" v-for="(logItem, index) in logInfo" :key="index">
           {{ logItem }}
-        </div>
+        </div> -->
       </a-spin>
     </custom-modal>
   </div>
@@ -200,7 +201,8 @@ export default {
       try {
         this.isGettingDetail = true
         const res = await postAction('/logManage/downloadFile', formData)
-        this.logInfo = res.split('\r\n')
+        // this.logInfo = res.split('\r\n')
+        this.logInfo = res
       } catch (error) {
         console.error(error)
       } finally {

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 style="font-family: 宋体" 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/AutomaticAnalysisLogModal.vue

@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" :width="1000" title="Auto Process Log Viewer">
     <a-spin :spinning="isLoading">
-      <pre style="font-family: 宋体">
+      <pre style="font-family: 仿宋">
         {{ content }}
       </pre>
     </a-spin>

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

@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" title="BetaGamma Analyser Log" :width="1200">
     <a-spin :spinning="isLoading">
-      <a-textarea v-model="content" style="font-family: 宋体"></a-textarea>
+      <a-textarea v-model="content" style="font-family: 仿宋"></a-textarea>
     </a-spin>
     <div slot="custom-footer">
       <a-button type="primary" @click="handleClick">Save As</a-button>

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

@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" :width="1000" title="View Sample Infomation">
     <a-spin :spinning="isLoading">
-      <a-textarea v-model="content" style="font-family: 宋体"></a-textarea>
+      <a-textarea v-model="content" style="font-family: 仿宋"></a-textarea>
     </a-spin>
 
     <div slot="custom-footer">

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

@@ -3,16 +3,16 @@
     <a-spin :spinning="isLoading">
       <a-tabs :animated="false" @change="handleTabChange">
         <a-tab-pane tab="Sample Spectrum" :key="1">
-          <a-textarea v-model="content.sample" style="font-family: 宋体"></a-textarea>
+          <a-textarea v-model="content.sample" style="font-family: 仿宋"></a-textarea>
         </a-tab-pane>
         <a-tab-pane tab="GasBg Spectrum" :key="2">
-          <a-textarea v-model="content.gasBg" style="font-family: 宋体"></a-textarea>
+          <a-textarea v-model="content.gasBg" style="font-family: 仿宋"></a-textarea>
         </a-tab-pane>
         <a-tab-pane tab="DetBg Spectrum" :key="3">
-          <a-textarea v-model="content.detBg" style="font-family: 宋体"></a-textarea>
+          <a-textarea v-model="content.detBg" style="font-family: 仿宋"></a-textarea>
         </a-tab-pane>
         <a-tab-pane tab="QC Spectrum" :key="4">
-          <a-textarea v-model="content.qc" style="font-family: 宋体"></a-textarea>
+          <a-textarea v-model="content.qc" style="font-family: 仿宋"></a-textarea>
         </a-tab-pane>
       </a-tabs>
     </a-spin>

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

@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" :width="1000" title="Data Processing Log">
     <a-spin :spinning="isLoading">
-      <pre class="data-processing-log" style="font-family: 宋体">{{ text }}</pre>
+      <pre class="data-processing-log" style="font-family: 仿宋">{{ text }}</pre>
     </a-spin>
     <div slot="custom-footer" style="text-align: center">
       <a-space :size="20">

src/views/spectrumAnalysis/components/ResultDisplay.vue

@@ -46,6 +46,8 @@
 </template>
 
 <script>
+import { cloneDeep } from 'lodash'
+
 const columns = [
   {
     title: 'Flag',
@@ -94,6 +96,8 @@ const columns = [
     width: 34,
   },
 ]
+
+const sortList = ['Xe131m', 'Xe133', 'Xe133m', 'Xe135']
 export default {
   props: {
     data: {
@@ -121,7 +125,8 @@ export default {
     data: {
       handler(val) {
         if (val && Array.isArray(val)) {
-          val.forEach((item) => {
+          const list = cloneDeep(val)
+          list.forEach((item) => {
             if (item.conc < 0) {
               item.className = 'error'
             } else if (item.conc > 0 && item.conc < item.mdc) {
@@ -130,8 +135,15 @@ export default {
               item.className = 'success'
             }
           })
-          this.source1 = val.slice(0, 2)
-          this.source2 = val.slice(2, 4)
+
+          list.sort((a, b) => {
+            const index1 = sortList.indexOf(a.nuclideName)
+            const index2 = sortList.indexOf(b.nuclideName)
+            return index1 - index2
+          })
+
+          this.source1 = list.slice(0, 2)
+          this.source2 = list.slice(2, 4)
         }
       },
       immediate: true,