Merge branch 'master-v32-xwx' into 'master'

杭州-大屏-今日申报数刷新为0



See merge request !186

@@ -12,9 +12,9 @@
                         <!--<div class="circlediv">
                         <!--<div class="circlediv">
                             <img class="rollimg" src="src/assets/images/zjdp/cycle-bg-1.png">
                             <img class="rollimg" src="src/assets/images/zjdp/cycle-bg-1.png">
                         </div>-->
                         </div>-->
-                        <div :class="'ball_c '+ item.code"><div>{{item.name}}</div></div>
-                        <div class="base u_p3d ypt__info">
-                            <div v-for="(kpiItem,index) in item.kpi" :class="'ball_base u_p3d ball_'+index+1">
+                        <div :class="'ball_c '+ item.code" style="z-index: 1000"><div @click="platformClick(index)" style="cursor:pointer;">{{item.name}}</div></div>
+                        <div class="base u_p3d ypt__info"  style="z-index: 1">
+                            <div v-for="(kpiItem,index) in item.kpi" :class="'ball_base u_p3d ball_'+index+1" >
                                 <div @mouseenter="addActive(index)" @mouseleave="closeActive" :class="['ball',{'active':isActive===index}]" v-if="kpiItem != ''">
                                 <div @mouseenter="addActive(index)" @mouseleave="closeActive" :class="['ball',{'active':isActive===index}]" v-if="kpiItem != ''">
                                     <p>{{kpiItem.kpiName}}</p><b>{{kpiItem.kpiValue}}</b>
                                     <p>{{kpiItem.kpiName}}</p><b>{{kpiItem.kpiValue}}</b>
                                 </div>
                                 </div>

@@ -14,6 +14,7 @@ export default {
     },
     },
     setup(props, {attrs, slots, emit}) {
     setup(props, {attrs, slots, emit}) {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
+        let resData = [];
 
 
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
@@ -21,6 +22,7 @@ export default {
             $.get(proxy.domainName +"/api-web/bigScreen/getCloudInfo"+'?access_token='+localStorage.getItem('access_token'),function(res){
             $.get(proxy.domainName +"/api-web/bigScreen/getCloudInfo"+'?access_token='+localStorage.getItem('access_token'),function(res){
                 const data = res.data;
                 const data = res.data;
                 if(data && data.length > 0){
                 if(data && data.length > 0){
+                    resData = data;
                     data.map((item,index)=>{
                     data.map((item,index)=>{
 
 
                         if(item.kpi && item.kpi.length==0){
                         if(item.kpi && item.kpi.length==0){
@@ -121,17 +123,29 @@ export default {
                 }
                 }
                 yptRunTimer = setTimeout(run, 1000 * 5);
                 yptRunTimer = setTimeout(run, 1000 * 5);
             }
             }
-
         })
         })
+
+        let get
+
+
         const addActive=(index)=>{
         const addActive=(index)=>{
             proxy.isActive=index;
             proxy.isActive=index;
         }
         }
+        let platformClick = (index) => {
+            let max = resData.length - 1;
+            let next = index + 1;
+            if (next > max){
+                next =  0 ;
+            }
+            proxy.$refs.cloudCarousel.setActiveItem(next);
+        }
         const closeActive=()=>{
         const closeActive=()=>{
             proxy.isActive='';
             proxy.isActive='';
         }
         }
         return{
         return{
             addActive,
             addActive,
-            closeActive
+            closeActive,
+            platformClick
         }
         }
     }
     }
 }
 }

@@ -37,6 +37,13 @@ export default {
     },
     },
     setup(props, {attrs, slots, emit}) {
     setup(props, {attrs, slots, emit}) {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
+        let declaredToday=Vue.ref(0);
+        let reportableToday=Vue.ref(0);
+        let declaredMonth=Vue.ref(0);
+        let reportableMonth=Vue.ref(0);
+
+
+
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             //本月应申报及申报率
             //本月应申报及申报率
@@ -181,8 +188,8 @@ export default {
             }
             }
         }
         }
         const goJump=()=>{
         const goJump=()=>{
-            // proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token')}})
-            window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token"));
+            proxy.$router.push({path:'/zj/dp',query: {access_token:localStorage.getItem('access_token'),msgKey: true}})
+            // window.open(window.location.origin + '/vue3/index.html#/zj/dp?access_token=' + localStorage.getItem("access_token"));
         }
         }
 
 
         return{
         return{
@@ -190,7 +197,11 @@ export default {
             eleWidthNum,
             eleWidthNum,
             getDeclareData,
             getDeclareData,
             startInterval,
             startInterval,
-            goJump
+            goJump,
+            declaredToday,
+            reportableToday,
+            declaredMonth,
+            reportableMonth
         }
         }
     },
     },
     unmounted () {
     unmounted () {

@@ -13,6 +13,8 @@ export default {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
         const {numm, numLen} = Vue.toRefs(props);
         const {numm, numLen} = Vue.toRefs(props);
         const orderNum = Vue.ref([]);
         const orderNum = Vue.ref([]);
+        let numDiff = Vue.ref(0);
+        let iStyle = Vue.ref('transform:translate(0,0)')
         // 处理数字
         // 处理数字
         // numm: 传入的数字  numLen: 默认显示几位数
         // numm: 传入的数字  numLen: 默认显示几位数
         let numVal=numm.value+'';
         let numVal=numm.value+'';
@@ -57,6 +59,8 @@ export default {
         return{
         return{
             orderNum,
             orderNum,
             toOrderNum,
             toOrderNum,
+            numDiff,
+            iStyle,
             setNumberTransform
             setNumberTransform
         }
         }
     },
     },