Merge remote-tracking branch 'origin/master-dev' into feature-Beta-dev-renpy

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

@@ -304,12 +304,12 @@ export default {
           item.nidFlag = val ? 1 : 0
         }
       })
-      this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, this.defaultSavedAnalysisResult)
+      this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, this.sampleDetail.savedAnalysisResult)
     },
     async getSampleDetail() {
       this.spectraType = this.SampleType[0].value
 
-      const { dbName, sampleId, inputFileName, analyst } = this.sample
+      const { dbName, sampleId, inputFileName, analyst, status } = this.sample
       try {
         this.cancelLastRequest()
         this.isLoading = true
@@ -320,6 +320,7 @@ export default {
             dbName,
             sampleId,
             analyst,
+            status
           },
           cancelToken
         )
@@ -631,7 +632,6 @@ export default {
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-
           updateSampleData({
             inputFileName,
             key: 'XeData',

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

@@ -8,7 +8,7 @@
     </search-form>
     <custom-table
       size="middle"
-      rowKey="analysitId"
+      rowKey="_index"
       :columns="columns"
       :list="dataSource"
       :pagination="ipagination"
@@ -195,12 +195,13 @@ export default {
         .then((res) => {
           if (res.success) {
             const result = res.result.records || res.result
-            result.forEach((item) => {
+            result.forEach((item, index) => {
               const fileName = item.inputFileName
               if (fileName) {
                 const arr = fileName.split('/')
                 item.inputFileName = arr[arr.length - 1]
               }
+              item._index = index
             })
 
             this.dataSource = result

src/views/spectrumAnalysis/gamma-analysis.vue

@@ -523,7 +523,7 @@ export default {
 
     // 获取样品详情
     async getSampleDetail() {
-      const { dbName, sampleId, analyst } = this.sample
+      const { dbName, sampleId, analyst, status } = this.sample
       try {
         // const { success, result, message } = Response
         this.cancelLastRequest()
@@ -536,6 +536,7 @@ export default {
             dbName,
             sampleId,
             analyst,
+            status
           },
           cancelToken
         )

src/views/spectrumAnalysis/index.vue

@@ -610,19 +610,20 @@ export default {
           ({ sampleType, inputFileName }) =>
             sampleType !== 'B' && sampleType !== 'C' && inputFileName !== this.sampleData.inputFileName
         )
-        .forEach(({ inputFileName: fileName, dbName, sampleId, analyst }) => {
+        .forEach(({ inputFileName: fileName, dbName, sampleId, analyst, status }) => {
           const params = {
             sampleId,
             dbName,
             fileName,
             analyst,
+            status
           }
           getAction('/gamma/initValue', params)
         })
       willAddList
         .filter(({ sampleType, inputFileName }) => sampleType == 'B' && inputFileName !== this.sampleData.inputFileName)
         .forEach(
-          ({ inputFileName: sampleFileName, gasFileName, detFileName, qcFileName, dbName, sampleId, analyst }) => {
+          ({ inputFileName: sampleFileName, gasFileName, detFileName, qcFileName, dbName, sampleId, analyst, status }) => {
             const params = {
               sampleId,
               dbName,
@@ -631,6 +632,7 @@ export default {
               gasFileName,
               detFileName,
               qcFileName,
+              status
             }
             getAction('/spectrumAnalysis/initValue', params)
           }

src/views/system/Scheduling.vue

@@ -140,7 +140,7 @@
           <a-transfer
             :target-keys="targetKeys"
             :render="(item) => item.title"
-            :operations="['Remove', 'Assign']"
+            :operations="['Assign', 'Remove']"
             :titles="['Particulate Station', 'Roster personnel']"
             :show-select-all="false"
             @change="onChange"
@@ -153,22 +153,6 @@
               <a-tree
                 v-if="direction === 'left'"
                 blockNode
-                checkStrictly
-                :treeData="accountTreeData"
-                :selectedKeys.sync="rightAccountChildSelectedKeys"
-                :expandedKeys.sync="rightAccountChildExpandedKeys"
-                @select="
-                  (_, props) => {
-                    onSelectAccount(_, props, itemSelect, itemSelectAll)
-                  }
-                "
-              >
-                <a-icon slot="switcherIcon" type="down" />
-              </a-tree>
-              <!-- 右侧穿梭框中的树 -->
-              <a-tree
-                v-if="direction === 'right'"
-                blockNode
                 checkable
                 checkStrictly
                 defaultExpandAll
@@ -188,6 +172,22 @@
               >
                 <a-icon slot="switcherIcon" type="down" />
               </a-tree>
+              <!-- 右侧穿梭框中的树 -->
+              <a-tree
+                v-if="direction === 'right'"
+                blockNode
+                checkStrictly
+                :treeData="accountTreeData"
+                :selectedKeys.sync="rightAccountChildSelectedKeys"
+                :expandedKeys.sync="rightAccountChildExpandedKeys"
+                @select="
+                  (_, props) => {
+                    onSelectAccount(_, props, itemSelect, itemSelectAll)
+                  }
+                "
+              >
+                <a-icon slot="switcherIcon" type="down" />
+              </a-tree>
             </template>
           </a-transfer>
           <!-- 穿梭框结束 -->
@@ -631,9 +631,7 @@ export default {
 
     // 穿梭框变化
     onChange(targetKeys, direction, moveKeys) {
-      console.log(targetKeys, direction, moveKeys)
+      if (direction == 'right') {
-      debugger
-      if (direction == 'left') {
         if (!this.checkedAccount) {
           this.$message.warning('Please Select A Person To Assign')
           return
@@ -959,6 +957,7 @@ export default {
   .ant-transfer {
     margin-top: 15px;
     margin-bottom: 10px;
+    flex-direction: row-reverse;
 
     ::v-deep {
       .ant-transfer-list {
@@ -990,6 +989,10 @@ export default {
           width: 92px;
           height: 26px;
           padding: 0;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
           .anticon {
             display: none;
           }
@@ -998,25 +1001,29 @@ export default {
           }
           &:first-child {
             margin-bottom: 52px;
-            &::after {
+            gap: 13px;
-              display: inline-block;
+
-              margin-left: 13px;
-              content: '';
-              width: 18px;
-              height: 10px;
-              background: url(~@/assets/images/system/transfer-right.png) no-repeat;
-              background-size: contain;
-            }
-          }
-          &:nth-child(2) {
             &::before {
-              display: inline-block;
+              position: static;
-              margin-right: 6px;
+              display: block;
               content: '';
               width: 18px;
               height: 10px;
               background: url(~@/assets/images/system/transfer-left.png) no-repeat;
               background-size: contain;
+              opacity: 1;
+            }
+          }
+          &:nth-child(2) {
+            gap: 6px;
+
+            &::after {
+              display: inline-block;
+              content: '';
+              width: 18px;
+              height: 10px;
+              background: url(~@/assets/images/system/transfer-right.png) no-repeat;
+              background-size: contain;
               position: static;
               opacity: initial;
             }