From 5589649d9cbe013321190141e9206a3c7581e73e Mon Sep 17 00:00:00 2001 From: haha Date: Tue, 3 Oct 2023 21:31:40 +0800 Subject: [PATCH] update code --- public/index.html | 29 ++++- public/maps/home.html | 2 +- public/maps/initApi.js | 3 +- public/maps/t1.html | 1 - src/App.vue | 23 +++- .../amplify/jishuguanli/amplify-bgqr.js | 3 +- .../amplify/jishuguanli/amplify-jsfh.js | 6 +- .../amplify/jishuguanli/amplify-kjcx.js | 2 +- .../amplify/jishuguanli/amplify-sgbzgf.js | 3 +- .../amplify/jixieguanli/amplify-fljgs.js | 3 +- .../amplify/jixieguanli/amplify-sbyxzt.js | 8 +- .../amplify/laowuyonggong/amplify-aqjy.js | 13 +-- .../amplify/laowuyonggong/amplify-gzzb.js | 3 +- .../amplify/laowuyonggong/amplify-rycqfb.js | 18 +-- .../amplify/shipinguanli/amplify-spjk.js | 2 +- .../amplify/tesedangjian/amplify-ghfw.js | 4 +- .../amplify/tesedangjian/amplify-jdsl.js | 2 - .../amplify/tesedangjian/amplify-lzgcjs.js | 2 - .../amplify/tesedangjian/amplify-sxzzjs.js | 2 - .../amplify/tesedangjian/amplify-tdjs.js | 2 - .../amplify/tesedangjian/amplify-xmdt.js | 5 +- .../amplify/zhiliangguanli/amplify-qysj.js | 1 - src/components/header.js | 104 ++++++++++-------- src/components/{headerV2.js => headerv1.js} | 51 ++++++--- src/components/labour-china-map.js | 1 - src/components/more-btn.js | 3 +- src/components/quality-objectives-safety.js | 3 +- src/components/quality-objectives.js | 2 +- src/components/roll-left-right-img.js | 3 +- src/pages/components/BorderBox1.vue | 3 +- src/pages/components/BorderBox2.vue | 3 +- src/pages/components/BorderBox3.vue | 3 +- src/pages/components/BorderBox4.vue | 1 - src/pages/components/BorderBox5.vue | 3 +- src/pages/components/ProblemmodifyDetail.vue | 6 +- src/pages/detail/mapModle.vue | 20 +++- src/pages/index.vue | 31 ++++-- src/pages/index/map3.vue | 1 - src/pages/index/mapIndex.vue | 92 ++++++++++++++++ src/pages/projectDetail.vue | 57 +++++++--- src/pages/projectEngin.vue | 19 ++-- src/pages/projectProgress.vue | 23 ++-- src/pages/projectQuality.vue | 22 ++-- src/pages/projectSafety.vue | 27 +++-- src/pages/projectVideo.vue | 16 ++- src/router/index.js | 7 +- vue.config.js | 4 +- 47 files changed, 426 insertions(+), 216 deletions(-) rename src/components/{headerV2.js => headerv1.js} (86%) create mode 100644 src/pages/index/mapIndex.vue diff --git a/public/index.html b/public/index.html index cf2abd7..1c1508f 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - <%= htmlWebpackPlugin.options.title %> + 北跨泾河-产发工程数字管理平台-大屏 @@ -14,13 +14,30 @@ - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/maps/home.html b/public/maps/home.html index 45b3a2a..24a6398 100644 --- a/public/maps/home.html +++ b/public/maps/home.html @@ -61,7 +61,7 @@ function (data) { if (Cesium.defined(data)) { if (Cesium.defined(data.obj) && data.obj instanceof Cesium.Cesium3DTileset) { - console.log(data); + //console.log(data); } } }, diff --git a/public/maps/initApi.js b/public/maps/initApi.js index c77ad91..cf41bcb 100644 --- a/public/maps/initApi.js +++ b/public/maps/initApi.js @@ -1,4 +1,4 @@ -window.initMap=()=>{ +window.initMap=()=>{ delete window.mapDefault delete window.mapApi delete window.mapOptions @@ -36,6 +36,7 @@ window.mapDefault={ "isOpenVR": false, "language": "zh-CN" }; + window.mapApi = new API(window.mapDefault); //api对象后面调用接口要全程使用，控制好作用域 //导航体 diff --git a/public/maps/t1.html b/public/maps/t1.html index 92b25ff..ef6c4d6 100644 --- a/public/maps/t1.html +++ b/public/maps/t1.html @@ -60,7 +60,6 @@ "http://106.12.253.67:10045/Tools/output/model/202211250957169703/root.glt", "3a07beae-5c1c-17d4-f0c2-63cf4e4416b9", (data) => { - console.log(data) if (Cesium.defined(data)) { if (Cesium.defined(data.obj) && data.obj instanceof Cesium.Cesium3DTileset) {} } diff --git a/src/App.vue b/src/App.vue index 4719866..1c1a15e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,22 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/src/components/amplify/jishuguanli/amplify-bgqr.js b/src/components/amplify/jishuguanli/amplify-bgqr.js index 3968269..1ecee54 100644 --- a/src/components/amplify/jishuguanli/amplify-bgqr.js +++ b/src/components/amplify/jishuguanli/amplify-bgqr.js @@ -186,8 +186,7 @@ var vms = Vue.component("amplify-bgqr", { data: [], } } - axios.post("/system/alterationEndorseConfig/list1",{pageNum:1,pageSize:9999,projectId:this.projectId}).then(res=>{ - console.log(res.data) + axios.post("/system/alterationEndorseConfig/list1",{pageNum:1,pageSize:9999,projectId:this.projectId}).then(res=>{ let result = res.data if(result.code == 0){ this.constructionNum = result.rows.filter(item=>item.alterationType == 0).length diff --git a/src/components/amplify/jishuguanli/amplify-jsfh.js b/src/components/amplify/jishuguanli/amplify-jsfh.js index 2c0722a..4ccc55a 100644 --- a/src/components/amplify/jishuguanli/amplify-jsfh.js +++ b/src/components/amplify/jishuguanli/amplify-jsfh.js @@ -82,8 +82,7 @@ var vms = Vue.component("amplify-jsfh", { var list = [] res.data.data.forEach((item)=>{ list.push(item.photo_url) - }) - console.log(list) + }) this.list = list } }).catch(err => { @@ -113,8 +112,7 @@ var vms = Vue.component("amplify-jsfh", { }else{ this.costIndex = this.costIndex - 1 } - } - console.log(this.costIndex) + } $(this.$refs.rollImgMax).animate({scrollLeft:(this.number*width*this.costIndex)+'px'}) this.direction = 'right' }, diff --git a/src/components/amplify/jishuguanli/amplify-kjcx.js b/src/components/amplify/jishuguanli/amplify-kjcx.js index e0b84e9..57d64be 100644 --- a/src/components/amplify/jishuguanli/amplify-kjcx.js +++ b/src/components/amplify/jishuguanli/amplify-kjcx.js @@ -129,7 +129,7 @@ var vms = Vue.component("amplify-kjcx", { for(let k in tmp ){ this.sciencelnnovateDataList.push(tmp[k]) } - console.log(this.sciencelnnovateDataList) + } }) }, diff --git a/src/components/amplify/jishuguanli/amplify-sgbzgf.js b/src/components/amplify/jishuguanli/amplify-sgbzgf.js index 37dbf37..f69fbc7 100644 --- a/src/components/amplify/jishuguanli/amplify-sgbzgf.js +++ b/src/components/amplify/jishuguanli/amplify-sgbzgf.js @@ -93,8 +93,7 @@ var vms = Vue.component("amplify-sgbzgf", { this.interval = setInterval(this.scroll, 50); }, methods: { - openAmplify(){ - console.log(this.projectId) + openAmplify(){ this.show = true this.getBiaoZhun() }, diff --git a/src/components/amplify/jixieguanli/amplify-fljgs.js b/src/components/amplify/jixieguanli/amplify-fljgs.js index 88c2765..354d073 100644 --- a/src/components/amplify/jixieguanli/amplify-fljgs.js +++ b/src/components/amplify/jixieguanli/amplify-fljgs.js @@ -59,8 +59,7 @@ var vms = Vue.component("amplify-fljgs", { //分类及工时情况 getClassifyBarData() { axios.post(requestUrl + "getClassifyWorks?deptId=" + deptId + "&pageSize=4&projectId=" + JSON.parse(localStorage.getItem("data1")).jzgj, {}).then(res => { - this.classifyBarData = [res.data.data.num, res.data.data.dayWorkTime, res.data.data.monthWorkTime]; - console.log(this.classifyBarData) + this.classifyBarData = [res.data.data.num, res.data.data.dayWorkTime, res.data.data.monthWorkTime]; this.showClassifyBarData = this.classifyBarData[0]; this.getChartData() }).catch(err => { diff --git a/src/components/amplify/jixieguanli/amplify-sbyxzt.js b/src/components/amplify/jixieguanli/amplify-sbyxzt.js index f14f032..764f69c 100644 --- a/src/components/amplify/jixieguanli/amplify-sbyxzt.js +++ b/src/components/amplify/jixieguanli/amplify-sbyxzt.js @@ -132,7 +132,7 @@ var vms = Vue.component("amplify-sbyxzt", { }) } }).catch(err => { - console.log(err); + //console.log(err); }) }, @@ -155,8 +155,7 @@ var vms = Vue.component("amplify-sbyxzt", { name:'静止', value:'0' }]; - } - console.log(array) + } let dataArray = []; for(let i = 0;i { diff --git a/src/components/amplify/laowuyonggong/amplify-aqjy.js b/src/components/amplify/laowuyonggong/amplify-aqjy.js index 90178c9..8ce1c67 100644 --- a/src/components/amplify/laowuyonggong/amplify-aqjy.js +++ b/src/components/amplify/laowuyonggong/amplify-aqjy.js @@ -95,8 +95,7 @@ var vms = Vue.component("amplify-aqjy", { this.ljaqjy = 0; } - this.ljaqjy = res.data.zcrs + ''; - console.log(res.data.zcrs) + this.ljaqjy = res.data.zcrs + ''; var safetyEducationData = []; var safetyEducationData2 = []; // safetyEducationData.push({text:"培训通过率",value:(res.data.jspxrs*res.data.pxtgl/100).toFixed(0)}); @@ -128,8 +127,7 @@ var vms = Vue.component("amplify-aqjy", { var chChart = echarts.init(this.$refs.charts2); this.echart2(chChart, this.safetyEducationData2) }, - echart1(chChart, chartData) { - console.log(chartData) + echart1(chChart, chartData) { var that = this let newPromise = new Promise((resolve) => { resolve() @@ -315,7 +313,6 @@ var vms = Vue.component("amplify-aqjy", { }, //出勤情况-灰名单 echart2(chChart, chartData) { - console.log(chartData) var that = this let newPromise = new Promise((resolve) => { resolve() @@ -339,15 +336,13 @@ var vms = Vue.component("amplify-aqjy", { } var prop = [] - for (let j = 0; j < value.length; j++) { - console.log(value) + for (let j = 0; j < value.length; j++) { if (total == 0) { prop.push(0) } else { prop.push((value[j] / total * 100).toFixed(1)) } - } - console.log(prop) + } var unit = '人' if (this.unit) { unit = this.unit diff --git a/src/components/amplify/laowuyonggong/amplify-gzzb.js b/src/components/amplify/laowuyonggong/amplify-gzzb.js index b7abbb5..0e15407 100644 --- a/src/components/amplify/laowuyonggong/amplify-gzzb.js +++ b/src/components/amplify/laowuyonggong/amplify-gzzb.js @@ -215,8 +215,7 @@ var vms = Vue.component("amplify-gzzb", { var chChartBar = echarts.init(this.$refs.amplifyStyle); this.echartBar(chChartBar,this.typedata) }, - echartBar(chChart,chartData){ - console.log(chartData) + echartBar(chChart,chartData){ var that = this let newPromise = new Promise((resolve) => { diff --git a/src/components/amplify/laowuyonggong/amplify-rycqfb.js b/src/components/amplify/laowuyonggong/amplify-rycqfb.js index 77031f7..887a5cd 100644 --- a/src/components/amplify/laowuyonggong/amplify-rycqfb.js +++ b/src/components/amplify/laowuyonggong/amplify-rycqfb.js @@ -146,8 +146,7 @@ var vms = Vue.component("amplify-rycqfb", { this.echart4(chChart,this.workData_5) }, //出勤情况-白名单 - echart1(chChart,chartData){ - console.log(chartData) + echart1(chChart,chartData){ var that = this let newPromise = new Promise((resolve) => { resolve() @@ -334,8 +333,7 @@ var vms = Vue.component("amplify-rycqfb", { }) }, //出勤情况-灰名单 - echart2(chChart,chartData){ - console.log(chartData) + echart2(chChart,chartData){ var that = this let newPromise = new Promise((resolve) => { resolve() @@ -359,15 +357,13 @@ var vms = Vue.component("amplify-rycqfb", { } var prop = [] - for (let j = 0; j < value.length; j++) { - console.log(value) + for (let j = 0; j < value.length; j++) { if(total == 0){ prop.push(0) }else{ prop.push((value[j]/total * 100).toFixed(1)) } - } - console.log(prop) + } var unit = '人' if(this.unit){ unit = this.unit @@ -524,8 +520,7 @@ var vms = Vue.component("amplify-rycqfb", { }) }, //出勤情况-临时人员 - echart3(chChart,chartData){ - console.log(chartData) + echart3(chChart,chartData){ var that = this let newPromise = new Promise((resolve) => { resolve() @@ -712,8 +707,7 @@ var vms = Vue.component("amplify-rycqfb", { }) }, //出勤情况-在线人员 - echart4(chChart,chartData){ - console.log(chartData) + echart4(chChart,chartData){ var that = this let newPromise = new Promise((resolve) => { resolve() diff --git a/src/components/amplify/shipinguanli/amplify-spjk.js b/src/components/amplify/shipinguanli/amplify-spjk.js index f4fb334..430e104 100644 --- a/src/components/amplify/shipinguanli/amplify-spjk.js +++ b/src/components/amplify/shipinguanli/amplify-spjk.js @@ -130,7 +130,7 @@ var vms = Vue.component("amplify-spjk", { var token = this.videoListData[0].videoList[0].token - console.log(token) + for (let i=0 ;ithis.datas.push(item.url)) }).catch(err => { diff --git a/src/components/amplify/tesedangjian/amplify-jdsl.js b/src/components/amplify/tesedangjian/amplify-jdsl.js index 0c49a2c..bdb0bc9 100644 --- a/src/components/amplify/tesedangjian/amplify-jdsl.js +++ b/src/components/amplify/tesedangjian/amplify-jdsl.js @@ -94,8 +94,6 @@ var vms = Vue.component("amplify-jdsl", { type[info.sub_type].push(info) } that.forData = type[4]; - console.log(type) - // console.log(that.forData) that.forData.map(item=>this.datas.push(item.url)) }).catch(err => { diff --git a/src/components/amplify/tesedangjian/amplify-lzgcjs.js b/src/components/amplify/tesedangjian/amplify-lzgcjs.js index 6ed7ac8..98fe221 100644 --- a/src/components/amplify/tesedangjian/amplify-lzgcjs.js +++ b/src/components/amplify/tesedangjian/amplify-lzgcjs.js @@ -94,8 +94,6 @@ var vms = Vue.component("amplify-lzgcjs", { type[info.sub_type].push(info) } that.forData = type[5]; - console.log(type) - // console.log(that.forData) that.forData.map(item=>this.datas.push(item.url)) }).catch(err => { diff --git a/src/components/amplify/tesedangjian/amplify-sxzzjs.js b/src/components/amplify/tesedangjian/amplify-sxzzjs.js index 177746d..e80c320 100644 --- a/src/components/amplify/tesedangjian/amplify-sxzzjs.js +++ b/src/components/amplify/tesedangjian/amplify-sxzzjs.js @@ -94,8 +94,6 @@ var vms = Vue.component("amplify-sxzzjs", { type[info.sub_type].push(info) } that.forData = type[1]; - console.log(type) - // console.log(that.forData) that.forData.map(item=>this.datas.push(item.url)) }).catch(err => { diff --git a/src/components/amplify/tesedangjian/amplify-tdjs.js b/src/components/amplify/tesedangjian/amplify-tdjs.js index 38a4078..871d2c5 100644 --- a/src/components/amplify/tesedangjian/amplify-tdjs.js +++ b/src/components/amplify/tesedangjian/amplify-tdjs.js @@ -94,8 +94,6 @@ var vms = Vue.component("amplify-tdjs", { type[info.sub_type].push(info) } that.forData = type[2]; - console.log(type) - // console.log(that.forData) that.forData.map(item=>this.datas.push(item.url)) }).catch(err => { diff --git a/src/components/amplify/tesedangjian/amplify-xmdt.js b/src/components/amplify/tesedangjian/amplify-xmdt.js index 6dd8bc1..8e7ae0c 100644 --- a/src/components/amplify/tesedangjian/amplify-xmdt.js +++ b/src/components/amplify/tesedangjian/amplify-xmdt.js @@ -69,7 +69,6 @@ var vms = Vue.component("amplify-xmdt", { }, methods: { openAmplify() { - console.log(this.modeltitle) this.show = true this.getData() }, @@ -95,9 +94,7 @@ var vms = Vue.component("amplify-xmdt", { info.text = info.file_name type[info.sub_type].push(info) } - that.forData = type[0]; - console.log(type) - console.log(that.forData) + that.forData = type[0]; that.forData.map(item=>this.datas.push(item.url)) }).catch(err => { diff --git a/src/components/amplify/zhiliangguanli/amplify-qysj.js b/src/components/amplify/zhiliangguanli/amplify-qysj.js index a2778dd..1c94614 100644 --- a/src/components/amplify/zhiliangguanli/amplify-qysj.js +++ b/src/components/amplify/zhiliangguanli/amplify-qysj.js @@ -51,7 +51,6 @@ var vms = Vue.component("amplify-qysj", { let url2 = "https://szh.makalu.cc/system/qualityTarget/list1" $.post(url2,{},res => { that.qualityTargetData = res[JSON.parse(localStorage.getItem("data1")).id] - console.log(that.qualityTargetData[JSON.parse(localStorage.getItem("data1")).id]); }) }, methods: { diff --git a/src/components/header.js b/src/components/header.js index 1901ff5..9b6b257 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -9,13 +9,13 @@ Vue.component("screen-header", { 北跨泾河-产发工程数字管理平台
-
项目概况
-
项目详情
-
安全管理
-
质量管理
-
进度管理
-
视频管理
-
工程管理
+
项目概况
+
项目详情
+
安全管理
+
质量管理
+
进度管理
+
视频管理
+
工程管理
@@ -43,21 +43,18 @@ Vue.component("screen-header", {
{{time}}
- - 晴 - 11~25℃ + + {{condTxt}} + {{temperature}}℃
- + `, - props: { - nav:{ - type:Number - }, + props: { red:{ type:String }, @@ -67,6 +64,7 @@ Vue.component("screen-header", { }, data() { return { + nav:1, dept1:'', dept2:'', showSel1:false, @@ -80,14 +78,27 @@ Vue.component("screen-header", { selDept:'', localStorage1: JSON.parse(localStorage.getItem("data1")), localStorage2: JSON.parse(localStorage.getItem("data2")), - isFullScreen:false + isFullScreen:false, + temperature:20, + condTxt:'', + condCode:'', } }, mounted(){ + this.getWeather(); + if(location.hash.indexOf("#/detail")>=0){this.nav=2;} + else if(location.hash.indexOf("#/safety")>=0){this.nav=3;} + else if(location.hash.indexOf("#/quality")>=0){this.nav=4;} + else if(location.hash.indexOf("#/progress")>=0){this.nav=5;} + else if(location.hash.indexOf("#/video")>=0){this.nav=6;} + else if(location.hash.indexOf("#/engin")>=0){this.nav=7;} + else{this.nav=1;} + this.setTitle(); this.timerID = setInterval(this.updateTime, 1000); this.updateTime(); this.init() this.$api.dept.list().then(d=>{ + this.$root.hasInitHeader=true; this.depts=[{text:'产发集团',id:0},...(d?.data||[]).map(it=>{ it.text=it.deptName; it.id=it.deptId; @@ -95,9 +106,19 @@ Vue.component("screen-header", { })] this.deptChange(); }); - + }, methods: { + getWeather(){ + let url=`https://widget-api.heweather.net/s6/plugin/view?key=fcd4fc1e48a144a483b7af74284229b8&location=CN101110101&lang=zh`; + this.$api.http.get(url).then(d=>{ + let info=d?.data?.now||{}; + this.temperature=info.tmp||20; + this.condTxt=info.cond_txt||'晴'; + this.condCode=info.cond_code||100; + this.condCode=`//widget-s.qweather.net/img/plugin/190516/icon/c/${this.condCode}n.png` + }); + }, toggleFullScreen(){ let el=document.body; this.$toggleFullScreen(el); @@ -130,37 +151,32 @@ Vue.component("screen-header", { let tmps=this.depts.filter(d=>d.text==this.dept1); if(tmps.length>0){ this.$bus.$emit("deptChange",tmps[0]) + this.$root.dept=tmps[0]; } }, + setTitle(){ + let titls=['','项目概况','项目详情','安全管理','质量管理','进度管理','视频管理','工程管理'] + let title=titls[this.nav]; + if(title){ + window.document.title=title; + }else{ + window.document.title='北跨泾河-产发工程数字管理平台-大屏'; + } + }, //页面条状 - pageJump(n,url,itemurl){ - if(n != this.nav){ - if(this.localStorage1.type == 1){ - if(url){ - location.href = url - }else{ - this.$notify({ - title: '提示', - message: '页面开发中，敬请期待！', - type: 'warning' - }); - } + pageJump(n,url){ + this.nav=n; + this.setTitle(); + if(url){ + location.href = url }else{ - if(n==5){ - location.href = url - }else{ - if(itemurl){ - location.href = itemurl - }else{ - this.$notify({ - title: '提示', - message: '页面开发中，敬请期待！', - type: 'warning' - }); - } - } + this.$notify({ + title: '提示', + message: '页面开发中，敬请期待！', + type: 'warning' + }); } - } + }, @@ -196,6 +212,7 @@ Vue.component("screen-header", { }).filter(it=>+it.progressVisible==0); this.data=[{id:0,text:'所有项目'},...objs]; this.$bus.$emit("loadProjects",this.data); + this.$root.projects=this.data; if(this.data.length>0){ this.setScreenLiSel2(this.data[0],init); }else{ @@ -212,6 +229,7 @@ Vue.component("screen-header", { this.$emit('itemdata',item); this.dept2=item.text; } + this.$root.project=this.localStorage2; this.$bus.$emit("projectChange",this.localStorage2); }else{ localStorage.removeItem("data2"); diff --git a/src/components/headerV2.js b/src/components/headerv1.js similarity index 86% rename from src/components/headerV2.js rename to src/components/headerv1.js index ca79a11..1901ff5 100644 --- a/src/components/headerV2.js +++ b/src/components/headerv1.js @@ -9,13 +9,13 @@ Vue.component("screen-header", { 北跨泾河-产发工程数字管理平台
-
项目概况
-
项目详情
-
安全管理
-
质量管理
-
进度管理
-
视频管理
-
工程管理
+
项目概况
+
项目详情
+
安全管理
+
质量管理
+
进度管理
+
视频管理
+
工程管理
@@ -48,7 +48,7 @@ Vue.component("screen-header", { 11~25℃
- + @@ -133,17 +133,32 @@ Vue.component("screen-header", { } }, //页面条状 - pageJump(n,url){ - if(n != this.nav){ - - if(url){ - location.href = url + pageJump(n,url,itemurl){ + if(n != this.nav){ + if(this.localStorage1.type == 1){ + if(url){ + location.href = url + }else{ + this.$notify({ + title: '提示', + message: '页面开发中，敬请期待！', + type: 'warning' + }); + } }else{ - this.$notify({ - title: '提示', - message: '页面开发中，敬请期待！', - type: 'warning' - }); + if(n==5){ + location.href = url + }else{ + if(itemurl){ + location.href = itemurl + }else{ + this.$notify({ + title: '提示', + message: '页面开发中，敬请期待！', + type: 'warning' + }); + } + } } } diff --git a/src/components/labour-china-map.js b/src/components/labour-china-map.js index 9816be3..2a20a99 100644 --- a/src/components/labour-china-map.js +++ b/src/components/labour-china-map.js @@ -51,7 +51,6 @@ Vue.component("labour-china-map", { triggerOn:'click', formatter: function(params) { var tipHtml = '' - console.log(params.dataIndex) if(params.data){ tipHtml = tooltip[params.dataIndex] return tipHtml diff --git a/src/components/more-btn.js b/src/components/more-btn.js index 2aa3aa1..c3c2f88 100644 --- a/src/components/more-btn.js +++ b/src/components/more-btn.js @@ -56,8 +56,7 @@ Vue.component("more-btn", { }, buttonClick(i, item) { this.btnNav = i - this.text = item.text - console.log(item) + this.text = item.text this.$emit('value',item); }, mouseenterBtn() { diff --git a/src/components/quality-objectives-safety.js b/src/components/quality-objectives-safety.js index 1de2cf1..772279e 100644 --- a/src/components/quality-objectives-safety.js +++ b/src/components/quality-objectives-safety.js @@ -35,8 +35,7 @@ Vue.component("quality-objectives-safety", { mounted(){ let that = this $.post("/weixin/saftTarget/list1",{},res => { - that.qualityTargetData = res[JSON.parse(localStorage.getItem("data1")).id] - console.log(that.qualityTargetData[JSON.parse(localStorage.getItem("data1")).id]); + that.qualityTargetData = res[JSON.parse(localStorage.getItem("data1")).id] }) }, methods: { diff --git a/src/components/quality-objectives.js b/src/components/quality-objectives.js index da40596..ebbae80 100644 --- a/src/components/quality-objectives.js +++ b/src/components/quality-objectives.js @@ -38,7 +38,7 @@ Vue.component("quality-objectives", { let url2 = "https://szh.makalu.cc/system/qualityTarget/list1" $.post(url2,{},res => { that.qualityTargetData = res[JSON.parse(localStorage.getItem("data1")).id] - console.log(that.qualityTargetData[JSON.parse(localStorage.getItem("data1")).id]); + //console.log(that.qualityTargetData[JSON.parse(localStorage.getItem("data1")).id]); }) }, methods: { diff --git a/src/components/roll-left-right-img.js b/src/components/roll-left-right-img.js index 3ab11b0..d562a36 100644 --- a/src/components/roll-left-right-img.js +++ b/src/components/roll-left-right-img.js @@ -64,8 +64,7 @@ Vue.component("roll-left-right-img", { }else{ this.costIndex = this.costIndex - 1 } - } - console.log(this.costIndex) + } $(this.$refs.rollImgMax).animate({scrollLeft:(width*this.costIndex)+'px'}) this.direction = 'right' }, diff --git a/src/pages/components/BorderBox1.vue b/src/pages/components/BorderBox1.vue index fd658f4..9bd3cf2 100644 --- a/src/pages/components/BorderBox1.vue +++ b/src/pages/components/BorderBox1.vue @@ -96,8 +96,7 @@ }, mounted() { this.$nextTick(()=>{ - let resizeObserver = new ResizeObserver(els=>{ - console.log("--->",els) + let resizeObserver = new ResizeObserver(els=>{ if(els.length>0){ let el=els[0]; this.width=el.contentRect?.width||150; diff --git a/src/pages/components/BorderBox2.vue b/src/pages/components/BorderBox2.vue index 675b74c..9c23948 100644 --- a/src/pages/components/BorderBox2.vue +++ b/src/pages/components/BorderBox2.vue @@ -48,8 +48,7 @@ }, mounted() { this.$nextTick(()=>{ - let resizeObserver = new ResizeObserver(els=>{ - console.log("--->",els) + let resizeObserver = new ResizeObserver(els=>{ if(els.length>0){ let el=els[0]; this.width=el.contentRect?.width||150; diff --git a/src/pages/components/BorderBox3.vue b/src/pages/components/BorderBox3.vue index ad12be8..0b3bb59 100644 --- a/src/pages/components/BorderBox3.vue +++ b/src/pages/components/BorderBox3.vue @@ -71,8 +71,7 @@ }, mounted() { this.$nextTick(()=>{ - let resizeObserver = new ResizeObserver(els=>{ - console.log("--->",els) + let resizeObserver = new ResizeObserver(els=>{ if(els.length>0){ let el=els[0]; this.width=el.contentRect?.width||150; diff --git a/src/pages/components/BorderBox4.vue b/src/pages/components/BorderBox4.vue index 34c4645..dc356e1 100644 --- a/src/pages/components/BorderBox4.vue +++ b/src/pages/components/BorderBox4.vue @@ -87,7 +87,6 @@ mounted() { this.$nextTick(()=>{ let resizeObserver = new ResizeObserver(els=>{ - console.log("--->",els) if(els.length>0){ let el=els[0]; this.width=el.contentRect?.width||150; diff --git a/src/pages/components/BorderBox5.vue b/src/pages/components/BorderBox5.vue index 7def0f4..7b11ac2 100644 --- a/src/pages/components/BorderBox5.vue +++ b/src/pages/components/BorderBox5.vue @@ -165,8 +165,7 @@ }, mounted() { this.$nextTick(()=>{ - let resizeObserver = new ResizeObserver(els=>{ - console.log("--->",els) + let resizeObserver = new ResizeObserver(els=>{ if(els.length>0){ let el=els[0]; this.width=el.contentRect?.width||150; diff --git a/src/pages/components/ProblemmodifyDetail.vue b/src/pages/components/ProblemmodifyDetail.vue index 90cbcd0..bdf0e60 100644 --- a/src/pages/components/ProblemmodifyDetail.vue +++ b/src/pages/components/ProblemmodifyDetail.vue @@ -1,5 +1,5 @@