From 84ac880d0fb74b6e4736766d2a24343501cd416b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Thu, 18 Aug 2022 09:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=A6=82=E8=A7=88):=E4=BA=BA=E5=91=98=E6=A6=82?= =?UTF-8?q?=E8=A7=88=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +- src/store/index.js | 12 +++--- .../jlw/projectHuli/generalView.vue | 42 +++++++++++-------- .../jlw/projectHuli/projectIntro.vue | 4 +- .../jlw/projectHuli/videoPhoto.vue | 8 ++-- 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index fd863c2f..c659fa9c 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,8 +40,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 -// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 - axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 + // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://47.97.202.104:6023/'; // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 diff --git a/src/store/index.js b/src/store/index.js index 681fcb34..4ef392f7 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,19 +45,19 @@ export default new Vuex.Store({ // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // - FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 + // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时，需要打开这两行代码 // UPLOADURL: 'http://124.71.178.44:100/upload/image', // FILEURL: 'http://124.71.178.44:100/image/', /* 2022-06-06 杨意本地的*/ // BASEURL:'http://192.168.34.174:6023/', - // UPLOADURL: 'http://192.168.34.125:6023/upload/image', - // FILEURL: 'http://192.168.34.125:6023/image/', + UPLOADURL: 'http://192.168.34.125:6023/upload/image', + FILEURL: 'http://192.168.34.125:6023/image/', // 邱平毅的 - UPLOADURL: 'http://192.168.34.216:6023/upload/image', - FILEURL: 'http://192.168.34.216:6023/image/', + // UPLOADURL: 'http://192.168.34.216:6023/upload/image', + // FILEURL: 'http://192.168.34.216:6023/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 ACCOUNTTYPE: ['系统管理员', '企业一级管理员', '企业二级管理员', '企业三级管理员', '项目管理员'], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号 diff --git a/src/views/projectAdmin/jlw/projectHuli/generalView.vue b/src/views/projectAdmin/jlw/projectHuli/generalView.vue index e05ad25e..8933592c 100644 --- a/src/views/projectAdmin/jlw/projectHuli/generalView.vue +++ b/src/views/projectAdmin/jlw/projectHuli/generalView.vue @@ -28,18 +28,17 @@ -
+
{{ '离场人数' }}
- + -->
@@ -77,17 +76,17 @@
-
+ {{ $t('message.companyDiagram.onlineManagePeople') }} + {{ $t('message.companyDiagram.onlineManagePeople') }}
- + --> @@ -150,15 +149,16 @@ export default { color:#3d83f3; } .label{ - font-size: 12px; + font-size: 14px; } .label1{ - width:68px; + width:70px; } } } } .manager { + height:90%; .manager-title { margin-top: 6px; margin-bottom: 8px; @@ -174,33 +174,39 @@ export default { } } .manager-persons { + height: 60%; display: flex; // margin-left: 20px; .person { + flex: 1; position: relative; - margin-top: 30px; - width: 86px; - height: 86px; - margin-right: 15px; + margin-top: 35px; + // width: 99px; + // height: 100px; + margin-right: 22px; background: url(~@/assets/images/projectImg/num_jia.png); background-size: 100%; + background-repeat: no-repeat; &:nth-child(2) { background: url(~@/assets/images/projectImg/num_yi.png); background-size: 100%; + background-repeat: no-repeat; } &:nth-child(3) { background: url(~@/assets/images/projectImg/num_bing.png); background-size: 100%; + background-repeat: no-repeat; } - &:nth-child(4) { - background: url(~@/assets/images/projectImg/num_ding.png); - background-size: 100%; - } + // &:nth-child(4) { + // background: url(~@/assets/images/projectImg/num_ding.png); + // background-size: 100%; + // } .person-info { transform: translate(15px); text-align: center; - font-size: 14px; - margin-left: 10px; + font-size: 16px; + margin-left: 22px; + margin-top: 2px; } } } diff --git a/src/views/projectAdmin/jlw/projectHuli/projectIntro.vue b/src/views/projectAdmin/jlw/projectHuli/projectIntro.vue index 4af9a69e..84b464e2 100644 --- a/src/views/projectAdmin/jlw/projectHuli/projectIntro.vue +++ b/src/views/projectAdmin/jlw/projectHuli/projectIntro.vue @@ -124,8 +124,8 @@ components:{Card}, default: "default title" }, projectData:{ - type:Array, - default: [] + type: Object, + default: {} } }, data() { diff --git a/src/views/projectAdmin/jlw/projectHuli/videoPhoto.vue b/src/views/projectAdmin/jlw/projectHuli/videoPhoto.vue index b57dffc3..ca581375 100644 --- a/src/views/projectAdmin/jlw/projectHuli/videoPhoto.vue +++ b/src/views/projectAdmin/jlw/projectHuli/videoPhoto.vue @@ -72,7 +72,7 @@ @@ -90,9 +90,8 @@ export default { return { show: false, projectData: { - videoUrl: "" + videoUrl: "", }, - fileUrl: "", imgUrl: "", //图片 showChangeImg: false, //显示隐藏更换图片 fullscreenLoading: null, @@ -105,7 +104,6 @@ export default { } }, created() { - this.fileUrl = this.$store.state.FILEURL; this.getDataDateils(); this.getQueryBySnData(); }, @@ -135,7 +133,7 @@ export default { projectSn: this.$store.state.projectSn, showType: 3 }).then(res => { - console.log('------获取图片',res) + // console.log('------获取图片',res.result) this.imgUrl = res.result.configValue; }); },