From 58146ba9707ad6a15856520f85e8bc83c0b03d6a Mon Sep 17 00:00:00 2001
From: dx <1242347652@qq.com>
Date: Mon, 31 Mar 2025 09:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/airqualitycollection/index.vue   |  2 +-
 src/views/enterpriseinspections/detail.vue |  2 +-
 src/views/task/create.vue                  |  3 +-
 src/views/task/detail.vue                  | 32 ++++++++++++++++------
 src/views/task/index.vue                   |  1 -
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/views/airqualitycollection/index.vue b/src/views/airqualitycollection/index.vue
index 1fd28be..0f06173 100644
--- a/src/views/airqualitycollection/index.vue
+++ b/src/views/airqualitycollection/index.vue
@@ -76,7 +76,7 @@
               label="时间"
               align="center"
               prop="time"
-              width="220px"
+              width="200px"
               :cell-style="{ borderBottom: '1px solid #EBEEF5' }"
               :header-cell-style="{
                 borderBottom: '1px solid #EBEEF5',
diff --git a/src/views/enterpriseinspections/detail.vue b/src/views/enterpriseinspections/detail.vue
index 3a75377..ddeb521 100644
--- a/src/views/enterpriseinspections/detail.vue
+++ b/src/views/enterpriseinspections/detail.vue
@@ -12,7 +12,7 @@
           text
           @click="
             push({
-              path: `/task/create`,
+              path: `/task/detail`,
               query: { id: detailData.taskId }
             })
           "
diff --git a/src/views/task/create.vue b/src/views/task/create.vue
index a862978..0b17c76 100644
--- a/src/views/task/create.vue
+++ b/src/views/task/create.vue
@@ -312,8 +312,9 @@ const goBack = () => {
 
 const handleDeleteTask = async () => {
 
+  await message.delConfirm("是否确定删除任务!", "删除任务")
   try {
-    await message.delConfirm("是否确定删除任务!", "删除任务")
+    
     await TaskInfoApi.deleteTaskInfo(formData.value.id)
   } finally {
     message.success('操作成功')
diff --git a/src/views/task/detail.vue b/src/views/task/detail.vue
index 1aef0e8..a87a571 100644
--- a/src/views/task/detail.vue
+++ b/src/views/task/detail.vue
@@ -7,30 +7,30 @@
         <div class="formClass">
        
           <div >
-            <span class="label">任务标题</span>  {{formData.title}}
+            <div class="label">任务标题</div>  {{formData.title}}
           </div>
 
           <div>
-            <span class="label">任务周期</span>  {{formData.startDate}}-{{formData.endDate}}
+            <div class="label">任务周期</div>  {{formData.startDate}}-{{formData.endDate}}
           </div>
           
           <div>
-            <span class="label">任务状态</span>  <dict-tag :type="DICT_TYPE.TASK_STATE" :value="formData.status" />
+            <div class="label">任务状态</div>  <dict-tag :type="DICT_TYPE.TASK_STATE" :value="formData.status" />
           </div>
 
           <div>
-            <span class="label">任务类型</span>  {{formData.taskTypeName}}
+            <div class="label">任务类型</div>  {{formData.taskTypeName}}
           </div>
           <div>
-            <span class="label">通知时间</span>   {{ getDictLabel(DICT_TYPE.TASK_NOTICE_TIME, formData.execCycle) }}
+            <div class="label">通知时间</div>  {{ getDictLabel(DICT_TYPE.TASK_NOTICE_TIME, formData.execCycle) }}
           </div>
 
           <div>
-            <span class="label">发布部门</span>  {{formData.deptName}}
+            <div class="label">发布部门</div>  {{formData.deptName}}
           </div>
 
           <div class="merge">
-            <span class="label">任务描述</span>  {{formData.description}}
+            <div class="label">任务描述</div> {{formData.description}}
           </div>
 
         </div>
@@ -239,9 +239,10 @@ const enterprise:any = ref({
   total: ref(0) as any
 })
 
-const handleDeleteTask = async (type: string) => {
+const handleDeleteTask = async () => {
+  await message.delConfirm("是否确定结束任务", "结束任务")
   try {
-    await message.delConfirm("是否确定结束任务", "结束任务")
+    
     formData.value.status = 3
     await TaskInfoApi.updateTaskInfo(formData.value)
   } finally {
@@ -526,8 +527,21 @@ onMounted(() => {
           font-size: 16px;
           color: var(--text-color-primary, #303133);
 
+          div{
+            display: flex;
+           
+            div{
+              width: 15%;
+              text-align: right;
+            }
+          }
+
           .merge {
             grid-column: span 3;
+            div{
+              width: 6%;
+              text-align: right;
+            }
           }
           
 
diff --git a/src/views/task/index.vue b/src/views/task/index.vue
index 7aafbe7..610b0b2 100644
--- a/src/views/task/index.vue
+++ b/src/views/task/index.vue
@@ -66,7 +66,6 @@
             <Icon icon="ep:circle-plus" class="mr-5px" /> 新增
           </el-button>
           <el-button
-          type="primary"
           plain
           @click="handleExport"
           :loading="exportLoading"