manage-client 1.22.46-ca → 1.22.47-ca

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "1.22.46-ca",
+  "version": "1.22.47-ca",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/webmeter/DrillData/LostContactAnalysisList.vue

@@ -246,7 +246,7 @@ let readySomething = async function (self) {
   self.initParams()
   let year = new Date().getFullYear()
   let month = new Date().getMonth()
-  self.$refs.paged.$refs.cri.model.startDate =  year+ '-' + month + '-01 00:00:00'
+  self.$refs.paged.$refs.cri.model.startDate = Util.toStartDate() + ' 00:00:00'
   // self.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
   self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
   // self.$refs.paged.$refs.cri.search()

package/src/components/webmeter/OperationMessage/OperationMessage.vue

@@ -59,6 +59,7 @@
                           placeholder='是否绑定'
                           :value.sync="model.f_isopenaccount"
                           @change="$parent.$parent.changeIsOpen"
+                          :value-single="true"
                           :options='$parent.$parent.f_isopenaccounts'
                           condition="f_isopenaccount = '{}'"
                           close-on-select>
@@ -233,8 +234,8 @@ export default {
   },
   methods: {
     changeIsOpen(){
-      console.log(this.$refs.paged.$refs.cri.model.f_isopenaccount[0])
-      if(this.$refs.paged.$refs.cri.model.f_isopenaccount[0]==='已绑定'){
+      console.log(this.$refs.paged.$refs.cri.model.f_isopenaccount)
+      if(this.$refs.paged.$refs.cri.model.f_isopenaccount==='已绑定'){
         this.f_buygas.push({ label: '已购气', value: '已购气' }, { label: '未购气', value: '未购气' })
         console.log('~~~~~~~~~~~~~~~~~~~~~~~~')
         console.log(this.f_buygas)

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue

@@ -155,7 +155,6 @@
                 <v-select style="width:60%"
                           v-model="model.f_error_level"
                           placeholder='异常级别'
-                          @change="$parent.$parent.getErrorInfo('f_error_type')"
                           :value.sync="model.f_error_level"
                           :options='$parent.$parent.GetErrorLevel'
                           condition="f_error_level = '{}'"
@@ -307,8 +306,7 @@ export default {
       echarts: false,
       searchshow: false,
       isActiveTotalForm: false,
-      GetErrorLevel:[],
-      GetErrorType:[],
+
       initres: {
         org:[this.$login.f.orgid],
         dep:[],
@@ -369,42 +367,42 @@ export default {
     clickshow() {
       this.searchshow = !this.searchshow
     },
-    getErrorInfo(items){
-      let self = this
-      let f_error_level=''
-      if (items!='f_error_level') {
-        if(this.$refs.paged.$refs.cri.model.f_error_level){
-          f_error_level=this.$refs.paged.$refs.cri.model.f_error_level[0]
-        }
-      }
-      let load = new HttpResetClass()
-      load.load('POST', '/manage/rs/sql/getExceptionType', {
-        data: {
-          items:items+' f_type',
-          condition:items=='f_error_level'?'1=1 group by '+items:`f_error_level='${f_error_level}' group by `+items
-        }
-      },{warnMsg:null,resolveMsg:null}).then((res) => {
-        let i = 0
-        let rows=res.data
-        let array1=[]
-        array1.push({label: '全部', value: ''})
-        console.log("rows========",rows)
-        for (i = 0; i < rows.length; i++) {
-          let dr = {label: '全部', value: ''}
-          dr.label=rows[i].f_type
-          dr.value=rows[i].f_type
-          array1.push(dr)
-          console.log("rows[i]========",rows[i],dr)
-        }
-        console.log("array1========",array1)
-        if (items=='f_error_level'){
-          self.GetErrorLevel=array1
-        }else {
-          self.GetErrorType=array1
-        }
-      })
-
-    },
+    // getErrorInfo(items){
+    //   let self = this
+    //   let f_error_level=''
+    //   if (items!='f_error_level') {
+    //     if(this.$refs.paged.$refs.cri.model.f_error_level){
+    //       f_error_level=this.$refs.paged.$refs.cri.model.f_error_level[0]
+    //     }
+    //   }
+    //   let load = new HttpResetClass()
+    //   load.load('POST', '/manage/rs/sql/getExceptionType', {
+    //     data: {
+    //       items:items+' f_type',
+    //       condition:items=='f_error_level'?'1=1 group by '+items:`f_error_level='${f_error_level}' group by `+items
+    //     }
+    //   },{warnMsg:null,resolveMsg:null}).then((res) => {
+    //     let i = 0
+    //     let rows=res.data
+    //     let array1=[]
+    //     array1.push({label: '全部', value: ''})
+    //     console.log("rows========",rows)
+    //     for (i = 0; i < rows.length; i++) {
+    //       let dr = {label: '全部', value: ''}
+    //       dr.label=rows[i].f_type
+    //       dr.value=rows[i].f_type
+    //       array1.push(dr)
+    //       console.log("rows[i]========",rows[i],dr)
+    //     }
+    //     console.log("array1========",array1)
+    //     if (items=='f_error_level'){
+    //       self.GetErrorLevel=array1
+    //     }else {
+    //       self.GetErrorType=array1
+    //     }
+    //   })
+    //
+    // },
     search(args) {
       this.startDate = this.$refs.paged.$refs.cri.model.startDate
       this.endDate = this.$refs.paged.$refs.cri.model.endDate
@@ -482,8 +480,17 @@ export default {
       }
 
     },
-    usertypes() {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    GetErrorLevel() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('异常级别')]
+    },
+    GetErrorType() {
+      let type = this.$refs.paged.$refs.cri.model.f_error_level
+      if(type) {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam(type)]
+      } else {
+        return [{label: '全部', value: ''}]
+      }
+
     },
     Gasproperties() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]

package/src/components/webmeter/newwebmeter/UserGasList.vue

@@ -193,8 +193,7 @@ export default {
       endDate: '',
       sumsmodel:{},
       orgid:[this.$login.f.orgid],
-      getfield:{"f_insert_date":"上报日期","anzhuang":"安装户数",
-        "c0":"停用户数",
+      getfield:{"f_insert_date":"上报日期",
         "c":"在用户数","user_bv":"用户使用率",
         "c1":"抄表成功户数",
         "f_gas_all":"总用气量","f_gas":"日均户均用气量(成功)",