From 75ffe344e591348402a5a302d85f01653ab71bc8 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 11 十月 2022 15:07:23 +0800
Subject: [PATCH] Default Changelist
---
src/views/specialWorkSystem/workTicket/apply/components/power.vue | 0
src/views/specialWorkSystem/plan/sumReserve/index.vue | 0
src/views/specialWorkSystem/process/gasCheck/index.vue | 2
src/views/specialWorkSystem/plan/appoint/index.vue | 0
src/views/specialWorkSystem/workTicket/apply/components/broken.vue | 0
src/views/specialWorkSystem/workTicket/apply/components/height.vue | 0
src/views/specialWorkSystem/flow/basicApprove/index.vue | 2
src/views/specialWorkSystem/alarm/alerts/index.vue | 2
src/views/specialWorkSystem/workTicket/apply/components/ground.vue | 0
src/views/specialWorkSystem/workTicket/apply/components/fire.vue | 0
src/views/specialWorkSystem/workTicket/apply/components/space.vue | 0
src/views/specialWorkSystem/process/components/dialogPermitNo.vue | 0
src/router/route.ts | 24 ------------
src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue | 2
src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue | 2
src/views/specialWorkSystem/process/analysis/index.vue | 4 +-
src/views/specialWorkSystem/flow/ruleofApp/index.vue | 2
src/views/specialWorkSystem/flow/ruleofApp/components/approveItemDialog.vue | 0
src/views/specialWorkSystem/flow/basicApprove/components/approveBasicDialog.vue | 0
src/views/specialWorkSystem/workTicket/apply/components/hoist.vue | 0
src/views/specialWorkSystem/workTicket/myApproval/index.vue | 2
src/views/specialWorkSystem/workTicket/apply/components/plate.vue | 0
src/views/specialWorkSystem/workTicket/apply/index.vue | 18 ++++----
src/views/specialWorkSystem/workTicket/myJobApply/index.vue | 2
src/views/specialWorkSystem/plan/reservation/index.vue | 0
src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue | 2
src/views/specialWorkSystem/workTicket/allApplys/index.vue | 2
27 files changed, 21 insertions(+), 45 deletions(-)
diff --git a/src/router/route.ts b/src/router/route.ts
index 2e55148..a0eed32 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -89,35 +89,11 @@
}
},
{
- path: '/screenPage',
- name: 'screenPage',
- component: () => import('/@/views/riskWarningSys/warningBigScreen/indexs/index.vue'),
- meta: {
- title: '预警预报'
- }
- },
- {
- path: '/material',
- name: 'material',
- component: () => import('/@/views/specialWorkSystem/foundationSet/material/index.vue'),
- meta: {
- title: '物资管理'
- }
- },
- {
path: '/msgDetail',
name: 'msgDetail',
component: () => import('/@/views/riskWarningSys/warningBigScreen/indexs/msgDetail.vue'),
meta: {
title: 'spi报告详情'
- }
- },
- {
- path: '/material',
- name: 'material',
- component: () => import('/@/views/specialWorkSystem/foundationSet/material/index.vue'),
- meta: {
- title: '作业物资'
}
}
];
diff --git a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
index 7a4e8cd..69ec3e8 100644
--- a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
+++ b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
@@ -95,7 +95,7 @@
import { Plus, Search, Delete, Edit, Download, Refresh, View, EditPen } from '@element-plus/icons-vue';
// import OpenSee from '/@/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue';
// import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
-// import EmergencySupplies from '/@/components/emergencySupplies/index.vue';
+// import EmergencySupplies from '/@/components/emergencySupplies/spi.vue';
// import OpenAdd from '/@/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue';
// import { contingencyApi } from '/@/api/contingency';
// import { emergencySuppliesMaintainApi } from '/@/api/emergencySuppliesMaintain';
diff --git a/src/views/specialWorkSystem/workAlert/alertRecord/index.vue b/src/views/specialWorkSystem/alarm/alerts/index.vue
similarity index 99%
rename from src/views/specialWorkSystem/workAlert/alertRecord/index.vue
rename to src/views/specialWorkSystem/alarm/alerts/index.vue
index f9059d6..0505b81 100644
--- a/src/views/specialWorkSystem/workAlert/alertRecord/index.vue
+++ b/src/views/specialWorkSystem/alarm/alerts/index.vue
@@ -155,7 +155,7 @@
}
export default {
- name: 'alertRecord',
+ name: 'alerts',
components: {},
setup() {
const userInfo = useUserInfo();
diff --git a/src/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue b/src/views/specialWorkSystem/flow/basicApprove/components/approveBasicDialog.vue
similarity index 100%
rename from src/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue
rename to src/views/specialWorkSystem/flow/basicApprove/components/approveBasicDialog.vue
diff --git a/src/views/specialWorkSystem/workFlow/approveBasic/index.vue b/src/views/specialWorkSystem/flow/basicApprove/index.vue
similarity index 98%
rename from src/views/specialWorkSystem/workFlow/approveBasic/index.vue
rename to src/views/specialWorkSystem/flow/basicApprove/index.vue
index 9f2ec17..a28df3b 100644
--- a/src/views/specialWorkSystem/workFlow/approveBasic/index.vue
+++ b/src/views/specialWorkSystem/flow/basicApprove/index.vue
@@ -85,7 +85,7 @@
import { ElTable, ElMessage, ElMessageBox } from 'element-plus';
import { approveBasicApi } from '/@/api/specialWorkSystem/approveBasic';
import { departmentApi } from '/@/api/systemManage/department';
-import approveBasicDialog from '/@/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue';
+import approveBasicDialog from '/@/views/specialWorkSystem/flow/basicApprove/components/approveBasicDialog.vue';
let global: any = {
homeChartOne: null,
homeChartTwo: null,
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue b/src/views/specialWorkSystem/flow/ruleofApp/components/approveItemDialog.vue
similarity index 100%
rename from src/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue
rename to src/views/specialWorkSystem/flow/ruleofApp/components/approveItemDialog.vue
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue b/src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue
similarity index 98%
rename from src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue
rename to src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue
index 8d9185e..215d37f 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue
+++ b/src/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue
@@ -97,7 +97,7 @@
<script lang="ts">
import { reactive, toRefs, ref, nextTick, onMounted } from 'vue';
-import approveItemDialog from '/@/views/specialWorkSystem/workFlow/approveRule/components/approveItemDialog.vue';
+import approveItemDialog from '/@/views/specialWorkSystem/flow/ruleofApp/components/approveItemDialog.vue';
import { ElMessage } from 'element-plus/es';
import { safetyActionApi } from '/@/api/specialWorkSystem/safetyAction';
import { approveBasicApi } from '/@/api/specialWorkSystem/approveBasic';
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue b/src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
similarity index 99%
rename from src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue
rename to src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
index 8a15ba4..7880a01 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue
+++ b/src/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue
@@ -110,7 +110,7 @@
import { ElMessage } from 'element-plus/es';
import { approveRuleApi } from '/@/api/specialWorkSystem/approveRule';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
-import approveLevelDialog from '/@/views/specialWorkSystem/workFlow/approveRule/components/approveLevelDialog.vue';
+import approveLevelDialog from '/@/views/specialWorkSystem/flow/ruleofApp/components/approveLevelDialog.vue';
interface dataState {
title: string;
pointTitle: string;
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/index.vue b/src/views/specialWorkSystem/flow/ruleofApp/index.vue
similarity index 99%
rename from src/views/specialWorkSystem/workFlow/approveRule/index.vue
rename to src/views/specialWorkSystem/flow/ruleofApp/index.vue
index f78529f..09bb87a 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/index.vue
+++ b/src/views/specialWorkSystem/flow/ruleofApp/index.vue
@@ -79,7 +79,7 @@
import { toRefs, reactive, ref, onMounted } from 'vue';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
import { ElTable, ElMessage, ElMessageBox } from 'element-plus';
-import approveRuleDialog from '/@/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue';
+import approveRuleDialog from '/@/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue';
import { departmentApi } from '/@/api/systemManage/department';
import { approveRuleApi } from '/@/api/specialWorkSystem/approveRule/index';
import { userApi } from '/@/api/systemManage/user';
diff --git a/src/views/specialWorkSystem/workPlan/workAppoint/index.vue b/src/views/specialWorkSystem/plan/appoint/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/workPlan/workAppoint/index.vue
rename to src/views/specialWorkSystem/plan/appoint/index.vue
diff --git a/src/views/specialWorkSystem/workPlan/workReservation/index.vue b/src/views/specialWorkSystem/plan/reservation/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/workPlan/workReservation/index.vue
rename to src/views/specialWorkSystem/plan/reservation/index.vue
diff --git a/src/views/specialWorkSystem/workPlan/reserveSum/index.vue b/src/views/specialWorkSystem/plan/sumReserve/index.vue
similarity index 100%
rename from src/views/specialWorkSystem/workPlan/reserveSum/index.vue
rename to src/views/specialWorkSystem/plan/sumReserve/index.vue
diff --git a/src/views/specialWorkSystem/workProcess/workCheck/index.vue b/src/views/specialWorkSystem/process/analysis/index.vue
similarity index 99%
rename from src/views/specialWorkSystem/workProcess/workCheck/index.vue
rename to src/views/specialWorkSystem/process/analysis/index.vue
index cc23da6..fda4558 100644
--- a/src/views/specialWorkSystem/workProcess/workCheck/index.vue
+++ b/src/views/specialWorkSystem/process/analysis/index.vue
@@ -212,9 +212,9 @@
url: string;
}
export default {
- name: 'workCheck',
+ name: 'analysis',
components: {
- permitNo: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workProcess/components/dialogPermitNo.vue'))
+ permitNo: defineAsyncComponent(() => import('/@/views/specialWorkSystem/process/components/dialogPermitNo.vue'))
},
setup() {
const userInfo = useUserInfo();
diff --git a/src/views/specialWorkSystem/workProcess/components/dialogPermitNo.vue b/src/views/specialWorkSystem/process/components/dialogPermitNo.vue
similarity index 100%
rename from src/views/specialWorkSystem/workProcess/components/dialogPermitNo.vue
rename to src/views/specialWorkSystem/process/components/dialogPermitNo.vue
diff --git a/src/views/specialWorkSystem/workProcess/gasCheck/index.vue b/src/views/specialWorkSystem/process/gasCheck/index.vue
similarity index 99%
rename from src/views/specialWorkSystem/workProcess/gasCheck/index.vue
rename to src/views/specialWorkSystem/process/gasCheck/index.vue
index a724e75..6ef38e0 100644
--- a/src/views/specialWorkSystem/workProcess/gasCheck/index.vue
+++ b/src/views/specialWorkSystem/process/gasCheck/index.vue
@@ -209,7 +209,7 @@
export default {
name: 'gasCheck',
components: {
- permitNo: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workProcess/components/dialogPermitNo.vue'))
+ permitNo: defineAsyncComponent(() => import('/@/views/specialWorkSystem/process/components/dialogPermitNo.vue'))
},
setup() {
const userInfo = useUserInfo();
diff --git a/src/views/specialWorkSystem/workTicket/allApplys/index.vue b/src/views/specialWorkSystem/workTicket/allApplys/index.vue
index baea648..7c5661e 100644
--- a/src/views/specialWorkSystem/workTicket/allApplys/index.vue
+++ b/src/views/specialWorkSystem/workTicket/allApplys/index.vue
@@ -342,7 +342,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'workApply'
+ path: 'apply'
});
};
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue b/src/views/specialWorkSystem/workTicket/apply/components/broken.vue
similarity index 100%
rename from src/views/specialWorkSystem/workTicket/workApply/components/broken.vue
rename to src/views/specialWorkSystem/workTicket/apply/components/broken.vue
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/fire.vue b/src/views/specialWorkSystem/workTicket/apply/components/fire.vue
similarity index 100%
rename from src/views/specialWorkSystem/workTicket/workApply/components/fire.vue
rename to src/views/specialWorkSystem/workTicket/apply/components/fire.vue
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/ground.vue b/src/views/specialWorkSystem/workTicket/apply/components/ground.vue
similarity index 100%
rename from src/views/specialWorkSystem/workTicket/workApply/components/ground.vue
rename to src/views/specialWorkSystem/workTicket/apply/components/ground.vue
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue b/src/views/specialWorkSystem/workTicket/apply/components/height.vue
similarity index 100%
rename from src/views/specialWorkSystem/workTicket/workApply/components/height.vue
rename to src/views/specialWorkSystem/workTicket/apply/components/height.vue
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue b/src/views/specialWorkSystem/workTicket/apply/components/hoist.vue
similarity index 100%
rename from src/views/specialWorkSystem/workTicket/workApply/components/hoist.vue
rename to src/views/specialWorkSystem/workTicket/apply/components/hoist.vue
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/plate.vue b/src/views/specialWorkSystem/workTicket/apply/components/plate.vue
similarity index 100%
rename from src/views/specialWorkSystem/workTicket/workApply/components/plate.vue
rename to src/views/specialWorkSystem/workTicket/apply/components/plate.vue
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/power.vue b/src/views/specialWorkSystem/workTicket/apply/components/power.vue
similarity index 100%
rename from src/views/specialWorkSystem/workTicket/workApply/components/power.vue
rename to src/views/specialWorkSystem/workTicket/apply/components/power.vue
diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/space.vue b/src/views/specialWorkSystem/workTicket/apply/components/space.vue
similarity index 100%
rename from src/views/specialWorkSystem/workTicket/workApply/components/space.vue
rename to src/views/specialWorkSystem/workTicket/apply/components/space.vue
diff --git a/src/views/specialWorkSystem/workTicket/workApply/index.vue b/src/views/specialWorkSystem/workTicket/apply/index.vue
similarity index 89%
rename from src/views/specialWorkSystem/workTicket/workApply/index.vue
rename to src/views/specialWorkSystem/workTicket/apply/index.vue
index f6e2393..fafc906 100644
--- a/src/views/specialWorkSystem/workTicket/workApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/apply/index.vue
@@ -46,16 +46,16 @@
departmentList: Array<any>
}
export default defineComponent({
- name: 'workTicket',
+ name: 'apply',
components: {
- fireForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/workApply/components/fire.vue')),
- spaceForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/workApply/components/space.vue')),
- hoistForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/workApply/components/hoist.vue')),
- groundForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/workApply/components/ground.vue')),
- brokenForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/workApply/components/broken.vue')),
- heightForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/workApply/components/height.vue')),
- powerForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/workApply/components/power.vue')),
- plateForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/workApply/components/plate.vue'))
+ fireForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/apply/components/fire.vue')),
+ spaceForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/apply/components/space.vue')),
+ hoistForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/apply/components/hoist.vue')),
+ groundForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/apply/components/ground.vue')),
+ brokenForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/apply/components/broken.vue')),
+ heightForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/apply/components/height.vue')),
+ powerForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/apply/components/power.vue')),
+ plateForm: defineAsyncComponent(() => import('/@/views/specialWorkSystem/workTicket/apply/components/plate.vue'))
},
setup() {
const userInfo = useUserInfo()
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/index.vue b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
index 116955a..5721959 100644
--- a/src/views/specialWorkSystem/workTicket/myApproval/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
@@ -301,7 +301,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'workApply'
+ path: 'apply'
});
};
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
index 47c1a5e..cdfc6e1 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -320,7 +320,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'workApply'
+ path: 'apply'
});
};
--
Gitblit v1.9.2