设备任务模块测试

陈嘉新
1 parent 900b162c
Showing 5 changed files with 98 additions and 62 deletions
HHECS.Web/src/main.js
HHECS.Web/src/views/table/taskModel_CRGV.vue
HHECS.Web/src/views/table/taskModel_RGV.vue
HHECS.Web/src/views/table/taskModel_host.vue
HHECS.Web/src/views/table/taskModel_stacker.vue
@@ -4,7 +4,7 @@ import Vue from &#39;vue&#39;
 Vue.prototype.$gl = window.$gl
  
 import ElementUI from 'element-ui'
-import locale from 'element-ui/lib/locale/lang/en'; // lang i18n
+import locale from 'element-ui/lib/locale/lang/zh-CN'; // lang i18n
 // import locale from 'element-ui/lib/locale/lang/zh-CN'; // lang i18n
 import 'element-ui/lib/theme-chalk/index.css'
  
@@ -29,8 +29,8 @@ Vue.prototype.$moment = moment
  * please remove it before going online ! ! !
  */
 if (process.env.NODE_ENV === 'production') {
-  const { mockXHR } = require('../mock')
-  mockXHR()
+    const { mockXHR } = require('../mock')
+    mockXHR()
 }
  
 // set ElementUI lang to EN
@@ -41,8 +41,8 @@ Vue.use(ElementUI, { locale })
 Vue.config.productionTip = false
  
 new Vue({
-  el: '#app',
-  router,
-  store,
-  render: h => h(App)
+    el: '#app',
+    router,
+    store,
+    render: h => h(App)
 })
@@ -250,7 +250,7 @@
         </div>
       </div>
       <!-- 新增弹框 -->
-      <el-dialog title="主任务新增" :visible.sync="dialogFormVisible">
+      <el-dialog title="CRGV任新增" :visible.sync="dialogFormVisible">
         <div class="container">
           <div class="box">
             <div class="inner-left">关联主任务：</div>
@@ -737,6 +737,9 @@ export default {
     },
     //新增按钮
     btnAdd() {
+      this.optionsAddType = [];
+      this.optionsAddLine = [];
+      this.optionsAddTos = [];
       this.fetchData("CRGVTaskType");
       this.fetchData("CRGVLine");
       this.fetchData("CRGVAllTo");
@@ -955,10 +958,11 @@ export default {
             if (response.data.tos == "") {
               response.data.tos = [];
             } else {
-              let a = [];
-              a.push(response.data.tos);
-              response.data.tos = a;
+              response.data.tos = response.data.tos
+                .split(", ")
+                .map((item) => item.trim());
             }
+
             switch (response.data.forkFlag) {
               case 0:
                 response.data.forkFlag = "None";
@@ -1234,7 +1238,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
+<style lang="scss">
 .app-container-father {
   width: 100%;
   height: 100%;
@@ -1461,5 +1465,10 @@ export default {
       border: 1px solid #ccc; /* 大 div 的边框 */
     }
   }
+  /* 修改复选框大小 */
+  .el-table .el-checkbox {
+    transform: scale(1.8) !important; /* 调整大小 */
+    margin-top: 5px;
+  }
 }
 </style>
@@ -255,7 +255,7 @@
         </div>
       </div>
       <!-- 新增弹框 -->
-      <el-dialog title="主任务新增" :visible.sync="dialogFormVisible">
+      <el-dialog title="RGV任务新增" :visible.sync="dialogFormVisible">
         <div class="container">
           <div class="box">
             <div class="inner-left">关联主任务：</div>
@@ -369,7 +369,7 @@
         </div>
       </el-dialog>
  
-      <el-dialog title="CRGV任务维护" :visible.sync="dialogFormVisibleTwo">
+      <el-dialog title="RGV任务维护" :visible.sync="dialogFormVisibleTwo">
         <div class="containerTwo">
           <div class="box1">
             <div class="dv-title" style="margin-left: 10px">
@@ -742,8 +742,12 @@ export default {
     },
     //新增按钮
     btnAdd() {
+      this.optionsAddType = [];
+      this.optionsAddLine = [];
+      this.optionsAddTos = [];
       this.fetchData("RGVTaskType");
       this.fetchData("RGVAllTo");
+      this.fetchData("RGVLine");
       this.dialogFormVisible = true;
     },
     //新增创建按钮
@@ -830,10 +834,6 @@ export default {
     },
     // 状态数据
     fetchData(data, key) {
-      this.optionsAddType = [];
-      this.options = [];
-      this.optionsAddLine = [];
-      this.optionsAddTos = [];
       let params = {
         Code: data,
       };
@@ -850,7 +850,7 @@ export default {
             this.options.push({ value: x.code, label: x.name });
           }
           //线体标记
-          else if (data == "RGVTaskType") {
+          else if (data == "RGVLine") {
             this.optionsAddLine.push({ value: x.code, label: x.name });
             if (this.optionsAddLine.length > 0) {
               this.elAddDialog.line = this.optionsAddLine[0].value;
@@ -978,10 +978,11 @@ export default {
             if (response.data.toStations == "") {
               response.data.toStations = [];
             } else {
-              let a = [];
-              a.push(response.data.toStations);
-              response.data.toStations = a;
+              response.data.toStations = response.data.toStations
+                .split(",")
+                .map((item) => item.trim());
             }
+
             switch (response.data.forkFlag) {
               case 0:
                 response.data.forkFlag = "None";
@@ -1288,7 +1289,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
+<style lang="scss">
 .app-container-father {
   width: 100%;
   height: 100%;
@@ -1515,5 +1516,10 @@ export default {
       border: 1px solid #ccc; /* 大 div 的边框 */
     }
   }
+  /* 修改复选框大小 */
+  .el-table .el-checkbox {
+    transform: scale(1.8) !important; /* 调整大小 */
+    margin-top: 5px;
+  }
 }
 </style>
@@ -104,6 +104,7 @@
           height="700"
           @selection-change="handleSelectionChange"
           highlight-current-row
+          @row-click="handleRowClick"
         >
           <el-table-column type="selection" align="center" width="55">
           </el-table-column>
@@ -247,7 +248,7 @@
           <div class="box">
             <div class="inner-left">任务类型：</div>
             <div class="inner-right">
-              <el-select v-model="elAddDialog.task" placeholder="请选择">
+              <el-select v-model="elAddDialog.type" placeholder="请选择">
                 <el-option
                   v-for="item in optionsAdd"
                   :key="item.value"
@@ -399,19 +400,9 @@
                 <div class="inner-inner-box1">
                   <div class="dv-maintenance-text">途径点：</div>
                   <div class="dv-maintenance-text2">
-                    <el-input v-model="elMaintenance.approachPoint" />
-                  </div>
-                  <div class="dv-maintenance-text3">
-                    <el-button class="T1" @click="approachPointModify()"
-                      >修改</el-button
-                    >
-                  </div>
-                </div>
-                <div class="inner-inner-box2">
-                  <div class="dv-maintenance-text">添加途径点：</div>
-                  <div class="dv-maintenance-text2">
                     <el-select
-                      v-model="elMaintenance.approachPointAdd"
+                      v-model="elMaintenance.approachPoint"
+                      multiple
                       placeholder="请选择"
                     >
                       <el-option
@@ -419,11 +410,14 @@
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                      />
+                      >
+                      </el-option>
                     </el-select>
                   </div>
                   <div class="dv-maintenance-text3">
-                    <el-button class="T1">修改</el-button>
+                    <el-button class="T1" @click="approachPointModify()"
+                      >修改</el-button
+                    >
                   </div>
                 </div>
               </div>
@@ -620,10 +614,11 @@ export default {
   data() {
     return {
       sysTable: [],
+      selectedRows: [],
       //   查询条件
       queryConfig: {
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 20,
         taskNumber: "",
         remoteTask: "",
         barcode: "",
@@ -634,7 +629,7 @@ export default {
       elAddDialog: {
         remoteTask: "",
         preRemoteTask: "",
-        type: 0,
+        type: "",
         from: "",
         to: "",
         approachPoint: "",
@@ -680,11 +675,25 @@ export default {
     };
   },
   created() {
-    this.fetchData("Status");
+    this.fetchData("MTaskStatus");
     this.getTableList();
     this.userCode = this.$store.state.user.name;
   },
   methods: {
+    handleRowClick(row) {
+      const index = this.selectedRows.indexOf(row);
+
+      if (index === -1) {
+        // 如果该行未被选中，则添加到选中行
+        this.selectedRows.push(row);
+      } else {
+        // 如果该行已被选中，则移除
+        this.selectedRows.splice(index, 1);
+      }
+
+      // 更新选择状态
+      this.$refs.table.toggleRowSelection(row, true);
+    },
     //回传
     getOne(data) {
       this.optionsCommitd = [];
@@ -722,7 +731,7 @@ export default {
     },
     //新增按钮
     btnAdd() {
-      this.fetchData("Type");
+      this.fetchData("MTaskType");
       this.dialogFormVisible = true;
     },
     //新增创建按钮
@@ -810,24 +819,16 @@ export default {
     },
     // 状态数据
     fetchData(data) {
-      let params = {};
-      if (data == "Type") {
-        params = {
-          Code: "MTaskType",
-        };
-      } else {
-        params = {
-          Code: "MTaskStatus",
-        };
-      }
+      this.optionsAdd = [];
+      let params = { Code: data };
       getHostType(params).then((response) => {
         response.data.dictDetails.forEach((x) => {
-          if (data == "Type") {
+          if (data == "MTaskType") {
             this.optionsAdd.push({ value: x.code, label: x.name });
             if (this.optionsAdd.length > 0) {
-              this.elAddDialog.task = this.optionsAdd[0].value;
+              this.elAddDialog.type = this.optionsAdd[0].value;
             }
-          } else {
+          } else if (data == "MTaskStatus") {
             this.options.push({ value: x.code, label: x.name });
           }
         });
@@ -1000,6 +1001,14 @@ export default {
         };
         GetMTaskById(params).then((response) => {
           if (response.code == "Success") {
+            if (response.data.approachPoint == "") {
+              response.data.approachPoint = [];
+            } else {
+              response.data.approachPoint = response.data.approachPoint
+                .split(", ")
+                .map((item) => item.trim());
+            }
+
             switch (response.data.mStage) {
               case 0:
                 response.data.mStage = "In";
@@ -1231,9 +1240,11 @@ export default {
     },
     //途径点
     approachPointModify() {
+      let lst = this.elMaintenance.approachPoint,
+        result = lst.join(", ");
       let prams = {
         id: this.multipleSelection[0].id,
-        data: this.elMaintenance.approachPoint,
+        data: result,
         userCode: this.userCode,
       };
       ApproachPointEdit(prams).then((response) => {
@@ -1294,7 +1305,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
+<style lang="scss">
 .app-container-father {
   width: 100%;
   height: 100%;
@@ -1534,5 +1545,10 @@ export default {
       border: 1px solid #ccc; /* 大 div 的边框 */
     }
   }
+  /* 修改复选框大小 */
+  .el-table .el-checkbox {
+    transform: scale(1.8) !important; /* 调整大小 */
+    margin-top: 5px;
+  }
 }
 </style>
@@ -534,7 +534,7 @@
                   <div class="dv-maintenance-text">起点站台：</div>
                   <div class="dv-maintenance-text2">
                     <el-select
-                      v-model="elAddDialog.fromStationCode"
+                      v-model="elMaintenance.fromStationCode"
                       placeholder="请选择"
                     >
                       <el-option
@@ -555,7 +555,7 @@
                   <div class="dv-maintenance-text">终点站台：</div>
                   <div class="dv-maintenance-text2">
                     <el-select
-                      v-model="elAddDialog.toStationCode"
+                      v-model="elMaintenance.toStationCode"
                       placeholder="请选择"
                     >
                       <el-option
@@ -841,7 +841,7 @@ export default {
         fromStationCode: "",
         toStationCode: "",
         toStationCodes: "",
-        type: 1,
+        type: "",
         priority: 0,
         srmCode: "",
         goodsType: 0,
@@ -959,6 +959,7 @@ export default {
       const params = this.elAddDialog;
       CreateSRMTask(params).then((response) => {
         if (response.code == "Success") {
+          this.getTableList();
           this.$message({
             message: "恭喜你，这是一条成功消息",
             type: "success",
@@ -1303,7 +1304,6 @@ export default {
                 break;
             }
             this.elMaintenance = response.data;
-            this.elMaintenanceTwo = response.data;
             this.dialogFormVisibleTwo = true;
           }
         });
@@ -1609,7 +1609,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
+<style lang="scss">
 .app-container-father {
   width: 100%;
   height: 100%;
@@ -1836,5 +1836,10 @@ export default {
       border: 1px solid #ccc; /* 大 div 的边框 */
     }
   }
+  /* 修改复选框大小 */
+  .el-table .el-checkbox {
+    transform: scale(1.8) !important; /* 调整大小 */
+    margin-top: 5px;
+  }
 }
 </style>