sale-client 3.5.93 → 3.5.95

package/build/dev-server.js

@@ -36,9 +36,9 @@ var proxyTable = {
   '/rs/logic/saleGetExportProgress': {
     target: fuwu
   },
-  // '/rs/logic/getWarningMsg': {
-  //   // target: 'http://localhost:8080/'
-  // },
+  '/rs/logic/getWarningMsg': {
+    target: 'http://localhost:8080/'
+  },
   '/rs/file': {
     target: fuwu
   },
@@ -88,6 +88,9 @@ var proxyTable = {
   '/rs/sql/getLicenseById': {
     target: fuwu
   },
+  '/rs/sql/getGasPriceInfo': {
+    target: 'http://127.0.0.1:8080'
+  },
   '/rs/sql/manage_getarealist': {
     target: fuwu
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.93",
+  "version": "3.5.95",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/comprehen/StairPrice/GasPriceList.vue

@@ -76,6 +76,14 @@
                         close-on-select v-ref:type>
               </v-select>
             </div>
+            <div :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">气价状态</label>
+              <v-select :value.sync="model.f_price_state" v-model="model.f_price_state"
+                        placeholder='气价状态' :options="$parent.$parent.price_states"
+                        condition="f_price_state = '{}'"
+                        close-on-select v-ref:type>
+              </v-select>
+            </div>
           </div>
         </div>
 
@@ -198,6 +206,7 @@
         f_orgid: '',
         gasproperties: [],
         custom: [{label: '全部', value: ''}, {label: '正常气价', value: '正常气价'}, {label: '自定义气价', value: '自定义气价'}],
+        price_states: [{label: '全部', value: ''}, {label: '使用中', value: '使用中'}, {label: '删除', value: '删除'}, {label: '已作废', value: '已作废'}],
         usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : []
       }
     },
@@ -215,13 +224,14 @@
     },
     ready () {
       this.$refs.paged.$refs.cri.model.performDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.f_price_state = '使用中'
       this.search()
     },
     methods: {
-      batchAdjust(){
-        this.$parent.usershow=true
-        this.$parent.priceid=null
-        this.$parent.priceorgid=null
+      batchAdjust () {
+        this.$parent.usershow = true
+        this.$parent.priceid = null
+        this.$parent.priceorgid = null
       },
       showhistory (row) {
         this.show = true

package/src/components/webMeter/paramSaveNew/ParamHistory.vue

@@ -6,10 +6,23 @@
           <li class="active"><a>{{data.name}}</a></li>
         </ul>
         <div class="col-sm-12"  style="height: auto" v-for="param in data.params">
-          {{param.name}}：{{row[param.title].bak_val}}
+          {{param.name}}：{{row[param.name+param.title].bak_val}}
         </div>
       </div>
       <div style="height: auto">
+        <ul class="nav nav-tabs col-sm-12" >
+          <li class="active"><a>区间用气量报警参数</a></li>
+        </ul>
+        <div class="col-sm-12"  style="height: auto">时间区间1：{{row['readperiodusegasAlarmparam'].bak_val.timesection1||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">区间1用气量：{{row['readperiodusegasAlarmparam'].bak_val.usegas1||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">时间区间2：{{row['readperiodusegasAlarmparam'].bak_val.timesection2||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">区间2用气量：{{row['readperiodusegasAlarmparam'].bak_val.usegas2||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">时间区间3：{{row['readperiodusegasAlarmparam'].bak_val.timesection3||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">区间3用气量：{{row['readperiodusegasAlarmparam'].bak_val.timesection3||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas1||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas2||'暂无数据'}}</div>
+        <div class="col-sm-12"  style="height: auto">上次报警区间：{{row['readperiodusegasAlarmparam'].bak_val.realusegas3||'暂无数据'}}</div>
+<!--        [{"yjbbhlength":28,"softversionNo":"n0100081","mzbbhlength":15,"mzversion":"BC25PAR01A04_BT","version":"2022-07-28","yjversion":"YIMS-M-T1-3-1-H-2-13-17_V1.1"}]-->
         <ul class="nav nav-tabs col-sm-12" >
           <li class="active"><a>软件版本号</a></li>
         </ul>
@@ -69,7 +82,7 @@ export default {
       handler: async function (val) {
         this.history = []
         if (val.length === 1) {
-          await this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
+          await this.$resetpost('rs/sql/getIotParams?pageNo=1&pageSize=9999999', {data: {t_userfiles_id: val[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
             this.row = {}
             console.log('=============', rat.data)
             this.row.forceSafeCheckUsedDayCount = 0
@@ -78,18 +91,24 @@ export default {
             this.row.isForceSrape = '1'
             if (rat.data.length > 0) {
               rat.data.forEach((item) => {
-                if (item.f_param_value === '1') {
-                  item.f_param_value = '开'
+                if (item.f_back_content === '1') {
+                  item.f_back_content = '开'
                 }
-                if (item.f_param_value === '0') {
-                  item.f_param_value = '关'
+                if (item.f_back_content === '0') {
+                  item.f_back_content = '关'
                 }
                 if (item.f_param_name === '读表功能') {
-                  if (item.f_param_value && item.f_param_value === 'getMeterVersion') {
-                    item.f_back_content = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['softversionNo']
+                  if (item.f_param_content === '读区间用气量报警参数' && item.f_back_content) {
+                    let str = item.f_back_content.substring(0, item.f_back_content.indexOf(']'))
+                    item.f_back_content = JSON.parse(str.replace('[', '').replace(']', ''))
+                  }
+                  if (item.f_param_value && item.f_back_content && item.f_param_value === 'getMeterVersion') {
+                    let str = item.f_back_content.substring(0, item.f_back_content.indexOf(']'))
+                    item.f_back_content = JSON.parse(str.replace('[', '').replace(']', ''))['softversionNo']
                   }
-                  if (item.f_param_value && item.f_param_value === 'readNextreportTime') {
-                    let str = JSON.parse(item.f_back_content.replace('[', '').replace(']', ''))['datetime']
+                  if (item.f_param_value && item.f_back_content && item.f_param_value === 'readNextreportTime') {
+                    let str = item.f_back_content.substring(0, item.f_back_content.indexOf(']'))
+                    str = JSON.parse(str.replace('[', '').replace(']', ''))['datetime']
                     item.f_back_content = '20' + str.substr(0, 2) + '-' + str.substr(2, 2) + '-' + str.substr(4, 2) + ' ' +
                     str.substr(6, 2) + ':' + str.substr(8, 2) + ':' + str.substr(10, 2)
                   }
@@ -98,7 +117,7 @@ export default {
                   }
                   this.row[item.f_param_value] = {set_val: item.f_param_value, bak_val: item.f_back_content}
                 } else {
-                  this.row[item.f_param_lname] = {set_val: item.f_param_value, bak_val: item.f_back_content}
+                  this.row[item.f_param_name + item.f_param_lname] = {set_val: item.f_param_value, bak_val: item.f_back_content}
                 }
               })
                 // let param = JSON.parse(rat.data[0].f_data)
@@ -126,7 +145,7 @@ export default {
       this.newmeterinfo = [{}]
       try {
         let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {resolveMsg: null, rejectMsg: null})
-        this.newmeterinfo = res.data.filter(item => { return (item.name !== '读表功能' && item.name !== '读记录数据') })
+        this.newmeterinfo = res.data.filter(item => { return (item.name !== '读表功能' && item.name !== '读记录数据' && item.name !== '设置区间用气量报警参数') })
       } catch (error) {
         this.$showAlert('该气表品牌不支持参数设置', 'warning', 1500)
       }