From 6acd42544aba7a8e81b658f052b279d5ac1a487d Mon Sep 17 00:00:00 2001
From: yyy <2605810609@qq.com>
Date: Sat, 17 May 2025 10:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  4 +--
 .env.local                                    |  2 +-
 src/views/mapPage/taskManagement/taskList.vue | 28 +++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.env.dev b/.env.dev
index fb9b85ed..63240148 100644
--- a/.env.dev
+++ b/.env.dev
@@ -6,7 +6,7 @@ VITE_DEV=true
 # 请求路径
 # VITE_BASE_URL='http://192.168.0.66:48080'
 # VITE_BASE_URL='http://192.168.0.189:48080'
-VITE_BASE_URL='http://192.168.0.45:48080'
+VITE_BASE_URL='http://192.168.77.50:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
@@ -33,7 +33,7 @@ VITE_OUT_DIR=dist
 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
 
 # 验证码的开关
-VITE_APP_CAPTCHA_ENABLE=true
+VITE_APP_CAPTCHA_ENABLE=false
 
 # GoView域名
 VITE_GOVIEW_URL='http://127.0.0.1:3000'
\ No newline at end of file
diff --git a/.env.local b/.env.local
index 5ed78b10..0a861d72 100644
--- a/.env.local
+++ b/.env.local
@@ -6,7 +6,7 @@ VITE_DEV=true
 # 请求路径
 # VITE_BASE_URL='http://192.168.0.74:48080'
 # VITE_BASE_URL='http://192.168.0.153:48080'
-VITE_BASE_URL='http://10.10.110.17:48080'           
+VITE_BASE_URL='http://10.10.100.17:48080'           
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/views/mapPage/taskManagement/taskList.vue b/src/views/mapPage/taskManagement/taskList.vue
index c2ea8c1d..724f5d08 100644
--- a/src/views/mapPage/taskManagement/taskList.vue
+++ b/src/views/mapPage/taskManagement/taskList.vue
@@ -146,23 +146,35 @@
                     <el-text class="mx-1">正在充电</el-text>
                   </div>
                   <div class="task-stage" v-else-if="scope.row.taskStage == 8">
-                    <div class="icon-dot"> </div>
+                    <div
+                      class="icon-dot"
+                      style="background-color: #909399; border: 0.0625rem solid #909399"
+                    >
+                    </div>
                     <el-text class="mx-1">取消</el-text>
                   </div>
                   <div class="task-stage" v-else-if="scope.row.taskStage == 9">
-                    <div class="icon-dot"> </div>
+                    <div
+                      class="icon-dot"
+                      style="background-color: #909399; border: 0.0625rem solid #909399"
+                    >
+                    </div>
                     <el-text class="mx-1">人工完成</el-text>
                   </div>
                   <div class="task-stage" v-else-if="scope.row.taskStage == 10">
-                    <div class="icon-dot"> </div>
+                    <div
+                      class="icon-dot"
+                      style="background-color: #ff4c4c; border: 0.0625rem solid #ff4c4c"
+                    >
+                    </div>
                     <el-text class="mx-1">异常</el-text>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="操作" width="270">
+              <el-table-column align="center" label="操作" width="340">
                 <template #default="scope">
                   <el-button
-                    v-if="scope.row.taskStage !== 5"
+                    v-if="scope.row.taskStatus === 0 || scope.row.taskStatus === 1"
                     type="warning"
                     @click="cancelTask(props.row, scope.row)"
                     >取消任务</el-button
@@ -171,7 +183,7 @@
                     placement="right"
                     :width="300"
                     trigger="click"
-                    v-if="scope.row.taskStage === 0"
+                    v-if="scope.row.taskStatus === 0 || scope.row.taskStatus === 1"
                   >
                     <template #reference>
                       <el-button type="primary" @click="modifyPriority(props.row, scope.row)"
@@ -189,9 +201,9 @@
                     </div>
                   </el-popover>
                   <el-button
-                    type="primary"
+                    type="success"
                     @click="finishTask(props.row, scope.row)"
-                    v-if="scope.row.taskStage !== 0 && scope.row.taskStage !== 5"
+                    v-if="scope.row.taskStatus === 0 || scope.row.taskStatus === 1"
                     >人工完成</el-button
                   >
                 </template>