Merge branch 'dev'

wanshenmean

8 天以前 83743fe4641fcfad9effc2b6104c8dedefcbdcb5

 Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue

@@ -52,7 +52,7 @@
        },
        {
          title: "任务状态",
          field: "taskState",
          field: "taskStatus",
          type: "selectList",
          dataKey: "taskState",
          data: [],
@@ -111,7 +111,7 @@
        bind: { key: "taskType", data: [] },
      },
      {
        field: "taskState",
        field: "taskStatus",
        title: "任务状态",
        type: "int",
        width: 150,