Ver Fonte

调整报表编辑组件的存放位置

yangguanjin há 1 semana atrás
pai
commit
0de0d2f0da

+ 29 - 29
src/pages.json

@@ -82,7 +82,7 @@
       }
     },
     {
-      "path": "pages/importanceEditor/importanceEditor",
+      "path": "pages/editor/equipCheckRecordEditor",
       "type": "page",
       "layout": "default",
       "style": {
@@ -92,7 +92,7 @@
       }
     },
     {
-      "path": "pages/inspectionPlanAudit/inspectionPlanEditor",
+      "path": "pages/editor/importanceEditor",
       "type": "page",
       "layout": "default",
       "style": {
@@ -102,25 +102,27 @@
       }
     },
     {
-      "path": "pages/loading/index",
+      "path": "pages/editor/inspectionPlanEditor",
       "type": "page",
       "layout": "default",
       "style": {
-        "navigationBarTitleText": "加载中",
-        "navigationStyle": "custom"
+        "navigationBarTitleText": "",
+        "navigationStyle": "custom",
+        "disableScroll": true
       }
     },
     {
-      "path": "pages/login/login",
+      "path": "pages/editor/securityCheckEditor",
       "type": "page",
       "layout": "default",
       "style": {
-        "navigationBarTitleText": "登录",
-        "navigationStyle": "custom"
+        "navigationBarTitleText": "",
+        "navigationStyle": "custom",
+        "disableScroll": true
       }
     },
     {
-      "path": "pages/securityCheck/securityCheckEditor",
+      "path": "pages/editor/serviceOrderEditor",
       "type": "page",
       "layout": "default",
       "style": {
@@ -129,6 +131,24 @@
         "disableScroll": true
       }
     },
+    {
+      "path": "pages/loading/index",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "加载中",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/login/login",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "登录",
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/securityCheck/securityCheckList",
       "type": "page",
@@ -152,16 +172,6 @@
         "disableScroll": true
       }
     },
-    {
-      "path": "pages/serviceOrderDetail/serviceOrderEditor",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "custom",
-        "disableScroll": true
-      }
-    },
     {
       "path": "pages/sign/index",
       "type": "page",
@@ -285,16 +295,6 @@
         "navigationStyle": "custom"
       }
     },
-    {
-      "path": "pages/equipment/detail/equipCheckRecordEditor",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "custom",
-        "disableScroll": true
-      }
-    },
     {
       "path": "pages/equipment/detail/equipmentDetail",
       "type": "page",

src/pages/equipment/detail/equipCheckRecordEditor.vue → src/pages/editor/equipCheckRecordEditor.vue


src/pages/importanceEditor/importanceEditor.vue → src/pages/editor/importanceEditor.vue


src/pages/inspectionPlanAudit/inspectionPlanEditor.vue → src/pages/editor/inspectionPlanEditor.vue


src/pages/securityCheck/securityCheckEditor.vue → src/pages/editor/securityCheckEditor.vue


src/pages/serviceOrderDetail/serviceOrderEditor.vue → src/pages/editor/serviceOrderEditor.vue


+ 2 - 2
src/pages/equipment/detail/components/BoilerInspectProject.vue

@@ -900,7 +900,7 @@ const handleRouteToInputWebview = (item: CheckItem) => {
   }
 
   uni.navigateTo({
-    url: `/pages/equipment/detail/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${item?.id}&templateId=${item.templateId}&equipCode=${item.equipCode}&useOnline=${props.useOnline}&reportUrl=${item.reportUrl || ''}`,
+    url: `/pages/editor/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${item?.id}&templateId=${item.templateId}&equipCode=${item.equipCode}&useOnline=${props.useOnline}&reportUrl=${item.reportUrl || ''}`,
   })
 }
 
@@ -1224,7 +1224,7 @@ const handleConfirmTemplate = async () => {
     }
     
     uni.navigateTo({
-      url: `/pages/equipment/detail/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${newReportId}&templateId=${selectedTemplate.value.value}&equipCode=${props.equipment?.equipCode || ''}&useOnline=1&reportUrl=`,
+      url: `/pages/editor/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${newReportId}&templateId=${selectedTemplate.value.value}&equipCode=${props.equipment?.equipCode || ''}&useOnline=1&reportUrl=`,
     })
   } catch (error) {
     uni.hideLoading()

+ 1 - 1
src/pages/equipment/detail/components/ContainerInspectProject.vue

@@ -630,7 +630,7 @@ const handleRouteToInputWebview = (item: CheckItem) => {
   }
 
   uni.navigateTo({
-    url: `/pages/equipment/detail/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${item?.id}&templateId=${item.templateId}&equipCode=${item.equipCode}&useOnline=${props.useOnline}&reportUrl=${item.reportUrl || ''}`,
+    url: `/pages/editor/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${item?.id}&templateId=${item.templateId}&equipCode=${item.equipCode}&useOnline=${props.useOnline}&reportUrl=${item.reportUrl || ''}`,
   })
 }
 

+ 2 - 2
src/pages/equipment/detail/components/PipeInspectProject.vue

@@ -630,7 +630,7 @@ const handleRouteToInputWebview = (item: CheckItem) => {
   }
 
   uni.navigateTo({
-    url: `/pages/equipment/detail/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${item?.id}&templateId=${item.templateId}&equipCode=${item.equipCode}&useOnline=${props.useOnline}&reportUrl=${item.reportUrl || ''}`,
+    url: `/pages/editor/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${item?.id}&templateId=${item.templateId}&equipCode=${item.equipCode}&useOnline=${props.useOnline}&reportUrl=${item.reportUrl || ''}`,
   })
 }
 
@@ -953,7 +953,7 @@ const handleConfirmTemplate = async () => {
     }
 
     uni.navigateTo({
-      url: `/pages/equipment/detail/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${newReportId}&templateId=${selectedTemplate.value.value}&equipCode=${props.equipment?.equipCode || ''}&useOnline=1&reportUrl=`,
+      url: `/pages/editor/equipCheckRecordEditor?userId=${userInfo.value?.id}&orderItemId=${props.orderItemId}&checkItemId=${newReportId}&templateId=${selectedTemplate.value.value}&equipCode=${props.equipment?.equipCode || ''}&useOnline=1&reportUrl=`,
     })
   } catch (error) {
     uni.hideLoading()

+ 1 - 1
src/pages/securityCheck/securityCheckList.vue

@@ -162,7 +162,7 @@ const handleEditSavetyRecord = async (item: any) => {
       orderId: item.orderId,
   })
   uni.navigateTo({
-    url: `/pages/securityCheck/securityCheckEditor?templateId=${res?.data?.templateId}&orderId=${item.orderId}&securityCheckId=${item.id}&mode=edit`,
+    url: `/pages/editor/securityCheckEditor?templateId=${res?.data?.templateId}&orderId=${item.orderId}&securityCheckId=${item.id}&mode=edit`,
   })
 }
 

+ 1 - 1
src/pages/sign/index.vue

@@ -602,7 +602,7 @@ const handleActionSelect = (item: any) => {
     }
     let url = ''
     if (routeType.value === 'FWD') {
-      url = `/pages/serviceOrderDetail/serviceOrderEditor?templateId=${templateId.value}&refId=${refId.value}`
+      url = `/pages/editor/serviceOrderEditor?templateId=${templateId.value}&refId=${refId.value}`
     } else if (routeType.value === 'JYRS') {
       uni.showToast({ title: '更新检验结果告知表单暂未实现', icon: 'none' })
     } else {

+ 2 - 2
src/pages/taskOnline/TaskOnlineEquipmentList.vue

@@ -559,7 +559,7 @@ const createInform = async () => {
     })
     const refId = addMajorIssueResp?.data || ''
     uni.navigateTo({
-      url: `/pages/importanceEditor/importanceEditor?templateId=${templateId}&refId=${refId}`,
+      url: `/pages/editor/importanceEditor?templateId=${templateId}&refId=${refId}`,
     })
   } catch (error) {
     uni.hideLoading()
@@ -622,7 +622,7 @@ const addInspectionplanConfirm = async () => {
     }
     const res = await requestFunc(TaskOrderFuncName.AddMajorIssues, equipType, reqData)
     uni.navigateTo({
-      url: `/pages/inspectionPlanAudit/inspectionPlanEditor?templateId=${selectedTemplateId.value}&refId=${res?.data || ''}`,
+      url: `/pages/editor/inspectionPlanEditor?templateId=${selectedTemplateId.value}&refId=${res?.data || ''}`,
     })
   } catch (error) {
     uni.hideLoading()

+ 2 - 2
src/pages/taskOnline/TaskOnlinePipeEquipmentList.vue

@@ -645,7 +645,7 @@ const createInform = async () => {
     const addMajorIssueResp = await requestFunc(TaskOrderFuncName.AddMajorIssues, EquipmentType.PIPE, reqData)
     const refId = addMajorIssueResp?.data || ''
     uni.navigateTo({
-      url: `/pages/importanceEditor/importanceEditor?templateId=${templateId}&refId=${refId}`,
+      url: `/pages/editor/importanceEditor?templateId=${templateId}&refId=${refId}`,
     })
   } catch (error) {
     uni.hideLoading()
@@ -711,7 +711,7 @@ const addInspectionplanConfirm = async () => {
     }
     const res = await requestFunc(TaskOrderFuncName.AddMajorIssues, EquipmentType.PIPE, reqData)
     uni.navigateTo({
-      url: `/pages/inspectionPlanAudit/inspectionPlanEditor?templateId=${selectedTemplateId.value}&refId=${res?.data || ''}`,
+      url: `/pages/editor/inspectionPlanEditor?templateId=${selectedTemplateId.value}&refId=${res?.data || ''}`,
     })
   } catch (error) {
     uni.hideLoading()

+ 1 - 1
src/pages/unClaim/unClaimList.vue

@@ -276,7 +276,7 @@ const handleSafetyCheck = async (taskOrder: any) => {
     })
     // 跳转到 WebView 编辑器
     uni.navigateTo({
-      url: `/pages/securityCheck/securityCheckEditor?businessType=AQJC&orderId=${taskOrder.id}&templateId=${res.data.templateId}&useOnline=1&mode=create`,
+      url: `/pages/editor/securityCheckEditor?businessType=AQJC&orderId=${taskOrder.id}&templateId=${res.data.templateId}&useOnline=1&mode=create`,
     })
   } catch (configError) {
     console.error('获取葡萄城配置信息失败:', configError)

+ 5 - 5
src/types/uni-pages.d.ts

@@ -8,14 +8,15 @@ interface NavigateToOptions {
        "/pages/aboutSystem/index" |
        "/pages/deviceExam/deviceExam" |
        "/pages/deviceExam/deviceExamDetail" |
-       "/pages/importanceEditor/importanceEditor" |
-       "/pages/inspectionPlanAudit/inspectionPlanEditor" |
+       "/pages/editor/equipCheckRecordEditor" |
+       "/pages/editor/importanceEditor" |
+       "/pages/editor/inspectionPlanEditor" |
+       "/pages/editor/securityCheckEditor" |
+       "/pages/editor/serviceOrderEditor" |
        "/pages/loading/index" |
        "/pages/login/login" |
-       "/pages/securityCheck/securityCheckEditor" |
        "/pages/securityCheck/securityCheckList" |
        "/pages/serviceOrderDetail/index" |
-       "/pages/serviceOrderDetail/serviceOrderEditor" |
        "/pages/sign/index" |
        "/pages/sign-detail/index" |
        "/pages/systemFile/systemFile" |
@@ -27,7 +28,6 @@ interface NavigateToOptions {
        "/pages/unitQuery/unitQueryDetail" |
        "/pages/uploadFile/UploadFile" |
        "/pages/user/index" |
-       "/pages/equipment/detail/equipCheckRecordEditor" |
        "/pages/equipment/detail/equipmentDetail" |
        "/pages/inspectionApproval/list/inspectionApprovalList" |
        "/pages/inspectionApproval/preViewReport/index" |