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

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/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)
-      debugger
-      if (direction == 'left') {
+      if (direction == 'right') {
         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 {
-              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) {
+            gap: 13px;
+
             &::before {
-              display: inline-block;
-              margin-right: 6px;
+              position: static;
+              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;
             }