Pārlūkot izejas kodu

Merge branch 'dev-web' into dev

tom 5 mēneši atpakaļ
vecāks
revīzija
07d6b2f8bd

+ 1 - 1
ruoyi-ui/src/api/sim/task.js

@@ -21,7 +21,7 @@ export function getTask(taskId) {
   // 新增任务
   export function addTask(data) {
     return request({
-      url: '/sim/task',
+      url: '/sim/task/',
       method: 'post',
       data: data
     })

+ 6 - 11
ruoyi-ui/src/views/peoples/task/index.vue

@@ -76,7 +76,7 @@
             >删除</el-button>
           </el-col>
 
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="warning"
               plain
@@ -85,7 +85,7 @@
               :disabled="single"
               @click="handleView"
             >详情</el-button>
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="1.5">
             <el-button
               type="primary"
@@ -1606,7 +1606,7 @@ export default {
       roleOptions: [],
       // 表单参数
       form: {
-        simType:''
+        simType:'',
       },
       defaultProps: {
         children: "children",
@@ -2607,13 +2607,6 @@ export default {
         }];
       });
 
-      // {
-        //   ids:1,
-        //   xinghao: 'FZD04B型侦毒器',
-        //   xianxiang: '开机无响应',
-        //   name: '1.电源开关',
-        // },
-
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       // console.log(this.selectedEquip+'@@@')
@@ -2775,6 +2768,7 @@ export default {
         name: undefined,
         simType:undefined,
         taskType:1,
+        faultId:'000100010001,000100010002',
         // postIds: [],
         // roleIds: []
       };
@@ -2864,7 +2858,8 @@ export default {
               this.getList();
             });
           } else {
-            console.log(this.form);
+            console.log(this.form)
+            return false;
             addTask(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;