feat: 一谢调整

src/api/module/taks/index.ts

@@ -32,6 +32,7 @@ export interface TaskCreateParams {
   mode: 'import' | 'export' | 'update'
   startTime?: string
   endTime?: string
+  firmware?: string
 }
 
 export const createTask = (params: TaskCreateParams) => globalServer({

src/components/Edfs-dialog.vue

@@ -23,7 +23,7 @@
             inner-text="确定"
           />
           <edfs-button v-if="useDelBtn" type="danger" @click="onDel" inner-text="删除" />
-          <edfs-button @click="onClose" inner-text="取消" />
+          <edfs-button @click="onClose" inner-text="关闭" />
         </div>
       </template>
     </el-dialog>

src/views/stationData/components/offTransferDlg.vue

@@ -1,5 +1,6 @@
 <template>
-  <EdfsDialog :title="'数据导出'" :is-show="visible" width="580px" @on-close="close" @on-save="onSave">
+  <EdfsDialog :title="'数据导出'" :is-show="visible" width="580px" :btnLoading="btnLoading" @on-close="close"
+              @on-save="onSave">
     <div class="flex-col gap-10 w-80% m-x-30px">
       <el-row>
         <div class="label">
@@ -45,6 +46,7 @@ function open(parmas: TaskCreateParams) {
   visible.value = true
 }
 
+const btnLoading = ref(false)
 async function onSave() {
   if (verifyData()) return
   if (!paramsData.value) {
@@ -55,14 +57,14 @@ async function onSave() {
   paramsData.value.devices.forEach((r) => {
     r.host = form.value.clientIp
   })
-
+  btnLoading.value = true
   const res = await createTask(paramsData.value)
   if (res.code !== 0) {
     message.error(`任务创建失败`)
   } else {
     message.success('任务创建成功,请在任务列表中查看')
   }
-
+  btnLoading.value = false
   emit('on-save')
   close()
 }

src/views/stationData/components/onLineTransferDlg.vue

@@ -1,5 +1,6 @@
 <template>
   <EdfsDialog :title="isBatchTransfer ? '批量迁移' : '数据迁移'" :is-show="visible" width="580px" @on-close="close"
+              :btnLoading="btnLoading"
     @on-save="onSave">
     <div class="flex-col gap-10 w-80% m-x-30px">
       <el-row>
@@ -101,7 +102,7 @@ function open(parmas: TaskCreateParams) {
   paramsData.value = parmas
   visible.value = true
 }
-
+const btnLoading = ref(false)
 async function onSave() {
   if (!verifyData()) return
   if (!paramsData.value) {
@@ -111,14 +112,15 @@ async function onSave() {
   const params = paramsData.value
   params.startTime = dayjs(startTime.value).format('YYYY-MM-DD HH:mm:ss')
   params.endTime = dayjs(endTime.value).format('YYYY-MM-DD HH:mm:ss')
+  btnLoading.value = true
   const res = await createTask(params)
   if (res.code !== 0) {
     message.error(`任务创建失败`)
   } else {
     message.success('任务创建成功,请在任务列表中查看')
   }
-  
 
+  btnLoading.value = false
   emit('on-save')
   close()
 }

src/views/stationData/transferData.vue

@@ -369,6 +369,7 @@ async function onFirmwareUpload(devices: IOnlineDevice[]) {
     site,
     devices: deivcesParms,
     mode: 'update',
+    firmware: firmwarePath.value,
   }
   const res = await createTask(parmas)
   if (res.code !== 0) {

src/views/taskList/index.vue

@@ -93,6 +93,7 @@ const tableCol = [
   { label: '任务类型', prop: 'mode', minWidth: '10%' },
   { label: '任务状态', prop: 'status', minWidth: '10%' },
   { label: '创建时间', prop: 'startTime', minWidth: '10%' },
+  { label: '任务详情', prop: 'info', minWidth: '20%' },
 ]
 
 
@@ -102,7 +103,6 @@ const list = ref<TaskList[]>([])
 const queryParams = reactive({
   page: 1,
   size: undefined,
-
 })
 const tableRef = ref()
 const getList = async () => {
@@ -139,7 +139,7 @@ const onCancel = async (id: string) => {
   await getList()
 }
 
-function onTaskFinish(id: string, status:  -1 | 0 | 1 | 2 | 3) {
+function onTaskFinish(id: string, status: -1 | 0 | 1 | 2 | 3) {
   const curTask = list.value.findIndex(item => item.id === id)
   if (curTask !== -1) {
     list.value[curTask].status = status

src/views/taskList/infoDrawer.vue

@@ -5,9 +5,9 @@
                :before-close="handleBeforeClose">
       <main class="wh-full" v-loading="loading">
         <template v-for="detail in detailList">
-          <el-descriptions border :title="`${detail.sn}任务详情`">
+          <el-descriptions border :title="`${detail.sn}任务详情`" style="margin-top: 20px">
             <el-descriptions-item :label-width="60" label="状态">
-              <el-tag size="small">{{
+              <el-tag size="small"  :type="statusTypeMap[detail.status]" >{{
                   statusList.find(r => r.value ===
                     detail.status)?.label || '--'
                 }}
@@ -24,11 +24,11 @@
             <el-descriptions-item :label-width="60" label="信息">
               {{ detail?.info ? detail.info : '暂无信息' }}
             </el-descriptions-item>
-            <el-descriptions-item label="当前进度">
+            <el-descriptions-item label="当前进度" style="width: 400px">
               <template v-if="detail.total === 0">
                 <span>暂无进度</span>
               </template>
-              <el-progress v-else style="width: 95%;"
+              <el-progress v-else
                            :percentage="Math.floor((detail.finish / detail.total) * 100)"
                            :text-inside="true" :stroke-width="20"/>
             </el-descriptions-item>
@@ -92,6 +92,14 @@ const statusList = [
   }
 ]
 
+const statusTypeMap = {
+  '-1': 'danger',
+  '0': 'info',
+  '1': 'warning',
+  '2': 'info',
+  '3': 'primary'
+}
+
 
 function zmqTaskCb(msg: SubMsgData) {
   const { feedback } = msg