From 1467cb18d77f95c955c0965bb46cad444b202018 Mon Sep 17 00:00:00 2001 From: haha Date: Thu, 21 Sep 2023 22:45:42 +0800 Subject: [PATCH] update code --- public/detail.html | 4 +- public/initApi.js | 76 -------- public/maps/initApi.js | 72 +++++++ public/maps/t1.html | 9 +- src/api/index.js | 2 + src/api/standard/index.js | 12 ++ src/components/module/module-one-1-1.vue | 2 +- src/pages/engin/enginImageItems.vue | 229 +++++++++++++++++++++++ src/pages/projectDetail.vue | 4 +- src/pages/projectEngin.vue | 108 +++++++++-- vue.config.js | 4 +- 11 files changed, 420 insertions(+), 102 deletions(-) delete mode 100644 public/initApi.js create mode 100644 public/maps/initApi.js create mode 100644 src/api/standard/index.js create mode 100644 src/pages/engin/enginImageItems.vue diff --git a/public/detail.html b/public/detail.html index db67149..17d2a6e 100644 --- a/public/detail.html +++ b/public/detail.html @@ -17,8 +17,8 @@ - - + + - + + + \ No newline at end of file diff --git a/src/pages/projectDetail.vue b/src/pages/projectDetail.vue index f2c8214..0488f30 100644 --- a/src/pages/projectDetail.vue +++ b/src/pages/projectDetail.vue @@ -849,9 +849,9 @@ export default { }, getProjectId(cb) { let func = () => { - let prjId = this.project.id; + let prjId = this.project?.id||0; if (prjId == 0) { - if (this.prjs.length == 0) { + if (!this.prjs||this.prjs.length == 0) { setTimeout(func, 100); } else { cb && cb(this.prjs[1].id); diff --git a/src/pages/projectEngin.vue b/src/pages/projectEngin.vue index 57a3b25..28e7a88 100644 --- a/src/pages/projectEngin.vue +++ b/src/pages/projectEngin.vue @@ -9,14 +9,25 @@
- - + + +
+ +
暂无数据
+
- - + + +
+ +
暂无数据
+
- - + +
+ +
暂无数据
+
@@ -32,13 +43,22 @@ - +
+ +
暂无数据
+
- +
+ +
暂无数据
+
- +
+ +
暂无数据
+
@@ -53,22 +73,76 @@ import '../components/background_video' import '../components/header' import '../components/staff-survey-chart' import BorderBox6 from './components/BorderBox6.vue' +import debounce from 'lodash.debounce' +import imageItem from './engin/enginImageItems.vue' export default { name: 'JhbigscreenProjectEngin', components: { - BorderBox6 + BorderBox6, + imageItem }, data() { return { - + loading:true, + index1:0, + index2:0, + index3:0, + index4:0, + index5:0, + index6:0, + list1:[], + list2:[], + list3:[], + list4:[], + list5:[], + list6:[], }; }, 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(); + })); }, methods: { + getProjectId(cb) { + let func = () => { + let prjId = this.project?.id||0; + if (prjId == 0) { + if (!this.prjs||this.prjs.length == 0) { + setTimeout(func, 100); + } else { + cb && cb(this.prjs[1].id); + } + } else { + cb && cb(prjId); + } + } + func(); + }, + loadData(){ + this.getProjectId(id => { + this.$api.standard.getList(id,this.dept.id).then(d=>{ + let tmps=d.data||[]; + this.list1=tmps.filter(it=>it.standardType==1); + this.list2=tmps.filter(it=>it.standardType==2); + this.list3=tmps.filter(it=>it.standardType==3); + this.list4=tmps.filter(it=>it.standardType==4); + this.list5=tmps.filter(it=>it.standardType==5); + this.list6=tmps.filter(it=>it.standardType==6); + this.loading=false; + }); + }); + }, onItemData(e) { if (e.type == 1) { location.href = 'index.html' @@ -79,6 +153,10 @@ export default { }; - \ No newline at end of file + diff --git a/vue.config.js b/vue.config.js index 22f92e0..92eccbc 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,8 +23,8 @@ module.exports = defineConfig({ } }, '/jhapi':{ - target: `http://62.234.3.186/jhapi/`, - //target: `http://127.0.0.1:8090/jhapi/`, + //target: `http://62.234.3.186/jhapi/`, + target: `http://127.0.0.1:8090/jhapi/`, changeOrigin: true, pathRewrite: { '^/jhapi':'/'