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

src/components/layouts/BasicLayout.vue

@@ -1,10 +1,9 @@
 <template>
   <global-layout>
     <transition name="page-transition">
-      <keep-alive v-if="keepAlive">
+      <keep-alive>
         <router-view />
       </keep-alive>
-      <router-view v-else />
     </transition>
   </global-layout>
 </template>
@@ -22,14 +21,6 @@
 
       }
     },
-    computed: {
-      keepAlive () {
-        return this.$route.meta.keepAlive
-      }
-    },
-    methods: {
-
-    },
   }
 </script>
 

src/components/layouts/RouteView.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="main">
-  <keep-alive :include="includedComponents">
+  <keep-alive>
-    <router-view v-if="keepAlive" />
+    <router-view />
   </keep-alive>
-  <router-view v-if="!keepAlive" />
   </div>
 </template>
 

src/config/router.config.js

@@ -1,4 +1,4 @@
-import { TabLayout, RouteView, BlankLayout, PageView } from '@/components/layouts'
+import { TabLayout, RouteView, BlankLayout, PageView, BasicLayout } from '@/components/layouts'
 import Login from '@/views/user/Login'
 
 /**
@@ -10,7 +10,7 @@ export const asyncRouterMap = [
   {
     path: '/',
     name: 'dashboard',
-    component: TabLayout,
+    component: BasicLayout,
     meta: { title: '首页' },
     redirect: '/station-operation',
     children: [

src/utils/util.js

@@ -88,7 +88,7 @@ export function generateIndexRouter(data) {
     path: '/',
     name: 'dashboard',
     //component: () => import('@/components/layouts/BasicLayout'),
-    component: resolve => require(['@/components/layouts/TabLayout'], resolve),
+    component: resolve => require(['@/components/layouts/BasicLayout'], resolve),
     meta: { title: '首页' },
     redirect: '/station-operation',
     children: [

src/views/logManage/index.vue

@@ -99,6 +99,7 @@ const columns = [
 ]
 
 export default {
+  name: 'LogManage',
   mixins: [JeecgListMixin],
   components: {
     TreeWithLine

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

@@ -183,15 +183,15 @@ export default {
     sampleInfo: {
       type: Object,
     },
-    analyseCurrentSpectrum: {
+    // analyseCurrentSpectrum: {
-      type: Object,
+    //   type: Object,
-    },
+    // },
   },
   data() {
     this.SampleType = SampleType
 
     return {
-      // analyseCurrentSpectrum: {},
+      analyseCurrentSpectrum: {},
       qcFlags: {},
 
       spectraVisible: false,
@@ -590,7 +590,7 @@ export default {
           data: newVal.XeData,
         })
       },
-      immediate: true,
+      // immediate: true,
       deep: true,
     },
     sampleInfo: {

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

@@ -13,7 +13,7 @@
 import ModalMixin from '@/mixins/ModalMixin'
 import { getAction } from '@/api/manage'
 import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
-import { showSaveFileModal } from '@/utils/file'
+import { saveAs } from 'file-saver'
 export default {
   mixins: [ModalMixin, SampleDataMixin],
   data() {
@@ -25,7 +25,14 @@ export default {
     async getDetail() {
       try {
         this.isLoading = true
-        const { dbName, sampleId, inputFileName: sampleFileName, gasFileName, detFileName, qcFileName } = this.newSampleData
+        const {
+          dbName,
+          sampleId,
+          inputFileName: sampleFileName,
+          gasFileName,
+          detFileName,
+          qcFileName,
+        } = this.newSampleData
         const result = await getAction('/spectrumAnalysis/viewBGLogViewer', {
           dbName,
           sampleId,
@@ -34,7 +41,7 @@ export default {
           detFileName,
           qcFileName,
         })
-        if(typeof result == 'string') {
+        if (typeof result == 'string') {
           this.content = result
         } else {
           const { success, result, message } = res
@@ -56,8 +63,9 @@ export default {
     },
 
     handleClick() {
+      let name = this.newSampleData.inputFileName.split('.')[0]
       const blob = new Blob([this.content], { type: 'text/plain' })
-      showSaveFileModal(blob, 'txt')
+      saveAs(blob, `${name}_beta analysis log.txt`)
     },
   },
 }

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

@@ -3,7 +3,7 @@
     <a-spin :spinning="isLoading">
       <pre class="data-processing-log">{{ text }}</pre>
     </a-spin>
-    <div slot="custom-footer" style="text-align: center;">
+    <div slot="custom-footer" style="text-align: center">
       <a-space :size="20">
         <a-button type="primary" @click="handleOk">Export</a-button>
         <a-button @click="visible = false">Cancel</a-button>
@@ -15,65 +15,49 @@
 <script>
 import ModalMixin from '@/mixins/ModalMixin'
 import { getAction } from '@/api/manage'
-import { saveAs } from 'file-saver';
+import { saveAs } from 'file-saver'
 import SampleDataMixin from '../../SampleDataMixin'
 export default {
   mixins: [ModalMixin, SampleDataMixin],
   data() {
     return {
-      text: "",
+      text: '',
       isLoading: false,
-      fileName: ''
+      fileName: '',
     }
   },
   methods: {
     beforeModalOpen() {
-      this.getViewGammaviewerLog();
+      this.getViewGammaviewerLog()
     },
     getViewGammaviewerLog() {
       this.isLoading = true
       const { sampleId, inputFileName: fileName } = this.sampleData
       let params = {
         sampleId,
-        fileName
+        fileName,
       }
-      getAction("/gamma/viewGammaViewerLog", params).then(res => {
+      getAction('/gamma/viewGammaViewerLog', params).then((res) => {
         this.isLoading = false
         if (res.success) {
           this.text = res.result
         } else {
-          this.text = ""
+          this.text = ''
-          this.$message.warning("This operation fails. Contact your system administrator")
+          this.$message.warning('This operation fails. Contact your system administrator')
         }
       })
     },
     handleOk() {
-      this.fileName=""
+      this.fileName = ''
       if (this.text) {
-        let strData = new Blob([this.text], { type: 'text/plain;charset=utf-8' });
+        let name = this.newSampleData.inputFileName.split('.')[0]
-        // saveAs(strData, `GammaViewer Log.txt`)
+        let strData = new Blob([this.text], { type: 'text/plain;charset=utf-8' })
-        let _this = this
+        saveAs(strData, `${name}_gamma analysis log.txt`)
-        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`)
-            }
-          },
-        });
       } else {
-        this.$message.warning("No data can be saved!")
+        this.$message.warning('No data can be saved!')
-      }
       }
     },
+  },
 }
 </script>
 

src/views/spectrumAnalysis/index.vue

@@ -53,8 +53,8 @@
         @reAnalyAll="getReAnalyAll"
         :sampleInfo="sampleInfo"
         :sample="sampleData"
-        :analyseCurrentSpectrum="analyseCurrentSpectrumData"
       />
+        <!-- :analyseCurrentSpectrum="analyseCurrentSpectrumData" -->
       <!-- Beta-Gamma 分析 -->
       <div v-else class="empty">Please Select a Sample</div>
       <resize-observer @notify="handleResize" />
@@ -259,6 +259,7 @@ const ANALYZE_TYPE = {
   BETA_GAMMA: 'betaGammaAnalysis',
 }
 export default {
+  name: 'SpectrumAnalysis',
   components: {
     BetaGammaAnalysis,
     GammaAnalysis,
@@ -375,7 +376,7 @@ export default {
       betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗
       statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗
       bgLogViewerVisible: false, // beta-gamma Log 下的BG log viewer 弹窗
-      analyseCurrentSpectrumData: {},
+      // analyseCurrentSpectrumData: {},
       resultDisplayFlag: [],
       params_toDB: {
         comment: '',
@@ -466,7 +467,7 @@ export default {
       this.params_toDB.checkDet = val.checkDet
     },
     getXeData(val) {
-      this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
+      // this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
       this.resultDisplayFlag = val
     },
     // formDB 来源 吧接口返回的文件名称添加到sampleData

src/views/stationOperation/index.vue

@@ -173,6 +173,7 @@ import { getAction } from '../../api/manage'
 import { cloneDeep } from 'lodash'
 const key = 'updateList'
 export default {
+  name: 'StationOperation',
   components: {
     Map,
     MapMarker,