Authored by 王涛

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

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



See merge request !53
Showing 16 changed files with 90 additions and 37 deletions
... ... @@ -13,7 +13,7 @@
.sjzx .item {
display: inline-block;
position: relative;
height: 120px;
/*height: 120px;*/
margin-right: 120px;
}
... ... @@ -22,14 +22,15 @@
font-size: 11px;
text-align: center;
position:absolute;
bottom:-13px;
bottom:2px;
left:17px;
margin: 0;
cursor: pointer;
}
.sjzx .item img {
display: block;
height: 118px;
/*height: 118px;*/
cursor: pointer;
}
... ... @@ -72,4 +73,13 @@
}
.sjzx .item ul li .icon-mj {
background-image: url("/vue3/src/assets/images/zjdp/icon-mj.png");
}
.imgDiv{
display: flex;
flex-flow: column;
justify-content: center;
align-items: center;
}
.imgDiv-video{
width: 24px;
}
\ No newline at end of file
... ...
... ... @@ -42,6 +42,7 @@ body{font-size: 15px;}
.flex-cloud{
width:42%
}
.left-top{height:550px;}
.flex-declare{
width:330px;
/*max-width: 323px;*/
... ...
... ... @@ -153,7 +153,7 @@ export default {
left: 'center',
bottom: '8%',
textStyle: {
fontSize: this.titleFontSize*0.5,
fontSize: this.titleFontSize*0.7,
color:'#ffffff'
}
... ...
... ... @@ -5,7 +5,7 @@ export default {
data () {
return {
domainName:sessionStorage.getItem('domainName'),
apiUrl:'/api-web/bigScreen/findPortfolio',//今日业务量
apiUrl:'/api-web/bigScreen/getBusinessNumber',//今日业务量
chartInstance: null,
allData: [{
name: "今日业务量",
... ... @@ -70,18 +70,58 @@ export default {
async getData () {
// await this.$http.get()
// const { data: ret } = await this.$http.get('volume')
const { data: ret } = await $.get(this.domainName +this.apiUrl+'?access_token='+localStorage.getItem('access_token'))
const { map: ret } = await $.get(this.domainName +this.apiUrl+'?access_token='+localStorage.getItem('access_token'))
//本月业务量
// const { data: ret1 } = await $.get(this.domainName +this.apiUrl1)
let retData=[];
retData.push({
name:'今日业务量',
data:ret
})
retData.push({
name:'本月业务量',
data:ret
})
let allData= [
{data: [
{
"name": "网络发票",
"typeName": "fp",
"value": 0
},
{
"name": "涉税文书",
"typeName": "ws",
"value": 0
},
{
"name": "网上申报",
"typeName": "sb",
"value": 0
}
],
name: "今日业务量"
},
{
data: [
{
"name": "网络发票",
"typeName": "fp",
"value": 0
},
{
"name": "涉税文书",
"typeName": "ws",
"value": 0
},
{
"name": "网上申报",
"typeName": "sb",
"value": 0
}
],
name: "本月业务量"
}]
if(ret){
retData=ret.allData
}else{
retData=allData
}
this.allData = retData
this.updateChart()
... ... @@ -92,14 +132,16 @@ export default {
['66%', '65%']
]
const seriesArr = this.allData.map((item, index) => {
const dataArr = []
let colorData=[];
if(item.data){
// if(item.data && item.data.length>0){
if(item.data ){
item.data.map(inner => {
dataArr.push({
name: inner.name,
value: inner.num,
value: inner.value,
/*itemStyle: {
color: this.colorData[index]
}*/
... ... @@ -123,6 +165,8 @@ export default {
radius: ['28%', '42%'],
center: centerArr[index],
color:colorData,
minAngle: 15,//最小角度
startAngle:120, //起始角度
itemStyle: {
borderRadius: 2,
borderWidth: 2
... ... @@ -137,6 +181,7 @@ export default {
}
})
const dataOption = {
series: seriesArr
}
this.chartInstance.setOption(dataOption)
... ...
... ... @@ -167,12 +167,7 @@ export default {
const unit=this.allData.polyline.unit;
let seriesData=[];
console.log("***",seriesArr)
$.each(seriesArr,function (index,item){
console.log("&&&",item)
console.log("/*/*/*",item.name)
seriesData .push({
name: item.name,
type: 'line',
... ... @@ -220,7 +215,7 @@ export default {
left: 'center',
bottom: '8%',
textStyle: {
fontSize: this.titleFontSize*0.5,
fontSize: this.titleFontSize*0.9,
color:'#ffffff'
}
... ...
... ... @@ -158,12 +158,7 @@ export default {
const unit=this.allData.polyline.unit;
let seriesData=[];
console.log("***",seriesArr)
$.each(seriesArr,function (index,item){
console.log("&&&",item)
console.log("/*/*/*",item.name)
seriesData .push({
name: item.name,
type: 'line',
... ... @@ -205,7 +200,7 @@ export default {
left: 'center',
bottom: '8%',
textStyle: {
fontSize: this.titleFontSize*0.5,
fontSize: this.titleFontSize*0.9,
color:'#ffffff'
}
... ...
... ... @@ -5,7 +5,7 @@
</div>
<div class="ypt">
<el-carousel direction="vertical" :autoplay="true" indicator-position="none" interval="10000" >
<el-carousel direction="vertical" :autoplay="true" indicator-position="none" >
<el-carousel-item v-for="(item,index) in cloudData" :key="index">
<div class="item swiper-slide" >
<div class="ui_base u_p3d">
... ...
... ... @@ -6,9 +6,13 @@
</div>
<div class="sjzx">
<div class="item sjzx_machineroom" v-for="item in jfdata" >
<h5 @click="isShowOuter(item)">{{item.machineRoomName}}</h5>
<img @click="isShow(item)" v-if="item.healthStatus==0" src="/vue3/src/assets/images/zjdp/jifang-1.png" alt="">
<img @click="isShow(item)" else="item.healthStatus==1" src="/vue3/src/assets/images/zjdp/jifang-2.png" alt="">
<h5 >{{item.machineRoomName}}</h5>
<div class="imgDiv">
<img @click="isShow(item)" class="imgDiv-video" src="/vue3/src/assets/images/zjdp/icon-jf.png">
<img @click="isShowOuter(item)" v-if="item.healthStatus==0" src="/vue3/src/assets/images/zjdp/jifang-1.png" alt="">
<img @click="isShowOuter(item)" else="item.healthStatus==1" src="/vue3/src/assets/images/zjdp/jifang-2.png" alt="">
</div>
<ul class="float-container">
<li><i class='icon-wd'></i><span>温度:{{item.wd}}</span></li>
<li><i class='icon-sd'></i><span>湿度:{{item.sd}}</span></li>
... ...
... ... @@ -43,11 +43,17 @@ export default {
]
})
const isShow=(item)=>{
console.log("999",item)
proxy.dialogMachineName=item.machineRoomName
proxy.centerDialogVisible = true
}
const isShowOuter=(item)=>{
proxy.outerVisible = true
console.log(";;;",item)
if(item.layout == 1){
proxy.outerVisible = true
}
}
return{
... ...
... ... @@ -17,7 +17,6 @@ export default {
// numm: 传入的数字 numLen: 默认显示几位数
let numVal=numm.value+'';
proxy.numDiff=parseInt(numLen.value)-parseInt(numVal.split("").length);
console.log("numDiff--",proxy.numDiff)
const toOrderNum = (num) => {
num = num.toString();
... ...
... ... @@ -78,7 +78,7 @@ export default {
proxy.clickTabs(proxy.checkId)
}
},4000)
},10000)
}
const arrowClick=(val)=>{
... ...
... ... @@ -49,7 +49,6 @@ export default {
let length=resData.length;
if(length<4){
for(let i=0;i<4-length;i++){
console.log("&&&",i)
resData.push({
"resTypeAllNum": 0,
"code": "other",
... ...
... ... @@ -45,7 +45,6 @@ export default {
},
setup(props, {attrs, slots, emit}) {
const {proxy} = Vue.getCurrentInstance();
console.log('aaa',Vue.EventBus)
let datetimeStyle=()=>{// 左上角日期时间大小
fontSize: proxy.titleFontSize / 3 + 'px';
marginLeft: proxy.titleFontSize / 5 + 'px'
... ...