11 Commits

Author SHA1 Message Date
Teo
fd4e05a802 Merge branch 'tcy' of http://192.168.110.2:3000/taoge_xiaodi/maintenance_system 2025-09-28 19:00:18 +08:00
tcy
af65455d33 style(dzt.vue): 调整已完成文本的字体大小以改善显示效果 2025-09-28 18:59:14 +08:00
Teo
d1c090b855 Merge branch 'ljx' of http://192.168.110.2:3000/taoge_xiaodi/maintenance_system 2025-09-28 18:58:57 +08:00
ljx
ed25998d61 修改 2025-09-28 18:58:39 +08:00
Teo
6003bcbe32 Merge branch 'dhr' of http://192.168.110.2:3000/taoge_xiaodi/maintenance_system 2025-09-28 18:55:19 +08:00
dhr
8cd3ed3f8c 0928 2025-09-28 18:54:52 +08:00
Teo
16003cff02 Merge branch 'tcy' of http://192.168.110.2:3000/taoge_xiaodi/maintenance_system 2025-09-28 18:54:20 +08:00
Teo
e9a60e978f 合并 2025-09-28 18:54:18 +08:00
tcy
63d17eea3c fix: 更新开发环境API地址并调整系统图文字大小
调整系统图中所有文字元素的字体大小以改善显示效果
2025-09-28 18:36:26 +08:00
dhr
9407ad5446 0928 2025-09-28 18:03:50 +08:00
dhr
3606ab7cf8 0928 2025-09-28 17:31:02 +08:00
20 changed files with 276 additions and 211 deletions

View File

@ -5,7 +5,7 @@ VITE_APP_TITLE = 新能源场站智慧运维平台
VITE_APP_ENV = 'development' VITE_APP_ENV = 'development'
# 开发环境 # 开发环境
VITE_APP_BASE_API = 'http://192.168.110.210:18899' VITE_APP_BASE_API = 'http://192.168.110.149:18899'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VITE_APP_CONTEXT_PATH = '/' VITE_APP_CONTEXT_PATH = '/'

View File

@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<div class="left_title_item"> <div class="left_title_item">
<div>站数量</div> <div>升压站数量</div>
<div> <div>
<span style="font-size: 24px; color: rgba(29, 214, 255, 1); padding-right: 10px">{{ data?.operatingRate ?? '0' }}</span> <span style="font-size: 24px; color: rgba(29, 214, 255, 1); padding-right: 10px">{{ data?.operatingRate ?? '0' }}</span>
<span style="color: rgba(156, 163, 175, 1)"></span> <span style="color: rgba(156, 163, 175, 1)"></span>

View File

@ -64,9 +64,9 @@
<!-- 主开关 --> <!-- 主开关 -->
<g :class="{ 'switch-closed': devices[0].status === 'closed' }"> <g :class="{ 'switch-closed': devices[0].status === 'closed' }">
<circle cx="200" cy="200" r="15" :fill="devices[0].status === 'closed' ? '#10b981' : '#ef4444'" /> <circle cx="200" cy="200" r="15" :fill="devices[0].status === 'closed' ? '#10b981' : '#ef4444'" />
<text x="200" y="250" text-anchor="middle" font-size="12">主开关</text> <text x="200" y="250" text-anchor="middle" font-size="5">主开关</text>
<text x="200" y="270" text-anchor="middle" font-size="10" fill="#666">220kV</text> <text x="200" y="270" text-anchor="middle" font-size="4" fill="#666">220kV</text>
<text x="200" y="285" text-anchor="middle" font-size="10" <text x="200" y="285" text-anchor="middle" font-size="4"
:fill="devices[0].status === 'closed' ? '#10b981' : '#ef4444'"> :fill="devices[0].status === 'closed' ? '#10b981' : '#ef4444'">
{{ devices[0].statusText }} {{ devices[0].statusText }}
</text> </text>
@ -78,15 +78,15 @@
<line x1="315" y1="190" x2="345" y2="190" stroke="#666" stroke-width="2" /> <line x1="315" y1="190" x2="345" y2="190" stroke="#666" stroke-width="2" />
<line x1="315" y1="210" x2="345" y2="210" stroke="#666" stroke-width="2" /> <line x1="315" y1="210" x2="345" y2="210" stroke="#666" stroke-width="2" />
<line x1="315" y1="230" x2="345" y2="230" stroke="#666" stroke-width="2" /> <line x1="315" y1="230" x2="345" y2="230" stroke="#666" stroke-width="2" />
<text x="330" y="285" text-anchor="middle" font-size="10" fill="#10b981">已完成</text> <text x="330" y="285" text-anchor="middle" font-size="5" fill="#10b981">已完成</text>
</g> </g>
<!-- 母线开关 --> <!-- 母线开关 -->
<g :class="{ 'switch-closed': devices[1].status === 'closed' }"> <g :class="{ 'switch-closed': devices[1].status === 'closed' }">
<circle cx="440" cy="200" r="15" :fill="devices[1].status === 'closed' ? '#10b981' : '#ef4444'" /> <circle cx="440" cy="200" r="15" :fill="devices[1].status === 'closed' ? '#10b981' : '#ef4444'" />
<text x="440" y="250" text-anchor="middle" font-size="12">母线开关</text> <text x="440" y="250" text-anchor="middle" font-size="5">母线开关</text>
<text x="440" y="270" text-anchor="middle" font-size="10" fill="#666">110kV</text> <text x="440" y="270" text-anchor="middle" font-size="4" fill="#666">110kV</text>
<text x="440" y="285" text-anchor="middle" font-size="10" <text x="440" y="285" text-anchor="middle" font-size="4"
:fill="devices[1].status === 'closed' ? '#10b981' : '#ef4444'"> :fill="devices[1].status === 'closed' ? '#10b981' : '#ef4444'">
{{ devices[1].statusText }} {{ devices[1].statusText }}
</text> </text>
@ -98,8 +98,8 @@
<!-- 馈线开关A --> <!-- 馈线开关A -->
<g :class="{ 'switch-closed': devices[2].status === 'closed' }"> <g :class="{ 'switch-closed': devices[2].status === 'closed' }">
<circle cx="600" cy="100" r="15" :fill="devices[2].status === 'closed' ? '#10b981' : '#ef4444'" /> <circle cx="600" cy="100" r="15" :fill="devices[2].status === 'closed' ? '#10b981' : '#ef4444'" />
<text x="600" y="60" text-anchor="middle" font-size="12">馈线开关A</text> <text x="600" y="60" text-anchor="middle" font-size="5">馈线开关A</text>
<text x="600" y="80" text-anchor="middle" font-size="10" <text x="600" y="80" text-anchor="middle" font-size="5"
:fill="devices[2].status === 'closed' ? '#10b981' : '#ef4444'"> :fill="devices[2].status === 'closed' ? '#10b981' : '#ef4444'">
{{ devices[2].statusText }} {{ devices[2].statusText }}
</text> </text>
@ -107,14 +107,14 @@
<!-- 负载A --> <!-- 负载A -->
<circle cx="680" cy="100" r="20" fill="#3b82f6" stroke="#1e40af" stroke-width="2" /> <circle cx="680" cy="100" r="20" fill="#3b82f6" stroke="#1e40af" stroke-width="2" />
<text x="680" y="105" text-anchor="middle" fill="white" font-size="12">负载A</text> <text x="680" y="105" text-anchor="middle" fill="white" font-size="5">负载A</text>
<text x="680" y="135" text-anchor="middle" font-size="10" fill="#10b981">已完成</text> <text x="680" y="135" text-anchor="middle" font-size="5" fill="#10b981">已完成</text>
<!-- 馈线开关B --> <!-- 馈线开关B -->
<g :class="{ 'switch-closed': devices[3].status === 'closed' }"> <g :class="{ 'switch-closed': devices[3].status === 'closed' }">
<circle cx="600" cy="300" r="15" :fill="devices[3].status === 'closed' ? '#10b981' : '#ef4444'" /> <circle cx="600" cy="300" r="15" :fill="devices[3].status === 'closed' ? '#10b981' : '#ef4444'" />
<text x="600" y="340" text-anchor="middle" font-size="12">馈线开关B</text> <text x="600" y="340" text-anchor="middle" font-size="5">馈线开关B</text>
<text x="600" y="360" text-anchor="middle" font-size="10" <text x="600" y="360" text-anchor="middle" font-size="5"
:fill="devices[3].status === 'closed' ? '#10b981' : '#ef4444'"> :fill="devices[3].status === 'closed' ? '#10b981' : '#ef4444'">
{{ devices[3].statusText }} {{ devices[3].statusText }}
</text> </text>
@ -123,8 +123,8 @@
<!-- 保护开关 --> <!-- 保护开关 -->
<g :class="{ 'switch-closed': devices[4].status === 'closed' }"> <g :class="{ 'switch-closed': devices[4].status === 'closed' }">
<circle cx="720" cy="300" r="15" :fill="devices[4].status === 'closed' ? '#10b981' : '#ef4444'" /> <circle cx="720" cy="300" r="15" :fill="devices[4].status === 'closed' ? '#10b981' : '#ef4444'" />
<text x="720" y="340" text-anchor="middle" font-size="12">保护开关</text> <text x="720" y="340" text-anchor="middle" font-size="5">保护开关</text>
<text x="720" y="360" text-anchor="middle" font-size="10" <text x="720" y="360" text-anchor="middle" font-size="5"
:fill="devices[4].status === 'closed' ? '#10b981' : '#ef4444'"> :fill="devices[4].status === 'closed' ? '#10b981' : '#ef4444'">
{{ devices[4].statusText }} {{ devices[4].statusText }}
</text> </text>

View File

@ -1005,35 +1005,35 @@ const handleEnable = async (row) => {
// 导航相关方法 // 导航相关方法
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/xunjianrenwu'); router.push('/znxj/xjgl/xunjianrenwu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/xunjianjihua'); router.push('/znxj/xjgl/xunjianjihua');
}; };
</script> </script>

View File

@ -333,34 +333,34 @@ const handleCreateTeam = () => {
// 导航路由跳转 // 导航路由跳转
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/cheliangzhuangtai'); router.push('/znxj/ywzz/cheliangzhuangtai');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/banzhuzhuangtai'); router.push('/znxj/ywzz/banzhuzhuangtai');
}; };
// ECharts实例 // ECharts实例

View File

@ -1047,32 +1047,32 @@ const handleSaveResult = async () => {
} }
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/baoxiujilu'); router.push('/znxj/bxgl/baoxiujilu');
}; };
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
// 组件挂载时获取数据 // 组件挂载时获取数据

View File

@ -885,36 +885,33 @@ const handleEvaluateTask = (record) => {
// 导航事件 // 导航事件
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/baoxiujilu'); router.push('/znxj/bxgl/baoxiujilu');
}; };
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
</script> </script>

View File

@ -299,34 +299,34 @@ const handleDispatch = (row) => {
// 导航路由跳转 // 导航路由跳转
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/cheliangzhuangtai'); router.push('/znxj/ywzz/cheliangzhuangtai');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/banzhuzhuangtai'); router.push('/znxj/ywzz/banzhuzhuangtai');
}; };
</script> </script>

View File

@ -234,13 +234,6 @@
<el-form-item label="工单描述"> <el-form-item label="工单描述">
<el-input v-model="createForm.resultDescription" type="textarea" :rows="3" placeholder="请描述该工单完成后预期达成的成果" /> <el-input v-model="createForm.resultDescription" type="textarea" :rows="3" placeholder="请描述该工单完成后预期达成的成果" />
</el-form-item> </el-form-item>
<el-form-item label="是否需要执行人" prop="needAssignee">
<el-radio-group v-model="createForm.needAssignee">
<el-radio label="true">指定执行人</el-radio>
<el-radio label="false">由系统分配</el-radio>
</el-radio-group>
</el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
@ -1276,35 +1269,35 @@ const handleSaveDraft = () => {
// 导航路由跳转 // 导航路由跳转
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/paidanjilu'); router.push('/znxj/gdgl/paidanjilu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/zhixingjilu'); router.push('/znxj/gdgl/zhixingjilu');
}; };
</script> </script>

View File

@ -560,25 +560,25 @@ const handleDelete = (id) => {
}; };
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
</script> </script>

View File

@ -1405,35 +1405,35 @@ const cancelCreate = () => {
// 导航路由跳转 // 导航路由跳转
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/paidanjilu'); router.push('/znxj/gdgl/paidanjilu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/zhixingjilu'); router.push('/znxj/gdgl/zhixingjilu');
}; };
// 关闭详情弹窗 // 关闭详情弹窗

View File

@ -698,32 +698,32 @@ const handleView = async (task) => {
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/qiangxiujilu'); router.push('/znxj/qxgl/qiangxiujilu');
}; };
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
// 加载状态 // 加载状态

View File

@ -943,43 +943,38 @@ const handleTaskTab = () => {
}; };
const handleRecordTab = () => { const handleRecordTab = () => {
router.push('/rili/qiangxiujiilu'); router.push('/znxj/qiangxiujiilu');
}; };
// 导航事件 // 导航事件
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/qiangxiujilu'); router.push('/znxj/qxgl/qiangxiujilu');
}; };
</script> </script>

View File

@ -397,34 +397,34 @@ const assignTask = (person) => {
// 导航路由跳转 // 导航路由跳转
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/cheliangzhuangtai'); router.push('/znxj/ywzz/cheliangzhuangtai');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/banzhuzhuangtai'); router.push('/znxj/ywzz/banzhuzhuangtai');
}; };
</script> </script>

View File

@ -688,34 +688,34 @@ const recentRecords = ref([]);
// 9. 方法:切换顶部导航 // 9. 方法:切换顶部导航
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/shiyanrenwu'); router.push('/znxj/sygl/shiyanrenwu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/shiyanjilu'); router.push('/znxj/sygl/shiyanjilu');
}; };
// 10. 方法:切换功能选项卡 // 10. 方法:切换功能选项卡
const switchTab = (tab) => { const switchTab = (tab) => {

View File

@ -629,37 +629,37 @@ const handleSizeChange = (size) => {
// 19. 导航方法 // 19. 导航方法
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
activeTab.value = 'plan'; activeTab.value = 'plan';
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
activeTab.value = 'task'; activeTab.value = 'task';
router.push('/rili/shiyanrenwu'); router.push('/znxj/sygl/shiyanrenwu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
activeTab.value = 'record'; activeTab.value = 'record';
router.push('/rili/shiyanjilu'); router.push('/znxj/sygl/shiyanjilu');
}; };
// 20. 详情弹窗相关 // 20. 详情弹窗相关

View File

@ -440,7 +440,7 @@ import router from '@/router';
import { syrenwulist, syrenwuDetail, addsyrenwu, updatesyrenwu } from '@/api/zhinengxunjian/shiyan/renwu'; import { syrenwulist, syrenwuDetail, addsyrenwu, updatesyrenwu } from '@/api/zhinengxunjian/shiyan/renwu';
import { shiyanlist } from '@/api/zhinengxunjian/shiyan'; import { shiyanlist } from '@/api/zhinengxunjian/shiyan';
import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian/index'; import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian/index';
import { addjiedian } from '@/api/zhinengxunjian/jiedian/index'; import { addjiedian, updatejiedian } from '@/api/zhinengxunjian/jiedian/index';
// 引入Element Plus组件提示/空状态/骨架屏/弹窗) // 引入Element Plus组件提示/空状态/骨架屏/弹窗)
import { ElMessage, ElEmpty, ElSkeleton, ElForm, ElMessageBox, ElDialog } from 'element-plus'; import { ElMessage, ElEmpty, ElSkeleton, ElForm, ElMessageBox, ElDialog } from 'element-plus';
@ -831,16 +831,45 @@ const mapApiToView = (apiData) => {
// 生成试验阶段信息 // 生成试验阶段信息
const getTestStage = () => { const getTestStage = () => {
try { try {
// 优先查找nodes数组中status为2的第一条数据 // 优先查找nodes数组中处于执行中或失败的节点来确定当前试验阶段
if (apiData && apiData.nodes && Array.isArray(apiData.nodes)) { if (apiData && apiData.nodes && Array.isArray(apiData.nodes)) {
const firstStatusTwoNode = apiData.nodes.find((node) => { // 查找执行中状态的节点
// 确保node存在且有status属性 const executingNode = apiData.nodes.find((node) => {
if (!node || node.status === undefined) return false; if (!node || node.status === undefined) return false;
// 处理status可能是字符串或数字的情况
return node.status === '2' || node.status === 2; return node.status === '2' || node.status === 2;
}); });
if (firstStatusTwoNode && firstStatusTwoNode.name) {
return firstStatusTwoNode.name; // 如果有执行中的节点根据code判断阶段
if (executingNode && executingNode.code !== undefined) {
const stepName = executingNode.name || '未命名步骤';
return `${executingNode.code}步(${stepName})`;
}
// 查找失败状态的节点
const failedNode = apiData.nodes.find((node) => {
if (!node || node.status === undefined) return false;
return node.status === '3' || node.status === 3;
});
// 如果有失败的节点根据code判断阶段
if (failedNode && failedNode.code !== undefined) {
const stepName = failedNode.name || '未命名步骤';
return `${failedNode.code}步(${stepName})`;
}
// 查找已完成的节点,确定最后完成的阶段
const completedNodes = apiData.nodes.filter((node) => {
if (!node || node.status === undefined) return false;
return node.status === '4' || node.status === 4;
});
if (completedNodes.length > 0) {
// 按code排序取最大的code
completedNodes.sort((a, b) => Number(b.code) - Number(a.code));
if (completedNodes[0].code !== undefined) {
const stepName = completedNodes[0].name || '未命名步骤';
return `${completedNodes[0].code}步(${stepName})`;
}
} }
} }
// 如果没有找到符合条件的nodes数据检查是否有明确的试验阶段信息 // 如果没有找到符合条件的nodes数据检查是否有明确的试验阶段信息
@ -1014,9 +1043,34 @@ const handleAction = async (task) => {
return node.status === '2' || node.status === 2; return node.status === '2' || node.status === 2;
}); });
if (firstUnfinishedNode) { if (firstUnfinishedNode) {
// 使用updatejiedian接口更新节点状态构造完整的节点信息数组
const nodeUpdateParams = [
{
...firstUnfinishedNode,
status: '3',
updateTime: new Date().toISOString(),
// 确保包含所有必需字段
createDept: firstUnfinishedNode.createDept || 0,
createBy: firstUnfinishedNode.createBy || 0,
createTime: firstUnfinishedNode.createTime || new Date().toISOString(),
updateBy: firstUnfinishedNode.updateBy || 0,
params: firstUnfinishedNode.params || {
property1: 'string',
property2: 'string'
},
module: firstUnfinishedNode.module || 'string',
orderId: firstUnfinishedNode.orderId || 0,
code: firstUnfinishedNode.code || 0,
name: firstUnfinishedNode.name || 'string',
intendedPurpose: firstUnfinishedNode.intendedPurpose || 'string',
intendedTime: firstUnfinishedNode.intendedTime || new Date().toISOString(),
finishTime: firstUnfinishedNode.finishTime || '',
remark: firstUnfinishedNode.remark || ''
}
];
await updatejiedian(nodeUpdateParams);
// 更新本地数据以反映最新状态
firstUnfinishedNode.status = '3'; firstUnfinishedNode.status = '3';
// 确保更新到updateParams中
updateParams.nodes = taskDetails.nodes;
} }
} }
} catch (innerError) { } catch (innerError) {
@ -1050,13 +1104,39 @@ const handleAction = async (task) => {
// 将失败的步骤状态改回2未完成 // 将失败的步骤状态改回2未完成
if (taskDetails.nodes && Array.isArray(taskDetails.nodes)) { if (taskDetails.nodes && Array.isArray(taskDetails.nodes)) {
taskDetails.nodes.forEach((node) => { const failedNodes = taskDetails.nodes.filter((node) => {
if (node.status === '3' || node.status === 3) { return node.status === '3' || node.status === 3;
node.status = '2';
}
}); });
// 确保更新到updateParams中
updateParams.nodes = taskDetails.nodes; // 构造包含所有失败节点的完整信息数组
const nodeUpdateParams = failedNodes.map((failedNode) => ({
...failedNode,
status: '2',
updateTime: new Date().toISOString(),
// 确保包含所有必需字段
createDept: failedNode.createDept || 0,
createBy: failedNode.createBy || 0,
createTime: failedNode.createTime || new Date().toISOString(),
updateBy: failedNode.updateBy || 0,
params: failedNode.params || {
property1: 'string',
property2: 'string'
},
module: failedNode.module || 'string',
orderId: failedNode.orderId || 0,
code: failedNode.code || 0,
name: failedNode.name || 'string',
intendedPurpose: failedNode.intendedPurpose || 'string',
intendedTime: failedNode.intendedTime || new Date().toISOString(),
finishTime: failedNode.finishTime || '',
remark: failedNode.remark || ''
}));
// 一次性调用updatejiedian接口更新所有节点
await updatejiedian(nodeUpdateParams);
// 更新本地数据以反映最新状态
for (const failedNode of failedNodes) {
failedNode.status = '2';
}
} }
break; break;
default: default:
@ -1261,34 +1341,34 @@ const handleCancelCreateTask = () => {
// ============== 5. 导航栏跳转逻辑(保持原有) ============== // ============== 5. 导航栏跳转逻辑(保持原有) ==============
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/shiyanrenwu'); router.push('/znxj/sygl/shiyanrenwu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/shiyanjilu'); router.push('/znxj/sygl/shiyanjilu');
}; };
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
// ============== 6. 页面初始化(加载任务列表和用户列表) ============== // ============== 6. 页面初始化(加载任务列表和用户列表) ==============

View File

@ -603,34 +603,34 @@ onUnmounted(() => {
// 导航方法 // 导航方法
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/xunjianrenwu'); router.push('/znxj/xjgl/xunjianrenwu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/xunjianjihua'); router.push('/znxj/xjgl/xunjianjihua');
}; };
</script> </script>

View File

@ -992,35 +992,35 @@ const handleCloseDetailDialog = () => {
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/xunjianrenwu'); router.push('/znxj/xjgl/xunjianrenwu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/xunjianjihua'); router.push('/znxj/xjgl/xunjianjihua');
}; };
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
// 处理任务操作按钮点击事件 // 处理任务操作按钮点击事件

View File

@ -1533,35 +1533,35 @@ const cancelCreate = () => {
// 导航路由跳转 // 导航路由跳转
const handleInspection1 = () => { const handleInspection1 = () => {
router.push('/rili/rili'); router.push('/znxj/rili');
}; };
const handleInspection2 = () => { const handleInspection2 = () => {
router.push('/rili/InspectionManagement'); router.push('/znxj/xjgl/InspectionManagement');
}; };
const handleInspection3 = () => { const handleInspection3 = () => {
router.push('/rili/shiyanguanli'); router.push('/znxj/sygl/shiyanguanli');
}; };
const handleInspection4 = () => { const handleInspection4 = () => {
router.push('/rili/baoxiuguanli'); router.push('/znxj/bxgl/baoxiuguanli');
}; };
const handleInspection5 = () => { const handleInspection5 = () => {
router.push('/rili/qiangxiuguanli'); router.push('/znxj/qxgl/qiangxiuguanli');
}; };
const handleInspection6 = () => { const handleInspection6 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspection7 = () => { const handleInspection7 = () => {
router.push('/rili/renyuanzhuangtai'); router.push('/znxj/ywzz/renyuanzhuangtai');
}; };
const handleInspectionManagement1 = () => { const handleInspectionManagement1 = () => {
router.push('/rili/gongdanliebiao'); router.push('/znxj/gdgl/gongdanliebiao');
}; };
const handleInspectionManagement2 = () => { const handleInspectionManagement2 = () => {
router.push('/rili/paidanjilu'); router.push('/znxj/gdgl/paidanjilu');
}; };
const handleInspectionManagement3 = () => { const handleInspectionManagement3 = () => {
router.push('/rili/zhixingjilu'); router.push('/znxj/gdgl/zhixingjilu');
}; };
// 关闭详情弹窗 // 关闭详情弹窗