vue2-client 1.2.79 → 1.2.82

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.2.81 - 1.2.82 -2022-07-21 @朱子峰**
+- 功能新增：
+- 兼容V4登陆
+
+**1.2.80 - 1.2.81 -2022-07-18 @江超**
+- 功能修改：
+- 更新物联网表统计页面
+
 **1.2.79 -2022-06-24 @苗艳强**
 - 问题修复：
 - x-form-table：

package/package.json

@@ -1,94 +1,94 @@
-{
-  "name": "vue2-client",
-  "version": "1.2.79",
-  "private": false,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/f2": "^3.8.11",
-    "@antv/g2plot": "^2.4.20",
-    "@babel/core": "^7.18.5",
-    "@logicflow/core": "^1.1.20",
-    "@logicflow/extension": "^1.1.20",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
-    "@vue/babel-preset-jsx": "^1.2.4",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.23.2",
-    "webpack": "^4.46.0",
-    "date-fns": "^2.28.0",
-    "default-passive-events": "^2.0.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.5.1",
-    "js-cookie": "^3.0.1",
-    "jsencrypt": "^3.2.1",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.6.14",
-    "vue-i18n": "^8.27.2",
-    "vue-infinite-scroll": "^2.0.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.5.4",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "^0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^6.0.0",
-    "@vue/cli-plugin-babel": "^4.5.18",
-    "@vue/cli-plugin-eslint": "^4.5.18",
-    "@vue/cli-plugin-router": "^4.5.18",
-    "@vue/cli-plugin-unit-jest": "~5.0.6",
-    "@vue/cli-plugin-vuex": "^4.5.18",
-    "@vue/cli-service": "^4.5.18",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "@vue/test-utils": "^1.3.0",
-    "@vue/vue2-jest": "^27.0.0",
-    "@vuepress/plugin-back-to-top": "^1.9.7",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.1.0",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^5.0.2",
-    "deepmerge": "^4.2.2",
-    "echarts": "^5.3.3",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^5.0.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "fast-deep-equal": "^3.1.3",
-    "gh-pages": "^3.2.3",
-    "jest": "^27.1.0",
-    "less": "^3.13.1",
-    "less-loader": "^7.3.0",
-    "react-bmap": "^1.0.130",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-amap": "^0.5.10",
-    "vue-baidu-map": "^0.21.22",
-    "vue-bmap-gl": "^0.0.30",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-mapvgl": "^0.0.34",
-    "vue-template-compiler": "^2.6.14",
-    "vuepress": "^1.9.7",
-    "webpack-theme-color-replacer": "^1.4.1",
-    "whatwg-fetch": "^3.6.2"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.2.82",
+  "private": false,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/f2": "^3.8.11",
+    "@antv/g2plot": "^2.4.20",
+    "@babel/core": "^7.18.5",
+    "@logicflow/core": "^1.1.20",
+    "@logicflow/extension": "^1.1.20",
+    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@vue/babel-preset-jsx": "^1.2.4",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.23.2",
+    "webpack": "^4.46.0",
+    "date-fns": "^2.28.0",
+    "default-passive-events": "^2.0.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.5.1",
+    "js-cookie": "^3.0.1",
+    "jsencrypt": "^3.2.1",
+    "lodash.get": "^4.4.2",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.6.14",
+    "vue-i18n": "^8.27.2",
+    "vue-infinite-scroll": "^2.0.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.5.4",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "^0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^6.0.0",
+    "@vue/cli-plugin-babel": "^4.5.18",
+    "@vue/cli-plugin-eslint": "^4.5.18",
+    "@vue/cli-plugin-router": "^4.5.18",
+    "@vue/cli-plugin-unit-jest": "~5.0.6",
+    "@vue/cli-plugin-vuex": "^4.5.18",
+    "@vue/cli-service": "^4.5.18",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "@vue/test-utils": "^1.3.0",
+    "@vue/vue2-jest": "^27.0.0",
+    "@vuepress/plugin-back-to-top": "^1.9.7",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.1.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^5.0.2",
+    "deepmerge": "^4.2.2",
+    "echarts": "^5.3.3",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "fast-deep-equal": "^3.1.3",
+    "gh-pages": "^3.2.3",
+    "jest": "^27.1.0",
+    "less": "^3.13.1",
+    "less-loader": "^7.3.0",
+    "react-bmap": "^1.0.130",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-amap": "^0.5.10",
+    "vue-baidu-map": "^0.21.22",
+    "vue-bmap-gl": "^0.0.30",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-mapvgl": "^0.0.34",
+    "vue-template-compiler": "^2.6.14",
+    "vuepress": "^1.9.7",
+    "webpack-theme-color-replacer": "^1.4.1",
+    "whatwg-fetch": "^3.6.2"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ]
+}

package/src/base-client/components/iot/WebmeterAnalysisView/WebmeterAnalysisView.vue

@@ -86,21 +86,23 @@
         </a-col>
       </a-row>
 
-      <a-card :body-style="{padding: '0'}" :bordered="false" :loading="loading">
+      <a-card :body-style="{padding: '0'}" :bordered="false">
         <div class="salesCard">
-          <a-tabs :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}" default-active-key="1" size="large">
+          <a-tabs :activeKey="tabActiveKey" :default-active-key="tabActiveKey" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}" size="large" @change="handleTabChange">
             <div slot="tabBarExtraContent" class="extra-wrapper">
               <div class="extra-item">
-                <a>今日</a>
-                <a>本周</a>
-                <a>本月</a>
-                <a>本年</a>
+                <a-radio-group v-model="countMode" button-style="solid" @change="toggleCountMode">
+                  <a-radio-button value="now">最近24小时</a-radio-button>
+                  <a-radio-button value="week">近一周</a-radio-button>
+                  <a-radio-button value="month">近一个月</a-radio-button>
+                  <a-radio-button value="year">近一年</a-radio-button>
+                </a-radio-group>
               </div>
               <a-range-picker :style="{width: '256px'}" />
             </div>
             <a-tab-pane key="1" tab="抄表情况分析">
               <a-row :lg="24" :md="24" :sm="24" :xl="24" :xs="24">
-                <x-card :loadState="radarLoadState" :retry="loadGasView">
+                <x-card :loadState="radarLoadState" :retry="getHandPlanCountByMeterBrand">
                   <div id="container" style="padding: 0 0 0 20px;height: 370px" />
                 </x-card>
               </a-row>
@@ -122,7 +124,7 @@
       <div :class="!isMobile && 'desktop'" class="antd-pro-pages-dashboard-analysis-twoColLayout">
         <a-row :gutter="24" :style="{ marginTop: '24px' }" type="flex">
           <a-col :lg="24" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-card :bordered="false" :loading="loading" :style="{ height: '100%' }" title="用气情况排行">
+            <x-card :bordered="false" :loadState="useGasLoadState" :retry="loadUseGasData" title="用气情况排行">
               <a-dropdown slot="extra" :trigger="['click']" placement="bottomLeft">
                 <a class="ant-dropdown-link" href="#">
                   <a-icon type="ellipsis" />
@@ -138,38 +140,38 @@
               </a-dropdown>
               <a-row :gutter="68">
                 <a-col :sm="12" :style="{ marginBottom: ' 24px'}" :xs="24">
-                  <number-info :sub-total="17.1" :total="21232.1">
+                  <number-info :status="useGasSubValue.status" :sub-total="useGasSubValue.subValue" :total="todayUseGasTotalValue">
                     <span slot="subtitle">
                       <span>当天总用气量</span>
-                      <a-tooltip slot="action" title="指标说明">
+                      <a-tooltip slot="action" title="本日所有物联网表用户总用气量">
                         <a-icon :style="{ marginLeft: '8px' }" type="info-circle-o" />
                       </a-tooltip>
                     </span>
                   </number-info>
                   <!-- miniChart -->
                   <div>
-                    <mini-smooth-area :dataSource="searchUserData" :scale="searchUserScale" :style="{ height: '45px' }" />
+                    <mini-smooth-area :dataSource="useGasWeekData" :scale="useGasWeekDataScale" :style="{ height: '45px' }" />
                   </div>
                 </a-col>
                 <a-col :sm="12" :style="{ marginBottom: ' 24px'}" :xs="24">
-                  <number-info :sub-total="0.2" :total="0.7" status="up">
+                  <number-info :status="handPlanUserSubValue.status" :sub-total="handPlanUserSubValue.subValue" :total="todayHandPlanUserCount">
                     <span slot="subtitle">
-                      <span>人均用气量</span>
-                      <a-tooltip slot="action" title="指标说明">
+                      <span>当天总抄表用户数</span>
+                      <a-tooltip slot="action" title="当天总抄表用户数">
                         <a-icon :style="{ marginLeft: '8px' }" type="info-circle-o" />
                       </a-tooltip>
                     </span>
                   </number-info>
                   <!-- miniChart -->
                   <div>
-                    <mini-smooth-area :dataSource="searchUserData" :scale="searchUserScale" :style="{ height: '45px' }" />
+                    <mini-smooth-area :dataSource="handPlanUserData" :scale="handPlanUserDataScale" :style="{ height: '45px' }" />
                   </div>
                 </a-col>
               </a-row>
               <div class="ant-table-wrapper">
                 <a-table
                   :columns="searchTableColumns"
-                  :dataSource="searchData"
+                  :dataSource="gasConsumptionRanking"
                   :pagination="{ pageSize: 5 }"
                   row-key="index"
                   size="small"
@@ -181,10 +183,10 @@
                   </span>
                 </a-table>
               </div>
-            </a-card>
+            </x-card>
           </a-col>
           <a-col :lg="24" :md="24" :sm="24" :xl="12" :xs="24">
-            <a-card :bordered="false" :loading="loading" :style="{ height: '100%' }" class="antd-pro-pages-dashboard-analysis-salesCard" title="指令类别占比">
+            <a-card :bordered="false" :loading="false" :style="{ height: '100%' }" class="antd-pro-pages-dashboard-analysis-salesCard" title="指令类别占比">
               <div slot="extra" style="height: inherit;">
                 <div class="analysis-salesTypeRadio">
                   <a-radio-group defaultValue="a">
@@ -262,26 +264,15 @@ for (let i = 0; i < 7; i++) {
     y: Math.ceil(Math.random() * 10)
   })
 }
-const searchUserScale = [
-  {
-    dataKey: 'x',
-    alias: '时间'
-  },
-  {
-    dataKey: 'y',
-    alias: '用气量',
-    min: 0,
-    max: 10
-  }]
 
 const searchTableColumns = [
   {
-    dataIndex: 'index',
+    dataIndex: 'f_userinfo_id',
     title: '用户编号',
     width: 90
   },
   {
-    dataIndex: 'keyword',
+    dataIndex: 'f_user_name',
     title: '用户姓名'
   },
   {
@@ -363,6 +354,7 @@ export default {
       screenWidth: document.documentElement.clientWidth,
       // 客户名称
       customerName: '',
+      // >> 指令总数统计
       // 指令数统计Loading
       instructSumLoadState: 'loading',
       //  总指令数
@@ -373,6 +365,7 @@ export default {
       instructYoD: 0,
       //  昨日新增指令数
       instructYesAdd: 0,
+      // >> 抄表量统计
       // 抄表量统计Loading
       metereadSumLoadState: 'loading',
       //  总抄表量
@@ -392,8 +385,7 @@ export default {
           alias: '抄表量'
         }
       ],
-      // 抄表情况分析Loading
-      radarLoadState: 'loading',
+      // >> 在用表具数统计
       // 在用表具统计Loading
       usingMeterSumLoadState: 'loading',
       //  在用表具总量
@@ -413,9 +405,8 @@ export default {
           alias: '开户数'
         }
       ],
-      // 指令成功率统计Loading
-      instructRateOfSuccessLoadState: 'loading',
-      //  指令成功率
+      // >> 表具指令下发成功率统计
+      //  表具指令成功率
       instructRateOfSuccessValue: 0,
       //  昨日指令成功率
       yesterdayInstructRateOf: 0,
@@ -425,13 +416,59 @@ export default {
       instructRateOfSuccessYoD: 0,
       //  指令成功率进度色
       instructRateOfColor: 'rgb(19, 194, 194)',
-      // 是否刷新加载中
-      loading: false,
+      // 表具指令下发成功率加载状态
+      instructRateOfSuccessLoadState: 'loading',
+
+      // 统计模式
+      countMode: 'now',
+      // 统计类型
+      tabActiveKey: '1',
+      // >> 表具上报情况统计
+      // 上报统计图表
+      uploadCountPlot: undefined,
+      // 抄表情况分析Loading
+      radarLoadState: 'loading',
+      // >> 用气情况排行统计
+      // 用气情况排行统计Loading
+      useGasLoadState: 'loading',
+      // 当天总用气量
+      todayUseGasTotalValue: 0,
+      // 昨天总用气量
+      yesterdayUseGasTotalValue: 0,
+      // 近一周的每天用气情况
+      useGasWeekData: [],
+      useGasWeekDataScale: [
+        {
+          dataKey: 'x',
+          alias: '时间'
+        },
+        {
+          dataKey: 'y',
+          alias: '用气量'
+        }
+      ],
+      // 当天抄表用户数
+      todayHandPlanUserCount: 0,
+      // 昨天抄表用户数
+      yesterdayHandPlanUserCount: 0,
+      // 近一周的每天抄表情况
+      handPlanUserData: [],
+      handPlanUserDataScale: [
+        {
+          dataKey: 'x',
+          alias: '时间'
+        },
+        {
+          dataKey: 'y',
+          alias: '用户数'
+        }
+      ],
+      // 用气排行榜
+      gasConsumptionRanking: [],
       rankList,
 
       // 搜索用户数
       searchUserData,
-      searchUserScale,
       searchTableColumns,
       searchData,
 
@@ -457,18 +494,37 @@ export default {
     this.loadUsingMeterSumCount()
     // 加载指令成功率统计
     this.loadInstructRateOfSuccess()
-    // 加载g2图表
-    this.loadGasView()
+    // 加载各表厂表具上报情况统计
+    this.getHandPlanCountByMeterBrand()
+    // 加载用气量统计
+    this.loadUseGasData()
   },
   computed: {
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
+    ...mapState('setting', ['isMobile']),
+    useGasSubValue: function () {
+      const subValue = this.todayUseGasTotalValue - this.yesterdayUseGasTotalValue
+      const status = subValue >= 0 ? 'up' : 'down'
+      return {
+        subValue: subValue,
+        status: status
+      }
+    },
+    handPlanUserSubValue: function () {
+      const subValue = this.todayHandPlanUserCount - this.yesterdayHandPlanUserCount
+      const status = subValue >= 0 ? 'up' : 'down'
+      return {
+        subValue: subValue,
+        status: status
+      }
+    },
   },
   methods: {
+    /**
+     * 加载指令总数统计
+     */
     loadInstructSumCount () {
       this.instructSumLoadState = 'loading'
-      return post(WebmeterAnalysisViewApi.instructSumCount, {}).then(res => {
+      post(WebmeterAnalysisViewApi.instructSumCount, {}).then(res => {
         this.instructSum = res.instructSum
         this.instructYoW = res.instructYoW
         this.instructYoD = res.instructYoD
@@ -479,10 +535,13 @@ export default {
         this.instructSumLoadState = 'error'
       })
     },
+    /**
+     * 加载抄表总数统计
+     */
     loadMetereadSumCount () {
       this.metereadSumDataByWeek = []
       this.metereadSumLoadState = 'loading'
-      return post(WebmeterAnalysisViewApi.meteReadSumCount, {}).then(res => {
+      post(WebmeterAnalysisViewApi.meteReadSumCount, {}).then(res => {
         // 加载近一周抄表数图表
         post(WebmeterAnalysisViewApi.meteReadDataByWeek, {}).then(res => {
           for (let i = 0, len = res.length; i < len; i++) {
@@ -500,6 +559,9 @@ export default {
         this.metereadSumLoadState = 'error'
       })
     },
+    /**
+     * 加载在用表具总数情况
+     */
     loadUsingMeterSumCount () {
       this.usingMeterSumDataByWeek = []
       this.usingMeterSumLoadState = 'loading'
@@ -521,9 +583,12 @@ export default {
         this.usingMeterSumLoadState = 'error'
       })
     },
+    /**
+     * 加载表具指令下发成功率
+     */
     loadInstructRateOfSuccess () {
       this.instructRateOfSuccessLoadState = 'loading'
-      return post(WebmeterAnalysisViewApi.instructRateOfSuccess, {}).then(res => {
+      post(WebmeterAnalysisViewApi.instructRateOfSuccess, {}).then(res => {
         this.instructRateOfSuccessValue = res.instructRateOfSuccessValue * 1.0
         if (this.instructRateOfSuccessValue < 70.0) {
           this.instructRateOfColor = 'rgb(242, 99, 123)'
@@ -541,21 +606,52 @@ export default {
         this.instructRateOfSuccessLoadState = 'error'
       })
     },
+    /**
+     * 格式化日期
+     * @param date 日期字符串
+     * @param format 格式化方式
+     * @returns {string|*} 格式化结果
+     */
     format (date, format) {
       return formatDate(date, format)
     },
-    loadGasView () {
-      const _this = this
-      _this.getHandPlanCountByMeterBrand()
+    /**
+     * 切换周期
+     */
+    toggleCountMode () {
+      this.updateDataByKey()
     },
+    /**
+     * Tab切换
+     */
+    handleTabChange (key) {
+      this.tabActiveKey = key + ''
+      this.updateDataByKey()
+    },
+    /**
+     * 根据模式更新数据
+     */
+    updateDataByKey () {
+      if (this.tabActiveKey === '1') {
+        this.getHandPlanCountByMeterBrand()
+      } else {
+        // this.getDeviceLostContactCountData()
+        // this.getDeviceLostContactRankData()
+      }
+    },
+    /**
+     * 获取各表厂表具上报情况
+     */
     getHandPlanCountByMeterBrand () {
       this.radarLoadState = 'loading'
-      fetch('/webmeterapi/foreignaidHandMeterSumCountData', {
+      fetch(WebmeterAnalysisViewApi.handMeterSumCountData, {
         method: 'POST',
-        body: JSON.stringify({})
+        body: JSON.stringify({
+          type: this.countMode
+        })
       }).then((res) => res.json())
         .then((data) => {
-          const linePlot = new Line('container', {
+          const plotOption = {
             data,
             xField: 'date',
             yField: 'value',
@@ -571,20 +667,47 @@ export default {
             },
             interactions: [{ type: 'brush' }],
             slider: {
-              start: 0.5,
+              start: 0,
               end: 1
             },
             legend: {
-              position: 'top'
+              position: 'top',
+              radio: true,
+              flipPage: false
             },
             smooth: true
-          })
-          linePlot.render()
+          }
+          if (this.uploadCountPlot) {
+            this.uploadCountPlot.update(plotOption)
+          } else {
+            this.uploadCountPlot = new Line('container', plotOption)
+            this.uploadCountPlot.render()
+          }
           this.radarLoadState = 'success'
         })
-      .catch((ex) => {
-        console.error(ex)
-        this.radarLoadState = 'error'
+        .catch((ex) => {
+          console.error(ex)
+          this.radarLoadState = 'error'
+        })
+    },
+    /**
+     * 获取用气请求排行
+     */
+    loadUseGasData () {
+      this.gasConsumptionRanking = []
+      this.useGasLoadState = 'loading'
+      return post(WebmeterAnalysisViewApi.useGasSumCount, {}).then(res => {
+        this.gasConsumptionRanking = res.gasConsumptionRanking
+        this.todayUseGasTotalValue = res.todayUseGasTotalValue
+        this.todayHandPlanUserCount = res.todayHandPlanUserCount
+        this.yesterdayUseGasTotalValue = res.yesterdayUseGasTotalValue
+        this.yesterdayHandPlanUserCount = res.yesterdayHandPlanUserCount
+        this.useGasWeekData = res.useGasWeekData
+        this.handPlanUserData = res.handPlanUserData
+        this.useGasLoadState = 'success'
+      }, err => {
+        console.warn(err)
+        this.useGasLoadState = 'error'
       })
     }
   }

package/src/base-client/plugins/AppData.js

@@ -1,70 +1,77 @@
-import { manageApi, post } from '@vue2-client/services/api'
-import { handleTree } from '@vue2-client/utils/util'
-const GetAppDataService = {
-  install (Vue) {
-    // 给vue增添对话框显示方法
-    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
-  },
-  async load () {
-    const params = {}
-    await post(manageApi.getDictionaryValue, {}).then((res) => {
-      Object.assign(params, res)
-      const badgeItemArray = {}
-      for (const key of Object.keys(params)) {
-        badgeItemArray[key] = {}
-        for (const item of params[key]) {
-          if (item.status) {
-            badgeItemArray[key][item.value] = {
-              status: item.status,
-              text: item.text
-            }
-          }
-        }
-      }
-      // 追加参数
-      localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
-      localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
-    })
-    // 获取省市区数据
-    await post(manageApi.getDivisionsOhChina, {}).then((res) => {
-      // 追加参数
-      localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
-    })
-  },
-  // 返回树形省市区
-  getDivisionsOhChinaForTree () {
-    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
-    return handleTree(JSON.parse(str), 'code', 'parentcode')
-  },
-  // 返回列表省市区
-  getDivisionsOhChinaForList () {
-    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
-    return JSON.parse(str)
-  },
-  getDictionaryList (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object[key]
-  },
-  getParam (key, value) {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    const result = object[key]
-    if (result && result.hasOwnProperty(value)) {
-      return result[value]
-    } else {
-      return null
-    }
-  },
-  getParams () {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object
-  },
-  getSingleValues () {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    return object
-  }
-}
-export default GetAppDataService
+import { manageApi, post } from '@vue2-client/services/api'
+import { handleTree } from '@vue2-client/utils/util'
+const setting = require('../../config/default/setting.config')
+const GetAppDataService = {
+  install (Vue) {
+    // 给vue增添对话框显示方法
+    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
+  },
+  async load () {
+    const params = {}
+    await post(manageApi.getDictionaryValue, {}).then((res) => {
+      // 判断是否是V4环境
+      if (setting.compatible === 'V4') {
+        // 如果是V4，从返回值中，data取值
+        Object.assign(params, res.data)
+      } else {
+        Object.assign(params, res)
+      }
+      const badgeItemArray = {}
+      for (const key of Object.keys(params)) {
+        badgeItemArray[key] = {}
+        for (const item of params[key]) {
+          if (item.status) {
+            badgeItemArray[key][item.value] = {
+              status: item.status,
+              text: item.text
+            }
+          }
+        }
+      }
+      // 追加参数
+      localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
+      localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
+    })
+    // 获取省市区数据
+    await post(manageApi.getDivisionsOhChina, {}).then((res) => {
+      // 追加参数
+      localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
+    })
+  },
+  // 返回树形省市区
+  getDivisionsOhChinaForTree () {
+    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
+    return handleTree(JSON.parse(str), 'code', 'parentcode')
+  },
+  // 返回列表省市区
+  getDivisionsOhChinaForList () {
+    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
+    return JSON.parse(str)
+  },
+  getDictionaryList (key) {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    const object = JSON.parse(str)
+    return object[key]
+  },
+  getParam (key, value) {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    const result = object[key]
+    if (result && result.hasOwnProperty(value)) {
+      return result[value]
+    } else {
+      return null
+    }
+  },
+  getParams () {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    const object = JSON.parse(str)
+    return object
+  },
+  getSingleValues () {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    return object
+  }
+}
+export default GetAppDataService

package/src/pages/login/Login.vue

@@ -54,7 +54,7 @@
 
 <script>
 import CommonLayout from '@vue2-client/layouts/CommonLayout'
-import { getRoutesConfig, login } from '@vue2-client/services/user'
+import { getRoutesConfig, login, V4Login } from '@vue2-client/services/user'
 import { setAuthorization } from '@vue2-client/utils/request'
 import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
 import { mapMutations, mapState } from 'vuex'
@@ -95,6 +95,10 @@ export default {
               loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
              break
             }
+            case 'V4' : {
+              V4Login(name, password).then(this.afterLoginV4)
+              break
+            }
           }
         }
       })
@@ -107,6 +111,33 @@ export default {
       this.setACCESSTOKEN(result.password)
       this.$router.push(this.homePage).catch(() => {})
     },
+    afterLoginV4 (res) {
+      const name = this.form.getFieldValue('name')
+      const password = this.form.getFieldValue('password')
+      this.logging = false
+      const loginRes = res
+      const V4Token = { token: res.data.access_token, expire: res.data.expires_in }
+      this.setV4AccessToken(V4Token)
+      if (loginRes.code === 200) {
+        const encrypt = new JSEncrypt()
+        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
+        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
+        // 获取路由配置
+        console.log('开始请求智慧燃气')
+        getRoutesConfig(data).then(result => {
+          this.$login.login(result).then(() => {
+            this.afterGeneral(result)
+            if (result.deps === '用户工单登记') {
+              this.$router.push(this.ticketPage).catch(() => {})
+            } else {
+              this.$router.push(this.homePage).catch(() => {})
+            }
+          })
+        })
+      } else {
+        this.error = loginRes.msg
+      }
+    },
     afterLogin (res) {
       const name = this.form.getFieldValue('name')
       const password = this.form.getFieldValue('password')
@@ -161,6 +192,11 @@ export default {
       // 格式化时间获取年月日, 登陆过期时间
       const dateAfter = new Date(timestamp)
       setAuthorization({ token: data, expireAt: dateAfter })
+    },
+    setV4AccessToken (data) {
+      localStorage.setItem('ACCESS_TOKEN', data.token)
+      localStorage.setItem('ACCESS_TOKEN_EXPIRES', data.expire)
+      setAuthorization({ token: data.token, expire: data.expire })
     }
   }
 }

package/src/services/api/WebmeterAnalysisViewApi.js

@@ -1,30 +1,20 @@
-const WebmeterAnalysisViewApi = {
-  // 查询：指令数统计
-  instructSumCount: '/webmeterapi/foreignaidInstructSumCountData',
-  // 查询：抄表数统计
-  meteReadSumCount: '/webmeterapi/foreignaidMetereadSumCountData',
-  // 查询：近一周抄表量数据
-  meteReadDataByWeek: '/webmeterapi/foreignaidMetereadDataByWeekData',
-  // 查询：在用表具数
-  usingMeterSumCount: '/webmeterapi/foreignaidUsingMeterSumCountData',
-  // 查询：近一周在用表具数数据
-  usingMeterDataByWeek: '/webmeterapi/foreignaidUsingMeterDataByWeekData',
-  // 查询：指令成功率统计
-  instructRateOfSuccess: '/webmeterapi/foreignaidInstructRateOfSuccessData',
-  // 查询：用气量趋势统计
-  VerticalChartOfGasConsumption: '/webmeterapi/VerticalChartOfGasConsumption',
-  // 查询：用气排行榜趋势统计
-  GasConsumptionRanking: '/webmeterapi/GasConsumptionRanking',
-  // 查询：指令圆形统计图
-  InstructionStateDiagram: '/webmeterapi/InstructionStateDiagram',
-  // 查询：用户气量分析
-  AnalysisOfUserGasConsumption: '/webmeterapi/AnalysisOfUserGasConsumption',
-  // 查询：用户气量统计图分析
-  LineChartOfTotalGasConsumption: '/webmeterapi/LineChartOfTotalGasConsumption',
-  // 查询：用户用气量分析折线图平均值
-  LineChartOfPerCapitaGasConsumption: '/webmeterapi/LineChartOfPerCapitaGasConsumption',
-  // 查询：周用用气量排行榜
-  RankingOfGasConsumptionAnalysis: '/webmeterapi/RankingOfGasConsumptionAnalysis'
-}
-
-export { WebmeterAnalysisViewApi }
+const WebmeterAnalysisViewApi = {
+  // 查询：指令数统计
+  instructSumCount: '/webmeterapi/foreignaidInstructSumCountData',
+  // 查询：抄表数统计
+  meteReadSumCount: '/webmeterapi/foreignaidMetereadSumCountData',
+  // 查询：近一周抄表量数据
+  meteReadDataByWeek: '/webmeterapi/foreignaidMetereadDataByWeekData',
+  // 查询：在用表具数
+  usingMeterSumCount: '/webmeterapi/foreignaidUsingMeterSumCountData',
+  // 查询：近一周在用表具数数据
+  usingMeterDataByWeek: '/webmeterapi/foreignaidUsingMeterDataByWeekData',
+  // 查询：指令成功率统计
+  instructRateOfSuccess: '/webmeterapi/foreignaidInstructRateOfSuccessData',
+  // 查询：按表厂抄表量统计
+  handMeterSumCountData: '/webmeterapi/foreignaidHandMeterSumCountData',
+  // 查询：统计用气量数据
+  useGasSumCount: '/webmeterapi/foreignaidUseGasSumCountData'
+}
+
+export { WebmeterAnalysisViewApi }

package/src/services/apiService.js

@@ -4,6 +4,7 @@
 
 module.exports = {
   LOGIN: `/rs/logic/getLogin`,
+  V4_LOGIN: '/auth/login',
   ROUTES: `/rs/user/userLogin/智慧燃气`,
   SEARCH: `/rs/search`,
   GOODS: `/goods`,

package/src/services/user.js

@@ -1,4 +1,4 @@
-import { LOGIN, ROUTES } from '@vue2-client/services/apiService'
+import { LOGIN, ROUTES, V4_LOGIN } from '@vue2-client/services/apiService'
 import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
 
 /**
@@ -18,6 +18,13 @@ export async function getRoutesConfig (value) {
   return request(ROUTES, METHOD.POST, value)
 }
 
+export async function V4Login (name, password) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password
+  })
+}
+
 /**
  * 退出登录
  */

package/src/utils/request.js

@@ -4,8 +4,13 @@ import Vue from 'vue'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import notification from 'ant-design-vue/es/notification'
 
+const setting = require('../config/default/setting.config')
+
 // 跨域认证信息 header 名
 const xsrfHeaderName = 'Authorization'
+// V4系统请求头名
+const v4TokenName = 'ACCESS_TOKEN'
+const v4TokenExpire = 'ACCESS_TOKEN_EXPIRES'
 
 axios.defaults.timeout = 5000
 axios.defaults.withCredentials = true
@@ -45,6 +50,43 @@ async function request (url, method, params, config) {
   }
 }
 
+/**
+ * 设置V4认证信息
+ * @param auth {Object}
+ * @param authType {AUTH_TYPE} 认证类型，默认：{AUTH_TYPE.BEARER}
+ */
+function setAuthorizationV4 (auth, authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      Cookie.set(v4TokenName, 'Bearer ' + auth.token)
+      Cookie.set(v4TokenExpire, 'Bearer ' + auth.expire)
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+}
+
+/**
+ * 移出V4认证信息
+ * @param authType {AUTH_TYPE} 认证类型
+ */
+function removeAuthorizationV4 (authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      Cookie.remove(v4TokenName)
+      Cookie.remove(v4TokenExpire)
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+}
+
 /**
  * 设置认证信息
  * @param auth {Object}
@@ -113,7 +155,14 @@ function loadInterceptors () {
     // 如果 token 存在
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
-      config.headers['Access-Token'] = token
+      // 判断是否为V4环境
+      if (setting.compatible === 'V4') {
+        // V4 环境则添加 V4请求头
+        config.headers['ACCESS_TOKEN'] = localStorage.getItem('ACCESS_TOKEN')
+        config.headers['ACCESS_TOKEN_EXPIRES'] = localStorage.getItem('ACCESS_TOKEN_EXPIRES')
+      } else {
+        config.headers['Access-Token'] = token
+      }
     }
     if (!config.headers['Content-Type']) {
       config.headers['Content-Type'] = 'application/json;charset=UTF-8'
@@ -194,5 +243,7 @@ export {
   removeAuthorization,
   checkAuthorization,
   loadInterceptors,
-  parseUrlParams
+  parseUrlParams,
+  setAuthorizationV4,
+  removeAuthorizationV4
 }