diff --git a/src/App.vue b/src/App.vue
index 0a05699..365f7f6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,8 +4,8 @@
-
-
@@ -14,8 +14,14 @@
\ No newline at end of file
diff --git a/src/api/buildNode/index.js b/src/api/buildNode/index.js
index 33d1336..4e0ae23 100644
--- a/src/api/buildNode/index.js
+++ b/src/api/buildNode/index.js
@@ -238,7 +238,7 @@ const countCompletionRate = (data) => {
it.percent = (((it.nodeId * 100.0) / it.id) * 1.0).toFixed(2);
}
return it;
- });
+ }).sort((a,b)=>b.percent-a.percent);
resolve(tmps);
});
});
diff --git a/src/pages/index.vue b/src/pages/index.vue
index fcbd39a..6f2ca11 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -41,7 +41,8 @@
-
+
+
diff --git a/src/pages/map.vue b/src/pages/map.vue
new file mode 100644
index 0000000..58cf55a
--- /dev/null
+++ b/src/pages/map.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue
index a6dbd13..4688a0e 100644
--- a/src/pages/projectDetail.vue
+++ b/src/pages/projectDetail.vue
@@ -936,6 +936,7 @@ export default {
this.$refs.mapModle.initImgs(obj?.images || []);
}
});
+ this.photographyList=[];
this.$api.project.selectLastPhotography(id).then(d => {
this.photographyList = d.data || [];
});
diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue
index 180596a..b2c07da 100644
--- a/src/pages/projectEngin.vue
+++ b/src/pages/projectEngin.vue
@@ -6,7 +6,7 @@
+ @click="doStandardDlg(null)">
@@ -164,7 +164,7 @@ export default {
};
return obj
},
- doStandardDlg(it){
+ doStandardDlg(it){
let obj={
deptId: this.dept?.id || 0,
projectId: this.project?.id || 0
diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue
index 2cc1a1e..54a411a 100644
--- a/src/pages/projectSafety.vue
+++ b/src/pages/projectSafety.vue
@@ -351,7 +351,7 @@ export default {
// 传达文件路由
fileNav: 1,
// 传达文件标题
- fileTitle: "传达文件(0)",
+ fileTitle: "传达文件",
// 传达文件列表
fileList: [],
infoNav: 'sxkj',
@@ -508,7 +508,8 @@ export default {
getWorkFileList() {
this.$api.workFile.getWorkFileList(this.fileNav,this.fileNav==3?this.dept.id:0).then(d => {
this.fileList = d.rows;
- let _title = "传达文件(" + this.fileList.length + ")";
+ //let _title = "传达文件(" + this.fileList.length + ")";
+ let _title = "传达文件";
this.fileTitle = _title;
});
},
diff --git a/src/router/index.js b/src/router/index.js
index 73ab127..9389dc4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,6 +9,12 @@ const routes = [
name: 'index',
meta:{nav:1,},
component: () => import(/* webpackChunkName: "index" */ '../pages/index.vue')
+ },
+ {
+ path: '/map',
+ name: 'map',
+ meta:{nav:100,},
+ component: () => import(/* webpackChunkName: "map" */ '../pages/map.vue')
},
{
path: '/detail',