sale-client 3.5.71 → 3.5.72

package/build/dev-server.js

@@ -12,7 +12,7 @@ var compiler = webpack(config)
 // https://github.com/chimurai/http-proxy-middleware
 var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-var fuwu = 'http://117.33.181.102:8400/'
+var fuwu = 'http://39.108.82.124:8400/'
 // var fuwu = 'http://121.36.106.17:8400/'
 // 铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
@@ -92,7 +92,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: 'http://117.33.181.102:8400/'
+    target: 'http://121.36.106.17:8400/'
   },
   '/rs/vue': {
     target: fuwu

package/package.json

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

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

@@ -32,15 +32,15 @@
           <!--            <label class="font_normal_body"-->
           <!--                   style="text-align:left">{{ param.default_value ? `当前默认值为：${param.default_value}；` : '当前未设置默认值' }}</label>-->
           <!--          </div>-->
-          <div class="col-sm-8" v-if="paramtype==='设置表功能开关'">
+          <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>-->
           </div>
-          <template v-if="paramtype!=='设置表功能开关'">
+          <template v-if="!['设置特殊故障是否关阀','设置表功能开关'].includes(paramtype)">
             <div class="col-sm-8" v-if="param.type!=='option'">
               <input :type="param.type" v-model="row[param.title]"
-                     style="width:70%"  :value.sync="row[param.title]"
+                     style="width:70%" :value.sync="row[param.title]"
                      placeholder="" class="input_search">
             </div>
             <div class="col-sm-8" v-if="param.type==='option'">
@@ -187,7 +187,7 @@ export default {
   title: '参数设置',
   props: ['user', 'checked1', 'gasbrandid', 'condition'],
   components: {RadioBtn},
-  data () {
+  data() {
     return {
       newmeterinfo: [{}],
       row: {},
@@ -199,7 +199,7 @@ export default {
       isenbale: false
     }
   },
-  ready () {
+  ready() {
 
   },
   watch: {
@@ -209,12 +209,12 @@ export default {
       },
       deep: true
     },
-    'gasbrandid' (val) {
+    'gasbrandid'(val) {
       if (val[0]) {
         this.refreshParam(val[0])
       }
     },
-    'paramtype' (val) {
+    'paramtype'(val) {
       this.row = {}
       if (val) {
         // 循环给row赋值  row存储当前页面的值   虽然我不知道为什么这么设计  但是目前只能继续用了
@@ -248,11 +248,11 @@ export default {
     }
   },
   methods: {
-    close () {
+    close() {
       this.row = {}
       this.$dispatch('close')
     },
-    async setParamDefault () {
+    async setParamDefault() {
       let params = []
       for (let i = 0; i < this.newmeterinfo.length; i++) {
         for (let j = 0; j < this.newmeterinfo[i].params.length; j++) {
@@ -266,14 +266,12 @@ export default {
                 data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
                 data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
                 data.param_lname = this.newmeterinfo[i].params[j].title
-                if (this.paramtype === '设置表功能开关') {
-                  if (this.row[key].length === 2 || (this.row[key].length === 1 && this.row[key][0] === '启用')) {
+                if (['设置特殊故障是否关阀', '设置表功能开关'].includes(this.paramtype)) {
+                  if (this.row[key].length === 1 && this.row[key][0] === '启用') {
                     data.param_value = data.param_content = '1'
-                  }
-                  if (this.row[key].length === 0) {
+                    params.push(data)
+                  } else if (this.row[key].length === 0) {
                     data.param_value = data.param_content = '0'
-                  }
-                  if (!(this.row[key].length === 1 && this.row[key][0] === '保持不变')) {
                     params.push(data)
                   }
                 } else if (this.row[key]) {
@@ -301,14 +299,16 @@ export default {
         f_gasbrand_id: this.gasbrandid[0]
       }
       console.log(param)
-      await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {
-        rejectMsg: '批量保存失败',
-        resolveMsg: '保存成功'
-      })
+      if (params.length > 0) {
+        await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {
+          rejectMsg: '批量保存失败',
+          resolveMsg: '保存成功'
+        })
+      }
       this.row = null
       this.$dispatch('clear')
     },
-    async setParam () {
+    async setParam() {
       let user = []
       let filesid = ''
       this.user.forEach((item) => {
@@ -332,15 +332,12 @@ export default {
                 data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
                 data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
                 data.param_lname = this.newmeterinfo[i].params[j].title
-                if (this.paramtype === '设置表功能开关') {
-                  debugger
-                  if (this.row[key].length === 2 || (this.row[key].length === 1 && this.row[key][0] === '启用')) {
+                if (['设置特殊故障是否关阀', '设置表功能开关'].includes(this.paramtype)) {
+                  if (this.row[key].length === 1 && this.row[key][0] === '启用') {
                     data.param_value = data.param_content = '1'
-                  }
-                  if (this.row[key].length === 0) {
+                    params.push(data)
+                  } else if (this.row[key].length === 0) {
                     data.param_value = data.param_content = '0'
-                  }
-                  if (!(this.row[key].length === 1 && this.row[key][0] === '保持不变')) {
                     params.push(data)
                   }
                 } else if (this.row[key]) {
@@ -369,14 +366,16 @@ export default {
         f_gasbrand_id: this.gasbrandid[0]
       }
       console.log(param)
-      await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {
-        rejectMsg: '批量保存失败',
-        resolveMsg: '保存成功'
-      })
+      if (params.length > 0) {
+        await this.$resetpost('/rs/logic/alteration_batch', {data: param}, {
+          rejectMsg: '批量保存失败',
+          resolveMsg: '保存成功'
+        })
+      }
       this.row = null
       this.$dispatch('clear')
     },
-    async refreshParam (val) {
+    async refreshParam(val) {
       this.paramtypes = []
       let temp = {
         tablename: 't_gasbrand',
@@ -420,7 +419,7 @@ export default {
       }
       this.$dispatch('showparam', true)
     },
-    async getBrandParamsHistory () {
+    async getBrandParamsHistory() {
       let http = new HttpResetClass()
       let res = await http.load('POST', 'rs/sql/getBrandParamHistory', {
         data: {

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

@@ -1,6 +1,6 @@
 <template>
-  <label>启用<input type="checkbox" v-model="value"  @click="onChange('启用')"  value="启用"/></label>
-  <label>保持不变<input type="checkbox" v-model="value" @click="onChange('保持不变')"  value="保持不变"/></label>
+  <label>启用<input type="checkbox" v-model="value"  @click="onChange('启用')" :disabled="value.includes('保持不变')"  value="启用"/></label>
+  <label>保持不变<input type="checkbox" v-model="value" @click="onChange('保持不变')" :disabled="value.includes('启用')" value="保持不变"/></label>
 </template>
 
 <script>
@@ -10,7 +10,7 @@ export default {
   props: {
     value: {
       type: Array,
-      default: []
+      default: ['保持不变']
     }
   },
   data () {