fix 正式版和演示版 yarn demo

.env.demo

@@ -0,0 +1,3 @@
+NODE_ENV=production
+BABEL_ENV=production
+VUE_APP_SECRET=demo

package.json

@@ -6,6 +6,7 @@
     "serve": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
     "test": "vue-cli-service build --mode test",
+    "demo": "vue-cli-service build --mode demo",
     "lint": "vue-cli-service lint",
     "test:e2e": "vue-cli-service test:e2e",
     "test:unit": "vue-cli-service test:unit"

src/api/api.js

@@ -1,9 +1,9 @@
 /*
  * @Author: mozhuangru
- * @LastEditors: mozhuangru
+ * @LastEditors: MoZhuangRu
  * @Description: 数据大屏
  * @Date: 2019-10-09 09:22:49
- * @LastEditTime: 2019-10-09 14:07:29
+ * @LastEditTime: 2019-11-21 08:57:21
  */
 import axios from '../assets/js/api.request'
 export default {
@@ -54,5 +54,21 @@ export default {
       params: data,
       method: 'get'
     })
+  },
+  // 报修统计
+  getRepairSum (data) {
+    return axios.request({
+      url: '/platform/dataScreen/repairSum',
+      params: data,
+      method: 'get'
+    })
+  },
+  // 报事统计
+  getReportSum (data) {
+    return axios.request({
+      url: '/platform/dataScreen/reportSum',
+      params: data,
+      method: 'get'
+    })
   }
 }

src/config/index.js

@@ -1,9 +1,9 @@
 /*
  * @Author: WangQiBiao
- * @LastEditors: WuWei
+ * @LastEditors: MoZhuangRu
  * @Description: 全局参数设置
  * @Date: 2019-03-12 09:40:46
- * @LastEditTime: 2019-10-14 10:55:38
+ * @LastEditTime: 2019-11-20 19:00:56
  */
 const REQUEST_MATCHING_HASH = `/9ad134a361f8d778` // 【9ad134a361f8d778 = 前端服务，用于后端接口匹配】
 
@@ -29,6 +29,8 @@ export default {
   fileUrl: process.env.NODE_ENV === 'production' ? `${REQUEST_MATCHING_HASH}` : 'http://139.159.229.250:8161',
   // 导出文件路径
   exportUrl: process.env.NODE_ENV === 'production' ? `${REQUEST_MATCHING_HASH}` : '/api',
+  // 数据区分
+  version: process.env.VUE_APP_SECRET === 'demo' ? 'demonstration' : 'real',
   /**
      * 输入框最长值
      */

src/views/index/components/communication/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 14:10:08
- * @LastEditors: WangQiBiao
- * @LastEditTime: 2019-10-16 08:56:44
+ * @LastEditors: MoZhuangRu
+ * @LastEditTime: 2019-11-21 10:27:17
  * @Description: 在线沟通
  -->
 <template>
@@ -38,6 +38,7 @@ import TagCom from '@/components/tag'
 import echarts from 'echarts'
 import { api } from '@/api'
 import vueSeamless from 'vue-seamless-scroll'
+import config from '@/config'
 
 export default {
   computed: {
@@ -49,6 +50,7 @@ export default {
   },
   data () {
     return {
+      reportSum: {},
       dialogData: []
     }
   },
@@ -65,11 +67,21 @@ export default {
   },
   methods: {
     init () {
-      api.getDialogRecord().then(res => {
+      api.getDialogRecord({
+        version: config.version
+      }).then(res => {
         this.dialogData = res.data.data.list
       })
-      this.circleProportionMap()
-      this.createSatisfactionMap()
+      this.getReportSum()
+    },
+    getReportSum () {
+      api.getReportSum({
+        version: config.version
+      }).then(res => {
+        this.reportSum = res.data.data.reportRepairStatisticsVos
+        this.circleProportionMap()
+        this.createSatisfactionMap()
+      })
     },
     /**
      * 占比
@@ -100,7 +112,7 @@ export default {
             },
             data: [
               {
-                value: 1652,
+                value: this.reportSum[this.reportSum.findIndex(item => item.type === 'reportAdvice')].total,
                 name: '咨询',
                 label: {
                   show: true,
@@ -111,7 +123,7 @@ export default {
                 }
               },
               {
-                value: 2462,
+                value: this.reportSum[this.reportSum.findIndex(item => item.type === 'reportComplaint')].total,
                 name: '投诉',
                 label: {
                   show: true,
@@ -122,7 +134,7 @@ export default {
                 }
               },
               {
-                value: 591,
+                value: this.reportSum[this.reportSum.findIndex(item => item.type === 'reportSuggest')].total,
                 name: '建议',
                 label: {
                   show: true,
@@ -133,7 +145,7 @@ export default {
                 }
               },
               {
-                value: 350,
+                value: this.reportSum[this.reportSum.findIndex(item => item.type === 'reportPraise')].total,
                 name: '表扬',
                 label: {
                   show: true,
@@ -182,14 +194,14 @@ export default {
             },
             data: [
               {
-                value: 83.2,
-                name: '83.2%',
+                value: this.reportSum[this.reportSum.findIndex(item => item.type === 'reportServiceScore')].total,
+                name: `${this.reportSum[this.reportSum.findIndex(item => item.type === 'reportServiceScore')].total}%`,
                 itemStyle: {
                   color: '#07E144'
                 }
               },
               {
-                value: 16.8,
+                value: 100 - (this.reportSum[this.reportSum.findIndex(item => item.type === 'reportServiceScore')].total),
                 itemStyle: {
                   color: '#262795'
                 }

src/views/index/components/entrance-guard/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 10:20:36
- * @LastEditors: WangQiBiao
- * @LastEditTime: 2019-10-16 08:56:48
+ * @LastEditors: MoZhuangRu
+ * @LastEditTime: 2019-11-21 10:22:52
  * @Description: 智能门禁
  -->
 <template>
@@ -35,6 +35,7 @@ import TitleCom from '@/components/title'
 import TagCom from '@/components/tag'
 import { api } from '@/api'
 import vueSeamless from 'vue-seamless-scroll'
+import config from '@/config'
 
 export default {
   computed: {
@@ -64,7 +65,8 @@ export default {
     init () {
       api.getFacePassRecord({
         pageSize: 30,
-        pageNum: 1
+        pageNum: 1,
+        version: config.version
       }).then(res => {
         this.faceData = res.data.data
       })

src/views/index/components/income/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-26 10:57:30
- * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-13 16:02:12
+ * @LastEditors: MoZhuangRu
+ * @LastEditTime: 2019-11-21 10:22:42
  * @Description: 收入统计
  -->
 <template>
@@ -35,6 +35,7 @@
 <script>
 import echarts from 'echarts'
 import { api } from '@/api'
+import config from '@/config'
 
 export default {
   data () {
@@ -50,7 +51,9 @@ export default {
     }
   },
   mounted () {
-    api.getBillSum().then(res => {
+    api.getBillSum({
+      version: config.version
+    }).then(res => {
       res.data.data.forEach(item => {
         this.billSum[item.type] = item.total
         if (item.type === 'billRate') {

src/views/index/components/paid-in/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-26 08:46:04
- * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-13 17:09:06
+ * @LastEditors: MoZhuangRu
+ * @LastEditTime: 2019-11-21 10:22:25
  * @Description: 近1年应实收统计
  -->
 <template>
@@ -21,6 +21,8 @@ import TitleCom from '@/components/title'
 import IncomeCom from './../income'
 import echarts from 'echarts'
 import { api } from '@/api'
+import config from '@/config'
+
 export default {
   data () {
     return {
@@ -32,7 +34,9 @@ export default {
     IncomeCom
   },
   mounted () {
-    api.getBillSumMonth().then(res => {
+    api.getBillSumMonth({
+      version: config.version
+    }).then(res => {
       this.yearTotal = res.data.data
       this.createMapPaid()
     })

src/views/index/components/parking/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 10:20:36
- * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-13 16:57:19
+ * @LastEditors: MoZhuangRu
+ * @LastEditTime: 2019-11-21 10:21:49
  * @Description: 智能停车
  -->
 <template>
@@ -35,6 +35,7 @@ import TitleCom from '@/components/title'
 import TagCom from '@/components/tag'
 import { api } from '@/api'
 import vueSeamless from 'vue-seamless-scroll'
+import config from '@/config'
 
 export default {
   computed: {
@@ -57,7 +58,8 @@ export default {
   mounted () {
     api.getTrafficRecord({
       pageSize: 30,
-      pageNum: 1
+      pageNum: 1,
+      version: config.version
     }).then(res => {
       this.parkData = res.data.data
     })

src/views/index/components/record/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-26 14:11:25
- * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-09 09:08:41
+ * @LastEditors: MoZhuangRu
+ * @LastEditTime: 2019-11-21 10:21:21
  * @Description:
  -->
 <template>
@@ -14,7 +14,7 @@
           <img class="list-item-icon" src="./images/shb@3x.png" alt="">
         </div>
         <div class="list-item-desc">
-          <span>{{2143 | numberFormat}}</span>
+          <span>{{equipment | numberFormat}}</span>
           <span class="desc-tips">次</span>
         </div>
         <div class="list-item-txt">设备巡检</div>
@@ -25,7 +25,7 @@
           <img class="list-item-icon" src="./images/baoan@3x.png" alt="">
         </div>
         <div class="list-item-desc">
-          <span>{{25316 | numberFormat}}</span>
+          <span>{{security | numberFormat}}</span>
           <span class="desc-tips">次</span>
         </div>
         <div class="list-item-txt">安防巡逻</div>
@@ -36,7 +36,7 @@
           <img class="list-item-icon" src="./images/baojie@3x.png" alt="">
         </div>
         <div class="list-item-desc">
-          <span>{{3218 | numberFormat}}</span>
+          <span>{{cleaning | numberFormat}}</span>
           <span class="desc-tips">次</span>
         </div>
         <div class="list-item-txt">保洁登记</div>
@@ -47,7 +47,7 @@
           <img class="list-item-icon" src="./images/renwu@3x.png" alt="">
         </div>
         <div class="list-item-desc">
-          <span>{{38765 | numberFormat}}</span>
+          <span>{{taskExecution | numberFormat}}</span>
           <span class="desc-tips">次</span>
         </div>
         <div class="list-item-txt">任务执行</div>
@@ -55,6 +55,35 @@
     </div>
   </div>
 </template>
+<script>
+import { api } from '@/api'
+import config from '@/config'
+
+export default {
+  data () {
+    return {
+      equipment: '',
+      security: '',
+      cleaning: '',
+      taskExecution: ''
+    }
+  },
+  mounted () {
+    this.getAssetInfo()
+  },
+  methods: {
+    getAssetInfo () {
+      api.getAssetInfo({
+        version: config.version
+      }).then(res => {
+        res.data.data.forEach(item => {
+          this[item.type] = item.total
+        })
+      })
+    }
+  }
+}
+</script>
 <style lang="scss" scoped>
 @import './index.scss';
 </style>

src/views/index/components/repair/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-25 17:54:01
- * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-09 08:51:19
+ * @LastEditors: MoZhuangRu
+ * @LastEditTime: 2019-11-21 09:42:52
  * @Description: 住户报修
  -->
 <template>
@@ -12,7 +12,7 @@
       <div class="rate-title">服务评分</div>
       <div class="rate-cnt">
         <el-rate
-        v-model="rate"
+        v-model="repairServiceScore"
         disabled
         :show-score="true"
         :allow-half="true"
@@ -29,22 +29,22 @@
         <div class="map-tips-item b1">
           <div class="map-tips-item-w"></div>
           <div class="map-tips-item-txt">待受理</div>
-          <div class="map-tips-item-p">{{320 | numberFormat}}</div>
+          <div class="map-tips-item-p">{{repairWaitAccept | numberFormat}}</div>
         </div>
         <div class="map-tips-item b2">
           <div class="map-tips-item-w"></div>
           <div class="map-tips-item-txt">已受理</div>
-          <div class="map-tips-item-p">{{653 | numberFormat}}</div>
+          <div class="map-tips-item-p">{{repairAccept | numberFormat}}</div>
         </div>
         <div class="map-tips-item b3">
           <div class="map-tips-item-w"></div>
           <div class="map-tips-item-txt">已解决</div>
-          <div class="map-tips-item-p">{{4654 | numberFormat}}</div>
+          <div class="map-tips-item-p">{{repairSolve | numberFormat}}</div>
         </div>
         <div class="map-tips-item b4">
           <div class="map-tips-item-w"></div>
           <div class="map-tips-item-txt">已评价</div>
-          <div class="map-tips-item-p">{{312 | numberFormat}}</div>
+          <div class="map-tips-item-p">{{repairEvaluate | numberFormat}}</div>
         </div>
       </div>
     </div>
@@ -53,19 +53,38 @@
 <script>
 import TitleCom from '@/components/title'
 import echarts from 'echarts'
+import { api } from '@/api'
+import config from '@/config'
+
 export default {
   components: {
     TitleCom
   },
   data () {
     return {
-      rate: 4.6
+      repairWaitAccept: '',
+      repairAccept: '',
+      repairSolve: '',
+      repairEvaluate: '',
+      repairSum: {},
+      repairServiceScore: 4.6
     }
   },
   mounted () {
-    this.createMap()
+    this.getRepairSum()
   },
   methods: {
+    getRepairSum () {
+      api.getRepairSum({
+        version: config.version
+      }).then(res => {
+        this.repairSum = res.data.data.reportRepairStatisticsVos.map(item => {
+          this[item.type] = item.total
+          return item
+        })
+        this.createMap()
+      })
+    },
     /**
      * 受理环比
      */
@@ -84,29 +103,29 @@ export default {
             },
             data: [
               {
-                value: 320,
-                name: '待受理  320',
+                value: this.repairWaitAccept,
+                name: '待受理',
                 itemStyle: {
                   color: '#F9AF09'
                 }
               },
               {
-                value: 653,
-                name: '已受理  653',
+                value: this.repairAccept,
+                name: '已受理',
                 itemStyle: {
                   color: '#0996FE'
                 }
               },
               {
-                value: 4654,
-                name: '已解决  4654',
+                value: this.repairSolve,
+                name: '已解决',
                 itemStyle: {
                   color: '#00C738'
                 }
               },
               {
-                value: 312,
-                name: '已评价  312',
+                value: this.repairEvaluate,
+                name: '已评价',
                 itemStyle: {
                   color: '#0BDCE5'
                 }

src/views/index/components/statistical/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: WangQiBiao
  * @Date: 2019-09-24 18:56:59
- * @LastEditors: mozhuangru
- * @LastEditTime: 2019-10-11 17:23:08
+ * @LastEditors: MoZhuangRu
+ * @LastEditTime: 2019-11-21 10:21:29
  * @Description:
  -->
 <template>
@@ -19,6 +19,7 @@
 import TipsCardCom from '@/components/tips-card'
 import { api } from '@/api'
 import countTo from 'vue-count-to'
+import config from '@/config'
 export default {
   data () {
     return {
@@ -61,7 +62,9 @@ export default {
     countTo
   },
   mounted () {
-    api.getAssetInfo().then(res => {
+    api.getAssetInfo({
+      version: config.version
+    }).then(res => {
       res.data.data.forEach(item => {
         this.list.map(val => {
           if (val.key === item.type) {

vue.config.js

@@ -1,16 +1,16 @@
 /*
  * @Author: WangQiBiao
- * @LastEditors: WuWei
+ * @LastEditors: MoZhuangRu
  * @Description: 配置文件
  * @Date: 2019-03-02 14:21:27
- * @LastEditTime: 2019-10-14 15:19:34
+ * @LastEditTime: 2019-11-21 10:12:47
  */
 const path = require('path')
 
 const resolve = dir => {
   return path.join(__dirname, dir)
 }
-const BASE_URL = process.env.NODE_ENV === 'production' ? '/screen' : process.env.VUE_APP_SECRET === 'test' ? '/screen' : '/'
+const BASE_URL = process.env.NODE_ENV === 'production' ? '/screen' : process.env.VUE_APP_SECRET === 'test' ? '/screen' : process.env.VUE_APP_SECRET === 'demo' ? '/screen' : '/'
 const ramdom = parseInt(Math.random() * 10000) // 随机数
 
 module.exports = {