echarts图数据bug修改，

新增箭头组件

src/assets/home.css

@@ -59,7 +59,7 @@
 }
 .clear10{ clear: both; height: 10px;}
 .card-01{ float: left; width: 470px; height: 165px;}
-.card1-mod{ float: left; width: 233px; padding: 10px; height: 165px;}
+.card1-mod{ float: left; width: 233px; padding: 5px; height: 165px;}
 .card1-mod h2{ clear: both; line-height: 25px; font-size: 14px; color: #fff; font-weight: normal;}
 .card1-mod .cmtitle{ clear: both; height: 40px; line-height: 40px;}
 .card1-mod .cmtitle span{ color: #15C436; font-size: 18px;}

src/components/Index.vue

@@ -503,7 +503,8 @@
 				this.ispopu = !this.ispopu
       },
       toMygh(){
-        window.location.href = 'https://192.168.30.51/#/manage-platform/index?token=TK_' + sessionStorage.getItem('token')
+        window.location.href = 'http://195.1.3.38:9001/#/manage-platform/index?token=TK_' + sessionStorage.getItem('token')
+        // window.location.href = 'https://192.168.30.51/#/manage-platform/index?token=TK_' + sessionStorage.getItem('token')
       },
       exitFn() {
         this.$router.push({

src/components/userJoin/ArrowClass.vue

+<template>
+  <div style="display: inline-block;">
+    <i :class="[rawData>0 ? 'el-icon-top color2' : 'el-icon-bottom color3']">&nbsp;</i>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "ArrowClass",
+    props:{
+      rawData:[String, Number]
+    },
+    data(){
+      return {
+        isUp:false
+      }
+    },
+    methods:{
+
+    },
+    mounted() {
+      if(parseFloat(this.rawData)>0){
+        this.isUp = true
+      }else{
+        this.isUp = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/userJoin/screenTwoPag2.vue

@@ -23,16 +23,17 @@
           <span class="span2">万</span>
           <span class="tag-huan">环</span>
           <span class="span2">{{aualperNum_gNum}}</span>
-          <span class="el-icon-bottom">&nbsp;</span>
+          <arrow-class :rawData="aualperNum_gNum"></arrow-class>
         </div>
         <div class="cmtline2">
-          <p><span>{{parseFloat(autoUpControPre_g).toFixed(1)}}% <em>环</em>{{(autoUpControPre_gHBL)}}% <i
-            class="el-icon-bottom color3">&nbsp;</i></span>自动上传血压控制率</p>
-          <p><span>{{parseFloat(ReportPre_g).toFixed(1)}}% <em>环</em>{{(ReportPre_gHBL)}}% <i
-            class="el-icon-bottom color3">&nbsp;</i></span>报告血压控制率</p>
-          <p><span>{{parseFloat(hospital_g).toFixed(1)}}万 <em>环</em>{{(hospital_gHBL)}}% <i
-            class="el-icon-bottom color3">&nbsp;</i></span>住院人数</p>
-          <p><span>{{formatnum(deadNum_g)}}人 <em>环</em>{{(deadNum_gHBL)}}% <i class="el-icon-bottom color3">&nbsp;</i></span>死亡人数
+          <p><span>{{parseFloat(autoUpControPre_g).toFixed(1)}}% <em>环</em>{{(autoUpControPre_gHBL)}}% <arrow-class :rawData="autoUpControPre_gHBL"></arrow-class>
+          </span>自动上传血压控制率</p>
+          <p><span>{{parseFloat(ReportPre_g).toFixed(1)}}% <em>环</em>{{(ReportPre_gHBL)}}% <arrow-class :rawData="ReportPre_gHBL"></arrow-class>
+          </span>报告血压控制率</p>
+          <p><span>{{parseFloat(hospital_g).toFixed(1)}}万 <em>环</em>{{(hospital_gHBL)}}% <arrow-class :rawData="hospital_gHBL"></arrow-class>
+          </span>住院人数</p>
+          <p><span>{{formatnum(deadNum_g)}}人 <em>环</em>{{(deadNum_gHBL)}}% <arrow-class :rawData="deadNum_gHBL"></arrow-class>
+          </span>死亡人数
           </p>
         </div>
       </div>
@@ -43,16 +44,16 @@
           <span class="span2">万</span>
           <span class="tag-huan">环</span>
           <span class="span2">{{aualperNum_qNum}}</span>
-          <span class="el-icon-bottom">&nbsp;</span>
+          <arrow-class :rawData="aualperNum_qNum"></arrow-class>
         </div>
         <div class="cmtline2">
-          <p><span>{{parseFloat(autoUpControPre_q).toFixed(1)}}% <em>环</em>{{(autoUpControPre_qHBL)}}% <i
-            class="el-icon-bottom color3">&nbsp;</i></span>自动上传血压控制率</p>
-          <p><span>{{parseFloat(ReportPre_q).toFixed(1)}}% <em>环</em>{{(ReportPre_qHBL)}}% <i
-            class="el-icon-bottom color3">&nbsp;</i></span>报告血压控制率</p>
-          <p><span>{{parseFloat(hospital_q).toFixed(1)}}万 <em>环</em>{{(hospital_qHBL)}}% <i
-            class="el-icon-bottom color3">&nbsp;</i></span>住院人数</p>
-          <p><span>{{formatnum(deadNum_q)}}人 <em>环</em>{{(deadNum_qHBL)}}% <i class="el-icon-bottom color3">&nbsp;</i></span>死亡人数
+          <p><span>{{parseFloat(autoUpControPre_q).toFixed(1)}}% <em>环</em>{{(autoUpControPre_qHBL)}}% <arrow-class :rawData="autoUpControPre_qHBL"></arrow-class>
+          </span>自动上传血压控制率</p>
+          <p><span>{{parseFloat(ReportPre_q).toFixed(1)}}% <em>环</em>{{(ReportPre_qHBL)}}% <arrow-class :rawData="ReportPre_qHBL"></arrow-class>
+          </span>报告血压控制率</p>
+          <p><span>{{parseFloat(hospital_q).toFixed(1)}}万 <em>环</em>{{(hospital_qHBL)}}% <arrow-class :rawData="hospital_qHBL"></arrow-class>
+          </span>住院人数</p>
+          <p><span>{{formatnum(deadNum_q)}}人 <em>环</em>{{(deadNum_qHBL)}}% <arrow-class :rawData="deadNum_qHBL"></arrow-class></span>死亡人数
           </p>
         </div>
       </div>
@@ -65,16 +66,16 @@
           <span class="span2">万</span>
           <span class="tag-huan">环</span>
           <span class="span2">{{aualperNum_gNum}}</span>
-          <span class="el-icon-bottom">&nbsp;</span>
+          <arrow-class :rawData="aualperNum_gNum"></arrow-class>
         </div>
         <div class="cmtline2">
-          <p><span>{{parseFloat(autoUpControPre_g).toFixed(1)}}% <em>环</em>{{autoUpControPre_gHBL}}%</span>自动上传血糖控制率
+          <p><span>{{parseFloat(autoUpControPre_g).toFixed(1)}}% <em>环</em>{{autoUpControPre_gHBL}}%<arrow-class :rawData="autoUpControPre_gHBL"></arrow-class></span>自动上传血糖控制率
           </p>
-          <p><span>{{parseFloat(ReportPre_g).toFixed(1)}}% <em>环</em>{{ReportPre_gHBL}}%</span>报告血糖控制率
+          <p><span>{{parseFloat(ReportPre_g).toFixed(1)}}% <em>环</em>{{ReportPre_gHBL}}%<arrow-class :rawData="ReportPre_gHBL"></arrow-class></span>报告血糖控制率
           </p>
-          <p><span>{{parseFloat(hospital_g).toFixed(1)}}万 <em>环</em>{{hospital_gHBL}}%</span>住院人数
+          <p><span>{{parseFloat(hospital_g).toFixed(1)}}万 <em>环</em>{{hospital_gHBL}}%<arrow-class :rawData="hospital_gHBL"></arrow-class></span>住院人数
           </p>
-          <p><span>{{formatnum(deadNum_g)}}人 <em>环</em>{{deadNum_gHBL}}%</span>死亡人数
+          <p><span>{{formatnum(deadNum_g)}}人 <em>环</em>{{deadNum_gHBL}}%<arrow-class :rawData="deadNum_gHBL"></arrow-class></span>死亡人数
           </p>
         </div>
       </div>
@@ -85,16 +86,16 @@
           <span class="span2">万</span>
           <span class="tag-huan">环</span>
           <span class="span2">{{aualperNum_qNum}}</span>
-          <span class="el-icon-bottom">&nbsp;</span>
+          <arrow-class :rawData="aualperNum_qNum"></arrow-class>
         </div>
         <div class="cmtline2">
-          <p><span>{{parseFloat(autoUpControPre_q).toFixed(1)}}% <em>环</em>{{autoUpControPre_qHBL}}%</span>自动上传血糖控制率
+          <p><span>{{parseFloat(autoUpControPre_q).toFixed(1)}}% <em>环</em>{{autoUpControPre_qHBL}}%<arrow-class :rawData="autoUpControPre_qHBL"></arrow-class></span>自动上传血糖控制率
           </p>
-          <p><span>{{parseFloat(ReportPre_q).toFixed(1)}}% <em>环</em>{{ReportPre_qHBL}}%</span>报告血糖控制率
+          <p><span>{{parseFloat(ReportPre_q).toFixed(1)}}% <em>环</em>{{ReportPre_qHBL}}%<arrow-class :rawData="ReportPre_qHBL"></arrow-class></span>报告血糖控制率
           </p>
-          <p><span>{{parseFloat(hospital_q).toFixed(1)}}万 <em>环</em>{{hospital_qHBL}}%</span>住院人数
+          <p><span>{{parseFloat(hospital_q).toFixed(1)}}万 <em>环</em>{{hospital_qHBL}}%<arrow-class :rawData="hospital_qHBL"></arrow-class></span>住院人数
           </p>
-          <p><span>{{formatnum(deadNum_q)}}人 <em>环</em>{{deadNum_qHBL}}%</span>死亡人数
+          <p><span>{{formatnum(deadNum_q)}}人 <em>环</em>{{deadNum_qHBL}}%<arrow-class :rawData="deadNum_qHBL"></arrow-class></span>死亡人数
           </p>
         </div>
       </div>
@@ -227,6 +228,7 @@
     getActiveNum,
     checkIsNull
   } from '@/utils/common.js'
+  import ArrowClass from './ArrowClass'
 
   export default {
     name: 'screenpage2',
@@ -244,7 +246,7 @@
         g_personAutoNumHBL: [], //在管数据 -- 去年 人群自动上传血压血糖合格人数
         q_personAutoNum: [], // 签 数据 -- 今年  签约 同上
         q_personAutoNumHBL: [], // 签数据  -- 去年 同上
-        themeId: 28,
+        themeId: 30,
         bleedtype: '血压',
         // 管 左侧变量
         aualperNum_g: 0,
@@ -803,7 +805,6 @@
           this.areaname = ''
           this.hospitalname = ''
           this.tablename = '各区'
-          this.themeId = 28
           this.thname = '各区'
           this.arname = '各区'
         } else if ('area' === this.userRole) {//区角色
@@ -1657,12 +1658,12 @@
 
         this.mbType = mblx
         if (mblx === 'gxy') {
-          this.themeId = 28
+          this.themeId = 30
           this.homeinit()
           this.bleedtype = "血压"
           this.pagedisname = '高血压'
         } else {
-          this.themeId = 28
+          this.themeId = 33
           this.homeinit()
           this.bleedtype = "血糖"
           this.pagedisname = '糖尿病'
@@ -1867,7 +1868,9 @@
         }
       }, 200)
     },
-    components: {}
+    components: {
+      ArrowClass
+    }
   }
 </script>
 

src/router/index.js

@@ -9,6 +9,7 @@ Vue.use(Router)
 export default new Router({
   mode: 'history',
   base: '/jkgl/',
+  // base: '/jkglTest/',
   routes: [
     {
       path: '/',