0929

调整系统图中所有文字元素的字体大小以改善显示效果

.env.development

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

src/api/wuziguanli/beijian/index.ts

@@ -61,16 +61,3 @@ export const delBeipinBeijian = (id: string | number | Array<string | number>) =
     method: 'delete'
   });
 };
-
-/**
- * 运维-物资-备件-查询总览
- * @param query
- * @returns {*}
- */
-export const chuRuKuTotal = (data:any): AxiosPromise<any> => {
-  return request({
-    url: '/ops/beipinBeijian/getCount',
-    method: 'get',
-    params: data
-  });
-};

src/api/wuziguanli/caigouPlan/index.ts

@@ -54,45 +54,3 @@ export const caigouPlanDetail = (id: string | number): AxiosPromise<CaigouPlanVO
     method: 'get'
   });
 };
-
-
-/**
- * 更新运维-物资-采购计划单
- * @param data
- * @returns {*}
- */
-export const updateCaigouPlan = (data: CaigouPlanForm): AxiosPromise<CaigouPlanVO> => {
-  return request({
-    url: '/ops/caigouPlan',
-    method: 'put',
-    data: data
-  });
-};
-
-// /**
-//  * 查询运维-物资-采购计划单年度金额
-//  * @param query
-//  * @returns {*}
-//  */
-// export const getJinE = (query?: CaigouPlanQuery): AxiosPromise<any> => {
-//   return request({
-//     url: '/ops/caigouPlan/getJinE',
-//     method: 'get',
-//     params: query
-//   });
-// };
-
-/**
- * 查询运维-物资-采购计划单年度金额
- * @param id
- * @returns {*}
- */
-export const getCount = (id: string | number): AxiosPromise<CaigouPlanVO> => {
-  return request({
-    url: '/ops/caigouPlan/getJinE',
-    method: 'get',
-    params: {
-      projectId: id
-    }
-  });
-};

src/api/wuziguanli/caigouPlan/types.ts

@@ -178,18 +178,6 @@ export interface CaigouPlanVO {
      * 采购申请计划文件 查询
      */
     opsCaigouPlanFilesVos?: Array<any>;
-    /**
-     * 申请原因
-     */
-    reason?: string;
-    /**
-     * 供应商名称
-     */
-    gonyingshangName?: string;
-    /**
-     * 设备类型
-     */
-    shebeiType?: string;
 
 }
 
@@ -372,18 +360,8 @@ export interface CaigouPlanForm extends BaseEntity {
      * 出货时间
      */
     chouhuoTime?: string;
-    /**
-     * 申请原因
-     */
-    reason?: string;
-    /**
-     * 供应商名称
-     */
-    gonyingshangName?: string;
-    /**
-     * 设备类型
-     */
-    shebeiType?: string;
+   
+
 }
 
 export interface CaigouPlanQuery extends PageQuery {
@@ -567,18 +545,6 @@ export interface CaigouPlanQuery extends PageQuery {
      * 出货时间
      */
     chouhuoTime?: string;
-     /**
-     * 申请原因
-     */
-    reason?: string;
-    /**
-     * 供应商名称
-     */
-    gonyingshangName?: string;
-    /**
-     * 设备类型
-     */
-    shebeiType?: string;
 }
 
 

src/api/wuziguanli/churuku/index.ts

@@ -62,43 +62,15 @@ export const delChurukudan = (id: string | number | Array<string | number>) => {
   });
 };
 
-/**
- * 运维-物资-出入库单折现图
- * @param query
- * @returns {*}
- */
-export const getChuRuKuCountLine = (data:any): AxiosPromise<any> => {
-  return request({
-    url: '/ops/churukudan/getChuRuKuDayCount',
-    method: 'get',
-    params: data
-  });
-};
-
 /**
  * 运维-物资-出入库单柱状图
  * @param query
  * @returns {*}
  */
-export const getChuRuKuDayCountBar = (data:any): AxiosPromise<any> => {
+export const getChuRuKuCountBar = (data:any): AxiosPromise<any> => {
   return request({
     url: '/ops/churukudan/getChuRuKuCount',
     method: 'get',
     params: data
   });
 };
-
-/**
- * 运维-物资-出入库单-查询产品名称列表
- * @param query
- * @returns {*}
- */
-export const getChanpinLists = (data:any): AxiosPromise<any> => {
-  return request({
-    url: '/ops/caigouPlan/getChanpinList',
-    method: 'get',
-    params: data
-  });
-};
-
-

src/api/wuziguanli/churuku/types.ts

@@ -47,18 +47,6 @@ export interface ChurukudanVO {
    */
   danjvType: string;
 
-  /**
-   * 审核状态
-   */
-  auditStatus?: string;
-  /**
-   * 产品名称
-   */
-  chanpinName?: string;
-  /**
-   * 产品id
-   */
-  chanpinId?: string | number;
 }
 
 export interface ChurukudanForm extends BaseEntity {
@@ -114,14 +102,6 @@ export interface ChurukudanForm extends BaseEntity {
    * 审核状态
    */
   auditStatus?: string;
-  /**
-   * 产品名称
-   */
-  chanpinName?: string;
-  /**
-   * 产品id
-   */
-  chanpinId?: string | number;
 
 }
 
@@ -159,18 +139,11 @@ export interface ChurukudanQuery extends PageQuery {
    * 开始日期
    */
   startDate?: string;
-  /**
-   * 产品名称
-   */
-  chanpinName?: string;
+  
   /**
    * 结束日期
    */
   endDate?: string;
-  /**
-   * 产品id
-   */
-  chanpinId?: string | number;
     /**
      * 日期范围参数
      */

src/components/FileUpload/index.vue

@@ -1,16 +1,5 @@
 <template>
   <div class="upload-file">
-     <!-- 文件列表 -->
-    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
-      <li v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
-        <el-link :href="`${file.url}`" :underline="false" target="_blank">
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
-        </el-link>
-        <div class="ele-upload-list__item-content-action">
-          <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
-        </div>
-      </li>
-    </transition-group>
     <el-upload
       ref="fileUploadRef"
       multiple
@@ -48,6 +37,17 @@
       </template>
       的文件
     </div>
+    <!-- 文件列表 -->
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
+        <el-link :href="`${file.url}`" :underline="false" target="_blank">
+          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+        </el-link>
+        <div class="ele-upload-list__item-content-action">
+          <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
+        </div>
+      </li>
+    </transition-group>
   </div>
 </template>
 
@@ -55,7 +55,7 @@
 import { propTypes } from '@/utils/propTypes';
 import { delOss, listByIds } from '@/api/system/oss';
 import { globalHeaders } from '@/utils/request';
-import { ref } from 'vue';
+
 const props = defineProps({
   modelValue: {
     type: [String, Object, Array],
@@ -89,6 +89,7 @@ const showTip = computed(() => props.isShowTip && (props.fileType || props.fileS
 
 const fileUploadRef = ref<ElUploadInstance>();
 
+
 // 监听 fileType 变化，更新 fileAccept
 const fileAccept = computed(() => props.fileType.map((type) => `.${type}`).join(','));
 
@@ -199,6 +200,7 @@ const uploadedSuccessfully = () => {
     uploadList.value = [];
     number.value = 0;
     emit('update:modelValue', listToString(fileList.value));
+    emit('update:fileList', fileList.value);
     proxy?.$modal.closeLoading();
   }
 };

src/layout/components/AppMain.vue

@@ -2,11 +2,9 @@
   <section class="app-main">
     <router-view v-slot="{ Component, route }">
       <transition :enter-active-class="animate" mode="out-in">
-        <div>
-          <keep-alive :include="tagsViewStore.cachedViews">
+        <keep-alive :include="tagsViewStore.cachedViews">
           <component :is="Component" v-if="!route.meta.link" :key="route.path" />
         </keep-alive>
-        </div>
       </transition>
     </router-view>
     <iframe-toggle />

src/store/modules/procurementDraft.ts

@@ -70,18 +70,11 @@ export const useProcurementDraftStore = defineStore('procurementDraft', () => {
     return false;
   };
 
-  // 清除所有草稿
-  const clearAllDrafts = (): void => {
-    draftList.value = [];
-    saveDraftsToStorage(draftList.value);
-  };
-
   return {
     draftList,
     saveDraft,
     getDraftList,
     getDraft,
-    deleteDraft,
-    clearAllDrafts
+    deleteDraft
   };
 });

src/utils/index.ts

@@ -365,9 +365,9 @@ export const getStepStatusText = (status: string | number): string => {
   const statusMap: Record<string, string> = {
     '1': '待执行',
     '2': '执行中',
-    '3': '已完成',
+    '3': '失败',
     '4': '已延期',
-    '5': '失败'
+    '5': '已完成'
   };
   return statusMap[statusStr] || '未知状态';
 };

src/views/integratedManage/stateManage/components/manageForm.vue

@@ -2,7 +2,7 @@
     <div class="manage-form-container">
         <!-- 搜索和筛选区域 -->
         <div class="search-filter-section">
-            <el-row :gutter="12" align="middle">
+            <el-row gutter="12" align="middle">
                 <el-col :span="2">
                     <el-select v-model="searchForm.deviceType" placeholder="设备类型" clearable>
                         <el-option label="全部类型" value="" />

src/views/largeScreen/components/leftPage.vue

@@ -38,7 +38,7 @@
           </div>
         </div>
         <div class="left_title_item">
-          <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="color: rgba(156, 163, 175, 1)">座</span>

src/views/materialManagement/components/DataAnalysis.vue

@@ -19,29 +19,9 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
+import { ref, onMounted, onUnmounted } from 'vue';
 import * as echarts from 'echarts';
 
-// 定义props
-const props = defineProps({
-    lineData: {
-        type: Object,
-        default: () => ({
-            days: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-            rukuCounnts: [5, 40, 20, 75, 60, 80, 40, 55, 30, 65, 5, 80],
-            chukuCounnts: [30, 40, 30, 30, 30, 15, 55, 50, 40, 60, 25, 90]
-        })
-    },
-    barData: {
-        type: Object,
-        default: () => ({
-            shebeiTypes: ['光伏组件', '逆变器', '汇流箱', '支架', '电缆'],
-            rukuCount: [5, 40, 20, 75, 60],
-            chukuCount: [30, 40, 30, 30, 30]
-        })
-    }
-});
-
 // 图表容器引用
 const lineChartRef = ref(null);
 const barChartRef = ref(null);
@@ -50,53 +30,6 @@ const barChartRef = ref(null);
 let lineChart = null;
 let barChart = null;
 
-// 计算属性：处理传入的lineData，确保数据有效
-const processedLineData = computed(() => {
-    // 检查传入的数据是否有效
-    if (!props.lineData || 
-        !props.lineData.days || 
-        props.lineData.days.length === 0 ||
-        !Array.isArray(props.lineData.rukuCounnts) ||
-        !Array.isArray(props.lineData.chukuCounnts)) {
-        return {
-            days: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-            rukuCounnts: [5, 40, 20, 75, 60, 80, 40, 55, 30, 65, 5, 80],
-            chukuCounnts: [30, 40, 30, 30, 30, 15, 55, 50, 40, 60, 25, 90]
-        };
-    }
-    
-    // 检查rukuCounnts和chukuCounnts是否全为0
-    const isRukuAllZero = props.lineData.rukuCounnts.every(item => item === 0);
-    const isChukuAllZero = props.lineData.chukuCounnts.every(item => item === 0);
-    
-    if (isRukuAllZero && isChukuAllZero) {
-        return {
-            days: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-            rukuCounnts: [5, 40, 20, 75, 60, 80, 40, 55, 30, 65, 5, 80],
-            chukuCounnts: [30, 40, 30, 30, 30, 15, 55, 50, 40, 60, 25, 90]
-        };
-    }
-    
-    return props.lineData;
-});
-
-// 计算属性：处理传入的barData，确保数据有效
-const processedBarData = computed(() => {
-    // 检查传入的数据是否有效
-    if (!props.barData || 
-        !props.barData.shebeiTypes || 
-        props.barData.shebeiTypes.length === 0 ||
-        !Array.isArray(props.barData.rukuCount) ||
-        !Array.isArray(props.barData.chukuCount)) {
-        return {
-            shebeiTypes: ['光伏组件', '逆变器', '汇流箱', '支架', '电缆'],
-            rukuCount: [5, 40, 20, 75, 60],
-            chukuCount: [30, 40, 30, 30, 30]
-        };
-    }
-    return props.barData;
-});
-
 onMounted(() => {
     // 初始化折线图
     initLineChart();
@@ -144,7 +77,7 @@ const initLineChart = () => {
             },
             xAxis: {
                 type: 'category',
-                data: processedLineData.value.days
+                data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12']
             },
             yAxis: {
                 type: 'value'
@@ -153,7 +86,7 @@ const initLineChart = () => {
                 {
                     name: '入库数量',
                     type: 'line',
-                    data: processedLineData.value.rukuCounnts,
+                    data: [5, 40, 20, 75, 60, 80, 40, 55, 30, 65, 5, 80],
                     symbol: 'none',
                     smooth: true,
                     lineStyle: {
@@ -172,7 +105,7 @@ const initLineChart = () => {
                 {
                     name: '出库数量',
                     type: 'line',
-                    data: processedLineData.value.chukuCounnts,
+                    data: [30, 40, 30, 30, 30, 15, 55, 50, 40, 60, 25, 90],
                     symbol: 'none',
                     smooth: true,
                     lineStyle: {
@@ -222,7 +155,7 @@ const initBarChart = () => {
             },
             xAxis: {
                 type: 'category',
-                data: processedBarData.value.shebeiTypes,
+                data: ['电器部件', '机械部件', '电子元件', '控制模块', '结构部件', '其他'],
                 axisLabel: {
                     interval: 0, // 强制显示所有标签
                     rotate: 30, // 标签旋转30度
@@ -238,7 +171,7 @@ const initBarChart = () => {
                 {
                     name: '入库数量',
                     type: 'bar',
-                    data: processedBarData.value.rukuCount,
+                    data: [650, 480, 510, 280, 650, 220],
                     itemStyle: {
                         color: 'rgba(22, 93, 255, 1)' // 入库数量颜色
                     },
@@ -249,7 +182,7 @@ const initBarChart = () => {
                 {
                     name: '出库数量',
                     type: 'bar',
-                    data: processedBarData.value.chukuCount,
+                    data: [850, 400, 770, 590, 540, 310],
                     itemStyle: {
                         color: 'rgba(15, 198, 194, 1)' // 出库数量颜色
                     },
@@ -272,12 +205,6 @@ const handleResize = () => {
         barChart.resize();
     }
 };
-
-// 监听数据变化，更新图表
-watch([() => props.lineData, () => props.barData], () => {
-    initLineChart();
-    initBarChart();
-}, { deep: true });
 </script>
 
 <style scoped>

src/views/materialManagement/components/detailInfo.vue

@@ -1,37 +1,84 @@
 <template>
     <div class="approval-form">
         <!-- 基础信息 -->
-        <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <el-descriptions title="基础信息" direction="vertical" :column="3" border size="large" class="infoClass">
-                <el-descriptions-item label="采购单编号">{{ props.detailInfo.id }}</el-descriptions-item>
-                <el-descriptions-item label="创建时间">{{ props.detailInfo.createTime }}</el-descriptions-item>
-                <el-descriptions-item label="经办人">{{ props.detailInfo.jingbanrenName }}</el-descriptions-item>
-                <el-descriptions-item label="所属部门">{{ props.detailInfo.caigouDanweiName }}</el-descriptions-item>
-                <el-descriptions-item label="采购类型">{{ getTagLabel(wz_purchase_type, props.detailInfo.caigouType)
-                    }}</el-descriptions-item>
-                <el-descriptions-item label="申请原因">{{ props.detailInfo.reason }}</el-descriptions-item>
-            </el-descriptions>
+        <el-card class="card" shadow="hover">
+            <template #header>
+                <h3>基础信息</h3>
+            </template>
+            <el-form :model="detailInfo" label-width="120px">
+                <el-row :gutter="20">
+                    <el-col :span="8">
+                        <el-form-item label="采购单号">
+                            <el-input v-model="detailInfo.id" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="创建时间">
+                            <el-input v-model="detailInfo.createTime" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="经办人">
+                            <el-input v-model="detailInfo.jingbanrenName" disabled />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="所属部门">
+                            <el-select v-model="detailInfo.caigouDanweiName" placeholder="请选择">
+                                <el-option label="运维部" value="运维部" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="采购类型">
+                            <el-select v-model="detailInfo.caigouType" placeholder="请选择">
+                                <el-option label="项目业务" value="项目业务" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-form-item label="申请原因">
+                    <el-input v-model="basicInfo.applyReason" type="textarea" :rows="2" placeholder="请输入申请原因" />
+                </el-form-item>
+            </el-form>
         </el-card>
+
         <!-- 供应商信息 -->
         <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <el-descriptions title="供应商信息" direction="vertical" :column="2" border size="large">
-                <el-descriptions-item label="供应商单位">{{ props.detailInfo.gonyingshangName }}</el-descriptions-item>
-                <el-descriptions-item label="出货时间">{{ props.detailInfo.chuhuoTime }}</el-descriptions-item>
-            </el-descriptions>
+            <template #header>
+                <h3>供应商信息</h3>
+            </template>
+            <el-form :model="detailInfo" label-width="120px">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="供应商单位">
+                            <el-select v-model="detailInfo.gonyingshangId" placeholder="请选择">
+                                <el-option label="AAAA精密仪器制造有限公司" value="AAAA精密仪器制造有限公司" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="出货时间">
+                            <el-select v-model="detailInfo.chouhuoTime" placeholder="请选择">
+                                <el-option label="2年零4个月" value="2年零4个月" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
         </el-card>
+
         <!-- 产品信息 -->
         <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <div slot="header" class="infoTitle">产品信息</div>
-            <el-table :data="props.detailInfo.opsCaigouPlanChanpinVos || []" border style="width: 100%">
+            <template #header>
+                <h3>产品信息</h3>
+            </template>
+            <el-table :data="detailInfo.opsCaigouPlanChanpinVos" border style="width: 100%">
                 <el-table-column prop="chanpinName" label="产品名称" />
                 <el-table-column prop="chanpinType" label="产品型号" />
-                <el-table-column prop="shebeiType" label="设备类型">
-                    <template #default="scope">
-                        {{ getTagLabel(wz_device_type, scope.row.shebeiType) }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="chanpinMonovalent" label="产品单价" align="center"
-                    :cell-style="{ background: 'pink' }" />
+                <el-table-column prop="chanpinMonovalent" label="产品单价" align="center" :cell-style="{ background: 'pink' }" />
                 <el-table-column prop="goumaiNumber" label="购买数量" align="center" :cell-style="{ background: 'pink' }" />
                 <el-table-column prop="yontu" label="用途" />
                 <el-table-column prop="totalPrice" label="合计" />
@@ -40,89 +87,163 @@
 
         <!-- 合同条款 -->
         <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <el-descriptions title="合同条款" direction="vertical" :column="3" border size="large">
-                <el-descriptions-item label="付款条件">{{ getTagLabel(wz_payment_terms, props.detailInfo.fukuantiaojian)
-                    }}</el-descriptions-item>
-                <el-descriptions-item label="发票开具方式">{{ getTagLabel(wz_invoicing_way, props.detailInfo.fapiaoKjfs)
-                    }}</el-descriptions-item>
-                <el-descriptions-item label="合同类型">{{
-                    getTagLabel(wz_contract_type, props.detailInfo.hetonType) }}</el-descriptions-item>
-            </el-descriptions>
+            <template #header>
+                <h3>合同条款</h3>
+            </template>
+            <el-form :model="contractInfo" label-width="120px">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="付款条件">
+                            <el-select v-model="detailInfo.fukuantiaojian" placeholder="请选择">
+                                <el-option label="银行卡" value="银行卡" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="发票开具方式">
+                            <el-select v-model="detailInfo.fapiaoKjfs" placeholder="请选择">
+                                <el-option label="请选择" value="请选择" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
         </el-card>
 
         <!-- 附件 -->
         <el-card class="card" shadow="hover" style="margin-top: 20px">
-            <div slot="header" class="infoTitle">附件</div>
-
-            <el-table :data="props.detailInfo.opsCaigouPlanFilesVos || []" border>
-                <el-table-column prop="fileName" label="文件名" width="300" />
-                <el-table-column label="文件类型" width="200">
-                    <template #default="scope">
-                        {{ getFileType(scope.row.fileName) }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="200">
-                    <template #default="scope">
-                        <el-link type="primary" @click="handlePreview(scope.row)">
-                            预览
-                        </el-link>
-                    </template>
-                </el-table-column>
-            </el-table>
+            <template #header>
+                <h3>附件</h3>
+            </template>
+            <el-upload class="upload-demo" action="#" :file-list="fileList" :auto-upload="false"
+                :on-preview="handlePreview">
+                <el-table :data="fileList" border style="width: 100%">
+                    <el-table-column prop="name" label="文件名" width="300" />
+                    <el-table-column prop="size" label="大小" width="100" />
+                    <el-table-column label="操作" width="100">
+                        <template #default="scope">
+                            <!-- <el-link type="primary" @click="handlePreview(scope.row)"> -->
+                            <el-link type="primary">
+                                预览
+                            </el-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-upload>
         </el-card>
     </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, getCurrentInstance, toRefs } from 'vue';
-import { defineProps } from 'vue';
+import { ref, onMounted, getCurrentInstance, toRefs } from 'vue';
+import { useRoute } from 'vue-router';
 import type { ComponentInternalInstance } from 'vue';
-import type { CaigouPlanVO } from '@/api/wuziguanli/caigouPlan/types';
-
-// 定义props
-const props = defineProps<{
-    detailInfo: CaigouPlanVO
-}>();
-
+const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_device_type } = toRefs<any>(proxy?.useDict('wz_device_type','wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine', 'wz_device_type'));
+const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_caigou_examine } = toRefs<any>(proxy?.useDict('wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine'));
 
+import { caigouPlanDetail } from '@/api/wuziguanli/caigouPlan';
+import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
 
+// 存储计划详情数据
+const detailInfo = ref<CaigouPlanVO>({} as CaigouPlanVO);
 
+// 存储计划编号
+const id = ref('');
 
-// 根据字典数组和值获取标签文本
-const getTagLabel = (dictArray: any[], value: any): string => {
-    if (!dictArray || !value) return '';
-    const item = dictArray.find(item => item.value === value);
-    return item?.label || value;
+const getDetailInfo = async () => {
+    const res = await caigouPlanDetail(id.value);
+    if (res.code === 200) {
+       detailInfo.value = res.data;
+       console.log(detailInfo.value);
+       
+    }
 }
 onMounted(() => {
+    // 接收路由参数
+    id.value = route.query.id as string;
+    getDetailInfo();
+
+
 
+});
+// 基础信息数据
+const basicInfo = ref({
+    orderNo: '0035455',
+    createTime: '2023-11-02 16:32',
+    handler: '李四',
+    dept: '运维部',
+    purchaseType: '项目业务',
+    applyReason:
+        '随着业务拓展，光伏电站业务负责增加，现有设备已运行5年，部分出现效率下降情况。为保证电站正常运行，计划采购一批新的逆变器替换老旧设备，并补充备件库存。',
 });
 
+// 供应商信息数据
+const supplierInfo = ref({
+    supplierName: 'AAAA精密仪器制造有限公司',
+    deliveryTime: '2年零4个月',
+    remark: '',
+});
 
-// 获取文件类型（后缀名）
-const getFileType = (fileName: string): string => {
-    if (!fileName) return '';
-    const lastDotIndex = fileName.lastIndexOf('.');
-    if (lastDotIndex === -1) return '';
-    return fileName.substring(lastDotIndex + 1).toLowerCase();
-};
+// 产品信息数据
+const productInfo = ref({
+    tableData: [
+        {
+            productName: 'AAABBBCCC',
+            productModel: '15-42',
+            productPrice: 500,
+            buyQuantity: 10,
+            usage: '组件',
+            total: 5000,
+        },
+    ],
+    remark: '',
+});
+
+// 合同条款数据
+const contractInfo = ref({
+    paymentCondition: '银行卡',
+    invoiceWay: '请选择',
+    remark: '',
+});
+
+// 附件数据
+const fileList = ref([
+    {
+        name: 'MWwwwww.jpg',
+        size: '30kb',
+        url: '',
+    },
+    {
+        name: '231234124w.zip',
+        size: '50kb',
+        url: '',
+    },
+    {
+        name: '12451asdas.doc',
+        size: '80kb',
+        url: '',
+    },
+    {
+        name: '21seasda.xls',
+        size: '29kb',
+        url: '',
+    },
+    {
+        name: '12kjaklskw.png',
+        size: '16kb',
+        url: '',
+    },
+]);
 
 // 预览文件
 const handlePreview = (file) => {
+    console.log('预览文件：', file);
     // 实际场景可在这里处理文件预览逻辑，如打开新窗口等
-    window.open(file.fileUrl, '_blank');
 };
 </script>
 
 <style scoped>
-.infoTitle {
-    font-size: 16px;
-    font-weight: bold;
-    margin-bottom: 20px;
-}
-
 .approval-form {
     padding: 20px;
 }
@@ -137,7 +258,7 @@ const handlePreview = (file) => {
     margin-top: 5px;
 }
 
-:v-deep(.el-input__inner) {
+::v-deep(.el-input__inner) {
     color: red;
 }
 </style>

src/views/materialManagement/components/updateInfo.vue

@@ -0,0 +1,261 @@
+<template>
+    <div class="approval-form">
+        <!-- 基础信息 -->
+        <el-card class="card" shadow="hover">
+            <template #header>
+                <h3>基础信息</h3>
+            </template>
+            <el-form :model="basicInfo" label-width="120px">
+                <el-row :gutter="20">
+                    <el-col :span="8">
+                        <el-form-item label="订单编号">
+                            <el-input v-model="basicInfo.orderNo" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="创建时间">
+                            <el-input v-model="basicInfo.createTime" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="经办人">
+                            <el-input v-model="basicInfo.handler" disabled />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="所属部门">
+                            <el-select v-model="basicInfo.dept" placeholder="请选择">
+                                <el-option label="运维部" value="运维部" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="采购类型">
+                            <el-select v-model="basicInfo.purchaseType" placeholder="请选择">
+                                <el-option label="项目业务" value="项目业务" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-form-item label="申请原因">
+                    <el-input v-model="basicInfo.applyReason" type="textarea" :rows="2" placeholder="请输入申请原因" />
+                </el-form-item>
+            </el-form>
+        </el-card>
+
+        <!-- 供应商信息 -->
+        <el-card class="card" shadow="hover" style="margin-top: 20px">
+            <template #header>
+                <h3>供应商信息</h3>
+            </template>
+            <el-form :model="supplierInfo" label-width="120px">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="供应商单位">
+                            <el-select v-model="supplierInfo.supplierName" placeholder="请选择">
+                                <el-option label="AAAA精密仪器制造有限公司" value="AAAA精密仪器制造有限公司" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="出货时间">
+                            <el-select v-model="supplierInfo.deliveryTime" placeholder="请选择">
+                                <el-option label="2年零4个月" value="2年零4个月" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </el-card>
+
+        <!-- 产品信息 -->
+        <el-card class="card" shadow="hover" style="margin-top: 20px">
+            <template #header>
+                <h3>产品信息</h3>
+            </template>
+            <el-table :data="productInfo.tableData" border style="width: 100%">
+                <el-table-column prop="productName" label="产品名称" />
+                <el-table-column prop="productModel" label="产品型号" />
+                <el-table-column prop="productPrice" label="产品单价" align="center" :cell-style="{ background: 'pink' }" />
+                <el-table-column prop="buyQuantity" label="购买数量" align="center" :cell-style="{ background: 'pink' }" />
+                <el-table-column prop="usage" label="用途" />
+                <el-table-column prop="total" label="合计" />
+            </el-table>
+        </el-card>
+
+        <!-- 合同条款 -->
+        <el-card class="card" shadow="hover" style="margin-top: 20px">
+            <template #header>
+                <h3>合同条款</h3>
+            </template>
+            <el-form :model="contractInfo" label-width="120px">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-form-item label="付款条件">
+                            <el-select v-model="contractInfo.paymentCondition" placeholder="请选择">
+                                <el-option label="银行卡" value="银行卡" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="发票开具方式">
+                            <el-select v-model="contractInfo.invoiceWay" placeholder="请选择">
+                                <el-option label="请选择" value="请选择" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </el-card>
+
+        <!-- 附件 -->
+        <el-card class="card" shadow="hover" style="margin-top: 20px">
+            <template #header>
+                <h3>附件</h3>
+            </template>
+            <el-upload class="upload-demo" action="#" :file-list="fileList" :auto-upload="false"
+                :on-preview="handlePreview">
+                <el-table :data="fileList" border style="width: 100%">
+                    <el-table-column prop="name" label="文件名" width="300" />
+                    <el-table-column prop="size" label="大小" width="100" />
+                    <el-table-column label="操作" width="100">
+                        <template #default="scope">
+                            <!-- <el-link type="primary" @click="handlePreview(scope.row)"> -->
+                            <el-link type="primary">
+                                预览
+                            </el-link>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-upload>
+        </el-card>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, getCurrentInstance, toRefs } from 'vue';
+import { useRoute } from 'vue-router';
+import type { ComponentInternalInstance } from 'vue';
+const route = useRoute();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wz_invoicing_way, wz_payment_terms, wz_purchase_type, wz_contract_type, wz_caigou_examine } = toRefs<any>(proxy?.useDict('wz_invoicing_way', 'wz_payment_terms', 'wz_purchase_type', 'wz_contract_type', 'wz_caigou_examine'));
+
+import { caigouPlanDetail } from '@/api/wuziguanli/caigouPlan';
+import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
+
+
+// 存储计划编号
+const id = ref('');
+
+const getDetailInfo = async () => {
+    const res = await caigouPlanDetail(id.value);
+    if (res.code === 200) {
+       console.log(res);
+       
+    }
+}
+onMounted(() => {
+    // 接收路由参数
+    id.value = route.query.id as string;
+    getDetailInfo();
+
+
+
+});
+// 基础信息数据
+const basicInfo = ref({
+    orderNo: '0035455',
+    createTime: '2023-11-02 16:32',
+    handler: '李四',
+    dept: '运维部',
+    purchaseType: '项目业务',
+    applyReason:
+        '随着业务拓展，光伏电站业务负责增加，现有设备已运行5年，部分出现效率下降情况。为保证电站正常运行，计划采购一批新的逆变器替换老旧设备，并补充备件库存。',
+});
+
+// 供应商信息数据
+const supplierInfo = ref({
+    supplierName: 'AAAA精密仪器制造有限公司',
+    deliveryTime: '2年零4个月',
+    remark: '',
+});
+
+// 产品信息数据
+const productInfo = ref({
+    tableData: [
+        {
+            productName: 'AAABBBCCC',
+            productModel: '15-42',
+            productPrice: 500,
+            buyQuantity: 10,
+            usage: '组件',
+            total: 5000,
+        },
+    ],
+    remark: '',
+});
+
+// 合同条款数据
+const contractInfo = ref({
+    paymentCondition: '银行卡',
+    invoiceWay: '请选择',
+    remark: '',
+});
+
+// 附件数据
+const fileList = ref([
+    {
+        name: 'MWwwwww.jpg',
+        size: '30kb',
+        url: '',
+    },
+    {
+        name: '231234124w.zip',
+        size: '50kb',
+        url: '',
+    },
+    {
+        name: '12451asdas.doc',
+        size: '80kb',
+        url: '',
+    },
+    {
+        name: '21seasda.xls',
+        size: '29kb',
+        url: '',
+    },
+    {
+        name: '12kjaklskw.png',
+        size: '16kb',
+        url: '',
+    },
+]);
+
+// 预览文件
+const handlePreview = (file) => {
+    console.log('预览文件：', file);
+    // 实际场景可在这里处理文件预览逻辑，如打开新窗口等
+};
+</script>
+
+<style scoped>
+.approval-form {
+    padding: 20px;
+}
+
+.card {
+    border-radius: 8px;
+}
+
+.error-tip {
+    color: red;
+    font-size: 12px;
+    margin-top: 5px;
+}
+
+::v-deep(.el-input__inner) {
+    color: red;
+}
+</style>

src/views/materialManagement/components/upload.vue

@@ -1,278 +0,0 @@
-<template>
-  <div class="upload-file">
-     <!-- 文件列表 -->
-    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
-      <li v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
-        <el-link :href="`${file.url}`" :underline="false" target="_blank">
-          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
-        </el-link>
-        <div class="ele-upload-list__item-content-action">
-          <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
-        </div>
-      </li>
-    </transition-group>
-    <el-upload
-      ref="fileUploadRef"
-      multiple
-      :drag="isDrag"
-      :action="uploadFileUrl"
-      :before-upload="handleBeforeUpload"
-      :file-list="fileList"
-      :limit="limit"
-      :accept="fileAccept"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      :on-success="handleUploadSuccess"
-      :show-file-list="false"
-      :headers="headers"
-      class="upload-file-uploader"
-      v-if="!disabled"
-    >
-      <!-- 上传按钮 -->
-      <el-button type="primary" v-if="!isDrag">选取文件</el-button>
-      <div v-else>
-        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-        <div class="el-upload__text">
-          拖拽文件到此处，或 <em>点击上传</em>
-        </div>
-      </div>
-    </el-upload>
-    <!-- 上传提示 -->
-    <div v-if="showTip && !disabled" class="el-upload__tip">
-      请上传
-      <template v-if="fileSize">
-        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
-      </template>
-      <template v-if="fileType">
-        格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>
-      </template>
-      的文件
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { propTypes } from '@/utils/propTypes';
-import { delOss, listByIds } from '@/api/system/oss';
-import { globalHeaders } from '@/utils/request';
-import { ref } from 'vue';
-const props = defineProps({
-  modelValue: {
-    type: [String, Object, Array],
-    default: () => []
-  },
-  // 数量限制
-  limit: propTypes.number.def(5),
-  // 大小限制(MB)
-  fileSize: propTypes.number.def(5),
-  // 文件类型, 例如['png', 'jpg', 'jpeg']
-  fileType: propTypes.array.def(['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'pdf']),
-  // 是否显示提示
-  isShowTip: propTypes.bool.def(true),
-  // 禁用组件（仅查看文件）
-  disabled: propTypes.bool.def(false),
-  // 是否开启拖拽上传
-  isDrag: propTypes.bool.def(false)
-});
-
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const emit = defineEmits(['update:modelValue', 'update:fileList']);
-const number = ref(0);
-const uploadList = ref<any[]>([]);
-
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadFileUrl = ref(baseUrl + '/resource/oss/upload'); // 上传文件服务器地址
-const headers = ref(globalHeaders());
-
-const fileList = ref<any[]>([]);
-const showTip = computed(() => props.isShowTip && (props.fileType || props.fileSize));
-
-const fileUploadRef = ref<ElUploadInstance>();
-
-// 暴露方法给父组件
-defineExpose({
-  // 清空所有文件
-  clearAllFiles: () => {
-    fileList.value = [];
-    emit('update:modelValue', '');
-    emit('update:fileList', []);
-  }
-});
-
-
-// 监听 fileType 变化，更新 fileAccept
-const fileAccept = computed(() => props.fileType.map((type) => `.${type}`).join(','));
-
-watch(
-  () => props.modelValue,
-  async (val) => {
-    if (val) {
-      let temp = 1;
-      // 首先将值转为数组
-      let list: any[] = [];
-      
-      if (Array.isArray(val)) {
-        // 如果是数组，检查第一个元素的格式
-        if (val.length > 0 && val[0].fileName && val[0].fileId && val[0].fileUrl) {
-          // 处理后端返回的格式 [{fileName,fileId,fileUrl}]
-          list = val.map(item => ({
-            name: item.fileName,
-            url: item.fileUrl,
-            ossId: item.fileId
-          }));
-        } else {
-          // 处理组件内部格式 [{name,url,ossId}]
-          list = val;
-        }
-      } else {
-        // 处理字符串格式（逗号分隔的ossId）
-        const res = await listByIds(val);
-        list = res.data.map((oss) => {
-          return { name: oss.originalName, url: oss.url, ossId: oss.ossId };
-        });
-      }
-      
-      // 然后将数组转为对象数组
-      fileList.value = list.map((item) => {
-        item = { name: item.name, url: item.url, ossId: item.ossId };
-        item.uid = item.uid || new Date().getTime() + temp++;
-        return item;
-      });
-    } else {
-      fileList.value = [];
-      return [];
-    }
-  },
-  { deep: true, immediate: true }
-);
-
-// 上传前校检格式和大小
-const handleBeforeUpload = (file: any) => {
-  // 校检文件类型
-  if (props.fileType.length) {
-    const fileName = file.name.split('.');
-    const fileExt = fileName[fileName.length - 1];
-    const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
-    if (!isTypeOk) {
-      proxy?.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}格式文件!`);
-      return false;
-    }
-  }
-  // 校检文件名是否包含特殊字符
-  if (file.name.includes(',')) {
-    proxy?.$modal.msgError('文件名不正确，不能包含英文逗号!');
-    return false;
-  }
-  // 校检文件大小
-  if (props.fileSize) {
-    const isLt = file.size / 1024 / 1024 < props.fileSize;
-    if (!isLt) {
-      proxy?.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
-      return false;
-    }
-  }
-  proxy?.$modal.loading('正在上传文件，请稍候...');
-  number.value++;
-  return true;
-};
-
-// 文件个数超出
-const handleExceed = () => {
-  proxy?.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
-};
-
-// 上传失败
-const handleUploadError = () => {
-  proxy?.$modal.msgError('上传文件失败');
-};
-
-// 上传成功回调
-const handleUploadSuccess = (res: any, file: UploadFile) => {
-  if (res.code === 200) {
-    uploadList.value.push({
-      name: res.data.fileName,
-      url: res.data.url,
-      ossId: res.data.ossId
-    });
-    
-    uploadedSuccessfully();
-  } else {
-    number.value--;
-    proxy?.$modal.closeLoading();
-    proxy?.$modal.msgError(res.msg);
-    fileUploadRef.value?.handleRemove(file);
-    uploadedSuccessfully();
-  }
-};
-
-// 删除文件
-const handleDelete = (index: number) => {
-  const ossId = fileList.value[index].ossId;
-  delOss(ossId);
-  fileList.value.splice(index, 1);
-  
-  // 转换为后端需要的格式 [{fileName,fileId,fileUrl}]
-  const formattedList = fileList.value.map(file => ({
-    fileName: file.name,
-    fileId: file.ossId,
-    fileUrl: file.url
-  }));
-  
-  emit('update:modelValue', formattedList);
-};
-
-// 上传结束处理
-const uploadedSuccessfully = () => {
-  if (number.value > 0 && uploadList.value.length === number.value) {
-    fileList.value = fileList.value.filter((f) => f.url !== undefined).concat(uploadList.value);
-    uploadList.value = [];
-    number.value = 0;
-    
-    // 转换为后端需要的格式 [{fileName,fileId,fileUrl}]
-    const formattedList = fileList.value.map(file => ({
-      fileName: file.name,
-      fileId: file.ossId,
-      fileUrl: file.url
-    }));
-    
-    emit('update:modelValue', formattedList);
-    emit('update:fileList', fileList.value);
-    proxy?.$modal.closeLoading();
-  }
-};
-
-// 获取文件名称
-const getFileName = (name: string) => {
-  // 如果是url那么取最后的名字 如果不是直接返回
-  if (name.lastIndexOf('/') > -1) {
-    return name.slice(name.lastIndexOf('/') + 1);
-  } else {
-    return name;
-  }
-};
-
-</script>
-
-<style lang="scss" scoped>
-.upload-file-uploader {
-  margin-bottom: 5px;
-}
-
-.upload-file-list .el-upload-list__item {
-  border: 1px solid #e4e7ed;
-  line-height: 2;
-  margin-bottom: 10px;
-  position: relative;
-}
-
-.upload-file-list .ele-upload-list__item-content {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  color: inherit;
-}
-
-.ele-upload-list__item-content-action .el-link {
-  margin-right: 10px;
-}
-</style>

src/views/materialManagement/inventoryManagement.vue

@@ -8,8 +8,8 @@
                         <div class="top">
                             <div class="title">单据列表</div>
                             <div class="button-actions">
-                                <button :class="{ active: type === 'ruku' }" @click="changeType('ruku')">入库单</button>
                                 <button :class="{ active: type === 'chuku' }" @click="changeType('chuku')">出库单</button>
+                                <button :class="{ active: type === 'ruku' }" @click="changeType('ruku')">入库单</button>
                             </div>
                         </div>
                         <div class="content" style="height: 100%;flex: 1;">
@@ -23,20 +23,20 @@
                                                 <el-input v-model="queryParams.danjvNumber" placeholder="请输入单据编号"
                                                     clearable @keyup.enter="handleQuery" />
                                             </el-form-item>
-                                            <!-- <el-form-item label="设备类型" prop="shebeiType">
+                                            <el-form-item label="设备类型" prop="shebeiType">
                                                 <el-select v-model="queryParams.shebeiType" placeholder="请选择设备类型"
                                                     clearable>
                                                     <el-option v-for="dict in wz_device_type" :key="dict.value"
                                                         :label="dict.label" :value="dict.value" />
                                                 </el-select>
-                                            </el-form-item> -->
-                                            <!-- <el-form-item label="审核状态" prop="auditStatus">
+                                            </el-form-item>
+                                            <el-form-item label="审核状态" prop="auditStatus">
                                                 <el-select v-model="queryParams.auditStatus" placeholder="请选择审核状态"
                                                     clearable>
                                                     <el-option v-for="dict in shenheStatus" :key="dict.value"
                                                         :label="dict.label" :value="dict.value" />
                                                 </el-select>
-                                            </el-form-item> -->
+                                            </el-form-item>
                                             <el-form-item label="开始日期" prop="startDate">
                                                 <el-date-picker v-model="queryParams.startDate" type="date"
                                                     placeholder="请选择开始日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
@@ -63,17 +63,21 @@
                             <el-table v-loading="loading" border :data="churukudanList"
                                 style="width: 100%;margin-top: 15px;">
                                 <el-table-column label="单据编号" align="center" prop="danjvNumber" />
-                                <el-table-column label="产品名称" align="center" prop="chanpinName"></el-table-column>
-                                <el-table-column label="经手人" align="center" prop="jingshourenName" width="80px" />
+                                <el-table-column label="设备类型" align="center" prop="shebeiType">
+                                    <template #default="scope">
+                                        <span>{{ getTagLabel(wz_device_type, scope.row.shebeiType) }}</span>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="经手人" align="center" prop="jingshourenName" />
                                 <el-table-column label="操作时间" align="center" prop="updateTime" />
                                 <el-table-column label="总数量" align="center" prop="zonNumber" width="80px" />
-                                <!-- <el-table-column label="审核状态" align="center" prop="shenheStatus">
+                                <el-table-column label="审核状态" align="center" prop="shenheStatus">
                                     <template #default="scope">
                                         <el-tag :type="getTagType(shenheStatus, scope.row.shenheStatus)" as="span">
                                             {{ getTagLabel(shenheStatus, scope.row.shenheStatus) }}
                                         </el-tag>
                                     </template>
-                                </el-table-column> -->
+                                </el-table-column>
                                 <el-table-column label="单据类型" align="center" prop="danjvType">
                                     <template #default="scope">
                                         <el-tag :type="getTagType(danjvType, scope.row.danjvType)">
@@ -83,8 +87,8 @@
                                 </el-table-column>
                                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                                     <template #default="scope">
-                                        <!-- <el-button link type="primary" @click="handleUpdate(scope.row)"
-                                            v-hasPermi="['personnel:churukudan:edit']">修改</el-button> -->
+                                        <el-button link type="primary" @click="handleUpdate(scope.row)"
+                                            v-hasPermi="['personnel:churukudan:edit']">修改</el-button>
                                         <el-button link type="primary" @click="handleDetail(scope.row)"
                                             v-hasPermi="['personnel:churukudan:query']">详情</el-button>
                                         <el-button link type="primary" @click="handleDelete(scope.row)"
@@ -114,7 +118,7 @@
                     <div class="item-box">
                         <div class="title">数据分析</div>
                         <div class="content">
-                            <DataAnalysis :lineData="lineData" :barData="barData" />
+                            <DataAnalysis />
                         </div>
                     </div>
                 </el-card>
@@ -129,17 +133,14 @@
                             :value="dict.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <!-- <el-form-item label="设备类型" prop="shebeiType">
+                <el-form-item label="单据编号" prop="danjvNumber">
+                    <el-input v-model="form.danjvNumber" placeholder="请输入单据编号" />
+                </el-form-item>
+                <el-form-item label="设备类型" prop="shebeiType">
                     <el-select v-model="form.shebeiType" placeholder="请选择设备类型">
                         <el-option v-for="dict in wz_device_type" :key="dict.value" :label="dict.label"
                             :value="dict.value"></el-option>
                     </el-select>
-                </el-form-item> -->
-                <el-form-item label="产品名称" prop="chanpinName">
-                    <el-select v-model="form.chanpinName" placeholder="请选择产品名称">
-                        <el-option v-for="dict in chanpinSelect" :key="dict.value" :label="dict.label"
-                            :value="dict.value"></el-option>
-                    </el-select>
                 </el-form-item>
                 <el-form-item label="经手人id" prop="jingshourenId">
                     <el-input v-model="form.jingshourenId" placeholder="请输入经手人id" />
@@ -151,7 +152,7 @@
                     <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
                 </el-form-item>
                 <el-form-item label="总数量" prop="zonNumber">
-                    <el-input v-model="form.zonNumber" placeholder="请输入总数量" type="number" min="0"/>
+                    <el-input v-model="form.zonNumber" placeholder="请输入总数量" />
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -315,7 +316,7 @@
     padding: 12px 0;
 }
 
-:v-deep(.el-card__body) {
+::v-deep(.el-card__body) {
     height: 100%;
 }
 </style>
@@ -324,7 +325,7 @@ import SystemInfo from './components/SystemInfo.vue';
 import DataAnalysis from './components/DataAnalysis.vue';
 import { ref, computed } from 'vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-import { listChurukudan, getChurukudan, delChurukudan, addChurukudan, updateChurukudan, getChuRuKuCountLine, getChuRuKuDayCountBar, getChanpinLists } from '@/api/wuziguanli/churuku/index';
+import { listChurukudan, getChurukudan, delChurukudan, addChurukudan, updateChurukudan, getChuRuKuCountBar } from '@/api/wuziguanli/churuku/index';
 import { ChurukudanVO, ChurukudanQuery, ChurukudanForm } from '@/api/wuziguanli/churuku/types';
 const { wz_device_type } = toRefs<any>(proxy?.useDict('wz_device_type'));
 
@@ -341,8 +342,8 @@ const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
 const total = ref(0);
-// 单据类型切换变量 - 默认入库单
-const type = ref<string>('ruku');
+// 单据类型切换变量 - 默认出库单
+const type = ref<string>('chuku');
 
 /** 切换单据类型 */
 const changeType = (newType: string) => {
@@ -426,8 +427,6 @@ const initFormData: ChurukudanForm = {
     danjvType: undefined,
     updateTime: undefined,
     auditStatus: undefined,
-    chanpinName: undefined,
-    chanpinId: undefined,
 }
 const data = reactive<PageData<ChurukudanForm, ChurukudanQuery>>({
     form: { ...initFormData },
@@ -441,18 +440,13 @@ const data = reactive<PageData<ChurukudanForm, ChurukudanQuery>>({
         startDate: undefined,
         endDate: undefined,
         auditStatus: undefined,
-        chanpinName: undefined,
-        chanpinId: undefined,
-        danjvType: '2', // 默认显示入库单
+        danjvType: '1', // 默认显示出库单
         params: {
         }
     },
     rules: {
-        // shebeiType: [
-        //     { required: true, message: "设备类型不能为空", trigger: "change" }
-        // ],
-        chanpinName: [
-            { required: true, message: "产品名称不能为空", trigger: "change" }
+        shebeiType: [
+            { required: true, message: "设备类型不能为空", trigger: "change" }
         ],
         jingshourenId: [
             { required: true, message: "经手人id不能为空", trigger: "blur" }
@@ -466,34 +460,10 @@ const data = reactive<PageData<ChurukudanForm, ChurukudanQuery>>({
         danjvType: [
             { required: true, message: "单据状态不能为空", trigger: "change" }
         ],
-        // 手机号码格式校验
-        contactNumber: [
-            { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码格式", trigger: "blur" }
-        ]
     }
 });
 
 const { queryParams, form, rules } = toRefs(data);
-// 查询产品名称列表
-const chanpinList = ref<any[]>([]);
-const chanpinSelect = ref<any[]>([]);
-// 查询产品名称列表
-const getChanpinList = async () => {
-    try {
-        const res = await getChanpinLists({ projectId: userStore.selectedProject.id });
-        chanpinList.value = res.data || [];
-        chanpinSelect.value = chanpinList.value.map(item => ({
-            label:item.caigouPlanName +'-'+item.chanpinName,
-            value: item.id
-        }));
-        console.log('chanpinSelect.value', chanpinSelect.value);
-        
-    } catch (error) {
-        console.error('获取产品名称列表失败:', error);
-        proxy?.$modal.msgError("获取产品名称列表失败，请稍后重试");
-        chanpinList.value = [];
-    }
-}
 
 /** 查询运维-物资-出入库单管理列表 */
 const getList = async () => {
@@ -556,23 +526,23 @@ const handleAdd = () => {
 }
 
 /** 修改按钮操作 */
-// const handleUpdate = async (row?: ChurukudanVO) => {
-//     reset();
-//     const _id = row?.id || ids.value[0];
-//     if (!_id) {
-//         proxy?.$modal.msgWarning("请选择要修改的数据");
-//         return;
-//     }
-//     try {
-//         const res = await getChurukudan(_id);
-//         Object.assign(form.value, res.data);
-//         dialog.visible = true;
-//         dialog.title = "修改运维-物资-出入库单管理";
-//     } catch (error) {
-//         console.error('获取出入库单详情失败:', error);
-//         proxy?.$modal.msgError("获取数据失败，请稍后重试");
-//     }
-// }
+const handleUpdate = async (row?: ChurukudanVO) => {
+    reset();
+    const _id = row?.id || ids.value[0];
+    if (!_id) {
+        proxy?.$modal.msgWarning("请选择要修改的数据");
+        return;
+    }
+    try {
+        const res = await getChurukudan(_id);
+        Object.assign(form.value, res.data);
+        dialog.visible = true;
+        dialog.title = "修改运维-物资-出入库单管理";
+    } catch (error) {
+        console.error('获取出入库单详情失败:', error);
+        proxy?.$modal.msgError("获取数据失败，请稍后重试");
+    }
+}
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -580,7 +550,6 @@ const submitForm = () => {
         if (valid) {
             buttonLoading.value = true;
             try {
-                form.value.chanpinId = form.value.chanpinName
                 if (form.value.id) {
                     await updateChurukudan(form.value);
                     proxy?.$modal.msgSuccess("修改成功");
@@ -638,29 +607,7 @@ const handleDelete = async (row?: ChurukudanVO) => {
     }
 }
 
-// 折线图数据获取
-const lineData = ref<any>();
-const fetchChuRuKuCountLineData = async () => {
-    if (!queryParams.value.projectId) {
-        return;
-    }
-    let data = {
-        projectId: queryParams.value.projectId,
-        startDate: currentMonthDates[0].fullDate,
-        endDate: currentMonthDates[currentMonthDates.length - 1].fullDate,
-    }
-    try {
-        const res = await getChuRuKuCountLine(data);
-        if (res.code === 200) {
-            lineData.value = res.data;
-        }
-        // 这里可以添加数据处理和图表更新的逻辑
-    } catch (error) {
-        proxy?.$modal.msgError("获取统计数据失败");
-    }
-}
 // 柱状图数据获取
-const barData = ref<any>();
 const fetchChuRuKuCountBarData = async () => {
     if (!queryParams.value.projectId) {
         return;
@@ -671,15 +618,16 @@ const fetchChuRuKuCountBarData = async () => {
         endDate: currentMonthDates[currentMonthDates.length - 1].fullDate,
     }
     try {
-        const res = await getChuRuKuDayCountBar(data);
-        if (res.code === 200) {
-            barData.value = res.data;
-        }
+        const res = await getChuRuKuCountBar(data);
+        console.log(res);
         // 这里可以添加数据处理和图表更新的逻辑
     } catch (error) {
-        proxy?.$modal.msgError("获取统计数据失败");
+        console.error('获取柱状图数据失败:', error);
+        // 可以选择是否显示错误提示，根据UI需求决定
+        // proxy?.$modal.msgError("获取统计数据失败");
     }
 }
+
 // 监听用户选择的项目变化
 watch(() => userStore.selectedProject, (newProject) => {
     if (newProject && newProject.id) {
@@ -690,16 +638,12 @@ watch(() => userStore.selectedProject, (newProject) => {
         }
         // 调用getList刷新数据
         getList();
-        fetchChuRuKuCountLineData();
         fetchChuRuKuCountBarData();
     }
 }, { immediate: true, deep: true });
 onMounted(() => {
     getList();
-    fetchChuRuKuCountLineData();
     fetchChuRuKuCountBarData();
-    // 查询产品名称列表
-    getChanpinList();
 });
 
 // 组件卸载时清空projectId

src/views/materialManagement/planDetails.vue

@@ -9,15 +9,15 @@
                                 <ArrowLeft />
                             </el-icon>
                         </span>
-                        <h2>{{ Info.jihuaName }}</h2>
+                        <h2>Q2风电轴承采购计划</h2>
                     </div>
                 </el-card>
             </el-col>
         </el-row>
-        <el-row :gutter="10">
+        <el-row gutter="10">
             <el-col :span="18">
                 <el-card>
-                    <detailInfo :detail-info="Info" />
+                    <detailInfo />
                 </el-card>
             </el-col>
             <el-col :span="6" style="flex-grow: 1;">
@@ -46,66 +46,12 @@
     cursor: pointer;
 }
 </style>
-<script setup lang="ts">
-
+<script setup>
 import detailInfo from './components/detailInfo.vue';
 import DetailsProcess from './components/DetailsProcess.vue';
-import { ref, onMounted, getCurrentInstance, toRefs, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import type { ComponentInternalInstance } from 'vue';
-const route = useRoute();
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-import { caigouPlanDetail } from '@/api/wuziguanli/caigouPlan';
-import { CaigouPlanVO, CaigouPlanQuery, CaigouPlanForm } from '@/api/wuziguanli/caigouPlan/types';
-
-
-// 存储计划详情数据
-const Info = ref<CaigouPlanVO>({} as CaigouPlanVO);
-
-// 存储计划编号
-const id = ref('');
-
-// 获取详细信息
-const getDetailInfo = async () => {
-    const res = await caigouPlanDetail(id.value);
-    if (res.code === 200) {
-        Info.value = res.data;
-        console.log(Info.value);
-
-    }
-}
-onMounted(() => {
-    // 接收路由参数
-    id.value = route.query.id as string || '';
-    console.log('组件挂载时路由参数id:', id.value);
-    // 确保id不为空时才调用接口
-    if (id.value) {
-        getDetailInfo();
-    } else {
-        proxy.$modal.msgError('未获取到详细信息')
-        setTimeout(() => {
-            router.back();
-        }, 800);
-    }
-});
-
-// 监听路由参数变化
-watch(
-    () => route.query.id,
-    (newId) => {
-        id.value = newId as string || ''; 
-        if (id.value) {
-            getDetailInfo();
-        } 
-    },
-    { immediate: true }
-);
 const router = useRouter();
 const handleBack = () => {
     router.back();
 }
-
-
-
 </script>

src/views/materialManagement/spareParts.vue

@@ -214,7 +214,7 @@
                             <dict-tag :options="wz_inventory_type" :value="scope.row.kucunStatus"></dict-tag>
                         </template>
                     </el-table-column>
-                    <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                         <template #default="scope">
                             <el-button type="text" @click="handleUpdate(scope.row)"
                                 v-hasPermi="['personnel:beipinBeijian:edit']">编辑</el-button>
@@ -223,7 +223,7 @@
                             <el-button type="text" @click="handleDelete(scope.row)"
                                 v-hasPermi="['personnel:beipinBeijian:remove']">删除</el-button>
                         </template>
-                    </el-table-column> -->
+                    </el-table-column>
                 </el-table>
                 <div class="pagination-section">
                     <div class="pagination-info">
@@ -252,7 +252,7 @@
                     <el-input v-model="form.guigexinghao" placeholder="请输入规格型号" />
                 </el-form-item>
                 <el-form-item label="库存数量" prop="kucunCount">
-                    <el-input v-model="form.kucunCount" placeholder="请输入库存数量" type="number" min="0" />
+                    <el-input v-model="form.kucunCount" placeholder="请输入库存数量" />
                 </el-form-item>
                 <el-form-item label="库存状态" prop="kucunStatus">
                     <el-select v-model="form.kucunStatus" placeholder="请选择库存状态">
@@ -260,12 +260,12 @@
                             :value="dict.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <!-- <el-form-item label="设备类型" prop="shebeiType">
+                <el-form-item label="设备类型" prop="shebeiType">
                     <el-select v-model="form.shebeiType" placeholder="请选择设备类型">
                         <el-option v-for="dict in wz_device_type" :key="dict.value" :label="dict.label"
                             :value="dict.value"></el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
             </el-form>
             <template #footer>
                 <div class="dialog-footer">
@@ -408,7 +408,7 @@ const userStore = useUserStore();
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-import { listBeipinBeijian, getBeipinBeijian, delBeipinBeijian, updateBeipinBeijian,chuRuKuTotal } from '@/api/wuziguanli/beijian';
+import { listBeipinBeijian, getBeipinBeijian, delBeipinBeijian, updateBeipinBeijian } from '@/api/wuziguanli/beijian';
 import { BeipinBeijianVO, BeipinBeijianQuery, BeipinBeijianForm } from '@/api/wuziguanli/beijian/types';
 
 
@@ -502,18 +502,6 @@ const getDictLabel = (dictType, value) => {
     return option?.label || value;
 };
 
-//查询总览
-const getTotalView= async () => {
-    try {
-        const res = await chuRuKuTotal({projectId: queryParams.value.projectId});
-        console.log(res);
-        
-        total.value = res.total;
-    } catch (error) {
-        proxy?.$modal.msgError('获取数据失败，请重试');
-    }
-}
-
 /** 查询运维-物资-备品配件列表 */
 const getList = async () => {
     loading.value = true;
@@ -523,6 +511,7 @@ const getList = async () => {
         total.value = res.total;
     } catch (error) {
         proxy?.$modal.msgError('获取数据失败，请重试');
+        console.error('获取备品配件列表失败:', error);
     } finally {
         loading.value = false;
     }
@@ -566,6 +555,7 @@ const handleUpdate = async (row?: BeipinBeijianVO) => {
         dialog.visible = true;
     } catch (error) {
         proxy?.$modal.msgError('获取数据失败，请重试');
+        console.error('获取备品配件详情失败:', error);
     }
 }
 
@@ -582,6 +572,7 @@ const handleDetail = async (row?: BeipinBeijianVO) => {
         detailDialogVisible.value = true;
     } catch (error) {
         proxy?.$modal.msgError('获取数据失败，请重试');
+        console.error('获取备品配件详情失败:', error);
     }
 }
 
@@ -604,6 +595,7 @@ const submitForm = () => {
                 await getList();
             } catch (error) {
                 proxy?.$modal.msgError('操作失败，请重试');
+                console.error('提交表单失败:', error);
             } finally {
                 buttonLoading.value = false;
             }
@@ -628,6 +620,7 @@ const handleDelete = async (row?: BeipinBeijianVO) => {
         // 如果是用户取消确认，则不显示错误信息
         if (error !== 'cancel') {
             proxy?.$modal.msgError('删除失败，请重试');
+            console.error('删除数据失败:', error);
         }
     } finally {
         loading.value = false;
@@ -651,8 +644,6 @@ watch(() => userStore.selectedProject, (newProject) => {
 
 onMounted(() => {
     getList();
-    // 初始化查询总览
-    getTotalView();
 });
 
 // 组件卸载时清空projectId

src/views/pvSystem/mainSystemDiagram/components/dzt.vue

@@ -64,9 +64,9 @@
                 <!-- 主开关 -->
                 <g :class="{ 'switch-closed': devices[0].status === 'closed' }">
                     <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="270" text-anchor="middle" font-size="10" fill="#666">220kV</text>
-                    <text x="200" y="285" text-anchor="middle" font-size="10"
+                    <text x="200" y="250" text-anchor="middle" font-size="5">主开关</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="4"
                         :fill="devices[0].status === 'closed' ? '#10b981' : '#ef4444'">
                         {{ devices[0].statusText }}
                     </text>
@@ -78,15 +78,15 @@
                     <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="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 :class="{ 'switch-closed': devices[1].status === 'closed' }">
                     <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="270" text-anchor="middle" font-size="10" fill="#666">110kV</text>
-                    <text x="440" y="285" text-anchor="middle" font-size="10"
+                    <text x="440" y="250" text-anchor="middle" font-size="5">母线开关</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="4"
                         :fill="devices[1].status === 'closed' ? '#10b981' : '#ef4444'">
                         {{ devices[1].statusText }}
                     </text>
@@ -98,8 +98,8 @@
                 <!-- 馈线开关A -->
                 <g :class="{ 'switch-closed': devices[2].status === 'closed' }">
                     <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="80" text-anchor="middle" font-size="10"
+                    <text x="600" y="60" text-anchor="middle" font-size="5">馈线开关A</text>
+                    <text x="600" y="80" text-anchor="middle" font-size="5"
                         :fill="devices[2].status === 'closed' ? '#10b981' : '#ef4444'">
                         {{ devices[2].statusText }}
                     </text>
@@ -107,14 +107,14 @@
 
                 <!-- 负载A -->
                 <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="135" text-anchor="middle" font-size="10" fill="#10b981">已完成</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="5" fill="#10b981">已完成</text>
 
                 <!-- 馈线开关B -->
                 <g :class="{ 'switch-closed': devices[3].status === 'closed' }">
                     <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="360" text-anchor="middle" font-size="10"
+                    <text x="600" y="340" text-anchor="middle" font-size="5">馈线开关B</text>
+                    <text x="600" y="360" text-anchor="middle" font-size="5"
                         :fill="devices[3].status === 'closed' ? '#10b981' : '#ef4444'">
                         {{ devices[3].statusText }}
                     </text>
@@ -123,8 +123,8 @@
                 <!-- 保护开关 -->
                 <g :class="{ 'switch-closed': devices[4].status === 'closed' }">
                     <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="360" text-anchor="middle" font-size="10"
+                    <text x="720" y="340" text-anchor="middle" font-size="5">保护开关</text>
+                    <text x="720" y="360" text-anchor="middle" font-size="5"
                         :fill="devices[4].status === 'closed' ? '#10b981' : '#ef4444'">
                         {{ devices[4].statusText }}
                     </text>

src/views/securitySurveillance/components/sbzt.vue

@@ -1,10 +1,10 @@
 <template>
     <el-card style="border-radius: 15px;">
-        <el-row :gutter="35">
+        <el-row gutter="35">
             <el-col :span="8" class="status-card">
                 <div class="title">设备状态</div>
                 <!-- gutter设置为20，创建左右间隙 -->
-                <el-row :gutter="20" style="width: 100%;">
+                <el-row gutter="20" style="width: 100%;">
                     <!-- 一行2个，每个占12格（24/2=12） -->
                     <el-col :span="12">
                         <div class="item">
@@ -120,7 +120,7 @@
     }
 
     .red {
-        :v-deep::before {
+        ::v-deep::before {
             position: absolute;
             content: '';
             background-color: rgba(227, 39, 39, 1);
@@ -133,7 +133,7 @@
     }
 
     .yellow {
-        :v-deep::before {
+        ::v-deep::before {
             position: absolute;
             content: '';
             background-color: rgba(255, 208, 35, 1);

src/views/securitySurveillance/components/spgl.vue

@@ -132,7 +132,7 @@
     position: relative;
     margin: 10px 0;
 
-    :v-deep::before {
+    ::v-deep::before {
         position: absolute;
         width: 5px;
         height: 5px;

src/views/zhinengxunjian/InspectionManagement.vue

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

src/views/zhinengxunjian/banzhuzhuangtai.vue

@@ -31,6 +31,7 @@
             suffix-icon="el-icon-search"
             @keyup.enter="handleSearch"
           ></el-input>
+          <el-button icon="Refresh" @click="() => { searchKeyword = ''; handleSearch(); }">重置</el-button>
           <el-button type="primary" class="new-team-btn" @click="handleCreateTeam"> <i class="el-icon-plus"></i> 新增班组 </el-button>
         </div>
       </div>
@@ -333,34 +334,34 @@ const handleCreateTeam = () => {
 
 // 导航路由跳转
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement2 = () => {
-  router.push('/rili/cheliangzhuangtai');
+  router.push('/znxj/ywzz/cheliangzhuangtai');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/banzhuzhuangtai');
+  router.push('/znxj/ywzz/banzhuzhuangtai');
 };
 
 // ECharts实例

src/views/zhinengxunjian/baoxiuguanli.vue

@@ -22,6 +22,9 @@
       <!-- 筛选栏 -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(名称/报修人/维修人)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="taskStatus" placeholder="任务状态">
               <el-option label="待执行" value="pending"></el-option>
@@ -46,6 +49,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button icon="Refresh" @click="resetFilters"> 重置 </el-button>
             <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
           </div>
         </div>
@@ -391,6 +395,7 @@ import { ElMessage, ElLoading } from 'element-plus';
 const activeTab = ref('task');
 
 // 筛选条件
+const keyword = ref('');
 const taskStatus = ref('');
 const planType = ref('');
 const executor = ref('');
@@ -580,12 +585,24 @@ const statusOrder = {
 
 // 分页处理后的数据（含排序）
 const pagedTasks = computed(() => {
-  // 先按状态排序
-  const sortedTasks = [...tasks.value].sort((a, b) => {
-    return statusOrder[a.status] - statusOrder[b.status];
-  });
+  // 先关键词过滤
+  let filtered = [...tasks.value];
+  if (keyword.value && keyword.value.trim()) {
+    const kw = keyword.value.trim();
+    filtered = filtered.filter(
+      (t) =>
+        (t.title && t.title.includes(kw)) ||
+        (t.reporter && t.reporter.includes(kw)) ||
+        (t.maintainer && t.maintainer.includes(kw)) ||
+        (t.id && String(t.id).includes(kw))
+    );
+  }
 
-  // 再进行分页
+  // 按状态排序
+  const sortedTasks = filtered.sort((a, b) => statusOrder[a.status] - statusOrder[b.status]);
+
+  // 更新总数并分页
+  total.value = sortedTasks.length;
   const startIndex = (currentPage.value - 1) * pageSize.value;
   const endIndex = startIndex + pageSize.value;
   return sortedTasks.slice(startIndex, endIndex);
@@ -597,6 +614,15 @@ const handleSearch = () => {
   getTaskList(); // 调用接口获取数据
 };
 
+const resetFilters = () => {
+  keyword.value = '';
+  taskStatus.value = '';
+  planType.value = '';
+  executor.value = '';
+  currentPage.value = 1;
+  getTaskList();
+};
+
 // 创建报修任务弹窗相关
 const createTaskDialogVisible = ref(false);
 const createTaskFormRef = ref(null);
@@ -1047,32 +1073,32 @@ const handleSaveResult = async () => {
   }
 };
 const handleInspectionManagement1 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/baoxiujilu');
+  router.push('/znxj/bxgl/baoxiujilu');
 };
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 
 // 组件挂载时获取数据

src/views/zhinengxunjian/baoxiujilu.vue

@@ -23,6 +23,9 @@
       <!-- 筛选栏 -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(单号/内容/报修人/维修人)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="taskStatus" placeholder="任务状态">
               <el-option label="待执行" value="1"></el-option>
@@ -56,6 +59,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button icon="Refresh" class="create-btn" @click="resetFilters"> 重置 </el-button>
           </div>
         </div>
       </div>
@@ -379,6 +383,7 @@ const taskStatus = ref('');
 const priority = ref('');
 const executor = ref('');
 const dateRange = ref([]);
+const keyword = ref('');
 
 // 分页相关
 const currentPage = ref(1);
@@ -438,8 +443,13 @@ const fetchRepairRecords = async () => {
 
 // 筛选后的记录
 const filteredRecords = computed(() => {
-  // 实际应用中这里会根据筛选条件过滤数据
-  return repairRecords.value;
+  const kw = keyword.value.trim().toLowerCase();
+  if (!kw) return repairRecords.value;
+  return repairRecords.value.filter((r) =>
+    [r.id, r.reportInfo, r.reportName, r.sendPersonVo?.userName, getStatusText(r.status)]
+      .filter(Boolean)
+      .some((v) => String(v).toLowerCase().includes(kw))
+  );
 });
 
 // 搜索处理
@@ -448,6 +458,17 @@ const handleSearch = () => {
   fetchRepairRecords(); // 重新获取数据
 };
 
+// 重置筛选
+const resetFilters = () => {
+  taskStatus.value = '';
+  priority.value = '';
+  executor.value = '';
+  dateRange.value = [];
+  keyword.value = '';
+  currentPage.value = 1;
+  fetchRepairRecords();
+};
+
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
@@ -885,36 +906,33 @@ const handleEvaluateTask = (record) => {
 
 // 导航事件
 const handleInspectionManagement1 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/baoxiujilu');
+  router.push('/znxj/bxgl/baoxiujilu');
 };
 
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
-
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
-
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
-
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 </script>
 

src/views/zhinengxunjian/cheliangzhuangtai.vue

@@ -71,6 +71,11 @@
                 <el-input v-model="plateNumber4" maxlength="1" class="plate-char"></el-input>
                 <el-input v-model="plateNumber5" maxlength="1" class="plate-char"></el-input>
               </div>
+              <div style="margin-top: 10px; display: flex; gap: 8px; justify-content: flex-end">
+                <el-input v-model="searchKeyword" placeholder="关键字(编号/类型/车牌)" clearable @keyup.enter="handleSearch" style="max-width: 220px" />
+                <el-button type="primary" icon="Search" @click="handleSearch">搜索</el-button>
+                <el-button icon="Refresh" @click="resetFilters">重置</el-button>
+              </div>
             </div>
           </div>
         </div>
@@ -299,34 +304,34 @@ const handleDispatch = (row) => {
 
 // 导航路由跳转
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement2 = () => {
-  router.push('/rili/cheliangzhuangtai');
+  router.push('/znxj/ywzz/cheliangzhuangtai');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/banzhuzhuangtai');
+  router.push('/znxj/ywzz/banzhuzhuangtai');
 };
 </script>
 

src/views/zhinengxunjian/css/detail-dialog.css

@@ -190,7 +190,8 @@
 }
 
 /* 步骤状态样式 - 已完成 */
-.task-detail-container .step-status.status-completed {
+.task-detail-container .step-status.status-completed,
+.task-detail-container .step-status.tag-completed {
   background-color: #f6ffed;
   color: #52c41a;
   border: 1px solid #b7eb8f;
@@ -203,6 +204,20 @@
   border: 1px solid #ffccc7;
 }
 
+/* 步骤状态样式 - 未完成 */
+.task-detail-container .step-status.status-unknown {
+  background-color: #f5f5f5;
+  color: #999;
+  border: 1px solid #d9d9d9;
+}
+
+/* 步骤状态样式 - 失败 */
+.task-detail-container .step-status.status-failed {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border: 1px solid #ffccc7;
+}
+
 /* 通用状态颜色样式 */
 .status-pending {
   color: #e6a23c;

src/views/zhinengxunjian/gongdanliebiao.vue

@@ -22,6 +22,9 @@
       <!-- 筛选栏 -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(标题/描述/创建人/编号)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="workOrderType" placeholder="工单类型" clearable>
               <el-option label="全部类型" value="all"></el-option>
@@ -53,6 +56,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch">搜索</el-button>
+            <el-button icon="Refresh" class="create-btn" @click="resetFilters">重置</el-button>
             <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateWorkOrder">发起工单任务</el-button>
           </div>
         </div>
@@ -234,13 +238,6 @@
           <el-form-item label="工单描述">
             <el-input v-model="createForm.resultDescription" type="textarea" :rows="3" placeholder="请描述该工单完成后预期达成的成果" />
           </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>
 
         <template #footer>
@@ -379,7 +376,7 @@
                   <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
                 </div>
                 <div class="step-status" :class="getStatusClass(node.status)">
-                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                  {{ node.status === '2' ? '未执行' : node.status === '3' ? '失败' : '已完成' }}
                 </div>
               </div>
             </div>
@@ -461,6 +458,7 @@ import { ElMessageBox } from 'element-plus';
 const activeTab = ref('list');
 
 // 筛选条件
+const keyword = ref('');
 const workOrderType = ref('all');
 const workOrderStatus = ref('all');
 const priority = ref('all');
@@ -611,10 +609,83 @@ const formatDate = (dateString) => {
 // 初始化加载数据
 fetchWorkOrderList();
 
-// 分页处理后的数据
+// 分页处理后的数据（前端筛选+分页）
 const pagedTableData = computed(() => {
-  // 由于接口已经处理了分页和筛选，这里直接返回全部数据
-  return rawTableData.value;
+  let filteredData = [...rawTableData.value];
+
+  if (keyword.value && keyword.value.trim()) {
+    const kw = keyword.value.trim();
+    filteredData = filteredData.filter(
+      (item) =>
+        (item.title && item.title.includes(kw)) ||
+        (item.description && item.description.includes(kw)) ||
+        (item.creator && item.creator.includes(kw)) ||
+        (item.orderNo && item.orderNo.includes(kw))
+    );
+  }
+
+  if (workOrderType.value !== 'all') {
+    let typeText = '';
+    switch (workOrderType.value) {
+      case 'maintenance':
+        typeText = '维护保养';
+        break;
+      case 'inspection':
+        typeText = '检查检测';
+        break;
+      case 'installation':
+        typeText = '安装调试';
+        break;
+      case 'upgrade':
+        typeText = '升级改造';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.type === typeText);
+  }
+
+  if (workOrderStatus.value !== 'all') {
+    let statusText = '';
+    switch (workOrderStatus.value) {
+      case 'accepted':
+        statusText = '已接单';
+        break;
+      case 'pending':
+        statusText = '待处理';
+        break;
+      case 'executing':
+        statusText = '执行中';
+        break;
+      case 'completed':
+        statusText = '已完成';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.status === statusText);
+  }
+
+  if (priority.value !== 'all') {
+    let priorityText = '';
+    switch (priority.value) {
+      case 'high':
+        priorityText = '高';
+        break;
+      case 'medium':
+        priorityText = '中';
+        break;
+      case 'low':
+        priorityText = '低';
+        break;
+    }
+    filteredData = filteredData.filter((item) => item.priority === priorityText);
+  }
+
+  if (createDate.value) {
+    filteredData = filteredData.filter((item) => item.createTime && item.createTime.includes(createDate.value));
+  }
+
+  total.value = filteredData.length;
+  const startIndex = (currentPage.value - 1) * pageSize.value;
+  const endIndex = startIndex + pageSize.value;
+  return filteredData.slice(startIndex, endIndex);
 });
 
 // 获取类型标签样式
@@ -659,10 +730,10 @@ const getStatusClass = (status) => {
   // 处理可能的数字输入
   const statusStr = status?.toString() || '';
   const statusClassMap = {
-    '1': 'status-pending',
-    '2': 'status-delayed',
-    '3': 'status-executing',
-    '4': 'status-completed'
+    '1': 'status-pending', // 待执行 - 蓝色
+    '2': 'status-unknown', // 未完成 - 灰色
+    '3': 'status-failed', // 失败 - 红色
+    '4': 'status-completed' // 已完成 - 绿色
   };
   return statusClassMap[statusStr] || 'status-unknown';
 };
@@ -697,19 +768,26 @@ const getStepStatusText = (status) => {
 
 const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
-  fetchWorkOrderList(); // 重新获取数据
+};
+
+// 重置筛选
+const resetFilters = () => {
+  keyword.value = '';
+  workOrderType.value = 'all';
+  workOrderStatus.value = 'all';
+  priority.value = 'all';
+  createDate.value = '';
+  currentPage.value = 1;
 };
 
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
   currentPage.value = 1;
-  fetchWorkOrderList(); // 重新获取数据
 };
 
 const handleCurrentChange = (val) => {
   currentPage.value = val;
-  fetchWorkOrderList(); // 重新获取数据
 };
 
 // 选项卡点击
@@ -1276,35 +1354,35 @@ const handleSaveDraft = () => {
 
 // 导航路由跳转
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/paidanjilu');
+  router.push('/znxj/gdgl/paidanjilu');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/zhixingjilu');
+  router.push('/znxj/gdgl/zhixingjilu');
 };
 </script>
 
@@ -1546,46 +1624,7 @@ const handleInspectionManagement3 = () => {
 }
 
 /* 导航栏样式 */
-.navigation-tabs {
-  display: flex;
-  margin-bottom: 20px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-  padding: 2px;
-}
-
-.nav-tab {
-  padding: 12px 24px;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  border-radius: 4px;
-  font-size: 14px;
-  color: #606266;
-  border-right: 1px solid #f0f0f0;
-  flex: 1;
-  text-align: center;
-}
-
-.nav-tab:last-child {
-  border-right: none;
-}
-
-.nav-tab:hover {
-  color: #409eff;
-  background-color: #ecf5ff;
-}
-
-.nav-tab.active {
-  background-color: #409eff;
-  color: #fff;
-  box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
-}
-
-.nav-tab {
-  cursor: pointer;
-  user-select: none;
-}
+/* 已注释的导航栏样式移除 */
 
 /* 弹窗样式 */
 .create-dialog {

src/views/zhinengxunjian/index.vue

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

src/views/zhinengxunjian/paidanjilu.vue

@@ -24,6 +24,9 @@
       <!-- 筛选栏 -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(标题/描述/创建人/编号)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="workOrderType" placeholder="工单类型" clearable>
               <el-option label="全部类型" value="all"></el-option>
@@ -55,6 +58,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch">搜索</el-button>
+            <el-button icon="Refresh" class="create-btn" @click="resetFilters">重置</el-button>
           </div>
         </div>
       </div>
@@ -430,7 +434,7 @@
                   <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
                 </div>
                 <div class="step-status" :class="getStatusClass(node.status)">
-                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                  {{ node.status === '2' ? '未执行' : node.status === '3' ? '失败' : '已完成' }}
                 </div>
               </div>
             </div>
@@ -509,6 +513,7 @@ import ImageUpload from '@/components/ImageUpload/index.vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 
 // 筛选条件
+const keyword = ref('');
 const workOrderType = ref('all');
 const workOrderStatus = ref('all');
 const priority = ref('all');
@@ -701,10 +706,10 @@ const getStatusClass = (status) => {
   // 处理可能的数字输入
   const statusStr = status?.toString() || '';
   const statusClassMap = {
-    '1': 'status-pending',
-    '2': 'status-delayed',
-    '3': 'status-executing',
-    '4': 'status-completed'
+    '1': 'status-pending', // 待执行 - 蓝色
+    '2': 'status-unknown', // 未执行 - 灰色
+    '3': 'status-failed', // 失败 - 红色
+    '4': 'status-completed' // 已完成 - 绿色
   };
   return statusClassMap[statusStr] || 'status-unknown';
 };
@@ -750,6 +755,18 @@ const pagedTableData = computed(() => {
   // 筛选逻辑
   let filteredData = [...rawTableData.value];
 
+  if (keyword.value && keyword.value.trim()) {
+    const kw = keyword.value.trim();
+    filteredData = filteredData.filter((item) => {
+      return (
+        (item.title && item.title.includes(kw)) ||
+        (item.description && item.description.includes(kw)) ||
+        (item.creator && item.creator.includes(kw)) ||
+        (item.orderNo && item.orderNo.includes(kw))
+      );
+    });
+  }
+
   if (workOrderType.value !== 'all') {
     // 转换筛选条件为显示文本进行匹配
     let typeText = '';
@@ -862,6 +879,16 @@ const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
 };
 
+// 重置筛选
+const resetFilters = () => {
+  keyword.value = '';
+  workOrderType.value = 'all';
+  workOrderStatus.value = 'all';
+  priority.value = 'all';
+  createDate.value = '';
+  currentPage.value = 1;
+};
+
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
@@ -1405,35 +1432,35 @@ const cancelCreate = () => {
 
 // 导航路由跳转
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/paidanjilu');
+  router.push('/znxj/gdgl/paidanjilu');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/zhixingjilu');
+  router.push('/znxj/gdgl/zhixingjilu');
 };
 
 // 关闭详情弹窗
@@ -1763,46 +1790,7 @@ const handleCloseDetailDialog = () => {
 }
 
 /* 导航栏样式 */
-.navigation-tabs {
-  display: flex;
-  margin-bottom: 20px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-  padding: 2px;
-}
-
-.nav-tab {
-  padding: 12px 24px;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  border-radius: 4px;
-  font-size: 14px;
-  color: #606266;
-  border-right: 1px solid #f0f0f0;
-  flex: 1;
-  text-align: center;
-}
-
-.nav-tab:last-child {
-  border-right: none;
-}
-
-.nav-tab:hover {
-  color: #409eff;
-  background-color: #ecf5ff;
-}
-
-.nav-tab.active {
-  background-color: #409eff;
-  color: #fff;
-  box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
-}
-
-.nav-tab {
-  cursor: pointer;
-  user-select: none;
-}
+/* 已注释的导航栏样式移除 */
 
 /* 弹窗样式 */
 .create-dialog {

src/views/zhinengxunjian/qiangxiuguanli.vue

@@ -22,6 +22,9 @@
       <!-- 筛选栏 -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(名称/报修人/维修人/位置)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="taskStatus" placeholder="任务状态">
               <el-option label="待执行" value="pending"></el-option>
@@ -49,6 +52,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button icon="Refresh" class="create-btn" @click="resetFilters"> 重置 </el-button>
             <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
           </div>
         </div>
@@ -426,6 +430,7 @@ import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian';
 const taskStatus = ref('all');
 const planType = ref('all');
 const executor = ref('all');
+const keyword = ref('');
 // 任务数据 - 添加了更多字段以展示滚动效果
 const tasks = ref([]);
 // 分页相关
@@ -458,6 +463,16 @@ const handleSearch = () => {
   getTaskList(); // 调用接口获取数据
 };
 
+// 重置筛选
+const resetFilters = () => {
+  taskStatus.value = 'all';
+  planType.value = 'all';
+  executor.value = 'all';
+  keyword.value = '';
+  currentPage.value = 1;
+  getTaskList();
+};
+
 // 创建紧急抢修任务弹窗相关
 const createTaskDialogVisible = ref(false);
 const createTaskFormRef = ref(null); // 表单引用
@@ -698,32 +713,32 @@ const handleView = async (task) => {
 };
 
 const handleInspectionManagement1 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/qiangxiujilu');
+  router.push('/znxj/qxgl/qiangxiujilu');
 };
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 
 // 加载状态
@@ -1090,9 +1105,8 @@ async function getTaskList() {
     const res = await qiangxiulist(requestParams);
 
     if (res.code === 200 && res.rows) {
-      total.value = res.total || 0;
       // 将API返回的数据转换为前端显示所需的格式
-      tasks.value = res.rows.map((item) => ({
+      const mapped = res.rows.map((item) => ({
         id: item.id,
         title: item.name || '未命名抢修任务',
         status: mapStatusToKey(item.status),
@@ -1124,6 +1138,19 @@ async function getTaskList() {
         // 添加needSupport字段，确保从API返回数据中获取实际值
         needSupport: item.support || ''
       }));
+
+      // 关键词过滤
+      const kw = keyword.value.trim().toLowerCase();
+      const filtered = kw
+        ? mapped.filter((t) =>
+            [t.title, t.reporter, t.maintainer, t.position, t.statusText]
+              .filter(Boolean)
+              .some((v) => String(v).toLowerCase().includes(kw))
+          )
+        : mapped;
+
+      tasks.value = filtered;
+      total.value = kw ? filtered.length : res.total || filtered.length;
     } else {
       tasks.value = [];
       total.value = 0;
@@ -1578,7 +1605,8 @@ setTimeout(() => {
 .detail-value {
   flex: 1;
   color: #4e5969;
-  word-break: break-all;
+  word-break: break-word;
+  line-height: 1.5;
 }
 
 .task-result {
@@ -1595,13 +1623,7 @@ setTimeout(() => {
   align-items: center;
   padding-top: 12px;
   border-top: 1px solid #f0f2f5;
-  position: absolute;
-  bottom: 16px;
-  right: 16px;
-  left: 16px;
   background-color: #fff;
-  padding: 12px 0 0 0;
-  z-index: 10;
 }
 
 .action-btn {
@@ -1705,10 +1727,11 @@ setTimeout(() => {
 }
 
 .task-title {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 500;
   color: #1d2129;
   line-height: 1.4;
+  word-break: break-word;
   flex: 1;
   margin-right: 8px;
 }
@@ -1721,35 +1744,32 @@ setTimeout(() => {
   border: 1px solid transparent;
 }
 
-/* 不同故障类型的颜色 */
-/* 电力，设备故障为红色 */
-.task-type-tag.electric,
-.task-type-tag.equipment {
+/* 优先级标签背景色样式 - 与保修管理页面保持一致 */
+.priority-high {
   background-color: #fff2f0;
   color: #ff4d4f;
   border-color: #ffccc7;
 }
 
-/* 供水，设备损坏为黄色 */
-.task-type-tag.water,
-.task-type-tag.damage {
+.priority-medium {
   background-color: #fffbe6;
   color: #fa8c16;
   border-color: #ffe58f;
 }
 
-/* 其余为绿色 */
-.task-type-tag {
-  background-color: #f6ffed;
-  color: #52c41a;
-  border-color: #b7eb8f;
+.priority-low {
+  background-color: #e6f7ff;
+  color: #1890ff;
+  border-color: #91d5ff;
 }
 
 .task-card:hover {
   transform: translateY(-3px);
   box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
 }
-.task-card[data-v-2668390e]::before {
+
+/* 左侧状态线样式 - 与保修管理页面保持一致 */
+.task-card::before {
   content: '';
   position: absolute;
   left: 0;
@@ -1757,6 +1777,22 @@ setTimeout(() => {
   bottom: 0;
   width: 4px;
 }
+
+.left-line-high::before {
+  background-color: #ff4d4f;
+}
+
+.left-line-medium::before {
+  background-color: #fa8c16;
+}
+
+.left-line-low::before {
+  background-color: #1677ff;
+}
+
+.left-line-completed::before {
+  background-color: #52c41a;
+}
 .task-details {
   margin-bottom: 16px;
 }
@@ -1769,8 +1805,9 @@ setTimeout(() => {
 }
 
 .detail-label {
-  flex: 0 0 70px;
+  flex: 0 0 85px;
   color: #86909c;
+  margin-right: 4px;
 }
 
 .detail-value {

src/views/zhinengxunjian/qiangxiujilu.vue

@@ -22,6 +22,9 @@
       <!-- 筛选栏 (默认隐藏) -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(单号/内容/报修人/维修人)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="taskStatus" placeholder="任务状态">
               <el-option label="待执行" value="pending"></el-option>
@@ -54,6 +57,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button icon="Refresh" class="create-btn" @click="resetFilters"> 重置 </el-button>
           </div>
         </div>
       </div>
@@ -64,7 +68,9 @@
           <div class="stat-info">
             <p class="stat-label">本月抢修总数</p>
             <p class="stat-value">{{ isCardLoading ? '加载中...' : statisticsData.totalCount }}</p>
-            <p class="stat-trend up">较上月:{{ statisticsData.monthChange }}</p>
+            <p class="stat-trend" :class="statisticsData.monthChangeClass">
+              较上月{{ statisticsData.monthChangeClass === 'warning' ? '无增长' : ':' + statisticsData.monthChange }}
+            </p>
           </div>
           <div class="stat-icon">
             <img src="@/assets/images/qiangxiu.png" alt="本月抢修总数" class="stat-image" />
@@ -75,7 +81,9 @@
           <div class="stat-info">
             <p class="stat-label">平均抢修时长</p>
             <p class="stat-value">{{ isCardLoading ? '加载中...' : statisticsData.avgDuration }}</p>
-            <p class="stat-trend down">较上月:{{ statisticsData.durationChange }}</p>
+            <p class="stat-trend" :class="statisticsData.durationChangeClass">
+              较上月{{ statisticsData.durationChangeClass === 'warning' ? '无增长' : ':' + statisticsData.durationChange }}
+            </p>
           </div>
           <div class="stat-icon">
             <img src="@/assets/images/qiangxiushijian.png" alt="平均抢修时长" class="stat-image" />
@@ -97,7 +105,9 @@
           <div class="stat-info">
             <p class="stat-label">按时完成率</p>
             <p class="stat-value">{{ isCardLoading ? '加载中...' : statisticsData.completionRate }}</p>
-            <p class="stat-trend up">{{ statisticsData.rateChange }}</p>
+            <p class="stat-trend" :class="statisticsData.rateChangeClass">
+              {{ statisticsData.rateChangeClass === 'warning' ? '较上月无增长' : statisticsData.rateChange }}
+            </p>
           </div>
           <div class="stat-icon success">
             <img src="@/assets/images/qiangxiuwancheng.png" alt="按时完成率" class="stat-image" />
@@ -360,6 +370,7 @@ const priority = ref('');
 const executor = ref('');
 const dateRange = ref([]);
 const showFilter = ref(false);
+const keyword = ref('');
 
 // 表单验证规则
 const assignTaskRules = {
@@ -427,7 +438,7 @@ const getTaskList = async () => {
 
     if (res && res.code === 200) {
       // 更新表格数据，将接口返回的字段映射到表格期望的字段
-      repairRecords.value = Array.isArray(res.rows)
+      const mapped = Array.isArray(res.rows)
         ? res.rows.map((item) => ({
             // 映射抢修单号
             reportNo: `R-${item.id || '000'}`,
@@ -454,7 +465,19 @@ const getTaskList = async () => {
             originalData: item
           }))
         : [];
-      total.value = res.total || 0;
+
+      // 关键词过滤
+      const kw = keyword.value.trim().toLowerCase();
+      const filtered = kw
+        ? mapped.filter((r) =>
+            [r.reportNo, r.content, r.reporter, r.handler, r.status]
+              .filter(Boolean)
+              .some((v) => String(v).toLowerCase().includes(kw))
+          )
+        : mapped;
+
+      repairRecords.value = filtered;
+      total.value = kw ? filtered.length : res.total || filtered.length;
     } else {
       ElMessage.error(`获取抢修记录失败：${res?.msg || '未知错误'}`);
       repairRecords.value = [];
@@ -586,15 +609,33 @@ const getStatisticsData = async () => {
     const res = await qiangxiuRecord({ projectId: 1 });
 
     if (res && res.code === 200) {
-      // 更新统计卡片数据
+      // API返回的实际数据在data字段中
+      const data = res.data || {};
+
+      // 更新统计卡片数据 - 映射新的API返回字段
+      // 解析百分比数据并添加判断逻辑
+      const bxsPercent = parseFloat(data.bxsjszzzl) || 0;
+      const clscPercent = parseFloat(data.clscjszzzl) || 0;
+      const wclPercent = parseFloat(data.wcljszzzl) || 0;
+
+      // 判断并设置变化率样式类
+      const getChangeClass = (percent) => {
+        if (percent > 100) return 'up';
+        if (percent < 100 && percent !== 0) return 'down';
+        return 'warning'; // 等于100或0时显示为灰色（无变化）
+      };
+
       statisticsData.value = {
-        totalCount: res.totalCount || 0,
-        avgDuration: res.avgDuration || '0分钟',
-        pendingCount: res.pendingCount || 0,
-        completionRate: res.completionRate || '0%',
-        monthChange: res.monthChange || '+0%',
-        durationChange: res.durationChange || '-0分钟',
-        rateChange: res.rateChange || '+0%'
+        totalCount: data.byzbxs || 0, // 本月报修总数
+        avgDuration: `${data.pjclsc || 0}分钟`, // 平均处理时长
+        pendingCount: data.dclbx || 0, // 待处理报修
+        completionRate: `${data.wcl || 0}%`, // 完成率
+        monthChange: `${bxsPercent > 0 ? '+' : ''}${bxsPercent}%`, // 报修数较上月变化
+        monthChangeClass: getChangeClass(bxsPercent), // 报修数变化率样式类
+        durationChange: `${clscPercent > 0 ? '+' : '-'}${Math.abs(clscPercent)}分钟`, // 处理时长较上月变化
+        durationChangeClass: getChangeClass(clscPercent), // 处理时长变化率样式类
+        rateChange: `${wclPercent > 0 ? '+' : ''}${wclPercent}%`, // 完成率较上月变化
+        rateChangeClass: getChangeClass(wclPercent) // 完成率变化率样式类
       };
     } else {
       ElMessage.error(`获取统计数据失败：${res?.msg || '未知错误'}`);
@@ -943,43 +984,38 @@ const handleTaskTab = () => {
 };
 
 const handleRecordTab = () => {
-  router.push('/rili/qiangxiujiilu');
+  router.push('/znxj/qiangxiujiilu');
 };
 
 // 导航事件
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
-
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
-
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
-
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
-
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
-
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 
 const handleInspectionManagement1 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/qiangxiujilu');
+  router.push('/znxj/qxgl/qiangxiujilu');
 };
 </script>
 
@@ -1127,7 +1163,7 @@ const handleInspectionManagement2 = () => {
 }
 
 .stat-trend.warning {
-  color: #fa8c16;
+  color: #999;
 }
 
 .stat-icon {
@@ -1215,39 +1251,53 @@ const handleInspectionManagement2 = () => {
 }
 
 .status-tag {
-  padding: 2px 8px;
-  border-radius: 4px;
+  padding: 4px 10px;
+  border-radius: 6px;
   font-size: 12px;
+  font-weight: 500;
 }
 
-.status-tag.processing {
+.status-processing {
   background-color: #fffbe6;
-  color: #faad14;
-  border: 1px solid #fff1b8;
+  color: #fa8c16;
+  border: 1px solid #ffe58f;
 }
 
-.status-tag.completed {
-  background-color: #f0f9eb;
+.status-completed {
+  background-color: #f6ffed;
   color: #52c41a;
-  border: 1px solid #e1f3d8;
+  border: 1px solid #b7eb8f;
+}
+
+.status-pending {
+  background-color: #e6f7ff;
+  color: #1677ff;
+  border: 1px solid #91d5ff;
 }
 
 .priority-tag {
-  padding: 2px 8px;
-  border-radius: 4px;
+  padding: 4px 10px;
+  border-radius: 6px;
   font-size: 12px;
+  font-weight: 500;
 }
 
-.priority-tag.urgent {
-  background-color: #ffebe6;
+.priority-urgent {
+  background-color: #fff2f0;
   color: #ff4d4f;
   border: 1px solid #ffccc7;
 }
 
-.priority-tag.normal {
+.priority-normal {
   background-color: #e6f7ff;
-  color: #1890ff;
-  border: 1px solid #b3d8ff;
+  color: #1677ff;
+  border: 1px solid #91d5ff;
+}
+
+.priority-fatal {
+  background-color: #fff2f0;
+  color: #ff4d4f;
+  border: 1px solid #ffccc7;
 }
 
 .detail-btn {
@@ -1258,6 +1308,10 @@ const handleInspectionManagement2 = () => {
   color: #fa8c16;
 }
 
+.evaluate-btn {
+  color: #52c41a;
+}
+
 /* 分页区域样式 */
 .pagination-section {
   display: flex;

src/views/zhinengxunjian/renyuanzhuangtai.vue

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

src/views/zhinengxunjian/shiyanguanli.vue

@@ -24,6 +24,7 @@
       <!-- 4. 筛选和操作区域（与试验系统filter-and-actions结构一致） -->
       <div class="filter-and-actions">
         <div class="filters">
+          <el-input v-model="keyword" placeholder="关键字(计划名/编号/负责人)" clearable @keyup.enter="handleSearch" style="width: 220px" />
           <el-select v-model="filterStatus" placeholder="巡检状态" clearable>
             <el-option label="全部状态" value="all"></el-option>
             <el-option label="正常" value="normal"></el-option>
@@ -49,7 +50,8 @@
           ></el-date-picker>
         </div>
         <div class="action-buttons">
-          <el-button type="primary" icon="Search" class="search-btn"> 搜索 </el-button>
+          <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+          <el-button icon="Refresh" @click="resetFilters"> 重置 </el-button>
           <el-button type="primary" icon="Plus" class="create-btn" @click="openRecordDialog"> <i class="fas fa-plus"></i> 新增实验记录 </el-button>
         </div>
       </div>
@@ -581,6 +583,7 @@ const activeTab = ref('plan'); // 默认为"巡检计划"
 const timeRange = ref('month'); // 统计时间范围：月/周/日
 
 // 2. 筛选条件
+const keyword = ref('');
 const filterStatus = ref('all');
 const filterType = ref('all');
 const dateRange = ref([]);
@@ -628,6 +631,22 @@ const fetchExperimentData = async () => {
   }
 };
 
+// 搜索与重置（当前数据主要来自接口，保留前端筛选入口）
+const handleSearch = () => {
+  // 可根据项目需要将 keyword/filter 传给接口；当前保持页内刷新
+  currentPage.value = 1;
+  fetchExperimentData();
+};
+
+const resetFilters = () => {
+  keyword.value = '';
+  filterStatus.value = 'all';
+  filterType.value = 'all';
+  dateRange.value = [];
+  currentPage.value = 1;
+  fetchExperimentData();
+};
+
 // 辅助方法
 const getTestObjectText = (type) => {
   const typeMap = {
@@ -688,43 +707,34 @@ const recentRecords = ref([]);
 
 // 9. 方法：切换顶部导航
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspectionManagement2 = () => {
-  router.push('/rili/shiyanrenwu');
+  router.push('/znxj/sygl/shiyanrenwu');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/shiyanjilu');
-};
-// 10. 方法：切换功能选项卡
-const switchTab = (tab) => {
-  activeTab.value = tab;
-  // 实际应用中需根据选项卡加载对应数据
-  if (tab === 'record') {
-    // 加载统计数据
-    updateStatData(timeRange.value);
-  }
+  router.push('/znxj/sygl/shiyanjilu');
 };
 
 // 11. 方法：更新统计数据（根据时间范围）
@@ -786,12 +796,6 @@ const getRecordStatusText = (status) => {
   return statusMap[status] || '';
 };
 
-// 进度条颜色
-const getProgressColor = (status) => {
-  const colorMap = { 'drafted': '#ccc', 'in-progress': '#3b82f6', 'completed': '#10b981', 'paused': '#9e9e9e' };
-  return colorMap[status] || '#ccc';
-};
-
 // 18. 新增实验记录弹窗相关
 const showRecordDialog = ref(false);
 const saveLoading = ref(false); // 保存加载状态
@@ -1104,21 +1108,6 @@ const handleEditRecord = async (row) => {
     loading.value = false;
   }
 };
-// 添加新步骤
-const addStep = () => {
-  formData.value.steps.push({ name: '', intendedPurpose: '', intendedTime: '' });
-};
-
-// 删除步骤
-const deleteStep = (index) => {
-  // 确保至少保留一个步骤
-  if (formData.value.steps.length <= 1) {
-    ElMessage.warning('至少需要保留一个步骤');
-    return;
-  }
-  // 从数组中删除指定索引的步骤
-  formData.value.steps.splice(index, 1);
-};
 
 // 添加新设备
 const addEquipment = () => {
@@ -1214,19 +1203,6 @@ const formatDate = (dateString) => {
   const seconds = String(date.getSeconds()).padStart(2, '0');
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 };
-
-// 日期时间格式化函数
-const formatDateTime = (dateString) => {
-  if (!dateString) return '';
-  const date = new Date(dateString);
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  const hours = String(date.getHours()).padStart(2, '0');
-  const minutes = String(date.getMinutes()).padStart(2, '0');
-  const seconds = String(date.getSeconds()).padStart(2, '0');
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-};
 </script>
 
 <style scoped>
@@ -1237,41 +1213,7 @@ const formatDateTime = (dateString) => {
   background-color: #f9fbfd;
   min-height: 100vh;
 }
-.navigation-tabs {
-  display: flex;
-  margin-bottom: 20px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-  padding: 2px;
-}
-
-.nav-tab {
-  padding: 12px 24px;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  border-radius: 4px;
-  font-size: 14px;
-  color: #606266;
-  border-right: 1px solid #f0f0f0;
-  flex: 1;
-  text-align: center;
-}
-
-.nav-tab:last-child {
-  border-right: none;
-}
-
-.nav-tab:hover {
-  color: #409eff;
-  background-color: #ecf5ff;
-}
-
-.nav-tab.active {
-  background-color: #409eff;
-  color: #fff;
-  box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
-}
+/* 已注释的导航栏样式移除 */
 
 /* 3. 页面标题 */
 .page-header {

src/views/zhinengxunjian/shiyanjilu.vue

@@ -23,6 +23,7 @@
       <!-- 筛选和操作区域 -->
       <div class="filter-and-actions">
         <div class="filters">
+          <el-input v-model="keyword" placeholder="关键字(任务名/负责人/编号)" clearable @keyup.enter="handleSearch" style="width: 220px" />
           <el-select v-model="filterStatus" placeholder="巡检状态" clearable>
             <el-option label="全部状态" value="all"></el-option>
             <el-option label="正常" value="normal"></el-option>
@@ -47,7 +48,8 @@
             class="date-picker"
           ></el-date-picker>
 
-          <el-button icon="Search" type="primary" class="search-btn"> 搜索 </el-button>
+          <el-button icon="Search" type="primary" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+          <el-button icon="Refresh" @click="resetFilters"> 重置 </el-button>
         </div>
       </div>
 
@@ -132,7 +134,7 @@
           <div class="test-records">
             <!-- 动态生成试验记录卡片 -->
             <div
-              v-for="(record, recordIndex) in testRecords"
+              v-for="(record, recordIndex) in filteredTestRecords"
               :key="record.id"
               class="test-record-card"
               :class="{ 'passed': record.status === 'completed', 'failed': record.status === 'failed' }"
@@ -358,7 +360,7 @@
                   <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
                 </div>
                 <div class="step-status" :class="getStatusClass(node.status)">
-                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                  {{ node.status === '2' ? '未完成' : node.status === '3' ? '失败' : '已完成' }}
                 </div>
               </div>
             </div>
@@ -396,6 +398,7 @@ import { syrenwulist, syrenwujilu, syrenwuDetail } from '@/api/zhinengxunjian/sh
 const activeTab = ref('record'); // 默认显示"试验记录"
 
 // 2. 筛选条件
+const keyword = ref('');
 const filterStatus = ref('all');
 const filterType = ref('all');
 const dateRange = ref([]);
@@ -449,6 +452,37 @@ const getTestRecords = async () => {
   }
 };
 
+// 前端过滤后的试验记录
+const filteredTestRecords = computed(() => {
+  let data = [...testRecords.value];
+
+  if (keyword.value && keyword.value.trim()) {
+    const kw = keyword.value.trim();
+    data = data.filter((rec) => {
+      return (
+        (rec.taskName && rec.taskName.includes(kw)) ||
+        (rec.personInfo?.userName && rec.personInfo.userName.includes(kw)) ||
+        (rec.id && String(rec.id).includes(kw))
+      );
+    });
+  }
+
+  // 可根据筛选状态/类型进一步过滤（若后续需要）
+  return data;
+});
+
+// 搜索与重置
+const handleSearch = () => {
+  // 若后端支持条件，可在此调用接口；当前保持前端过滤
+};
+
+const resetFilters = () => {
+  keyword.value = '';
+  filterStatus.value = 'all';
+  filterType.value = 'all';
+  dateRange.value = [];
+};
+
 // 8. 方法：获取统计数据
 const getStatisticsData = async () => {
   try {
@@ -599,7 +633,7 @@ const getStatusClass = (status) => {
   const classMap = {
     '1': 'tag-pending', // 待执行
     '4': 'tag-executing', // 执行中
-    '2': 'tag-delayed', // 已延期
+    '2': 'status-unknown', // 未完成
     '5': 'tag-completed', // 已完成
     '3': 'status-failed', // 失败
     'completed': 'tag-completed',
@@ -629,37 +663,37 @@ const handleSizeChange = (size) => {
 
 // 19. 导航方法
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
   activeTab.value = 'plan';
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspectionManagement2 = () => {
   activeTab.value = 'task';
-  router.push('/rili/shiyanrenwu');
+  router.push('/znxj/sygl/shiyanrenwu');
 };
 const handleInspectionManagement3 = () => {
   activeTab.value = 'record';
-  router.push('/rili/shiyanjilu');
+  router.push('/znxj/sygl/shiyanjilu');
 };
 
 // 20. 详情弹窗相关
@@ -715,41 +749,7 @@ onMounted(async () => {
   min-height: 100vh;
 }
 
-.navigation-tabs {
-  display: flex;
-  margin-bottom: 20px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-  padding: 2px;
-}
-
-.nav-tab {
-  padding: 12px 24px;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  border-radius: 4px;
-  font-size: 14px;
-  color: #606266;
-  border-right: 1px solid #f0f0f0;
-  flex: 1;
-  text-align: center;
-}
-
-.nav-tab:last-child {
-  border-right: none;
-}
-
-.nav-tab:hover {
-  color: #409eff;
-  background-color: #ecf5ff;
-}
-
-.nav-tab.active {
-  background-color: #409eff;
-  color: #fff;
-  box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
-}
+/* 已注释的导航栏样式移除 */
 
 /* 3. 选项卡样式 */
 .tabs-wrapper {
@@ -864,6 +864,12 @@ onMounted(async () => {
   border-color: #b7eb8f;
 }
 
+.tag-incomplete {
+  background-color: #f5f5f5;
+  color: #999;
+  border-color: #d9d9d9;
+}
+
 /* 保留原有的部分样式以确保兼容性 */
 .status-in-progress {
   background-color: #fffbe6;

src/views/zhinengxunjian/shiyanrenwu.vue

@@ -24,6 +24,9 @@
       <!-- 筛选栏 -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(任务名/测试对象/执行人)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="taskStatus" placeholder="任务状态">
               <el-option label="待执行" value="1"></el-option>
@@ -50,6 +53,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button icon="Refresh" class="create-btn" @click="resetFilters"> 重置 </el-button>
             <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
           </div>
         </div>
@@ -372,7 +376,7 @@
                   <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
                 </div>
                 <div class="step-status" :class="getStatusClass(node.status)">
-                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                  {{ node.status === '2' ? '未执行' : node.status === '3' ? '失败' : '已完成' }}
                 </div>
               </div>
             </div>
@@ -440,7 +444,7 @@ import router from '@/router';
 import { syrenwulist, syrenwuDetail, addsyrenwu, updatesyrenwu } from '@/api/zhinengxunjian/shiyan/renwu';
 import { shiyanlist } from '@/api/zhinengxunjian/shiyan';
 import { xunjianUserlist } from '@/api/zhinengxunjian/xunjian/index';
-import { addjiedian } from '@/api/zhinengxunjian/jiedian/index';
+import { addjiedian, updatejiedian } from '@/api/zhinengxunjian/jiedian/index';
 // 引入Element Plus组件（提示/空状态/骨架屏/弹窗）
 import { ElMessage, ElEmpty, ElSkeleton, ElForm, ElMessageBox, ElDialog } from 'element-plus';
 
@@ -479,6 +483,7 @@ const loading = ref(false);
 // 筛选条件（与接口参数对应）
 const taskStatus = ref(''); // 任务状态：1=待执行，2=暂停（已延期），3=失败，4=执行中，5=已完成
 const planType = ref(''); // 关联计划ID：1=每日，2=每周，3=每月
+const keyword = ref(''); // 关键词
 
 /**
  * 将节点数据按模块分组
@@ -548,10 +553,11 @@ const getStatusClass = (status) => {
   // 处理可能的数字输入
   const statusStr = status?.toString() || '';
   const statusClassMap = {
-    '1': 'status-pending',
-    '2': 'status-delayed',
-    '3': 'status-executing',
-    '4': 'status-completed'
+    '1': 'status-pending', // 待执行
+    '2': 'status-unknown', // 未完成 - 灰色
+    '3': 'status-failed', // 失败 - 红色
+    '4': 'status-executing', // 执行中
+    '5': 'status-completed' // 已完成 - 绿色
   };
   return statusClassMap[statusStr] || 'status-unknown';
 };
@@ -586,7 +592,7 @@ const getStepStatusText = (status) => {
   const statusMap = {
     '1': '待执行',
     '2': '执行中',
-    '3': '已完成',
+    '3': '失败',
     '4': '已延期'
   };
   return statusMap[statusStr] || '未知状态';
@@ -716,8 +722,18 @@ const getTaskList = async () => {
 
     if (response.code === 200) {
       // 3. 接口数据映射为页面展示格式
-      tasks.value = (response.rows || []).map((item) => mapApiToView(item));
-      total.value = response.total || 0; // 同步总条数
+      const mapped = (response.rows || []).map((item) => mapApiToView(item));
+      // 4. 前端关键词过滤
+      const kw = keyword.value.trim();
+      const filtered = kw
+        ? mapped.filter((t) =>
+            [t.title, t.target, t.executor, t.relatedPlan, t.statusText]
+              .filter(Boolean)
+              .some((v) => String(v).toLowerCase().includes(kw.toLowerCase()))
+          )
+        : mapped;
+      tasks.value = filtered;
+      total.value = kw ? filtered.length : response.total || filtered.length; // 同步总条数
     } else {
       ElMessage.error('获取任务列表失败：' + (response.msg || '未知错误'));
       tasks.value = [];
@@ -749,9 +765,9 @@ const mapApiToView = (apiData) => {
       result: '-'
     },
     '2': {
-      statusText: '已延期',
+      statusText: '未完成',
       cardClass: 'card-delayed',
-      tagClass: 'tag-delayed',
+      tagClass: 'status-unknown',
       actionText: '重新安排',
       actionClass: 'reschedule-btn',
       result: '-'
@@ -759,7 +775,7 @@ const mapApiToView = (apiData) => {
     '3': {
       statusText: '失败',
       cardClass: 'card-failed',
-      tagClass: 'tag-failed',
+      tagClass: 'status-failed',
       actionText: '重新执行',
       actionClass: 'reschedule-btn',
       result: '失败',
@@ -831,16 +847,45 @@ const mapApiToView = (apiData) => {
   // 生成试验阶段信息
   const getTestStage = () => {
     try {
-      // 优先查找nodes数组中status为2的第一条数据
+      // 优先查找nodes数组中处于执行中或失败的节点来确定当前试验阶段
       if (apiData && apiData.nodes && Array.isArray(apiData.nodes)) {
-        const firstStatusTwoNode = apiData.nodes.find((node) => {
-          // 确保node存在且有status属性
+        // 优先查找失败状态的节点（根据需求，优先显示status为3的数据）
+        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 executingNode = apiData.nodes.find((node) => {
           if (!node || node.status === undefined) return false;
-          // 处理status可能是字符串或数字的情况
           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 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数据，检查是否有明确的试验阶段信息
@@ -892,6 +937,16 @@ const handleSearch = () => {
   getTaskList();
 };
 
+// 重置筛选条件
+const resetFilters = () => {
+  taskStatus.value = '';
+  planType.value = '';
+  executor.value = 'all';
+  keyword.value = '';
+  currentPage.value = 1;
+  getTaskList();
+};
+
 /**
  * 每页条数变化
  * @param {number} val - 新的每页条数
@@ -1014,9 +1069,34 @@ const handleAction = async (task) => {
                 return node.status === '2' || node.status === 2;
               });
               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';
-                // 确保更新到updateParams中
-                updateParams.nodes = taskDetails.nodes;
               }
             }
           } catch (innerError) {
@@ -1050,13 +1130,39 @@ const handleAction = async (task) => {
 
           // 将失败的步骤状态改回2（未完成）
           if (taskDetails.nodes && Array.isArray(taskDetails.nodes)) {
-            taskDetails.nodes.forEach((node) => {
-              if (node.status === '3' || node.status === 3) {
-                node.status = '2';
-              }
+            const failedNodes = taskDetails.nodes.filter((node) => {
+              return node.status === '3' || node.status === 3;
             });
-            // 确保更新到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;
         default:
@@ -1261,34 +1367,34 @@ const handleCancelCreateTask = () => {
 
 // ============== 5. 导航栏跳转逻辑（保持原有） ==============
 const handleInspectionManagement1 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspectionManagement2 = () => {
-  router.push('/rili/shiyanrenwu');
+  router.push('/znxj/sygl/shiyanrenwu');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/shiyanjilu');
+  router.push('/znxj/sygl/shiyanjilu');
 };
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 
 // ============== 6. 页面初始化（加载任务列表和用户列表） ==============
@@ -1502,6 +1608,12 @@ const getTaskStatusClass = (status) => {
   border-color: #ffccc7;
 }
 
+.tag-incomplete {
+  background-color: #f5f5f5;
+  color: #999;
+  border-color: #d9d9d9;
+}
+
 .task-details {
   margin-bottom: 16px;
 }
@@ -1782,10 +1894,14 @@ const getTaskStatusClass = (status) => {
   color: #f56c6c;
 }
 
-.status-failed {
+.status-unknown {
   color: #909399;
 }
 
+.status-failed {
+  color: #f56c6c;
+}
+
 /* 响应式设计 */
 @media (max-width: 1200px) {
   .task-cards {

src/views/zhinengxunjian/xunjianjihua.vue

@@ -603,34 +603,34 @@ onUnmounted(() => {
 
 // 导航方法
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspectionManagement2 = () => {
-  router.push('/rili/xunjianrenwu');
+  router.push('/znxj/xjgl/xunjianrenwu');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/xunjianjihua');
+  router.push('/znxj/xjgl/xunjianjihua');
 };
 </script>
 
@@ -654,46 +654,7 @@ const handleInspectionManagement3 = () => {
 }
 
 /* 导航栏样式 */
-.navigation-tabs {
-  display: flex;
-  margin-bottom: 20px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-  padding: 2px;
-}
-
-.nav-tab {
-  padding: 12px 24px;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  border-radius: 4px;
-  font-size: 14px;
-  color: #606266;
-  border-right: 1px solid #f0f0f0;
-  flex: 1;
-  text-align: center;
-}
-
-.nav-tab:last-child {
-  border-right: none;
-}
-
-.nav-tab:hover {
-  color: #409eff;
-  background-color: #ecf5ff;
-}
-
-.nav-tab.active {
-  background-color: #409eff;
-  color: #fff;
-  box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
-}
-
-.nav-tab {
-  cursor: pointer;
-  user-select: none;
-}
+/* 已移除未使用的导航样式（模板中为注释状态） */
 
 /* 选项卡样式 */
 .tabs-wrapper {

src/views/zhinengxunjian/xunjianrenwu.vue

@@ -23,6 +23,9 @@
       <!-- 筛选栏 -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(任务名/对象/执行人)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="taskStatus" placeholder="任务状态">
               <el-option label="待执行" value="pending"></el-option>
@@ -43,6 +46,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch"> 搜索 </el-button>
+            <el-button icon="Refresh" class="create-btn" @click="resetFilters"> 重置 </el-button>
             <el-button type="primary" icon="Plus" class="create-btn" @click="handleCreateTask"> 手动创建任务 </el-button>
           </div>
         </div>
@@ -387,7 +391,7 @@
                   <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
                 </div>
                 <div class="step-status" :class="getStatusClass(node.status)">
-                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                  {{ node.status === '2' ? '未执行' : node.status === '3' ? '失败' : '已完成' }}
                 </div>
               </div>
             </div>
@@ -429,11 +433,13 @@ import { xjrenwuDetail, xjrenwulist, addxjrenwu, updatexjrenwu } from '@/api/zhi
 import { xunjianUserlist, xunjianlist } from '@/api/zhinengxunjian/xunjian/index';
 import { addjiedian } from '@/api/zhinengxunjian/jiedian/index';
 import { ElMessage, ElLoading, ElForm } from 'element-plus';
+import { formatDate } from '@/utils/index';
 
 // 筛选条件
 const taskStatus = ref('');
 const planType = ref('');
 const executor = ref('');
+const keyword = ref('');
 
 // 任务数据 - 初始为空数组，通过API获取
 const tasks = ref([]);
@@ -462,9 +468,9 @@ const getStatusClass = (status) => {
   const statusStr = status?.toString() || '';
   const statusClassMap = {
     '1': 'status-pending',
-    '2': 'status-delayed',
-    '3': 'status-executing',
-    '4': 'status-completed'
+    '2': 'status-unknown', // 未完成状态显示为灰色
+    '3': 'status-failed', // 失败状态显示为红色
+    '4': 'status-completed' // 已完成状态显示为绿色
   };
   return statusClassMap[statusStr] || 'status-unknown';
 };
@@ -543,16 +549,13 @@ const getTaskList = async () => {
     const params = {
       pageSize: pageSize.value,
       pageNum: currentPage.value,
-      personId: 1,
-      taskType: taskStatus.value || undefined, // 任务状态
-      planType: planType.value || undefined, // 计划类型
-      personName: executor.value || undefined // 执行人
+      projectId: 1
     };
 
     const response = await xjrenwulist(params);
 
     if (response.code === 200 && response.rows) {
-      tasks.value = response.rows.map((item) => {
+      const mapped = response.rows.map((item) => {
         // 获取原始数据中的id
         const taskId = item.id || '';
         if (!taskId) {
@@ -603,13 +606,16 @@ const getTaskList = async () => {
 
         return task;
       });
-
-      total.value = response.total || tasks.value.length;
-
-      // 搜索后如果没有结果，显示提示信息
-      if (tasks.value.length === 0) {
-        ElMessage.info('未找到符合条件的任务');
-      }
+      const kw = keyword.value.trim();
+      const filtered = kw
+        ? mapped.filter((t) =>
+            [t.title, t.target, t.executor, t.relatedPlan, t.statusText]
+              .filter(Boolean)
+              .some((v) => String(v).toLowerCase().includes(kw.toLowerCase()))
+          )
+        : mapped;
+      tasks.value = filtered;
+      total.value = kw ? filtered.length : response.total || filtered.length;
     }
   } catch (error) {
     console.error('获取巡检任务数据失败:', error);
@@ -809,7 +815,7 @@ const handleSaveTask = async () => {
 
       createTime: new Date().toISOString(),
       updateTime: new Date().toISOString(),
-      startTime: new Date().toISOString().slice(0, 19).replace('T', ' '),
+      startTime: formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss'),
       params: {
         property1: 'string',
         property2: 'string'
@@ -992,35 +998,35 @@ const handleCloseDetailDialog = () => {
 };
 
 const handleInspectionManagement1 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/xunjianrenwu');
+  router.push('/znxj/xjgl/xunjianrenwu');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/xunjianjihua');
+  router.push('/znxj/xjgl/xunjianjihua');
 };
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 
 // 处理任务操作按钮点击事件
@@ -1045,7 +1051,7 @@ const handleAction = async (task) => {
       const updateData = {
         ...originalTask.rawData,
         id: task.id,
-        startTime: new Date().toISOString().slice(0, 19).replace('T', ' '),
+        startTime: formatDate(new Date().toString()),
         taskType: '3', // 3表示执行中
         status: 'executing',
         taskProgress: 0
@@ -1072,14 +1078,7 @@ const handleAction = async (task) => {
 
       const originalTask = tasks.value[taskIndex];
 
-      const now = new Date();
-      const year = now.getFullYear();
-      const month = String(now.getMonth() + 1).padStart(2, '0');
-      const day = String(now.getDate()).padStart(2, '0');
-      const hours = String(now.getHours()).padStart(2, '0');
-      const minutes = String(now.getMinutes()).padStart(2, '0');
-      const seconds = String(now.getSeconds()).padStart(2, '0');
-      const finishTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      const finishTime = formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss');
 
       const updateData = {
         ...originalTask.rawData,
@@ -1463,166 +1462,6 @@ const handleAction = async (task) => {
   }
 }
 
-/* 任务详情弹窗样式 */
-.task-detail-container {
-  max-height: 600px;
-  overflow-y: auto;
-}
-
-/* 步骤条展示样式 */
-.step-item {
-  display: flex;
-  align-items: flex-start;
-  margin-bottom: 12px;
-  padding: 12px;
-  background-color: #fafafa;
-  border-radius: 6px;
-  transition: all 0.3s ease;
-}
-
-.step-item:hover {
-  background-color: #f5f7fa;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
-}
-
-.step-number {
-  width: 28px;
-  height: 28px;
-  background-color: #409eff;
-  color: white;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 12px;
-  font-size: 14px;
-  font-weight: bold;
-  flex-shrink: 0;
-}
-
-.step-info {
-  flex: 1;
-}
-
-.step-name {
-  font-weight: 500;
-  color: #1d2129;
-  margin-bottom: 4px;
-  font-size: 14px;
-}
-
-.step-purpose {
-  color: #606266;
-  margin-bottom: 4px;
-  font-size: 13px;
-}
-
-.step-time,
-.step-finish-time,
-.step-remark {
-  color: #909399;
-  font-size: 12px;
-  margin-bottom: 2px;
-}
-
-.step-status {
-  padding: 4px 12px;
-  border-radius: 4px;
-  font-size: 12px;
-  font-weight: 500;
-  flex-shrink: 0;
-  margin-top: 4px;
-}
-
-/* 步骤状态样式 */
-.step-status.status-pending {
-  background-color: #e6f7ff;
-  color: #1677ff;
-  border: 1px solid #91d5ff;
-}
-
-.step-status.status-executing {
-  background-color: #fffbe6;
-  color: #fa8c16;
-  border: 1px solid #ffe58f;
-}
-
-.step-status.status-completed {
-  background-color: #f6ffed;
-  color: #52c41a;
-  border: 1px solid #b7eb8f;
-}
-
-.step-status.status-delayed {
-  background-color: #fff2f0;
-  color: #ff4d4f;
-  border: 1px solid #ffccc7;
-}
-
-.detail-card {
-  margin-bottom: 20px;
-  padding: 20px;
-  background-color: #fafafa;
-  border-radius: 8px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
-}
-
-.card-title {
-  margin: 0 0 16px 0;
-  padding-bottom: 12px;
-  border-bottom: 2px solid #409eff;
-  font-size: 16px;
-  font-weight: 600;
-  color: #303133;
-}
-
-.card-content {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.info-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 20px;
-}
-
-.info-item {
-  flex: 1;
-  min-width: 280px;
-}
-
-.info-item.full-width {
-  min-width: 100%;
-}
-
-.info-label {
-  display: inline-block;
-  width: 100px;
-  color: #606266;
-  font-weight: 500;
-}
-
-.info-value {
-  color: #303133;
-  word-break: break-word;
-}
-
-.fail-reason {
-  color: #f56c6c;
-}
-
-.no-info {
-  color: #909399;
-  font-style: italic;
-  padding: 10px 0;
-}
-
-.loading-details {
-  padding: 20px 0;
-}
-
 /* 状态颜色样式 */
 .status-pending {
   color: #e6a23c;

src/views/zhinengxunjian/zhixingjilu.vue

@@ -24,6 +24,9 @@
       <!-- 筛选栏 -->
       <div class="filter-bar">
         <div class="filter-container">
+          <div class="filter-item">
+            <el-input v-model="keyword" placeholder="关键字(标题/描述/创建人)" clearable @keyup.enter="handleSearch" />
+          </div>
           <div class="filter-item">
             <el-select v-model="workOrderType" placeholder="工单类型" clearable>
               <el-option label="全部类型" value="all"></el-option>
@@ -55,6 +58,7 @@
           </div>
           <div class="filter-actions">
             <el-button type="primary" icon="Search" class="search-btn" @click="handleSearch">搜索</el-button>
+            <el-button icon="Refresh" class="create-btn" @click="resetFilters">重置</el-button>
           </div>
         </div>
       </div>
@@ -83,26 +87,54 @@
             </div>
           </div>
 
-          <!-- 横向进度时间线 - 使用Element Plus的Steps组件 -->
-          <div class="progress-timeline-container">
-            <div class="progress-timeline">
-              <el-steps direction="horizontal" :active="activeStepIndex" align-center class="custom-steps" :progress-dot="false">
-                <template v-if="trackingSteps.length > 0">
-                  <el-step v-for="(step, index) in trackingSteps" :key="step.id" :title="step.name" :status="getStatusByIndex(index)">
-                    <template #description>
-                      <div class="step-description">
-                        <div class="step-person-time">
-                          {{ step.executor || (step.getOrderPersonVo && step.getOrderPersonVo.userName) || '待分配' }}
-                        </div>
-                        <template v-if="step.intendedTime">
-                          <div class="step-person-time">预期时间：{{ formatDateTime(step.intendedTime) }}</div>
-                        </template>
-                        <div class="step-content">预期目的：{{ step.intendedPurpose || '-' }}</div>
-                      </div>
-                    </template>
-                  </el-step>
-                </template>
-              </el-steps>
+          <!-- 进度条设计 -->
+          <div class="tracking-progress-container" v-if="currentTrackedWorkOrder">
+            <!-- 进度条整体容器 -->
+            <div class="progress-bar-wrapper">
+              <!-- 进度条背景 -->
+              <div class="progress-bar-background"></div>
+              <!-- 进度条填充 -->
+              <div class="progress-bar-fill" :style="{ width: getProgressPercentage() + '%' }"></div>
+              <!-- 进度条节点 -->
+              <div class="progress-bar-nodes">
+                <div
+                  v-for="(step, index) in trackingSteps"
+                  :key="step.id"
+                  class="progress-node"
+                  :class="getStepStatusClass(index)"
+                  :style="{ left: getNodePosition(index) + '%' }"
+                >
+                  <div class="node-circle">
+                    <div class="node-icon">{{ step.code || index + 1 }}</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <!-- 步骤信息显示 -->
+            <div class="progress-steps-info">
+              <div v-for="(step, index) in trackingSteps" :key="step.id" class="step-info-card" :class="getStepStatusClass(index)">
+                <div class="step-header">
+                  <div class="step-number">{{ step.code || index + 1 }}</div>
+                  <div class="step-name">{{ step.name }}</div>
+                </div>
+                <div class="step-details">
+                  <div class="step-person">
+                    <i class="el-icon-user"></i>
+                    {{ step.executor || (step.getOrderPersonVo && step.getOrderPersonVo.userName) || '待分配' }}
+                  </div>
+                  <template v-if="step.intendedTime">
+                    <div class="step-time">
+                      <i class="el-icon-time"></i>
+                      预期时间：{{ formatDateTime(step.intendedTime) }}
+                    </div>
+                  </template>
+                  <div class="step-purpose">
+                    <i class="el-icon-document"></i>
+                    预期目的：{{ step.intendedPurpose || '-' }}
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
 
@@ -140,6 +172,11 @@
             </template>
           </el-table-column>
           <el-table-column align="center" prop="creator" label="创建人" min-width="100"></el-table-column>
+          <el-table-column align="center" prop="progress" label="工单进度" min-width="100">
+            <template #default="scope">
+              <el-progress :percentage="parseFloat(scope.row.progress) || 0" show-text />
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="createTime" label="创建时间" min-width="140"></el-table-column>
           <el-table-column align="center" prop="deadline" label="截止时间" min-width="140"></el-table-column>
           <el-table-column align="center" prop="status" label="状态" min-width="100">
@@ -296,13 +333,6 @@
           <el-form-item label="工单描述">
             <el-input v-model="createForm.resultDescription" type="textarea" :rows="3" placeholder="请描述该工单完成后预期达成的成果" />
           </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>
 
         <template #footer>
@@ -445,7 +475,7 @@
                   <div v-if="node.remark" class="step-remark">备注：{{ node.remark }}</div>
                 </div>
                 <div class="step-status" :class="getStatusClass(node.status)">
-                  {{ node.status === '2' ? '未完成' : '已完成' }}
+                  {{ node.status === '2' ? '未执行' : node.status === '3' ? '失败' : '已完成' }}
                 </div>
                 <!-- 连接线 -->
                 <div v-if="index < detailData.nodes.length - 1" class="step-connector" :class="{ 'connector-completed': node.status !== '2' }"></div>
@@ -526,6 +556,7 @@ import ImageUpload from '@/components/ImageUpload/index.vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 
 // 筛选条件
+const keyword = ref('');
 const workOrderType = ref('all');
 const workOrderStatus = ref('all');
 const priority = ref('all');
@@ -568,7 +599,8 @@ const fetchWorkOrderList = async () => {
         getOrderTime: item.getOrderTime ? formatDate(item.getOrderTime) : '',
         finishiOrderTime: item.finishiOrderTime ? formatDate(item.finishiOrderTime) : '',
         position: item.position || '',
-        device: item.device || ''
+        device: item.device || '',
+        progress: item.progress // 添加进度字段
       }));
 
       // 更新总条数
@@ -613,7 +645,8 @@ const updateCurrentTrackedOrder = () => {
         intendedTime: node.intendedTime,
         finishTime: node.finishTime,
         intendedPurpose: node.intendedPurpose || '-',
-        remark: node.remark || ''
+        remark: node.remark || '',
+        status: node.status || '' // 添加status字段
       }));
     } else {
       // 如果nodes数组为空，创建一些默认的步骤数据
@@ -621,13 +654,12 @@ const updateCurrentTrackedOrder = () => {
     }
 
     // 设置当前激活步骤索引
-    // 如果有实际的完成时间，我们可以基于此设置激活步骤
-    // 否则默认设置为第一个步骤
+    // 根据status字段判断，status='1'表示完成，status='2'表示未完成，status='3'表示失败
     activeStepIndex.value = 0;
 
     // 检查是否有已完成的步骤，如果有，将激活步骤设置为最后一个已完成步骤的下一个
     for (let i = trackingSteps.value.length - 1; i >= 0; i--) {
-      if (trackingSteps.value[i].finishTime) {
+      if (trackingSteps.value[i].status === '1') {
         activeStepIndex.value = Math.min(i + 1, trackingSteps.value.length - 1);
         break;
       }
@@ -797,8 +829,10 @@ const refreshTrackingSteps = async () => {
 
 // 根据索引获取步骤状态
 const getStatusByIndex = (index) => {
+  if (!currentTrackedWorkOrder.value) return 'wait';
+
   if (index < activeStepIndex.value) {
-    return 'success';
+    return 'finish';
   } else if (index === activeStepIndex.value) {
     return 'process';
   } else {
@@ -806,6 +840,101 @@ const getStatusByIndex = (index) => {
   }
 };
 
+// 试验记录页面步骤条状态判断 - 重点跟踪区域专用
+const getStepStatusClass = (index) => {
+  if (!currentTrackedWorkOrder.value) return 'pending';
+
+  const step = trackingSteps.value[index];
+  if (step) {
+    // 优先根据status字段判断状态
+    const status = step.status?.toString() || '';
+
+    if (status === '1') {
+      return 'completed'; // 完成状态 - 绿色
+    } else if (status === '3') {
+      return 'delayed'; // 失败状态 - 红色
+    } else if (status === '2') {
+      return 'pending'; // 未完成状态 - 灰色
+    }
+  }
+
+  // fallback到基于索引的判断逻辑
+  if (index < activeStepIndex.value) {
+    return 'completed';
+  } else if (index === activeStepIndex.value) {
+    return 'active';
+  } else {
+    return 'pending';
+  }
+};
+
+// 获取进度线状态 - 重点跟踪区域专用
+const getLineStatusClass = (index) => {
+  if (!currentTrackedWorkOrder.value) return 'pending';
+
+  // 进度线状态与前一个步骤状态保持一致
+  const prevStepIndex = index;
+  const prevStep = trackingSteps.value[prevStepIndex];
+
+  if (prevStep) {
+    const status = prevStep.status?.toString() || '';
+
+    if (status === '1') {
+      return 'completed'; // 前一步骤已完成 - 绿色
+    } else if (status === '3') {
+      return 'delayed'; // 前一步骤失败 - 红色
+    }
+  }
+
+  //  fallback到基于索引的判断逻辑
+  if (index < activeStepIndex.value) {
+    return 'completed';
+  } else {
+    return 'pending';
+  }
+};
+
+// 计算进度百分比
+const getProgressPercentage = () => {
+  if (!currentTrackedWorkOrder.value || trackingSteps.value.length === 0) return 0;
+
+  // 优先使用API返回的progress字段值
+  if (currentTrackedWorkOrder.value.progress) {
+    try {
+      // 将字符串类型的progress转换为数字
+      const progressValue = parseFloat(currentTrackedWorkOrder.value.progress);
+      // 确保进度值在0-100之间
+      return Math.min(Math.max(progressValue, 0), 100);
+    } catch (error) {
+      console.warn('解析progress字段失败，使用默认计算逻辑:', error);
+      // 解析失败时使用原有逻辑
+    }
+  }
+
+  // 计算已完成步骤数
+  const completedSteps = trackingSteps.value.filter((step) => step.status === '1').length;
+
+  // 如果没有已完成步骤，但有活跃步骤，则使用活跃步骤的位置
+  if (completedSteps === 0 && activeStepIndex.value >= 0) {
+    return (activeStepIndex.value / trackingSteps.value.length) * 100;
+  }
+
+  // 计算进度百分比
+  const percentage = (completedSteps / trackingSteps.value.length) * 100;
+
+  // 确保最大为100%
+  return Math.min(percentage, 100);
+};
+
+// 计算节点位置百分比
+const getNodePosition = (index) => {
+  if (!currentTrackedWorkOrder.value || trackingSteps.value.length <= 1) return 0;
+
+  // 等距分布节点
+  const position = (index / (trackingSteps.value.length - 1)) * 100;
+  return position;
+};
+
 // 将状态码转换为可读的状态文本
 const getStatusText = (statusCode) => {
   const statusMap = {
@@ -837,6 +966,18 @@ const pagedTableData = computed(() => {
   // 筛选逻辑
   let filteredData = [...rawTableData.value];
 
+  if (keyword.value && keyword.value.trim()) {
+    const kw = keyword.value.trim();
+    filteredData = filteredData.filter((item) => {
+      return (
+        (item.title && item.title.includes(kw)) ||
+        (item.description && item.description.includes(kw)) ||
+        (item.creator && item.creator.includes(kw)) ||
+        (item.orderNo && item.orderNo.includes(kw))
+      );
+    });
+  }
+
   if (workOrderType.value !== 'all') {
     // 转换筛选条件为显示文本进行匹配
     let typeText = '';
@@ -949,10 +1090,10 @@ const getStatusClass = (status) => {
   // 处理可能的数字输入
   const statusStr = status?.toString() || '';
   const statusClassMap = {
-    '1': 'status-pending',
-    '2': 'status-delayed',
-    '3': 'status-executing',
-    '4': 'status-completed'
+    '1': 'status-pending', // 待执行 - 蓝色
+    '2': 'status-unknown', // 未执行 - 灰色
+    '3': 'status-failed', // 失败 - 红色
+    '4': 'status-completed' // 已完成 - 绿色
   };
   return statusClassMap[statusStr] || 'status-unknown';
 };
@@ -990,6 +1131,16 @@ const handleSearch = () => {
   currentPage.value = 1; // 重置到第一页
 };
 
+// 重置筛选
+const resetFilters = () => {
+  keyword.value = '';
+  workOrderType.value = 'all';
+  workOrderStatus.value = 'all';
+  priority.value = 'all';
+  createDate.value = '';
+  currentPage.value = 1;
+};
+
 // 分页事件
 const handleSizeChange = (val) => {
   pageSize.value = val;
@@ -1282,6 +1433,25 @@ const handleEdit = async (row) => {
     createForm.resultDescription = workOrderDetail.results || '';
     createForm.needAssignee = !!workOrderDetail.executor;
 
+    // 根据工单状态设置进度
+    // 1: 待派单, 2: 已派单, 3: 执行中, 4: 已完成, 5: 已拒绝
+    switch (workOrderDetail.status) {
+      case '1':
+        createForm.progress = 0;
+        break;
+      case '2':
+        createForm.progress = 25;
+        break;
+      case '3':
+        createForm.progress = 50;
+        break;
+      case '4':
+        createForm.progress = 100;
+        break;
+      default:
+        createForm.progress = 0;
+    }
+
     // 填充步骤数据：从nodes数组中提取并按code排序
     if (workOrderDetail.nodes && Array.isArray(workOrderDetail.nodes)) {
       // 复制nodes数组并按code升序排序
@@ -1343,7 +1513,8 @@ const createForm = reactive({
   file: '',
   fileList: [],
   resultDescription: '',
-  needAssignee: 'false'
+  needAssignee: 'false',
+  progress: 0
 });
 
 const createFormRules = {
@@ -1473,7 +1644,8 @@ const submitCreate = async () => {
       createBy: '',
       handlerDept: '',
       handler: '',
-      handlerName: ''
+      handlerName: '',
+      progress: createForm.progress || 0
     };
 
     // 编辑操作：调用updategongdan接口
@@ -1493,6 +1665,8 @@ const submitCreate = async () => {
           createForm[key] = [{ name: '', intendedPurpose: '', intendedTime: '' }];
         } else if (key === 'fileList') {
           createForm[key] = [];
+        } else if (key === 'progress') {
+          createForm[key] = 0;
         } else {
           createForm[key] = '';
         }
@@ -1523,6 +1697,8 @@ const cancelCreate = () => {
       createForm[key] = [{ name: '', intendedPurpose: '', intendedTime: '' }];
     } else if (key === 'fileList') {
       createForm[key] = [];
+    } else if (key === 'progress') {
+      createForm[key] = 0;
     } else {
       createForm[key] = '';
     }
@@ -1533,35 +1709,35 @@ const cancelCreate = () => {
 
 // 导航路由跳转
 const handleInspection1 = () => {
-  router.push('/rili/rili');
+  router.push('/znxj/rili');
 };
 const handleInspection2 = () => {
-  router.push('/rili/InspectionManagement');
+  router.push('/znxj/xjgl/InspectionManagement');
 };
 const handleInspection3 = () => {
-  router.push('/rili/shiyanguanli');
+  router.push('/znxj/sygl/shiyanguanli');
 };
 const handleInspection4 = () => {
-  router.push('/rili/baoxiuguanli');
+  router.push('/znxj/bxgl/baoxiuguanli');
 };
 const handleInspection5 = () => {
-  router.push('/rili/qiangxiuguanli');
+  router.push('/znxj/qxgl/qiangxiuguanli');
 };
 const handleInspection6 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 const handleInspection7 = () => {
-  router.push('/rili/renyuanzhuangtai');
+  router.push('/znxj/ywzz/renyuanzhuangtai');
 };
 const handleInspectionManagement1 = () => {
-  router.push('/rili/gongdanliebiao');
+  router.push('/znxj/gdgl/gongdanliebiao');
 };
 
 const handleInspectionManagement2 = () => {
-  router.push('/rili/paidanjilu');
+  router.push('/znxj/gdgl/paidanjilu');
 };
 const handleInspectionManagement3 = () => {
-  router.push('/rili/zhixingjilu');
+  router.push('/znxj/gdgl/zhixingjilu');
 };
 
 // 关闭详情弹窗
@@ -1738,10 +1914,6 @@ const handleCloseDetailDialog = () => {
   transition: all 0.3s ease;
 }
 
-.step-connector.connector-completed {
-  background: linear-gradient(to bottom, #52c41a, #73d13d);
-}
-
 /* 动画效果 */
 @keyframes fadeInUp {
   from {
@@ -2046,46 +2218,7 @@ const handleCloseDetailDialog = () => {
 }
 
 /* 导航栏样式 */
-.navigation-tabs {
-  display: flex;
-  margin-bottom: 20px;
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
-  padding: 2px;
-}
-
-.nav-tab {
-  padding: 12px 24px;
-  cursor: pointer;
-  transition: all 0.3s ease;
-  border-radius: 4px;
-  font-size: 14px;
-  color: #606266;
-  border-right: 1px solid #f0f0f0;
-  flex: 1;
-  text-align: center;
-}
-
-.nav-tab:last-child {
-  border-right: none;
-}
-
-.nav-tab:hover {
-  color: #409eff;
-  background-color: #ecf5ff;
-}
-
-.nav-tab.active {
-  background-color: #409eff;
-  color: #fff;
-  box-shadow: 0 2px 4px rgba(64, 158, 255, 0.3);
-}
-
-.nav-tab {
-  cursor: pointer;
-  user-select: none;
-}
+/* 导航栏相关样式移除（对应模板已注释） */
 
 /* 弹窗样式 */
 .create-dialog {
@@ -2566,17 +2699,7 @@ const handleCloseDetailDialog = () => {
 }
 
 /* 动画效果 */
-@keyframes pulse {
-  0% {
-    box-shadow: 0 0 0 0 rgba(22, 93, 255, 0.4);
-  }
-  70% {
-    box-shadow: 0 0 0 10px rgba(22, 93, 255, 0);
-  }
-  100% {
-    box-shadow: 0 0 0 0 rgba(22, 93, 255, 0);
-  }
-}
+/* 重复的 pulse 动画移除（下方已存在统一定义） */
 
 .custom-steps {
   padding: 20px 10px;
@@ -2977,17 +3100,7 @@ const handleCloseDetailDialog = () => {
   position: relative;
   overflow: hidden;
 }
-.custom-steps::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 4px;
-  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
-  z-index: 0;
-  border-radius: 4px 4px 0 0;
-}
+/* 去重：自定义步骤条顶部装饰在下方统一块中定义 */
 
 /* 重点跟踪区域样式 */
 .tracking-section {
@@ -3205,17 +3318,7 @@ const handleCloseDetailDialog = () => {
 }
 
 /* 顶部装饰条 */
-.custom-steps::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
-  border-radius: 6px 6px 0 0;
-  box-shadow: 0 2px 12px rgba(22, 93, 255, 0.2);
-}
+/* 去重：自定义步骤条顶部装饰重复定义移除 */
 
 /* 背景装饰 */
 .custom-steps::after {
@@ -3231,30 +3334,10 @@ const handleCloseDetailDialog = () => {
 }
 
 /* 左侧装饰 */
-.custom-steps::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
-  border-radius: 6px 6px 0 0;
-  box-shadow: 0 2px 12px rgba(22, 93, 255, 0.2);
-}
+/* 去重：重复 before 装饰定义移除 */
 
 /* 右侧装饰 */
-.custom-steps::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  height: 6px;
-  background: linear-gradient(90deg, #165dff, #409eff, #69c0ff);
-  border-radius: 6px 6px 0 0;
-  box-shadow: 0 2px 12px rgba(22, 93, 255, 0.2);
-}
+/* 去重：重复 before 装饰定义移除 */
 
 /* 左侧装饰球 */
 .custom-steps::before {
@@ -3296,13 +3379,299 @@ const handleCloseDetailDialog = () => {
   position: relative;
 }
 
+/* 重点跟踪区域进度条样式 */
+.tracking-progress-container {
+  padding: 20px;
+  background-color: #fff;
+}
+
+/* 进度条包装器 */
+.progress-bar-wrapper {
+  position: relative;
+  height: 40px;
+  margin-bottom: 30px;
+  display: flex;
+  align-items: center;
+}
+
+/* 进度条背景 */
+.progress-bar-background {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  right: 0;
+  height: 6px;
+  background-color: #e5e7eb;
+  border-radius: 3px;
+  transform: translateY(-50%);
+}
+
+/* 进度条填充 */
+.progress-bar-fill {
+  position: absolute;
+  top: 50%;
+  left: 0;
+  height: 6px;
+  background: linear-gradient(90deg, #00b42a, #95de64);
+  border-radius: 3px;
+  transition: width 0.6s ease;
+  transform: translateY(-50%);
+}
+
+/* 进度条节点容器 */
+.progress-bar-nodes {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+/* 进度条节点 */
+.progress-node {
+  position: absolute;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+
+/* 节点圆圈 */
+.node-circle {
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
+  background-color: #fff;
+  border: 2px solid #e5e7eb;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  transition: all 0.3s ease;
+  z-index: 2;
+}
+
+/* 节点图标/数字 */
+.node-icon {
+  font-size: 14px;
+  font-weight: 600;
+  color: #6b7280;
+}
+
+/* 步骤信息卡片容器 */
+.progress-steps-info {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 12px;
+}
+
+/* 单个步骤信息卡片 */
+.step-info-card {
+  flex: 1;
+  min-width: 160px;
+  max-width: 250px;
+  padding: 12px;
+  border-radius: 6px;
+  border: 1px solid #f0f0f0;
+  background-color: #fff;
+  transition: all 0.3s ease;
+}
+
+/* 步骤卡片头部 */
+.step-header {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+/* 步骤数字 */
+.step-info-card .step-number {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: #e5e7eb;
+  color: #6b7280;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 11px;
+  font-weight: 600;
+  margin-right: 6px;
+}
+
+/* 步骤名称 */
+.step-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #1f2937;
+}
+
+/* 步骤详情 */
+.step-details {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  font-size: 14px;
+}
+
+.step-details > div {
+  display: flex;
+  align-items: center;
+  color: #6b7280;
+}
+
+.step-details i {
+  margin-right: 6px;
+  font-size: 14px;
+}
+
+/* 已完成状态样式 - 绿色 */
+.step-info-card.completed {
+  border-color: #00b42a;
+  background-color: #f6ffed;
+}
+
+.step-info-card.completed .step-number {
+  background-color: #00b42a;
+  color: white;
+}
+
+.progress-node.completed .node-circle {
+  border-color: #00b42a;
+  background-color: #fff;
+}
+
+.progress-node.completed .node-icon {
+  background-color: #00b42a;
+  color: white;
+  border-radius: 50%;
+  width: 28px;
+  height: 28px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 进行中状态样式 */
+.step-info-card.active {
+  border-color: #165dff;
+  background-color: #f0f7ff;
+  box-shadow: 0 4px 12px rgba(22, 93, 255, 0.1);
+}
+
+.step-info-card.active .step-number {
+  background-color: #165dff;
+  color: white;
+}
+
+.progress-node.active .node-circle {
+  border-color: #165dff;
+  background-color: #fff;
+  animation: pulse 2s infinite;
+}
+
+.progress-node.active .node-icon {
+  background-color: #165dff;
+  color: white;
+  border-radius: 50%;
+  width: 28px;
+  height: 28px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 待处理状态样式 */
+.step-info-card.pending {
+  border-color: #e5e7eb;
+  background-color: #fff;
+}
+
+/* 失败/逾期状态样式 */
+.step-info-card.delayed {
+  border-color: #ff4d4f;
+  background-color: #fff2f0;
+}
+
+.step-info-card.delayed .step-number {
+  background-color: #ff4d4f;
+  color: white;
+}
+
+.progress-node.delayed .node-circle {
+  border-color: #ff4d4f;
+  background-color: #fff;
+}
+
+.progress-node.delayed .node-icon {
+  background-color: #ff4d4f;
+  color: white;
+  border-radius: 50%;
+  width: 28px;
+  height: 28px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+/* 脉冲动画 */
+@keyframes pulse {
+  0% {
+    box-shadow: 0 0 0 0 rgba(22, 93, 255, 0.4);
+  }
+  70% {
+    box-shadow: 0 0 0 10px rgba(22, 93, 255, 0);
+  }
+  100% {
+    box-shadow: 0 0 0 0 rgba(22, 93, 255, 0);
+  }
+}
+
+.tracking-progress-timeline .progress-step.completed .step-number {
+  background-color: #00b42a;
+  color: white;
+}
+
+.tracking-progress-timeline .progress-line.completed {
+  background-color: #00b42a;
+}
+
+.tracking-progress-timeline .progress-step.delayed .step-number {
+  background-color: #dc2626;
+  color: white;
+}
+
+.tracking-progress-timeline .progress-line.delayed {
+  background-color: #dc2626;
+}
+
+.tracking-progress-timeline .step-name {
+  font-size: 14px;
+  font-weight: 500;
+  color: #1f2329;
+  margin-bottom: 8px;
+  text-align: center;
+}
+
+.tracking-progress-timeline .step-info {
+  font-size: 12px;
+  color: #6b7280;
+  text-align: center;
+}
+
+.tracking-progress-timeline .step-person-time {
+  margin-bottom: 4px;
+}
+
+.tracking-progress-timeline .step-purpose {
+  margin-top: 4px;
+  line-height: 1.4;
+}
+
 .custom-step:hover {
   transform: translateY(-8px);
   filter: brightness(1.03);
 }
 
-/* 步骤连接线 */
-.custom-step:not(:last-child)::after {
+/* 步骤连接线 - 默认（进行中） */
+.custom-step:not(:last-child):not(.is-wait)::after {
   content: '';
   position: absolute;
   top: 32px;
@@ -3314,6 +3683,12 @@ const handleCloseDetailDialog = () => {
   box-shadow: 0 2px 8px rgba(22, 93, 255, 0.3);
 }
 
+/* 已完成步骤连接线 */
+.custom-step.completed:not(:last-child)::after {
+  background: linear-gradient(90deg, #00b42a 0%, #95de64 100%);
+  box-shadow: 0 2px 8px rgba(0, 180, 42, 0.3);
+}
+
 /* 待处理步骤连接线 */
 .custom-step.is-wait:not(:last-child)::after {
   background: linear-gradient(90deg, #dcdfe6 0%, #e4e7ed 100%);