sale-client 3.5.131 → 3.5.133

package/package.json

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

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

@@ -397,7 +397,8 @@ export default {
       }
     },
     closeParam () {
-      // this.$refs.form.row={}
+      this.$refs.form.paramtype = undefined
+      this.$refs.form.paramGroup = undefined
       this.showParame = !this.showParame
       // if (this.isCheckAll) {
       this.map.clear()
@@ -406,7 +407,8 @@ export default {
       // this.isCheckAll = false
     },
     clear () {
-      this.$refs.form.paramtype = ''
+      this.$refs.form.paramtype = undefined
+      this.$refs.form.paramGroup = undefined
       // this.isCheckAll = false
       this.showParame = false
       this.map.clear()

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

@@ -4,38 +4,44 @@
       <div class="col-sm-4">
         <label class="font_normal_body" style="text-align:left">参数类型</label>
       </div>
-      <div class="col-sm-8">
+      <div class="col-sm-4">
+        <v-select
+          placeholder="请选择参数组别"
+          :value.sync="paramGroup"
+          style="width:40%"
+          width="80%"
+          :search="false"
+          :value-single="true"
+          @change="paramGroupChange"
+          v-model="paramGroup"
+          :options='paramGroups'
+          close-on-select
+        ></v-select>
+      </div>
+      <div class="col-sm-4" v-show="['读取','设置'].includes(paramGroup)">
         <v-select
           placeholder="请选择参数类型"
           :value.sync="paramtype"
           style="width:40%"
-          width="40%"
+          width="80%"
+          :search="false"
           :value-single="true"
           v-model="paramtype"
           :options='paramtypes'
           close-on-select
         ></v-select>
       </div>
-      <!--<div class="col-sm-8" >
-        -&#45;&#45;&#45;&#45;{{row.overdueMessageValue}}
-        <input :type="text" v-model="row.overdueMessageValue" :value.sync="row.overdueMessageValue" style="width:70%" placeholder=""  class="input_search">
-      </div>-->
-      <div v-for="(index,data) in newmeterinfo" style="height: auto">
+      <div v-for="(_,data) in newmeterinfo" style="height: auto">
         <div class="col-sm-12" style="height: auto" v-if="data.name===paramtype"
-             v-for="(param_index,param) in data.params">
+             v-show="['设置特殊故障是否关阀','设置表功能开关'].includes(paramtype)&&!param.name.startsWith('设置')"
+             v-for="(_,param) in data.params">
           <div class="col-sm-4">
             <label class="font_normal_body" style="text-align:left">{{ param.name }}：</label>
             <p class="glyphicon glyphicon-info-sign" style="margin-top:5%;color:#4a7cae"
                :title="param.remark + '，当前系统设置默认值为：'+param.default_value"></p>
           </div>
-          <!--          <div class="col-sm-4">-->
-          <!--            <label class="font_normal_body"-->
-          <!--                   style="text-align:left">{{ param.default_value ? `当前默认值为：${param.default_value}；` : '当前未设置默认值' }}</label>-->
-          <!--          </div>-->
           <div class="col-sm-8" v-if="['设置特殊故障是否关阀','设置表功能开关'].includes(paramtype)">
-            <radio-btn v-model="row[param.title]" :value.sync="row[param.title]"></radio-btn>
-            <!--            <label>启用<input type="radio" v-model="param.isenbale"  @click="reMeterinfo(index,param_index,data.params)" :disabled="!param.default_value" value="启用"/></label>-->
-            <!--            <label>保持不变<input type="radio" v-model="param.isenbale" @click="reMeterinfo(index,param_index,data.params)"  value="保持不变"/></label>-->
+            <radio-btn @toggle="radioBtnToggle" :title="param.title" v-model="row[param.title]" :value.sync="row[param.title]"></radio-btn>
           </div>
           <template v-if="!['设置特殊故障是否关阀','设置表功能开关'].includes(paramtype)">
             <div class="col-sm-8" v-if="param.type!=='option'">
@@ -196,7 +202,13 @@ export default {
       paramtype: '',
       param: {},
       history: [],
-      isenbale: false
+      isenbale: false,
+      paramGroups: [{label: '读取', value: '读取'}, {label: '设置', value: '设置'},
+        {label: '设置表功能开关', value: '设置表功能开关'}, {
+          label: '设置特殊故障是否关阀',
+          value: '设置特殊故障是否关阀'
+        }],
+      paramGroup: ''
     }
   },
   ready () {
@@ -222,7 +234,7 @@ export default {
         if (temp && temp.params.length > 0) {
           for (let i = 0; i < temp.params.length; i++) {
             if (['设置特殊故障是否关阀', '设置表功能开关'].includes(val)) {
-              this.row[temp.params[i].title] = '0'
+              this.row[temp.params[i].title] = ['保持不变']
             } else {
               if (temp.params[i].default_value) {
                 this.row[temp.params[i].title] = temp.params[i].default_value
@@ -231,27 +243,49 @@ export default {
           }
         }
         this.row = Object.assign({}, this.row)
-        // if (this.user.length === 1) {
-        //   this.$resetpost('rs/sql/getIotParams', {data: {t_userfiles_id: this.user[0].f_userfiles_id}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
-        //     this.row = {}
-        //     if (rat.data.length > 0) {
-        //       rat.data.forEach((item) => {
-        //         console.log('=============>this.paramtype', val)
-        //         console.log('=============>item', item.f_param_group_name)
-        //         if (val === item.f_param_group_name) {
-        //           this.$set('row.' + item.f_param_lname, item.f_param_value)
-        //         }
-        //       })
-        //       // let param = JSON.parse(rat.data[0].f_data)
-        //       // console.log(param)
-        //       // this.row= param
-        //     }
-        //   })
-        // }
       }
     }
   },
   methods: {
+    radioBtnToggle (title, value) {
+      // 设置表功能开关 ->  启用时操作 ->  设置
+      // pzwbit0 -> bzwbit0
+      // 设置特殊故障是否关阀 ->  启用时操作 ->  设置
+      // pbit0 -> bbit0
+      // 当启用 为 ['保持不变']时 设置应为 ['保持不变']
+      // 当启用 为 ['启用']时 设置应为 ['启用']
+      // 当启用 为 []时 设置应为 ['启用']
+      // 获取到设置的title
+      // 把第一个p替换成b
+      if (!title.startsWith('p')) {
+        return
+      }
+      let _title = title.replace('p', 'b')
+      if (value.length === 1) {
+        if (value[0] === '保持不变') {
+          this.row[_title] = ['保持不变']
+        } else {
+          this.row[_title] = ['启用']
+        }
+      } else {
+        this.row[_title] = ['启用']
+      }
+      this.row = Object.assign({}, this.row)
+    },
+    paramGroupChange (val) {
+      const tempArr = ['设置特殊故障是否关阀', '设置表功能开关']
+      if (['读取', '设置'].includes(val)) {
+        this.paramtypes = this.newmeterinfo
+          .filter(item => item.theType === val && !tempArr.includes(item.name))
+          .map(item => {
+            return {label: item.name, value: item.name}
+          })
+          .sort((a, b) => a.label.length - b.label.length)
+        this.paramtype = undefined
+        return
+      }
+      this.paramtype = val
+    },
     close () {
       this.row = {}
       this.$dispatch('close')
@@ -399,8 +433,8 @@ export default {
       this.newmeterinfo = [{}]
 
       let res = await this.$resetpost('/webmeter/rs/logic/getParamsByGasBrand', {data: {gasBrandId: val}}, {
-        resolveMsg: '参数已加载',
-        rejectMsg: null
+        resolveMsg: null,
+        rejectMsg: '参数获取失败'
       })
       let allDefaultValue = await this.$resetpost('/rs/sql/getAllDefaultValues', {data: {gasBrandId: val}}, {
         resolveMsg: null,

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

@@ -11,6 +11,10 @@ export default {
     value: {
       type: Array,
       default: ['保持不变']
+    },
+    title: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -23,10 +27,15 @@ export default {
   },
   methods: {
     onChange (e) {
+      let _value = []
       this.$emit('input', e)
+      // 因为数组元素个数只有1或者0 判断相同的已经存在就是取消操作
+      if (!this.value.includes(e)) {
+        _value.push(e)
+      }
+      this.$dispatch('toggle', this.title, _value)
     }
   }
-
 }
 </script>