diff --git a/src/components/Header.vue b/src/components/Header.vue index 73cf0c8522ce4d98ddb101b4ee826c02fe7322b5..4a48cadbf0e78ea9604591d326a4702c0581a448 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -41,7 +41,13 @@ {{userData.currUserName}} <i class="el-icon-arrow-down el-icon--right"></i> </span> --> - + <span class="admin-header-right"> + <a-tooltip class="header-item" title="杩斿洖闂ㄦ埛" placement="bottom"> + <a :href="portal"> + <a-icon type="home" /> 杩斿洖闂ㄦ埛 + </a> + </a-tooltip> + </span> <el-dropdown @command="handleCommand"> <span class="el-dropdown-link" style="color: white"> {{ userData.currUserName }} @@ -102,6 +108,7 @@ export default { return { systemName: process.env.VUE_APP_sysName, showMobileMenu: false, + portal: process.env.VUE_APP_PORTAL_URL+'/#/home/siteArrange',//闂ㄦ埛鍦板潃 }; }, methods: { @@ -208,7 +215,23 @@ export default { </script> <style lang="less"> + .layout-header { + .admin-header-right{ + color: inherit; + .header-item{ + color: inherit; + padding: 0 12px; + cursor: pointer; + align-self: center; + a{ + color: inherit; + i{ + font-size: 16px; + } + } + } + } .mobile-menu-list { display: none; } diff --git a/src/components/Map.vue b/src/components/Map.vue index d6f6bf60db70db280ba2336d3b813f4169498e3c..2097ff993d1cbee1d0948c8535dc17313fe8e571 100644 --- a/src/components/Map.vue +++ b/src/components/Map.vue @@ -74,25 +74,25 @@ </el-col> <el-col :span="4"> <span style="font-size: 13px" - ><b style="color: green">{{ info.onlineCount }}</b></span + ><b style="color: green">{{ info.onlineTotal || '--' }}</b></span ><br /> <span style="font-size: 12px">鍦ㄧ嚎</span> </el-col> <el-col :span="4"> <span style="font-size: 13px" - ><b style="color: red">{{ info.offlineCount }}</b></span + ><b style="color: red">{{ info.offlineTotal || '--'}}</b></span ><br /> <span style="font-size: 12px">绂荤嚎</span> </el-col> <el-col :span="4"> <span style="font-size: 13px" - ><b style="color: orange">{{ info.stopCount }}</b></span + ><b style="color: orange">{{ info.stopCount || '--'}}</b></span ><br /> <span style="font-size: 12px">鍋滅敤</span> </el-col> <el-col :span="4"> <span style="font-size: 13px" - ><b style="color: grey">{{ info.unActiveCount }}</b></span + ><b style="color: grey">{{ info.unActiveTotal || '--'}}</b></span ><br /> <span style="font-size: 12px">寰呮縺娲�</span> </el-col> diff --git a/src/views/Home.vue b/src/views/Home.vue index 7a71d1c01f5398e878646841453aaf71072b306d..169b7e195d15edc0439efed0f80139b7d2f419b3 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -544,7 +544,7 @@ export default { { type: "value", min: 0, // 閰嶇疆 Y 杞村埢搴︽渶灏忓€� - max: 500, // 閰嶇疆 Y 杞村埢搴︽渶澶у€� + // max: 500, // 閰嶇疆 Y 杞村埢搴︽渶澶у€� // interval: 50, splitNumber: 5, // 閰嶇疆 Y 杞存暟鍊奸棿闅� axisTick: { @@ -567,7 +567,7 @@ export default { show: false, }, axisLabel: { - formatter: "{value} %", + formatter:(value)=>{return value*100 + '%'} , }, }, ], @@ -619,6 +619,16 @@ export default { backgroundColor: "#6a7985", }, }, + formatter:function(data){ + let str = ''; + data.forEach((item,idx)=>{ + str += `${item.marker}${item.seriesName}: ${item.data*100+'%'}` + if(!idx){ + str += '</br>' + } + }) + return str + } }, legend: { top: "40px", @@ -658,6 +668,9 @@ export default { axisLine: { show: false, }, + axisLabel: { + formatter:(value)=>{return value*100 + '%'} , + }, }, ], series: [ diff --git a/src/views/sitestat/maplist.vue b/src/views/sitestat/maplist.vue index 6499816148d7012c699d95c44ca34e7549a23efb..6eacebaff0497f08076c8821ee479a5e4340ee0c 100644 --- a/src/views/sitestat/maplist.vue +++ b/src/views/sitestat/maplist.vue @@ -64,13 +64,13 @@ <div class="are">{{ item.detailAddress }}</div> <div class="data"> <div class="sbzs dataitem"> - 璁惧鎬绘暟锛�<span>{{ item.deviceTotal }}鍙�</span> + 璁惧鎬绘暟锛�<span>{{ item.deviceTotal}}鍙�</span> </div> <div class="zx dataitem"> - 鍦ㄧ嚎锛�<span>{{ item.onlineTotal }}鍙�</span> + 鍦ㄧ嚎锛�<span>{{ item.onlineTotal || '--'}}鍙�</span> </div> <div class="lx dataitem"> - 绂荤嚎锛�<span>{{ item.offlineTotal }}鍙�</span> + 绂荤嚎锛�<span>{{ item.offlineTotal || '--'}}鍙�</span> </div> </div> </div>