ak/zn-admin-vue3-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务列表 操作按钮的显示

Browse Source
This commit is contained in:
yyy 2025-05-17 10:52:14 +08:00
parent f97c7964a8
commit 6acd42544a
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -6,7 +6,7 @@ VITE_DEV=true
# 请求路径 # 请求路径
# VITE_BASE_URL='http://192.168.0.66:48080' # 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.189:48080'
VITE_BASE_URL='http://192.168.0.45:48080' VITE_BASE_URL='http://192.168.77.50:48080'
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
VITE_UPLOAD_TYPE=server VITE_UPLOAD_TYPE=server
@ -33,7 +33,7 @@ VITE_OUT_DIR=dist
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
# 验证码的开关 # 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true VITE_APP_CAPTCHA_ENABLE=false
# GoView域名 # GoView域名
VITE_GOVIEW_URL='http://127.0.0.1:3000' VITE_GOVIEW_URL='http://127.0.0.1:3000'

2
.env.local
View File

@ -6,7 +6,7 @@ VITE_DEV=true
# 请求路径 # 请求路径
# VITE_BASE_URL='http://192.168.0.74:48080' # VITE_BASE_URL='http://192.168.0.74:48080'
# VITE_BASE_URL='http://192.168.0.153: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 服务 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
VITE_UPLOAD_TYPE=server VITE_UPLOAD_TYPE=server

28
src/views/mapPage/taskManagement/taskList.vue
View File

@ -146,23 +146,35 @@
<el-text class="mx-1">正在充电</el-text> <el-text class="mx-1">正在充电</el-text>
</div> </div>
<div class="task-stage" v-else-if="scope.row.taskStage == 8"> <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> <el-text class="mx-1">取消</el-text>
</div> </div>
<div class="task-stage" v-else-if="scope.row.taskStage == 9"> <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> <el-text class="mx-1">人工完成</el-text>
</div> </div>
<div class="task-stage" v-else-if="scope.row.taskStage == 10"> <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> <el-text class="mx-1">异常</el-text>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="270"> <el-table-column align="center" label="操作" width="340">
<template #default="scope"> <template #default="scope">
<el-button <el-button
v-if="scope.row.taskStage !== 5" v-if="scope.row.taskStatus === 0 || scope.row.taskStatus === 1"
type="warning" type="warning"
@click="cancelTask(props.row, scope.row)" @click="cancelTask(props.row, scope.row)"
>取消任务</el-button >取消任务</el-button
@ -171,7 +183,7 @@
placement="right" placement="right"
:width="300" :width="300"
trigger="click" trigger="click"
v-if="scope.row.taskStage === 0" v-if="scope.row.taskStatus === 0 || scope.row.taskStatus === 1"
> >
<template #reference> <template #reference>
<el-button type="primary" @click="modifyPriority(props.row, scope.row)" <el-button type="primary" @click="modifyPriority(props.row, scope.row)"
@ -189,9 +201,9 @@
</div> </div>
</el-popover> </el-popover>
<el-button <el-button
type="primary" type="success"
@click="finishTask(props.row, scope.row)" @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 >人工完成</el-button
> >
</template> </template>