From 607936b45f5ff267652bd01853defe84d7d0360f Mon Sep 17 00:00:00 2001 From: yjl <1490736767@qq.com> Date: Wed, 22 Mar 2023 15:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80-=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 8 +- components/footers/footers.vue | 14 +- main.js | 13 +- pages/projectEnd/progressManagement/index.vue | 297 +++++++++++++++++- .../projectEnd/projectIndex/projectIndex.vue | 17 +- .../{sjjt_hjjc.png => lssg_active.png} | Bin static/sjjt_syzl-tab.png | Bin 0 -> 668 bytes static/sjjt_syzl.png | Bin 0 -> 542 bytes 8 files changed, 326 insertions(+), 23 deletions(-) rename static/sjjtIcon/{sjjt_hjjc.png => lssg_active.png} (100%) create mode 100644 static/sjjt_syzl-tab.png create mode 100644 static/sjjt_syzl.png diff --git a/App.vue b/App.vue index 6575107c..24fa8956 100644 --- a/App.vue +++ b/App.vue @@ -12,10 +12,10 @@ if (uni.getStorageSync('ipPort')) { this.globalData.siteUrl = uni.getStorageSync('ipPort') + '/' } else { - this.globalData.siteUrl = 'http://182.90.224.147:100/' //演示平台 + // this.globalData.siteUrl = 'http://182.90.224.147:100/' //演示平台 // this.globalData.siteUrl = 'http://124.71.178.44:8012/' // 河南 // this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通 - // this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局 + this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局 // this.globalData.siteUrl = 'http://192.168.34.148:6023/' //广西联通/本地 // this.globalData.siteUrl = 'http://8.142.139.165:7080/' // 湖里 // this.globalData.siteUrl = "http://58.34.63.88:9090/" @@ -42,11 +42,11 @@ this.globalData.siteUrl = uni.getStorageSync('ipPort') + '/' } else { // this.globalData.siteUrl = 'http://8.142.139.165:7080/' // 湖里 - this.globalData.siteUrl = 'http://182.90.224.147:100/' // 演示平台 + // this.globalData.siteUrl = 'http://182.90.224.147:100/' // 演示平台 // this.globalData.siteUrl = 'http://124.71.178.44:8012/' // 河南 // this.globalData.siteUrl = 'http://192.168.34.148:6023/' //广西联通/本地 // this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通 - // this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局 + this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局 // this.globalData.siteUrl = "http://58.34.63.88:9090/" // this.globalData.siteUrl = 'http://124.71.178.44:9000/' // Vue.prototype.url_config = 'http://192.168.34.125:6023/' diff --git a/components/footers/footers.vue b/components/footers/footers.vue index c48fbb4a..47f92215 100644 --- a/components/footers/footers.vue +++ b/components/footers/footers.vue @@ -23,8 +23,12 @@ mounted() { this.userInfo = JSON.parse(uni.getStorageSync('userInfo')) if(this.userInfo.accountType==5||this.userInfo.accountType==6){ - this.tabList.push({appName:'首页',moduleIcon2:'tabIcon-index',moduleIcon:'tabIcon-index-active',plugin:'projectEnd',appShow:1}, - {appName:'我的',moduleIcon2:'tabIcon-my2',moduleIcon:'tabIcon-my2-active',plugin:'my',appShow:1}) + this.tabList.push( + {appName:'首页',moduleIcon2:'tabIcon-index',moduleIcon:'tabIcon-index-active',plugin:'projectEnd',appShow:1}, + {appName:'我的',moduleIcon2:'tabIcon-my2',moduleIcon:'tabIcon-my2-active',plugin:'my',appShow:1}, + + + ) }else{ var moduleList = this.userInfo.menuAuthority.moduleList for (let i = 0; i < moduleList.length; i++) { @@ -32,7 +36,11 @@ this.tabList.push(moduleList[i]) } } - this.tabList.push({appName:'我的',moduleIcon2:'tabIcon-my',moduleIcon:'tabIcon-my-select',plugin:'my',appShow:1}) + this.tabList.push( + {appName:'首页总览',moduleIcon2:'sjjt_syzl',moduleIcon:'sjjt_syzl-tab',plugin:'projectManage',appShow:1}, + {appName:'我的',moduleIcon2:'tabIcon-my',moduleIcon:'tabIcon-my-select',plugin:'my',appShow:1}, + + ) } // console.log(this.tabList) diff --git a/main.js b/main.js index 62f7b3bd..88328591 100644 --- a/main.js +++ b/main.js @@ -11,8 +11,8 @@ App.mpType = 'app' // Vue.prototype.url_config = '' // Vue.prototype.COMPANY = "longguang" // Vue.prototype.COMPANY = "nanchang" -Vue.prototype.COMPANY = "sanjiang" -// Vue.prototype.COMPANY = "" +// Vue.prototype.COMPANY = "sanjiang" +Vue.prototype.COMPANY = "" if (process.env.NODE_ENV === 'development') { // 开发环境 @@ -24,7 +24,7 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://139.9.66.234:8/' // Vue.prototype.url_config = 'http://192.168.34.125:6023/' // Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通 - // Vue.prototype.url_config = 'http://124.71.67.160:8088/'//中建四局 + Vue.prototype.url_config = 'http://124.71.67.160:8088/'//中建四局 // Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地 // Vue.prototype.url_config = 'http://223.82.100.80:9000/' // Vue.prototype.url_config = 'http://120.236.247.200:9000/' @@ -39,10 +39,11 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://124.71.178.44:8/' // Vue.prototype.url_config = 'http://124.71.87.250/' // Vue.prototype.url_config = 'http://124.71.178.44:8012' // 河南 - Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 + // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 // this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地 // this.globalData.siteUrl = 'http://182.90.224.147:18170'//瑞士恒通 // this.globalData.siteUrl = 'http://116.169.63.183:7070/'//三江 + // this.globalData.siteUrl = 'http://192.168.34.221:8088'//郭圣熊本地 } } else { @@ -51,13 +52,13 @@ if (process.env.NODE_ENV === 'development') { if (uni.getStorageSync('ipPort')) { Vue.prototype.url_config = uni.getStorageSync('ipPort') + '/' } else { - Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 + // Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台 // Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南 // Vue.prototype.url_config = 'http://8.142.139.165:7080/' //湖里 // Vue.prototype.url_config = 'http://139.9.66.234:8/' // Vue.prototype.url_config = 'http://192.168.34.125:6023/' // Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通 - // Vue.prototype.url_config = 'http://124.71.67.160:8088/' //中建四局 + Vue.prototype.url_config = 'http://124.71.67.160:8088/' //中建四局 // Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地 // Vue.prototype.url_config = 'http://223.82.100.80:9000/' // Vue.prototype.url_config = 'http://120.236.247.200:9000/' diff --git a/pages/projectEnd/progressManagement/index.vue b/pages/projectEnd/progressManagement/index.vue index b710bfce..b7840de6 100644 --- a/pages/projectEnd/progressManagement/index.vue +++ b/pages/projectEnd/progressManagement/index.vue @@ -1,9 +1,302 @@ \ No newline at end of file + .flex2 { + display: flex; + align-items: center; + justify-content: space-between; + } + + .tab { + width: 100%; + height: 45px; + text-align: center; + box-shadow: 0 0 10px rgba(194, 194, 194, 0.5); + position: fixed; + } + + .tabType { + width: 33%; + line-height: 43px; + border-bottom: 1px solid rgba(194, 194, 194, 0.2); + + } + + .checkedTab { + color: #4181FE; + border-bottom: 2px solid #4181FE; + + } + + + .item { + box-shadow: 0 4px 24px 0px rgba(212, 220, 236, 0.69); + border-radius: 8px; + height: 175px; + width: 92%; + margin: 15px 10px; + padding: 10px 0px 0px 10px; + + } + + .noData { + text-align: center; + font-size: 32rpx; + margin-top: 120px; + color: #bed0fb; + } + + .noDataImg { + width: 125px; + height: 98px; + } + + .item_title { + margin: 10px 10px; + font-weight: 800; + } + + .item_content { + margin: 10px 10px; + } + + .name { + margin: 10px 10px; + } + + .time { + margin: 10px 10px; + } + + .content { + /* padding: 20px 30rpx 0; */ + box-sizing: border-box; + width: 100%; + margin-top: 15%; + } + + .state { + + font-size: 14px; + margin-top: -42%; + margin-left: 85%; + } + + .state2 { + background: #3579ff; + width: 89px; + height: 30px; + border-radius: 28px; + text-align: center; + line-height: 30px; + color: #fff; + margin-left: 260px; + margin-top: 125px; + } + + + .state3 { + display: none; + } + + .stateTextColor1 { + color: #ff9900; + } + + .stateTextColor2 { + color: #0085ff; + } + + .stateTextColor3 { + color: #28d061; + } + + .headerName { + width: calc(113% - 50px); + background: #4181fe; + color: #fff; + padding-left: 0 !important; + position: fixed; + } + diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue index 94eb11ce..a4aa7621 100644 --- a/pages/projectEnd/projectIndex/projectIndex.vue +++ b/pages/projectEnd/projectIndex/projectIndex.vue @@ -393,6 +393,7 @@ }, goMoudleFn(item) { + //添加虚拟模块 报警提示 // if(item.moduleName=="预警播报"){ // uni.navigateTo({ @@ -400,8 +401,9 @@ // }) // return false; // } - // console.log('item.plugin', item.plugin) + console.log('item.plugin===================', item) switch (item.plugin) { + case 'markRoom': uni.navigateTo({ url: '../markRoom/markRoom' @@ -511,17 +513,16 @@ url: '../betonManage/index' }) break - case 'dangerBroadcast': + case 'progressManage': + uni.navigateTo({ + url: '../progressManagement/index' + }) + break + case 'dangerBroadcast': uni.navigateTo({ url: '../../alarmPage/index' }) break - case 'progressManagement': - uni.navigateTo({ - url: '../progressManagement/progressManage' - }) - break - case 'saosao': console.log('打开saosao') // let that = this; diff --git a/static/sjjtIcon/sjjt_hjjc.png b/static/sjjtIcon/lssg_active.png similarity index 100% rename from static/sjjtIcon/sjjt_hjjc.png rename to static/sjjtIcon/lssg_active.png diff --git a/static/sjjt_syzl-tab.png b/static/sjjt_syzl-tab.png new file mode 100644 index 0000000000000000000000000000000000000000..b3a007beb73f199af7c6b90c580d030a5d595943 GIT binary patch literal 668 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3-qtXDD_6shlj%IUqI!0TqMALCQc3p!s0+ zAU04LSS3UaPy~VY{Lm~1`aP&5$S;_Ik(rf)n_pB)MpjN2A>xq9vT?K}7HKYsG$#mkrP-hck~ z?Z>ab|FYNoI>*4k$l&SX7~*mK?Uj>ZhY|!@E^=+|Qqs_JTcmOB5d&YtW)@cij<5gt zA1k^0oVc<-dtd7O-D@s4_6%8N_PH%lDh?XIhp+!tjnd3pcGjnAH*WNXe=SzfvA?1o#B z=JD?h_w<{puji4xT9Cdd+0<**(VTg^7O%N2!ti9i#@j;48RnYnjoZ0bmGsSt zvi_0V$@t`}K@YBRZTPA1?7K9>f~Q`kjQg~ns%^Ft{t0RscwSTZObQ}NA vuUGld&bMFn!>-Q{-<8_doh*I%?$!tPiRl|f)dj?QLCMV1)z4*}Q$iB}WOh!M literal 0 HcmV?d00001 diff --git a/static/sjjt_syzl.png b/static/sjjt_syzl.png new file mode 100644 index 0000000000000000000000000000000000000000..fabd952695924c086744d702221280601f6f2a8d GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3-qtXDD_6snr2KA+A6g3>p|1LKz$!w6sDM z6cVJQeD(BVfoyg4Bo&otZS7DEjW{*qNFAL>prDpkf~IDSx_X4BW|XdOl#WighDNxC zez=xaq?&e&wswrBUW|rrl(u%XmR78$Zj^>jjJkFdkfEs)sjUs<0>y#sXbqhx4edxR z-6$=cNKKsxO`w!^q=q)ox@b+EC@?o#Ln}&4H&ROnB(gBv#RlkB%aS0!U7BfLb+*NY@U*i|+)gI0j&Yx@bvZmnS;_jJ?iiPc-KbcgKdGh+Sr4{!I ze$Kny@wn~y3LE8F(LJZTF8tJdJo{Pv&TUCS+HYr?fA`6|&+~cS`7M9m#ir+YZ8B!m zKckr)$I$Sq?UGsOf;U0)qL0nc>MacT#4a=SkD#%tz4P7h2XV3)>yOslWn&15>SM58 zd#YAYxlz9L+qbV-_b!zF4L_L8ux0)K8_`VmJe9Ez>JPQwzQ6QGtbIec@dx#