safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/components/checkplan/SelectCheckPlan.vue

@@ -10,12 +10,11 @@
                 role-lable="安 检 员"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
-                v-model="model.f_checker_id"
-                condition="c.f_checker = '{}'">
+                v-model="model.f_checker_id">
               </role-selector-safe>
             </div>
             <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
-              <label class="font_normal_body">起始月份</label>
+              <label class="font_normal_body">计划起始</label>
               <datepicker
                 :value.sync="$parent.$parent.f_check_start"
                 placeholder='起始月份' style="width:60%"
@@ -26,7 +25,7 @@
               </datepicker>
             </div>
             <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
-              <label class="font_normal_body">结束月份</label>
+              <label class="font_normal_body">计划截止</label>
               <datepicker
                 :value.sync="$parent.$parent.f_check_end"
                 placeholder='结束月份' style="width:60%"
@@ -36,43 +35,58 @@
                 :show-rest-button="reset">
               </datepicker>
             </div>
-            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" >
               <label class="font_normal_body">安检状态</label>
               <v-select :value.sync="model.f_last_check_state" :options='$parent.$parent.checkStates' placeholder='上次安检状态' close-on-select
-                        style="width:60% "   class="select select_list"  v-model='model.f_last_check_state'   condition="cp.f_entry_status = '{}'">
+                        style="width:60% "   class="select select_list"  v-model='model.f_last_check_state'   condition="i.f_last_check_state = '{}'">
               </v-select>
-            </div>
-            <div class="form-group col-sm-2" v-if="!$parent.$parent.$parent.showItem && $parent.$parent.criteriaShow"></div>
-            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
+            </div>-->
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
               <label class="font_normal_body">安检起始</label>
               <datepicker
                 :value.sync="$parent.$parent.f_start_time"
-                placeholder='起始时间' style="width:60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM-dd'"
+                placeholder='安检起始' style="width:60%"
                 :show-rest-button="reset">
               </datepicker>
             </div>
-            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">安检结束</label>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检截止</label>
               <datepicker
                 :value.sync="$parent.$parent.f_end_time"
-                placeholder='结束时间' style="width:60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM-dd'"
+                placeholder='安检截止' style="width:60%"
                 :show-rest-button="reset">
               </datepicker>
             </div>
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检起始</label>-->
+            <!--<datepicker-->
+            <!--:value.sync="$parent.$parent.f_start_time"-->
+            <!--placeholder='起始时间' style="width:60%"-->
+            <!--:disabled-days-of-week="[]"-->
+            <!--:format="'yyyy-MM-dd'"-->
+            <!--:show-rest-button="reset">-->
+            <!--</datepicker>-->
+            <!--</div>-->
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检结束</label>-->
+            <!--<datepicker-->
+            <!--:value.sync="$parent.$parent.f_end_time"-->
+            <!--placeholder='结束时间' style="width:60%"-->
+            <!--:disabled-days-of-week="[]"-->
+            <!--:format="'yyyy-MM-dd'"-->
+            <!--:show-rest-button="reset">-->
+            <!--</datepicker>-->
+            <!--</div>-->
             <div style="width: auto;margin-top:8px;float: right" :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
               <export-excel-safe   :data="$parent.$parent.searchData"
-                              :field="$parent.$parent.excelHeaders"
-                              progress="safeGetExportProgress"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
+                                   :field="$parent.$parent.excelHeaders"
+                                   progress="safeGetExportProgress"
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
-              <div class="button_spacing"
-                   :class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"
-                   @click="$parent.$parent.hidden()">
-               </div>
+              <!--<div class="button_spacing"-->
+              <!--:class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"-->
+              <!--@click="$parent.$parent.hidden()">-->
+              <!--</div>-->
               <div class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
                    @click="$parent.$parent.hiddenr()"></div>
@@ -84,141 +98,214 @@
         <template partial='head'>
           <tr>
             <th>安检员</th>
-            <th>计划数</th>
-            <th>已检</th>
-            <th>未检</th>
+            <th>总入户量</th>
+            <th>总到访不遇量</th>
+            <th>总拒检量</th>
+            <th>安检总量</th>
+            <th>计划总数</th>
+            <th>入户</th>
+            <th>到访不遇</th>
+            <th>拒检</th>
+            <th>无计划总数</th>
+            <th>无计划入户</th>
+            <th>无计划到访不遇</th>
+            <th>无计划拒检</th>
           </tr>
         </template>
         <template partial='body'>
           <td style="text-align: center">{{row.f_checker}}</td>
-          <td style="text-align: center">{{row.c}}</td>
-          <td style="text-align: center">{{row.checked}}</td>
-          <td style="text-align: center">{{row.unchecked}}</td>
+          <td style="text-align: center">{{row.ruhu_total}}</td>
+          <td style="text-align: center">{{row.daofang_total}}</td>
+          <td style="text-align: center">{{row.jujian_total}}</td>
+          <td style="text-align: center">{{row.total_sum}}</td>
+          <td style="text-align: center">{{row.plannum}}</td>
+          <td style="text-align: center">{{row.ruhu}}</td>
+          <td style="text-align: center">{{row.daofang}}</td>
+          <td style="text-align: center">{{row.jujian}}</td>
+          <td style="text-align: center">{{row.no_plan_num}}</td>
+          <td style="text-align: center">{{row.noruhu}}</td>
+          <td style="text-align: center">{{row.nodaofang}}</td>
+          <td style="text-align: center">{{row.nojujian}}</td>
         </template>
         <template partial="foot">
           <td style="text-align: center"><span><b>合计：</b></span></td>
-          <td style="text-align: center">{{model.sums.c}}</td>
-          <td style="text-align: center">{{model.sums.checked}}</td>
-          <td style="text-align: center">{{model.sums.unchecked}}</td>
+          <td style="text-align: center">{{model.sums.ruhu_total}}</td>
+          <td style="text-align: center">{{model.sums.daofang_total}}</td>
+          <td style="text-align: center">{{model.sums.jujian_total}}</td>
+          <td style="text-align: center">{{model.sums.total_sum}}</td>
+          <td style="text-align: center">{{model.sums.plannum}}</td>
+          <td style="text-align: center">{{model.sums.ruhu}}</td>
+          <td style="text-align: center">{{model.sums.daofang}}</td>
+          <td style="text-align: center">{{model.sums.jujian}}</td>
+          <td style="text-align: center">{{model.sums.no_plan_num}}</td>
+          <td style="text-align: center">{{model.sums.noruhu}}</td>
+          <td style="text-align: center">{{model.sums.nodaofang}}</td>
+          <td style="text-align: center">{{model.sums.nojujian}}</td>
         </template>
       </data-grid>
     </criteria-paged>
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
-  import co from 'co'
-  import Vue from 'vue'
-  import * as Util from '../Util'
+import {PagedList} from 'vue-client'
 
 
-  export default {
-    title: '安检计划查询',
-    data() {
-      let options = []
-      let year = (new Date()).getFullYear()
-      for (let i = year - 8; i <= year + 1; i++)
-        options.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/planCount', 20, {
-        f_plan_year: 'this.f_plan_year[0]',
-        f_checker: 'this.chosenOrg.name',
-        f_filialeids: 'this.f_filialeids '
-      }, {c: '', checked: '', unchecked: ''})
-      model.f_plan_year = year + ''
-      model.f_filialeids = '('+this.$login.f.orgid+')'
-      model.chosenOrg = {id: 0, name: ''}
-      return {
-        excelHeaders:{
-          'f_checker': '安检员',
-          'c': '计划数',
-          'checked': '已检',
-          'unchecked': '未检'
-        },
-        searchData:{
-
-          condition:"1=1",
-          f_plan_year:year[0],
-          f_checker:'',
-          f_filialeids:'('+this.$login.f.orgid+')'
-        }
-        ,
-        checker: this.$login.f,
-        checkers: [],
-        checkersname: [],
-        checkStates: this.$appdata.getParam('安检状态'),
-        f: this.$login.f,
-        criteriaShow: false,
-        model: model,
-        c_year_list: options,
-        f_check_start:'',
-        f_check_end: '',
+export default {
+  title: '安检计划查询',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    for (let i = year - 8; i <= year + 1; i++)
+      options.push({label: i + '', value: i + ''})
+    let model = new PagedList('rs/sql/planCount', 20, {
+      f_filialeids: 'this.f_filialeids',
+      f_start_time: 'this.f_start_time',
+      condition1:'this.condition1',
+      condition2:'this.condition2',
+      condition3:'this.condition3',
+      f_end_time: 'this.f_end_time'
+    }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
+    model.f_filialeids = '('+this.$login.f.orgid+')'
+    return {
+      excelHeaders:{
+        'f_checker': '安检员',
+        'plannum': '计划总数',
+        // 'yrj': '计划中已入户',
+        // 'wrj': '计划中未入户',
+        'ruhu': '入户',
+        'jujian': '拒检',
+        'daofang': '到访不遇',
+        'no_plan_num': '无计划总数',
+        'noruhu': '无计划入户',
+        'nojujian': '无计划拒检',
+        'nodaofang': '无计划到访不遇'
+      },
+      searchData:{
+        condition:"1=1",
+        condition1:"1=1",
+        condition2:"1=1",
+        condition3:"and 1=1",
+        f_plan_year:year[0],
+        f_checker:'',
+        f_filialeids:'('+this.$login.f.orgid+')',
         f_start_time:'',
         f_end_time:''
+      },
+      checker: this.$login.f,
+      checkers: [],
+      checkersname: [],
+      checkStates: this.$appdata.getParam('安检状态'),
+      f: this.$login.f,
+      criteriaShow: false,
+      model: model,
+      c_year_list: options,
+      f_check_start:'',
+      f_check_end: '',
+      f_start_time:'',
+      f_end_time:''
+    }
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    hiddenr() {
+      this.$parent.showItem = !this.$parent.showItem
+    },
+    search(args) {
+      let tempStr = args.condition
+      let condition1 =tempStr
+      let condition2 =tempStr
+      let condition3 = ' and 1=1 '
+      if (this.f_check_start) {
+        condition1 += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
+        condition1 += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
+      }
+      if (this.f_check_end) {
+        condition1 += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
+        condition1 += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
+      }
+      if(this.f_start_time){
+        condition2 += ` AND f_offsite_time >= '${this.f_start_time} 00:00:00'`
+      }
+      if (this.f_end_time){
+        condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_checker_id){
+        condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+        condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
       }
+      this.model.f_start_time=this.f_start_time
+      this.model.f_end_time=this.f_end_time
+      this.model.condition1=condition1
+      this.model.condition2=condition2
+      this.model.condition3=condition3
+
+      this.searchData.condition1=condition1
+      this.searchData.condition2=condition2
+      this.searchData.condition3=condition3
+
+      this.model.search(args.condition, args.model)
     },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      hiddenr() {
-        this.$parent.showItem = !this.$parent.showItem
-      },
-      search(args) {
-        if (this.f_check_start) {
-          args.condition += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
-          args.condition += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
-        }
-        if (this.f_check_end) {
-          args.condition += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
-          args.condition += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
-        }
-        this.$dispatch('checkstatus-changed', this.$refs.paged.$refs.cri.model.f_last_check_state[0])
-        this.model.search(args.condition, args.model)
-        console.log('this.model')
-        console.log(this.model.rows.length)
-      },
-      getRes(obj){
-        this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-        console.log(this.model.f_filialeids)
+    getRes(obj){
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      //tag
+    }
+  },
+  ready() {
+    this.model.id = this.$login.f.id
+    this.model.f_subcompany = this.$login.f.f_fengongsi
+    this.model.f_filialeid = this.$login.f.orgid
+  },
+
+  watch: {
+    'model.condition'(val) {
+      if(val){
+        this.searchData.condition = val
+      }
+    },
+    'model.f_checker'(val) {
+      if(val){
+        this.searchData.f_checker = val
       }
     },
-    ready() {
-      this.model.id = this.$login.f.id
-      this.model.f_subcompany = this.$login.f.f_fengongsi
-      this.model.f_filialeid = this.$login.f.orgid
+    'f_start_time'(val) {
+      if(val){
+        this.searchData.f_start_time = val
+      }
     },
-
-    watch: {
-      'model.condition'(val) {
-        if(val){
-          this.searchData.condition = val
-        }
-      },
-      'model.f_checker'(val) {
-        if(val){
-          this.searchData.f_checker = val
-        }
-      },
-      'checker'() {
-        // console.log('1')
-        console.log("f_checker", this.checker)
-        this.model.chosenOrg = this.checker[0]
-      },
-      'model.rows.length'() {
-        // 如果查询无结果，将合计置为0
-        if(this.model.rows.length < 1){
-          this.model.sums.c = 0
-          this.model.sums.checked = 0
-          this.model.sums.unchecked = 0
-        }
+    'f_end_time'(val) {
+      if(val){
+        this.searchData.f_end_time = val
       }
     },
-    computed: {
-      selected() {
-        // console.log('2')
-        // this.$parent.showItem=!this.$parent.showItem
-        return this.$refs.paged.$refs.grid.selected
+    'checker'() {
+      // //tag
+      //tag
+      this.model.chosenOrg = this.checker[0]
+    },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1 &&this. model.sums){
+        this.model.sums.yrj = 0
+        this.model.sums.no_plan_num = 0
+        this.model.sums.wrj = 0
+        this.model.sums.ruhu = 0
+        this.model.sums.jujian = 0
+        this.model.sums.daofang = 0
+        this.model.sums.ruhu_total=0
+        this.model.sums.daofang_total=0
+        this.model.sums.jujian_total=0
+        this.model.sums.total_sum=0
       }
     }
+  },
+  computed: {
+    selected() {
+      // //tag
+      // this.$parent.showItem=!this.$parent.showItem
+      return this.$refs.paged.$refs.grid.selected
+    }
   }
+}
 </script>

package/src/components/checkplan/SelectMessage.vue

@@ -73,7 +73,7 @@
     },
     ready () {
       this.model.search("1=1")
-      console.log(this.model)
+      //tag
     },
     methods: {
       search () {
@@ -81,17 +81,17 @@
       },
       selfSearch (args) {
         // args.condition = `${args.condition} and f_price_id = '${this.priceid}'`
-        console.log("11111111111111111")
-        //console.log(this.checkrow,this.$parent.$refs.list,'cew')
+        //tag
+        ////tag
         var cc= this.model.condition
-        console.log(this.model.condition)
-        console.log(cc)
+        //tag
+        //tag
         this.condition = args.condition
         args.condition=args.condition
-        console.log( this.condition,args.condition)
+        //tag
 
 
-        console.log( this.condition,args.condition)
+        //tag
         this.model.search(args.condition)
       }
     },

package/src/components/checkplan/checkmsg.vue

@@ -112,20 +112,20 @@
           condition: `id  = '${self.data.f_filialeid}'`,
           orderitem: 'id'
         }})/*.then(res=>{*/
-      console.log("aaaaaaaaaaaaaaaa")
-      console.log(JSON.stringify(res.data[0].f_dir))
+      //tag
+      //tag)
       if (!res.data[0].f_dir){
         this.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
       }else{
         //this.f_dir=res.data[0].f_dir
         //try {
           let res1=await new HttpResetClass().load('GET',`/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {},{resolveMsg: '获取居民配置项成功！', rejectMsg: '获取居民配置项出错！'})/*.then(res=>{*/
-          console.log('111111111111居民===>', res1.data)
+          //tag
           //this.safeConfig["民用配置项"]=Object.assign({},res.data)
           Vue.config.safecheck.DevicesConfig=res1.data
           /*})*/
           let res2=await new HttpResetClass().load('GET',`/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {},{resolveMsg: '获取非居民配置项成功！', rejectMsg: '获取非居民配置项出错！'})/*.then(res=>{*/
-          console.log('22222222222222非居民===>', res2.data)
+          //tag
           //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
           Vue.config.safecheck.DevicesSetConfig=res2.data
           /*}).then(res=> {
@@ -274,13 +274,13 @@
     },
     props: ['data','show'],
     async ready () {
-      console.log("登录信息",this.$login)
+      //tag
       let res=await new HttpResetClass().load('POST','rs/sql/查询计划项表信息',{data:{f_userid:this.data.f_userinfoid}})
       this.planmeter=res.data[0]
       asyncReady(this).then(() => {
 
         this.$resetpost('rs/path/getUserinfomation', {data:{condition:`id = '${this.data.id}'`}}).then((res)=>{
-          console.log('res',res.data)
+          //tag
           let d=true
           if(res.data.length>0){
             this.userinfo = res.data[0]
@@ -295,73 +295,73 @@
             if(d){
               this.f_defect_content='正常'
             }
-            console.log("88888888888888888"+this.f_defect_content)
-            console.log(JSON.stringify(this.userinfo))
+            //tag
+            //tag)
             if(this.userinfo.f_sign_path != ''){
               this.userinfo.f_sign_path = 'rs/image/file/' + this.userinfo.f_sign_path
             }
           }else{
-            console.log('没找到')
+            //tag
             this.$showMessage('未查询到该用户安检单信息')
             this.$parent.showcheckmsg = false
           }
 
           if (this.userinfo.f_check_type=='民用'){
             this.deviceconfig=Vue.config.safecheck.DevicesConfig
-            // console.log("deviceconfig1==>"+JSON.stringify(this.deviceconfig))
+            // //tag)
           }else if (this.userinfo.f_check_type=='非民用'){
             this.deviceconfig=Vue.config.safecheck.DevicesSetConfig
-            //console.log("deviceconfig2==>"+JSON.stringify(this.deviceconfig))
+            ////tag)
           }
          /* if (this.userinfo.f_collection_type=='按气量'){
             this.deviceconfig["燃气表"]=this.config["燃气表"]
-            //console.log("deviceconfig3==>"+JSON.stringify(this.deviceconfig))
+            ////tag)
           }else if (this.userinfo.f_collection_type=='按金额'){
             this.deviceconfig["燃气表"]=this.config2["燃气表"]
-            //console.log("deviceconfig4==>"+JSON.stringify(this.deviceconfig))
+            ////tag)
           }*/
-          console.log("this.configjb-------------"+JSON.stringify(this.configjb)+"-------------"+typeof this.deviceconfig)
-          console.log("this.deviceconfig-------------"+JSON.stringify(this.deviceconfig))
+          //tag+"-------------"+typeof this.deviceconfig)
+          //tag)
           if(typeof this.deviceconfig == 'string'){
             this.deviceconfig=JSON.parse(this.deviceconfig)
           }
           if (this.planmeter.f_meter_classify=='机表'){
             let aaa=Object.assign({},this.configjb["燃气表"].items,this.deviceconfig["燃气表"].items)
             this.deviceconfig["燃气表"].items=aaa
-            //console.log("deviceconfig3==>"+JSON.stringify(this.deviceconfig))
+            ////tag)
           }else if (this.planmeter.f_meter_classify=='金额卡表'){
             let aaa=Object.assign({},this.configkbFee["燃气表"].items,this.deviceconfig["燃气表"].items)
             this.deviceconfig["燃气表"].items=aaa
-            //console.log("deviceconfig3==>"+JSON.stringify(this.deviceconfig))
+            ////tag)
           }else if (this.planmeter.f_meter_classify=='气量卡表'){
             let aaa=Object.assign({},this.configkbGas["燃气表"].items,this.deviceconfig["燃气表"].items)
             this.deviceconfig["燃气表"].items=aaa
-            //console.log("ddddddd==>"+JSON.stringify(this.configkbGas["燃气表"].items))
+            ////tag)
           }else if (this.planmeter.f_meter_classify=='物联网表'&&this.planmeter.f_collection_type=='按气量'){
             let aaa=Object.assign({},this.configwlGas["燃气表"].items,this.deviceconfig["燃气表"].items)
             this.deviceconfig["燃气表"].items=aaa
-            //console.log("deviceconfig3==>"+JSON.stringify(this.deviceconfig))
+            ////tag)
           }else if (this.planmeter.f_meter_classify=='物联网表'&&this.planmeter.f_collection_type=='按金额'){
             let aaa=Object.assign({},this.configwlFee["燃气表"].items,this.deviceconfig["燃气表"].items)
             this.deviceconfig["燃气表"].items=aaa
-            //console.log("deviceconfig3==>"+JSON.stringify(this.deviceconfig))
+            ////tag)
           }else {
             this.$showMessage("未获取到表型异常")
             return
           }
 
-          // console.log("dddd1"+JSON.stringify(this.deviceconfig))
+          // //tag)
           this.deviceconfig2=ObjConfig.getObjConfig(this.deviceconfig)
-          //console.log("dddd2"+JSON.stringify(this.deviceconfig))
+          ////tag)
           this.deviceconfig2[0].items=jsonSort(this.deviceconfig2[0].items,"index")
-          //console.log("dddd3"+JSON.stringify(this.deviceconfig2))
+          ////tag)
           this.deviceconfig2[1].items=jsonSort(this.deviceconfig2[1].items,"index")
-          //console.log("dddd4"+JSON.stringify(this.deviceconfig2))
+          ////tag)
           this.deviceconfig2=jsonSort(this.deviceconfig2,"index")
-          //console.log("dddd5"+JSON.stringify(this.deviceconfig2))
+          ////tag)
           this.defectcontent()
         })
-        console.log("this.userinfo.f_defect_content------------------"+this.userinfo.f_defect_content)
+        //tag
 
       })
     },
@@ -370,10 +370,10 @@
         this.$parent.showcheckmsg = false
       },
       getdefect(obj){
-        console.log(JSON.stringify(obj))
+        //tag)
         let str=''
         for(let o=0;o<obj.length;o++){
-          console.log(obj[o].f_item_value)
+          //tag
           if(o==obj.length-1){
             str += obj[o].f_item_value
           }else{
@@ -430,12 +430,12 @@
         return currentdate;
       },
       // getId(){
-      //   console.log('返回值:')
+      //   //tag
       // },
       //获取隐患信息
       getHidden(){
         setTimeout(()=> {
-          console.log('关闭打印提示框')
+          //tag
           this.$parent.showcheckmsg = false
         }, 1000)
       },