vue2-client 1.2.49 → 1.2.50

package/src/base-client/components/iot/MeterDetailsView/part/MeterDetailsSellGas.vue

@@ -90,10 +90,6 @@ export default {
     STable
   },
   props: {
-    selectOrgName: {
-      type: String,
-      required: true
-    },
     userid: {
       type: String,
       required: true
@@ -105,8 +101,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadSellGasData: parameter => {
         const queryParams = {
-          userId: this.userid,
-          orgName: this.selectOrgName
+          userId: this.userid
         }
         const requestParameters = Object.assign({}, parameter, queryParams)
         return this.getSimpleSellGas(requestParameters)

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

@@ -1,12 +1,5 @@
 <template>
-  <a-drawer
-    title="物联网综合分析"
-    placement="right"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    :visible="visible"
-    @close="onClose"
-  >
-    <a-page-header :title="selectOrgName +' - 物联网运行维护'">
+  <a-page-header title="物联网运行维护">
       <div>
         <a-row :gutter="24">
           <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
@@ -221,7 +214,6 @@
         </div>
       </div>
     </a-page-header>
-  </a-drawer>
 </template>
 
 <script>
@@ -472,38 +464,11 @@ export default {
     ...mapState('setting', ['isMobile'])
   },
   props: {
-    selectOrgName: {
-      type: String,
-      required: true
-    },
-    webmeterUrl: {
-      type: String,
-      required: true
-    },
-    systemVersion: {
-      type: String,
-      required: true
-    },
-    dataSource: {
-      type: String,
-      required: true
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    }
   },
   methods: {
-    onClose () {
-      this.$emit('update:visible', false)
-    },
     loadInstructSumCount () {
       this.instructSumLoadState = 'loading'
-      return post(WebmeterAnalysisViewApi.instructSumCount, {
-        webmeterUrl: this.webmeterUrl,
-        systemVersion: this.systemVersion,
-        dataSource: this.dataSource
-      }).then(res => {
+      return post(WebmeterAnalysisViewApi.instructSumCount, {}).then(res => {
         this.instructSum = res.instructSum
         this.instructYoW = res.instructYoW
         this.instructYoD = res.instructYoD
@@ -517,17 +482,9 @@ export default {
     loadMetereadSumCount () {
       this.metereadSumDataByWeek = []
       this.metereadSumLoadState = 'loading'
-      return post(WebmeterAnalysisViewApi.meteReadSumCount, {
-        webmeterUrl: this.webmeterUrl,
-        systemVersion: this.systemVersion,
-        dataSource: this.dataSource
-      }).then(res => {
+      return post(WebmeterAnalysisViewApi.meteReadSumCount, {}).then(res => {
         // 加载近一周抄表数图表
-        post(WebmeterAnalysisViewApi.meteReadDataByWeek, {
-          webmeterUrl: this.webmeterUrl,
-          systemVersion: this.systemVersion,
-          dataSource: this.dataSource
-        }).then(res => {
+        post(WebmeterAnalysisViewApi.meteReadDataByWeek, {}).then(res => {
           for (let i = 0, len = res.length; i < len; i++) {
             this.metereadSumDataByWeek.push({
               x: res[i].date,
@@ -546,17 +503,9 @@ export default {
     loadUsingMeterSumCount () {
       this.usingMeterSumDataByWeek = []
       this.usingMeterSumLoadState = 'loading'
-      return post(WebmeterAnalysisViewApi.usingMeterSumCount, {
-        webmeterUrl: this.webmeterUrl,
-        systemVersion: this.systemVersion,
-        dataSource: this.dataSource
-      }).then(res => {
+      return post(WebmeterAnalysisViewApi.usingMeterSumCount, {}).then(res => {
         // 加载近一周开户数图表
-        post(WebmeterAnalysisViewApi.usingMeterDataByWeek, {
-          webmeterUrl: this.webmeterUrl,
-          systemVersion: this.systemVersion,
-          dataSource: this.dataSource
-        }).then(res => {
+        post(WebmeterAnalysisViewApi.usingMeterDataByWeek, {}).then(res => {
           for (let i = 0, len = res.length; i < len; i++) {
             this.usingMeterSumDataByWeek.push({
               x: res[i].date,
@@ -574,11 +523,7 @@ export default {
     },
     loadInstructRateOfSuccess () {
       this.instructRateOfSuccessLoadState = 'loading'
-      return post(WebmeterAnalysisViewApi.instructRateOfSuccess, {
-        webmeterUrl: this.webmeterUrl,
-        systemVersion: this.systemVersion,
-        dataSource: this.dataSource
-      }).then(res => {
+      return post(WebmeterAnalysisViewApi.instructRateOfSuccess, {}).then(res => {
         this.instructRateOfSuccessValue = res.instructRateOfSuccessValue * 1.0
         if (this.instructRateOfSuccessValue < 70.0) {
           this.instructRateOfColor = 'rgb(242, 99, 123)'
@@ -607,11 +552,7 @@ export default {
       this.radarLoadState = 'loading'
       fetch('/webmeterapi/foreignaidHandMeterSumCountData', {
         method: 'POST',
-        body: JSON.stringify({
-          webmeterUrl: this.webmeterUrl,
-          systemVersion: this.systemVersion,
-          dataSource: this.dataSource
-        })
+        body: JSON.stringify({})
       }).then((res) => res.json())
         .then((data) => {
           const linePlot = new Line('container', {
@@ -646,22 +587,6 @@ export default {
         this.radarLoadState = 'error'
       })
     }
-  },
-  watch: {
-    'visible' (val) {
-      if (val) {
-        // 加载指令数统计
-        this.loadInstructSumCount()
-        // 加载抄表量统计
-        this.loadMetereadSumCount()
-        // 加载在用表具量统计
-        this.loadUsingMeterSumCount()
-        // 加载指令成功率统计
-        this.loadInstructRateOfSuccess()
-        // 加载g2图表
-        this.loadGasView()
-      }
-    }
   }
 }
 </script>

package/src/base-client/components/iot/WebmeterAnalysisView/index.md

@@ -29,11 +29,6 @@ export default {
 ```html
 <webmeter-analysis-view
   :visible.sync="detailVisible"
-  :select-org-name="selectOrgName"
-  :webmeter-url="selectUrl"
-  :system-version="selectSystemVersion"
-  :data-source="selectDataSource"
-  v-if="selectUrl"
 />
 ```
 
@@ -42,7 +37,6 @@ export default {
 | 参数            | 说明        | 类型      | 默认值   |
 |---------------|-----------|---------|-------|
 | visible       | 是否显示      | Boolean | false |
-| selectOrgName | 燃气公司客户名   | String  | null  |
 | webmeterUrl   | 物联网表服务名   | String  | null  |
 | systemVersion | 系统所属版本    | String  | null  |
 | dataSource    | 系统所属数据库版本 | String  | null  |