monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 8098af8153348efb34179c4b61e569eb7ce23b3c 2 parents 0828db61 6794d9db

Merge branch 'master-v32-lushangqing' into 'master' 

大屏及电子税务局页面样式修改，数据中心，



See merge request !53
Inline Side-by-side
Showing 16 changed files with 89 additions and 36 deletions
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 .sjzx .item { 13 .sjzx .item {
14 display: inline-block; 14 display: inline-block;
15 position: relative; 15 position: relative;
16 - height: 120px; 16 + /*height: 120px;*/
17 margin-right: 120px; 17 margin-right: 120px;
18 } 18 }
19 19
@@ -22,14 +22,15 @@ @@ -22,14 +22,15 @@
22 font-size: 11px; 22 font-size: 11px;
23 text-align: center; 23 text-align: center;
24 position:absolute; 24 position:absolute;
25 - bottom:-13px; 25 + bottom:2px;
26 left:17px; 26 left:17px;
  27 + margin: 0;
27 cursor: pointer; 28 cursor: pointer;
28 } 29 }
29 30
30 .sjzx .item img { 31 .sjzx .item img {
31 display: block; 32 display: block;
32 - height: 118px; 33 + /*height: 118px;*/
33 cursor: pointer; 34 cursor: pointer;
34 } 35 }
35 36
@@ -73,3 +74,12 @@ @@ -73,3 +74,12 @@
73 .sjzx .item ul li .icon-mj { 74 .sjzx .item ul li .icon-mj {
74 background-image: url("/vue3/src/assets/images/zjdp/icon-mj.png"); 75 background-image: url("/vue3/src/assets/images/zjdp/icon-mj.png");
75 } 76 }
  77 +.imgDiv{
  78 + display: flex;
  79 + flex-flow: column;
  80 + justify-content: center;
  81 + align-items: center;
  82 +}
  83 +.imgDiv-video{
  84 + width: 24px;
  85 +}
@@ -42,6 +42,7 @@ body{font-size: 15px;} @@ -42,6 +42,7 @@ body{font-size: 15px;}
42 .flex-cloud{ 42 .flex-cloud{
43 width:42% 43 width:42%
44 } 44 }
  45 +.left-top{height:550px;}
45 .flex-declare{ 46 .flex-declare{
46 width:330px; 47 width:330px;
47 /*max-width: 323px;*/ 48 /*max-width: 323px;*/
@@ -153,7 +153,7 @@ export default { @@ -153,7 +153,7 @@ export default {
153 left: 'center', 153 left: 'center',
154 bottom: '8%', 154 bottom: '8%',
155 textStyle: { 155 textStyle: {
156 - fontSize: this.titleFontSize*0.5, 156 + fontSize: this.titleFontSize*0.7,
157 color:'#ffffff' 157 color:'#ffffff'
158 } 158 }
159 159
@@ -5,7 +5,7 @@ export default { @@ -5,7 +5,7 @@ export default {
5 data () { 5 data () {
6 return { 6 return {
7 domainName:sessionStorage.getItem('domainName'), 7 domainName:sessionStorage.getItem('domainName'),
8 - apiUrl:'/api-web/bigScreen/findPortfolio',//今日业务量 8 + apiUrl:'/api-web/bigScreen/getBusinessNumber',//今日业务量
9 chartInstance: null, 9 chartInstance: null,
10 allData: [{ 10 allData: [{
11 name: "今日业务量", 11 name: "今日业务量",
@@ -70,18 +70,58 @@ export default { @@ -70,18 +70,58 @@ export default {
70 async getData () { 70 async getData () {
71 // await this.$http.get() 71 // await this.$http.get()
72 // const { data: ret } = await this.$http.get('volume') 72 // const { data: ret } = await this.$http.get('volume')
73 - const { data: ret } = await $.get(this.domainName +this.apiUrl+'?access_token='+localStorage.getItem('access_token')) 73 + const { map: ret } = await $.get(this.domainName +this.apiUrl+'?access_token='+localStorage.getItem('access_token'))
74 //本月业务量 74 //本月业务量
75 // const { data: ret1 } = await $.get(this.domainName +this.apiUrl1) 75 // const { data: ret1 } = await $.get(this.domainName +this.apiUrl1)
76 let retData=[]; 76 let retData=[];
77 - retData.push({  
78 - name:'今日业务量',  
79 - data:ret  
80 - })  
81 - retData.push({  
82 - name:'本月业务量',  
83 - data:ret  
84 - }) 77 + let allData= [
  78 + {data: [
  79 + {
  80 + "name": "网络发票",
  81 + "typeName": "fp",
  82 + "value": 0
  83 + },
  84 + {
  85 + "name": "涉税文书",
  86 + "typeName": "ws",
  87 + "value": 0
  88 + },
  89 + {
  90 + "name": "网上申报",
  91 + "typeName": "sb",
  92 + "value": 0
  93 + }
  94 + ],
  95 + name: "今日业务量"
  96 + },
  97 + {
  98 + data: [
  99 + {
  100 + "name": "网络发票",
  101 + "typeName": "fp",
  102 + "value": 0
  103 + },
  104 + {
  105 + "name": "涉税文书",
  106 + "typeName": "ws",
  107 + "value": 0
  108 + },
  109 + {
  110 + "name": "网上申报",
  111 + "typeName": "sb",
  112 + "value": 0
  113 + }
  114 + ],
  115 + name: "本月业务量"
  116 + }]
  117 + if(ret){
  118 + retData=ret.allData
  119 + }else{
  120 + retData=allData
  121 +
  122 + }
  123 +
  124 +
85 this.allData = retData 125 this.allData = retData
86 126
87 this.updateChart() 127 this.updateChart()
@@ -92,14 +132,16 @@ export default { @@ -92,14 +132,16 @@ export default {
92 ['66%', '65%'] 132 ['66%', '65%']
93 ] 133 ]
94 134
  135 +
95 const seriesArr = this.allData.map((item, index) => { 136 const seriesArr = this.allData.map((item, index) => {
96 const dataArr = [] 137 const dataArr = []
97 let colorData=[]; 138 let colorData=[];
98 - if(item.data){ 139 + // if(item.data && item.data.length>0){
  140 + if(item.data ){
99 item.data.map(inner => { 141 item.data.map(inner => {
100 dataArr.push({ 142 dataArr.push({
101 name: inner.name, 143 name: inner.name,
102 - value: inner.num, 144 + value: inner.value,
103 /*itemStyle: { 145 /*itemStyle: {
104 color: this.colorData[index] 146 color: this.colorData[index]
105 }*/ 147 }*/
@@ -123,6 +165,8 @@ export default { @@ -123,6 +165,8 @@ export default {
123 radius: ['28%', '42%'], 165 radius: ['28%', '42%'],
124 center: centerArr[index], 166 center: centerArr[index],
125 color:colorData, 167 color:colorData,
  168 + minAngle: 15,//最小角度
  169 + startAngle:120, //起始角度
126 itemStyle: { 170 itemStyle: {
127 borderRadius: 2, 171 borderRadius: 2,
128 borderWidth: 2 172 borderWidth: 2
@@ -137,6 +181,7 @@ export default { @@ -137,6 +181,7 @@ export default {
137 } 181 }
138 }) 182 })
139 const dataOption = { 183 const dataOption = {
  184 +
140 series: seriesArr 185 series: seriesArr
141 } 186 }
142 this.chartInstance.setOption(dataOption) 187 this.chartInstance.setOption(dataOption)
@@ -167,12 +167,7 @@ export default { @@ -167,12 +167,7 @@ export default {
167 const unit=this.allData.polyline.unit; 167 const unit=this.allData.polyline.unit;
168 168
169 let seriesData=[]; 169 let seriesData=[];
170 -  
171 - console.log("***",seriesArr)  
172 $.each(seriesArr,function (index,item){ 170 $.each(seriesArr,function (index,item){
173 - console.log("&&&",item)  
174 - console.log("/*/*/*",item.name)  
175 -  
176 seriesData .push({ 171 seriesData .push({
177 name: item.name, 172 name: item.name,
178 type: 'line', 173 type: 'line',
@@ -220,7 +215,7 @@ export default { @@ -220,7 +215,7 @@ export default {
220 left: 'center', 215 left: 'center',
221 bottom: '8%', 216 bottom: '8%',
222 textStyle: { 217 textStyle: {
223 - fontSize: this.titleFontSize*0.5, 218 + fontSize: this.titleFontSize*0.9,
224 color:'#ffffff' 219 color:'#ffffff'
225 } 220 }
226 221
@@ -158,12 +158,7 @@ export default { @@ -158,12 +158,7 @@ export default {
158 const unit=this.allData.polyline.unit; 158 const unit=this.allData.polyline.unit;
159 159
160 let seriesData=[]; 160 let seriesData=[];
161 -  
162 - console.log("***",seriesArr)  
163 $.each(seriesArr,function (index,item){ 161 $.each(seriesArr,function (index,item){
164 - console.log("&&&",item)  
165 - console.log("/*/*/*",item.name)  
166 -  
167 seriesData .push({ 162 seriesData .push({
168 name: item.name, 163 name: item.name,
169 type: 'line', 164 type: 'line',
@@ -205,7 +200,7 @@ export default { @@ -205,7 +200,7 @@ export default {
205 left: 'center', 200 left: 'center',
206 bottom: '8%', 201 bottom: '8%',
207 textStyle: { 202 textStyle: {
208 - fontSize: this.titleFontSize*0.5, 203 + fontSize: this.titleFontSize*0.9,
209 color:'#ffffff' 204 color:'#ffffff'
210 } 205 }
211 206
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 </div> 6 </div>
7 <div class="ypt"> 7 <div class="ypt">
8 - <el-carousel direction="vertical" :autoplay="true" indicator-position="none" interval="10000" > 8 + <el-carousel direction="vertical" :autoplay="true" indicator-position="none" >
9 <el-carousel-item v-for="(item,index) in cloudData" :key="index"> 9 <el-carousel-item v-for="(item,index) in cloudData" :key="index">
10 <div class="item swiper-slide" > 10 <div class="item swiper-slide" >
11 <div class="ui_base u_p3d"> 11 <div class="ui_base u_p3d">
@@ -6,9 +6,13 @@ @@ -6,9 +6,13 @@
6 </div> 6 </div>
7 <div class="sjzx"> 7 <div class="sjzx">
8 <div class="item sjzx_machineroom" v-for="item in jfdata" > 8 <div class="item sjzx_machineroom" v-for="item in jfdata" >
9 - <h5 @click="isShowOuter(item)">{{item.machineRoomName}}</h5>  
10 - <img @click="isShow(item)" v-if="item.healthStatus==0" src="/vue3/src/assets/images/zjdp/jifang-1.png" alt="">  
11 - <img @click="isShow(item)" else="item.healthStatus==1" src="/vue3/src/assets/images/zjdp/jifang-2.png" alt=""> 9 + <h5 >{{item.machineRoomName}}</h5>
  10 + <div class="imgDiv">
  11 + <img @click="isShow(item)" class="imgDiv-video" src="/vue3/src/assets/images/zjdp/icon-jf.png">
  12 + <img @click="isShowOuter(item)" v-if="item.healthStatus==0" src="/vue3/src/assets/images/zjdp/jifang-1.png" alt="">
  13 + <img @click="isShowOuter(item)" else="item.healthStatus==1" src="/vue3/src/assets/images/zjdp/jifang-2.png" alt="">
  14 + </div>
  15 +
12 <ul class="float-container"> 16 <ul class="float-container">
13 <li><i class='icon-wd'></i><span>温度：{{item.wd}}</span></li> 17 <li><i class='icon-wd'></i><span>温度：{{item.wd}}</span></li>
14 <li><i class='icon-sd'></i><span>湿度：{{item.sd}}</span></li> 18 <li><i class='icon-sd'></i><span>湿度：{{item.sd}}</span></li>
@@ -43,11 +43,17 @@ export default { @@ -43,11 +43,17 @@ export default {
43 ] 43 ]
44 }) 44 })
45 const isShow=(item)=>{ 45 const isShow=(item)=>{
  46 + console.log("999",item)
  47 +
46 proxy.dialogMachineName=item.machineRoomName 48 proxy.dialogMachineName=item.machineRoomName
47 proxy.centerDialogVisible = true 49 proxy.centerDialogVisible = true
48 } 50 }
49 const isShowOuter=(item)=>{ 51 const isShowOuter=(item)=>{
  52 + console.log(";;;",item)
  53 + if(item.layout == 1){
50 proxy.outerVisible = true 54 proxy.outerVisible = true
  55 + }
  56 +
51 57
52 } 58 }
53 return{ 59 return{
@@ -17,7 +17,6 @@ export default { @@ -17,7 +17,6 @@ export default {
17 // numm: 传入的数字 numLen: 默认显示几位数 17 // numm: 传入的数字 numLen: 默认显示几位数
18 let numVal=numm.value+''; 18 let numVal=numm.value+'';
19 proxy.numDiff=parseInt(numLen.value)-parseInt(numVal.split("").length); 19 proxy.numDiff=parseInt(numLen.value)-parseInt(numVal.split("").length);
20 - console.log("numDiff--",proxy.numDiff)  
21 const toOrderNum = (num) => { 20 const toOrderNum = (num) => {
22 21
23 num = num.toString(); 22 num = num.toString();
@@ -78,7 +78,7 @@ export default { @@ -78,7 +78,7 @@ export default {
78 proxy.clickTabs(proxy.checkId) 78 proxy.clickTabs(proxy.checkId)
79 79
80 } 80 }
81 - },4000) 81 + },10000)
82 } 82 }
83 83
84 const arrowClick=(val)=>{ 84 const arrowClick=(val)=>{
@@ -49,7 +49,6 @@ export default { @@ -49,7 +49,6 @@ export default {
49 let length=resData.length; 49 let length=resData.length;
50 if(length<4){ 50 if(length<4){
51 for(let i=0;i<4-length;i++){ 51 for(let i=0;i<4-length;i++){
52 - console.log("&&&",i)  
53 resData.push({ 52 resData.push({
54 "resTypeAllNum": 0, 53 "resTypeAllNum": 0,
55 "code": "other", 54 "code": "other",
@@ -45,7 +45,6 @@ export default { @@ -45,7 +45,6 @@ export default {
45 }, 45 },
46 setup(props, {attrs, slots, emit}) { 46 setup(props, {attrs, slots, emit}) {
47 const {proxy} = Vue.getCurrentInstance(); 47 const {proxy} = Vue.getCurrentInstance();
48 - console.log('aaa',Vue.EventBus)  
49 let datetimeStyle=()=>{// 左上角日期时间大小 48 let datetimeStyle=()=>{// 左上角日期时间大小
50 fontSize: proxy.titleFontSize / 3 + 'px'; 49 fontSize: proxy.titleFontSize / 3 + 'px';
51 marginLeft: proxy.titleFontSize / 5 + 'px' 50 marginLeft: proxy.titleFontSize / 5 + 'px'