diff --git a/src/components/header.vue b/src/components/header.vue
index d32b91d..2202444 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -6,35 +6,57 @@
@@ -97,7 +119,7 @@
@@ -183,6 +205,7 @@ export default {
condCode: '',
proTypeList:[],
proType:'',
+ projs:[],
}
},
created(){
@@ -210,7 +233,7 @@ export default {
localStorage.setItem("project_category",JSON.stringify(tmps));
});
},
- async mounted() {
+ async mounted() {
window.headerApp = this
await this.initMe();
this.getWeather();
@@ -224,50 +247,54 @@ export default {
this.isTypeBuser = true;
if (this.$route.name == "index") {
this.$router.push("/detail");
+ return;
}
- this.$api.project.findProjectByDept(-1).then(d => {
- let objs = (d?.data || []).map(it => {
+ }
+ let ajaxs=[
+ this.$api.dept.list(),
+ this.$api.project.findProjectByDept(0)
+ ];
+ let res=await this.$api.http.all(ajaxs);
+ this.projs=res[1].data||[];
+ if ([5, 6, 7, 15, 16, 17, 99].includes(roleId)) {
+ let objs = (res[1]?.data || []).map(it => {
it.text = it.projectName;
return it;
}).filter(it => +it.progressVisible == 0);
this.data = [{ id: 0, text: '所有项目' }, ...objs];
let dept={id:0,text:''};
this.$root.dept=dept;
- this.$root.hasInitHeader=true;
- this.$bus.$emit("deptChange", dept)
+ this.$root.hasInitHeader=true;
this.$root._prjIds=objs.map(it=>it.id);
- Cookies.set("__ids__",objs.map(it=>it.id).join(","));
- this.$bus.$emit("loadProjects", this.data);
+ Cookies.set("__ids__",objs.map(it=>it.id).join(","));
this.$root.projects = this.data;
if (this.data.length > 0) {
this.setScreenLiSel2(this.data[0], true);
} else {
this.setScreenLiSel2(null);
- }
- });
+ }
} else {
- this.isTypeBuser = false;
- this.$api.dept.list().then(d => {
+ this.isTypeBuser = false;
this.$root.hasInitHeader = true;
if (roleId < 4) {
- this.depts = [{ text: '产发集团', id: 0 }, ...(d?.data || []).map(it => {
+ this.depts = [{ text: '产发集团', id: 0 }, ...(res[0]?.data || []).map(it => {
it.text = it.deptName;
it.id = it.deptId;
return it;
})]
- } else {
- this.depts = [...(d?.data || []).map(it => {
- it.text = it.deptName;
- it.id = it.deptId;
- return it;
- })]
- }
- this.setScreenLiSel1(this.localStorage1);
- this.deptChange();
- });
+ } else {
+ this.depts = [...(res[0]?.data || []).map(it => {
+ it.text = it.deptName;
+ it.id = it.deptId;
+ return it;
+ })]
+ }
+ this.setScreenLiSel1(this.localStorage1);
+ this.deptChange();
}
this.$root.isTypeBuser = this.isTypeBuser;
- this.init();
+ this.init();
+ this.$bus.$emit("headerChange",this);
},
methods: {
initMe() {
@@ -351,8 +378,7 @@ export default {
}
}
let tmps = this.depts.filter(d => d.text == this.dept1);
- if (tmps.length > 0) {
- this.$bus.$emit("deptChange", tmps[0])
+ if (tmps.length > 0) {
this.$root.dept = tmps[0];
}
},
@@ -370,7 +396,10 @@ export default {
this.nav = n;
this.setTitle();
if (url) {
- location.href = url
+ location.href="#/"
+ setTimeout(()=>{
+ location.href = url
+ },400);
} else {
this.$notify({
title: '提示',
@@ -407,10 +436,21 @@ export default {
this.deptChange();
this.loadProject();
},
+ doSetScreenLiSel1(item){
+ this.setScreenLiSel1(item);
+ this.$bus.$emit("headerChange",this);
+ },
+ doSetScreenLiSel2(item){
+ this.setScreenLiSel2(item);
+ this.$bus.$emit("headerChange",this);
+ },
+ doSetScreenLiSel3(item){
+ this.setScreenLiSel3(item);
+ this.$bus.$emit("headerChange",this);
+ },
setScreenLiSel1(item) {
localStorage.setItem("data1", JSON.stringify(item))
- this.localStorage1 = JSON.parse(localStorage.getItem("data1"))
- this.$emit('itemdata', item);
+ this.localStorage1 = JSON.parse(localStorage.getItem("data1"))
this.showSel1 = false
this.dept1 = item.text;
this.deptChange();
@@ -419,14 +459,25 @@ export default {
loadProject(init,cb) {
if (this.isTypeBuser) {
return;
- }
- this.$api.project.findProjectByDept(this.localStorage1.id).then(d => {
- let objs = (d?.data || []).map(it => {
+ }
+ let tmps=this.projs.filter(d=>{
+ let b1= true;
+ if(this.localStorage1.id!=0){
+ b1=d.deptId==this.localStorage1.id
+ }
+ let b2=true;
+ let tmps=this.proTypeList.filter(it=>it.text==this.proType);
+ if(tmps.length>0 && tmps[0].value!=0){
+ b2=d.projectType==tmps[0].value;
+ }
+ return b1 && b2;
+ });
+ let objs = (tmps || []).map(it => {
it.text = it.projectName;
return it;
}).filter(it => +it.progressVisible == 0);
this.data = [{ id: 0, text: '所有项目' }, ...objs];
- this.$bus.$emit("loadProjects", this.data);
+ //this.$bus.$emit("loadProjects", this.data);
this.$root.projects = this.data;
if(this.data.find(it=>it.id==this.localStorage2.id)){
this.setScreenLiSel2(this.localStorage2)
@@ -440,7 +491,7 @@ export default {
if(cb){
cb();
}
- });
+
},
setScreenLiSel2(item, init) {
if (item) {
@@ -451,8 +502,7 @@ export default {
this.$emit('itemdata', item);
this.dept2 = item.text;
}
- this.$root.project = this.localStorage2;
- this.$bus.$emit("projectChange", this.localStorage2);
+ this.$root.project = this.localStorage2;
} else {
localStorage.removeItem("data2");
this.localStorage2 = {};
diff --git a/src/pages/components/MonitAndWarning.vue b/src/pages/components/MonitAndWarning.vue
index 2608c5b..a2b9e45 100644
--- a/src/pages/components/MonitAndWarning.vue
+++ b/src/pages/components/MonitAndWarning.vue
@@ -104,18 +104,9 @@ export default {
};
},
mounted() {
- this.$bus.$on("projectChange", (res) => {
- this.prjInfo = res;
- if (this.deptInfo.text) {
- this.getMonitAndWarning();
- }
- });
- this.$bus.$on("deptChange", (dept) => {
- this.deptInfo = dept;
- if (this.prjInfo.id) {
- this.getMonitAndWarning();
- }
- });
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/pages/detail/mapModle.vue b/src/pages/detail/mapModle.vue
index 03e5128..d6bcb8a 100644
--- a/src/pages/detail/mapModle.vue
+++ b/src/pages/detail/mapModle.vue
@@ -36,10 +36,9 @@ export default {
mounted() {
window.mymap = this;
- this.$bus.$on("projectChange", res => {
- this.project = res;
- this.reloadMap();
- });
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if(this.$root.hasInitHeader){
this.initMe();
}
diff --git a/src/pages/engin/auditingPage.vue b/src/pages/engin/auditingPage.vue
index dea4850..3b9afd9 100644
--- a/src/pages/engin/auditingPage.vue
+++ b/src/pages/engin/auditingPage.vue
@@ -261,17 +261,9 @@ export default {
},
mounted() {
- this.$bus.$on("loadProjects", debounce(prjs => {
- this.prjs = prjs;
- }));
- this.$bus.$on("projectChange", debounce(res => {
- this.project = res;
- this.loadData();
- }));
- this.$bus.$on("deptChange", debounce(dept => {
- this.dept = dept;
- this.loadData();
- }));
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/pages/index.vue b/src/pages/index.vue
index c89c2f8..18fc6eb 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -471,42 +471,9 @@ export default {
}
this.loading = true;
});
- this.$bus.$on("loadProjects", debounce(prjs => {
- this.prjs = prjs;
- if (this.prj.id == 0) {
- this.prjInfo = this.prjs[1];
- }
- }));
- this.$bus.$on("projectChange", debounce(res => {
- if (res.id == 0) {
- const func = () => {
- if (this.prjs && this.prjs.length > 1) {
- this.prjInfo = this.prjs[1];
- } else {
- setTimeout(func, 100);
- }
- }
- func();
- } else {
- this.prjInfo = res;
- }
- this.prj = res;
- this.investmentAmountData1[0].value = "" + res.paidAmount * 1.0;
- this.investmentAmountData2[0].value = "" + res.onAccountAmount * 1.0;
- this.elKey++;
- this.onWarningInfoNav(0);
- this.sumCostOutByDeptId();
- this.groupByProjectCategory(this.deptInfo.id);
-
- }));
- this.$bus.$on("deptChange", debounce(dept => {
- this.deptInfo = dept;
- this.groupByProjectCategory(dept.id);
- this.onClickoOverview(0)
- this.qualityNavClick(0);
- this.onWarningInfoNav(0);
- this.sumCostOutByDeptId();
- }));
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if(this.$root.hasInitHeader){
this.initMe();
}
diff --git a/src/pages/photography.vue b/src/pages/photography.vue
index ab3d7b5..7321b65 100644
--- a/src/pages/photography.vue
+++ b/src/pages/photography.vue
@@ -72,13 +72,9 @@ export default {
},
mounted() {
- this.$bus.$on("loadProjects", debounce(prjs => {
- this.prjs = prjs;
- }));
- this.$bus.$on("projectChange", debounce(res => {
- this.prj = res;
- this.loadData2();
- }));
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/pages/progress/problemProgress.vue b/src/pages/progress/problemProgress.vue
index 551ec2b..8a88986 100644
--- a/src/pages/progress/problemProgress.vue
+++ b/src/pages/progress/problemProgress.vue
@@ -66,14 +66,9 @@ export default {
};
},
mounted() {
- this.$bus.$on("deptChange", debounce(dept => {
- this.dept = dept;
- this.loadData();
- }));
- this.$bus.$on("projectChange", debounce(res => {
- this.prj = res;
- this.loadData();
- }));
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
this.info = this.scheduleInfo || {};
this.prj = this.prjInfo || {};
if(this.$root.hasInitHeader){
diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue
index 28731a9..6475255 100644
--- a/src/pages/projectDetail.vue
+++ b/src/pages/projectDetail.vue
@@ -916,18 +916,12 @@ export default {
},
mounted() {
window.xapp = this;
- this.$bus.$on(
- "loadProjects",
- debounce((prjs) => {
- this.prjs = prjs;
- })
- );
-
- this.$bus.$on(
- "projectChange",
- debounce((res) => {
- this.project = res;
- this.mapName = "";
+ this.$bus.$on("headerChange",()=>{
+ this.project = this.$root.project || {};
+ this.dept = this.$root.dept || {};
+ this.prjs = this.$root.projects || [];
+ let res=this.project;
+ this.mapName = "";
if (res.id == 0) {
if (this.prjs.length > 1) {
this.getMapName(this.prjs[1].projectName);
@@ -936,15 +930,8 @@ export default {
this.getMapName(res.projectName);
}
this.loadData();
- this.loadFilshNode();
- })
- );
- this.$bus.$on(
- "deptChange",
- debounce((dept) => {
- this.dept = dept;
- })
- );
+ this.loadFilshNode();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/pages/projectEngin copy.vue b/src/pages/projectEngin copy.vue
index dbaa3ea..d4f3d84 100644
--- a/src/pages/projectEngin copy.vue
+++ b/src/pages/projectEngin copy.vue
@@ -142,17 +142,9 @@ export default {
},
mounted() {
- this.$bus.$on("loadProjects", debounce(prjs => {
- this.prjs = prjs;
- }));
- this.$bus.$on("projectChange",debounce(res => {
- this.project = res;
- this.loadData();
- }));
- this.$bus.$on("deptChange",debounce(dept => {
- this.dept = dept;
- this.loadData();
- }));
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
this.loadPeriodical();
if(this.$root.hasInitHeader){
this.initMe();
diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue
index 5edb9b1..816f77b 100644
--- a/src/pages/projectEngin.vue
+++ b/src/pages/projectEngin.vue
@@ -228,17 +228,9 @@ export default {
},
mounted() {
- this.$bus.$on("loadProjects", debounce(prjs => {
- this.prjs = prjs;
- }));
- this.$bus.$on("projectChange", debounce(res => {
- this.project = res;
- this.loadData();
- }));
- this.$bus.$on("deptChange", debounce(dept => {
- this.dept = dept;
- this.loadData();
- }));
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/pages/projectProgress.vue b/src/pages/projectProgress.vue
index c25037d..90246cf 100644
--- a/src/pages/projectProgress.vue
+++ b/src/pages/projectProgress.vue
@@ -453,22 +453,9 @@ export default {
this.loadPlan();
},
mounted() {
- this.$bus.$on("projectChange", debounce(res => {
- this.prjInfo = res;
- this.loadProjectConstructionProgress();
- this.selectScheduledAlerts();
- this.selectCompletionRate();
- }));
- this.$bus.$on("loadProjects", debounce(prjs => {
- this.projects = prjs;
- }));
- this.$bus.$on("deptChange", debounce(dept => {
- this.dept = dept;
- this.groupByProjectCategory(dept.id);
- this.deptChange();
- this.selectScheduledAlerts();
- this.selectCompletionRate();
- }))
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if(this.$root.hasInitHeader){
this.initMe();
}
diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue
index 01a9263..d434a3f 100644
--- a/src/pages/projectQuality.vue
+++ b/src/pages/projectQuality.vue
@@ -423,32 +423,9 @@ export default {
let dt1=this.$dt((+new Date())-30*24*3600*1000);
let dt2=this.$dt(new Date());
this.selDate=[dt1,dt2];
- this.$bus.$on(
- "loadProjects",
- debounce((prjs) => {
- this.prjs = prjs;
- })
- );
- this.$bus.$on(
- "projectChange",
- debounce((res) => {
- this.projectInfo = res;
- this.doDeptChane();
- this.checkDetection(0);
- this.doMeasuredNav(0, "汇总");
- this.selectTop20materialSeal();
- })
- );
- this.$bus.$on(
- "deptChange",
- debounce((dept) => {
- this.dept = dept;
- this.doDeptChane();
- this.checkDetection(0);
- this.doMeasuredNav(0, "汇总");
- this.selectTop20materialSeal();
- })
- );
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue
index 246fa65..16be423 100644
--- a/src/pages/projectSafety.vue
+++ b/src/pages/projectSafety.vue
@@ -395,7 +395,7 @@ export default {
projectInsuranceDlg, JobWorkerDialog, enginChart, workTrainListDlg
},
data() {
- return {
+ return {
dictWorkTrainDataType: [],
selDate: [],
elSummaryKey: 0,
@@ -486,50 +486,41 @@ export default {
let dt1=this.$dt((+new Date())-30*24*3600*1000);
let dt2=this.$dt(new Date());
this.selDate=[dt1,dt2];
- this.$bus.$on("projectChange", debounce(res => {
- this.projectInfo = res;
- this.doDeptChane();
- this.getWorkTrainChart();
- //this.getWorkTrainList();
- //this.getEmergencyDrillList();
- this.getProjectSpecialView();
- this.getDeptSafetyWorksList();
- this.getProjectInsuranceList();
- }));
- this.$bus.$on("loadProjects", debounce(prjs => {
- this.projects = prjs;
- }))
- this.$bus.$on("deptChange", debounce(dept => {
- this.dept = dept;
- this.doDeptChane();
- //this.getWorkTrainList();
- //this.getEmergencyDrillList();
- this.getProjectSpecialView();
- this.getDeptSafetyWorksList();
- this.getProjectInsuranceList();
- if (this.fileNav == 3) {
- this.getWorkFileList();
- }
- }));
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
-
+
},
- methods: {
+ methods: {
+ getPrjId(cb){
+ let isFromPrj=(+this.$route.meta?.nav)>200;//是否是从项目详情打开
+ if(isFromPrj){
+ this.getProjectId(id=>{
+ cb(id);
+ });
+ }else{
+ cb(this.projectInfo?.id || 0);
+ }
+ },
doShowWorkTrain(type) {
+ this.getPrjId(prjId=>{
this.$refs.workTrainListDlg.showDialog({
type: type,
deptId: this.dept.id || 0,
- projectId: this.projectInfo?.id || 0,
+ projectId: prjId,
prj: this.projectInfo || {},
dicts: this.dictWorkTrainDataType.filter(d => d.cssClass == (type == 0 ? 'a' : 'b'))
});
+ });
},
doShowAttendanceDetail() {
+ this.getPrjId(prjId=>{
let data = {
deptId: this.dept.id || 0,
- projectId: this.projectInfo?.id || 0,
+ projectId: prjId,
attendanceTime: this.$dt(new Date()).format("YYYY-MM-DD")
}
if (this.infoNav == 1) {
@@ -537,6 +528,7 @@ export default {
} else {
this.$refs.jobWorkerdlg.showDialog(data);
}
+ });
},
initMe() {
this.projectInfo = this.$root.project || {};
@@ -587,7 +579,8 @@ export default {
});
},
getWorkTrainChart() {
- this.$api.workTrain.getGroupByDataType(this.dept?.id || 0, this.projectInfo?.id || 0).then(d => {
+ this.getPrjId(prjId=>{
+ this.$api.workTrain.getGroupByDataType(this.dept?.id || 0, prjId).then(d => {
this.WorkTrainChart1 = (d.data || []).filter(it => it.trainType === 'a').map(it => { return { value: it.id || 0, name: it.trainTitle } });
this.WorkTrainChart2 = (d.data || []).filter(it => it.trainType === 'b').map(it => { return { value: it.id || 0, name: it.trainTitle } });
let cnt = 0;
@@ -668,31 +661,40 @@ export default {
};
this.$refs.chart4.init(opt2);
});
+ });
},
// 获取教育培训列表
getWorkTrainList() {
- this.$api.workTrain.getWorkTrainList(0, this.dept?.id || 0, this.projectInfo?.id || 0).then(d => {
+ this.getPrjId(prjId=>{
+ this.$api.workTrain.getWorkTrainList(0, this.dept?.id || 0, prjId).then(d => {
this.workTrainList = d.rows;
});
+ });
},
// 获取教育培训列表
getEmergencyDrillList() {
- this.$api.workTrain.getWorkTrainList(1, this.dept?.id || 0, this.projectInfo?.id || 0).then(d => {
+ this.getPrjId(prjId=>{
+ this.$api.workTrain.getWorkTrainList(1, this.dept?.id || 0, prjId).then(d => {
this.emergencyDrillList = d.rows;
});
+ });
},
// 获取特种人员数据列表
getProjectSpecialView() {
- this.$api.special.getProjectSpecialView(this.dept?.id || 0, this.projectInfo?.id || 0).then(d => {
+ this.getPrjId(prjId=>{
+ this.$api.special.getProjectSpecialView(this.dept?.id || 0, prjId).then(d => {
this.specialDataList = d.rows;
});
+ });
},
//查询安全作业概况
getDeptSafetyWorksList() {
//查询安全作业
- this.$api.flow.findSafetyWorkList(this.dept?.id || 0, this.projectInfo?.id || 0, this.infoNav).then(d => {
+ this.getPrjId(prjId=>{
+ this.$api.flow.findSafetyWorkList(this.dept?.id || 0, prjId, this.infoNav).then(d => {
this.safetyWorkFlowList = d.data || [];
});
+ });
},
getProjectId(cb) {
let func = () => {
@@ -750,12 +752,14 @@ export default {
});
},
getProjectInsuranceList() {
- this.$api.insurance.getProjectInsuranceList(this.dept?.id || 0, this.projectInfo?.id || 0).then(d => {
+ this.getPrjId(prjId=>{
+ this.$api.insurance.getProjectInsuranceList(this.dept?.id || 0, prjId).then(d => {
this.insuranceDataList = [];
if (d.rows.length > 0 && d.rows[0] != null) {
this.insuranceDataList = d.rows;
}
});
+ });
},
fmt(n) {
n = "" + n;
diff --git a/src/pages/projectVideo.vue b/src/pages/projectVideo.vue
index 28493e0..dc28a2a 100644
--- a/src/pages/projectVideo.vue
+++ b/src/pages/projectVideo.vue
@@ -319,27 +319,9 @@ export default {
},
mounted() {
window.xapp = this;
- this.$bus.$on(
- "projectChange",
- debounce((res) => {
- this.projectInfo = res;
- this.initVideoMenu();
- })
- );
- this.$bus.$on(
- "loadProjects",
- debounce((prjs) => {
- this.projectInfos = prjs;
- //this.initVideoMenu();
- })
- );
- this.$bus.$on(
- "deptChange",
- debounce((dept) => {
- this.dept = dept;
- //this.initVideoMenu();
- })
- );
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/pages/quality/projectChecking.vue b/src/pages/quality/projectChecking.vue
index ed9aa89..14f0786 100644
--- a/src/pages/quality/projectChecking.vue
+++ b/src/pages/quality/projectChecking.vue
@@ -204,20 +204,9 @@ export default {
});
},
mounted() {
- this.$bus.$on(
- "loadProjects",
- debounce((prjs) => {
- this.prjs = prjs;
- })
- );
- this.$bus.$on("projectChange", throttle((res) => {
- this.projectInfo = res;
- this.loadData();
- }));
- this.$bus.$on("deptChange", throttle((dept) => {
- this.dept = dept;
- this.loadData();
- }));
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/pages/toAIVideoProject.vue b/src/pages/toAIVideoProject.vue
index cee9881..e299e47 100644
--- a/src/pages/toAIVideoProject.vue
+++ b/src/pages/toAIVideoProject.vue
@@ -384,33 +384,9 @@ export default {
this.forIndex = 0;
},
mounted() {
- this.$bus.$on(
- "projectChange",
- debounce((res) => {
- this.projectInfo = res;
- console.log("项目改变");
- console.log(this.projectInfo);
- this.init();
- })
- );
- this.$bus.$on(
- "loadProjects",
- debounce((prjs) => {
- this.projectInfos = prjs;
- console.log("项目加载");
- console.log(this.projectInfos);
- this.init();
- })
- );
- this.$bus.$on(
- "deptChange",
- debounce((dept) => {
- this.dept = dept;
- console.log("部门改变");
- console.log(this.dept);
- this.init();
- })
- );
+ this.$bus.$on("headerChange",()=>{
+ this.initMe();
+ });
if (this.$root.hasInitHeader) {
this.initMe();
}
diff --git a/src/router/index.js b/src/router/index.js
index 2410689..b0069c5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -35,16 +35,59 @@ const routes = [
meta:{nav:4,},
component: () => import(/* webpackChunkName: "quality" */ '../pages/projectQuality.vue')
} ,
+ {
+ path: '/prjQuality',
+ name: 'prjQuality',
+ meta:{nav:209,},
+ component: () => import(/* webpackChunkName: "quality" */ '../pages/projectQuality.vue')
+ } ,
+ {
+ path: '/prjProgress',
+ name: 'prjProgress',
+ meta:{nav:210,},
+ component: () => import(/* webpackChunkName: "progress" */ '../pages/projectProgress.vue')
+ }
+ ,
+ {
+ path: '/prjVideo',
+ name: 'prjVideo',
+ meta:{nav:211,},
+ component: () => import(/* webpackChunkName: "video" */ '../pages/projectVideo.vue')
+ },
+ {
+ path: '/prjAiVideo',
+ name: 'prjAiVideo',
+ meta:{nav:212,},
+ component: () => import(/* webpackChunkName: "video" */ '../pages/toAIVideoProject.vue')
+ },
+ {
+ path: '/prjPhotography',
+ name: 'prjPhotography',
+ meta:{nav:213,},
+ component: () => import(/* webpackChunkName: "video" */ '../pages/photography.vue')
+ },
+ {
+ path: '/prjEngin',
+ name: 'prjEngin',
+ meta:{nav:214,},
+ component: () => import(/* webpackChunkName: "video" */ '../pages/projectEngin.vue')
+ },
+ {
+ path: '/prjEnginAuditing',
+ name: 'prjEnginAuditing',
+ meta:{nav:215,},
+ component: () => import(/* webpackChunkName: "video" */ '../pages/engin/auditingPage.vue')
+ },
{
path: '/concreteStrength',
name: 'concreteStrength',
- meta:{nav:27,},
+ meta:{nav:207,},
component: () => import(/* webpackChunkName: "concreteStrength" */ '../pages/quality/concreteStrength.vue')
} ,
{
path: '/standardCuringRoom',
name: 'standardCuringRoom',
- meta:{nav:26,},
+ meta:{nav:206,},
component: () => import(/* webpackChunkName: "standardCuringRoom" */ '../pages/quality/standardCuringRoom.vue')
}
,
@@ -53,34 +96,40 @@ const routes = [
name: 'safety',
meta:{nav:3,},
component: () => import(/* webpackChunkName: "safety" */ '../pages/projectSafety.vue')
+ },
+ {
+ path: '/prjSafety',
+ name: 'prjSafety',
+ meta:{nav:208,},
+ component: () => import(/* webpackChunkName: "safety" */ '../pages/projectSafety.vue')
}
, {
path: '/distributionBox',
name: 'distributionBox',
- meta:{nav:23,},
+ meta:{nav:203,},
component: () => import(/* webpackChunkName: "distributionBox" */ '../pages/safe/distributionBox.vue')
}
, {
path: '/dumbwaiter',
name: 'dumbwaiter',
- meta:{nav:24,},
+ meta:{nav:204,},
component: () => import(/* webpackChunkName: "dumbwaiter" */ '../pages/safe/dumbwaiter.vue')
}, {
path: '/personnelPosition',
name: 'personnelPosition',
- meta:{nav:25,},
+ meta:{nav:205,},
component: () => import(/* webpackChunkName: "personnelPosition" */ '../pages/safe/personnelPosition.vue')
}
, {
path: '/excavation',
name: 'excavation',
- meta:{nav:22,},
+ meta:{nav:202,},
component: () => import(/* webpackChunkName: "excavation" */ '../pages/safe/excavation.vue')
}
, {
path: '/towerCrane',
name: 'towerCrane',
- meta:{nav:21,},
+ meta:{nav:201,},
component: () => import(/* webpackChunkName: "towerCrane" */ '../pages/safe/towerCrane.vue')
}
,