safecheck-client 3.0.35-6 → 3.0.35-61

package/src/components/pc/NewCheckpaper.vue

@@ -270,6 +270,30 @@ div {
               </tr>
               </tbody>
             </table>
+            <table class="table table-striped table-bordered" style="margin-top: 35px"
+                   v-show="showPdfImg && paperdata.f_entry_status=='入户' && ajresult=='有隐患'">
+              <thead>
+              <tr>
+                <th style="text-align: center">隐患照片</th>
+              </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td style="margin: auto;text-align: center">
+                  <div class="container" style="max-width: 550px;background: #FFFFFF">
+                    <div class="img" v-for="img in deviceImgs">
+                      <img-self-plus :list="deviceCollect.imgs " :src="img.f_overall_path" style="float: left"
+                                     width="150"
+                                     height="200"></img-self-plus>
+                    </div>
+                  </div>
+
+
+                </td>
+
+              </tr>
+              </tbody>
+            </table>
             <table class="table table-striped table-bordered" style="margin-top: 35px"
                    v-show="paperdata.f_entry_status=='入户'">
               <thead>
@@ -631,6 +655,30 @@ div {
 
                 </tbody>
               </table>
+              <table class="table table-striped table-bordered" style="margin-top: 35px"
+                     v-show="showPdfImg && paperdata.f_entry_status=='入户' && ajresult=='有隐患'">
+                <thead>
+                <tr>
+                  <th style="text-align: center">隐患照片</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="margin: auto;text-align: center">
+                    <div class="container" style="max-width: 550px;background: #FFFFFF">
+                      <div class="img" v-for="img in deviceImgs">
+                        <img-self-plus :list="deviceCollect.imgs " :src="img.f_overall_path" style="float: left"
+                                       width="150"
+                                       height="200"></img-self-plus>
+                      </div>
+                    </div>
+
+
+                  </td>
+
+                </tr>
+                </tbody>
+              </table>
               <table class="table table-striped table-bordered" style="margin-top: 35px"
                      v-show="paperdata.f_entry_status=='入户'">
                 <thead>
@@ -976,6 +1024,7 @@ export default {
         f_defect_content: ''
       },
       showPdfDownload: this.$appdata.getSingleValue('安检结果pdf下载') ? this.$appdata.getSingleValue('安检结果pdf下载') : false,
+      showPdfImg: this.$appdata.getSingleValue('安检结果pdf展示隐患照片') ? this.$appdata.getSingleValue('安检结果pdf展示隐患照片') : false,
       lastCheckData: {},
       paperdata: {},
       picturename: '隐患照片',
@@ -983,6 +1032,7 @@ export default {
       hasDevice: false,
       deviceCollect: {},
       deviceCollects: [],
+      deviceImgs:[],
       isshow: false,
       ajresult: '',
       loading: true,
@@ -1165,6 +1215,7 @@ export default {
       //tag)
       //tag
       this.deviceCollects = []
+      this.deviceImgs = []
       let checkResult = '正常'
       this.result = '正常'
       let codata = JSON.parse(JSON.stringify(this.data))
@@ -1182,6 +1233,7 @@ export default {
             // //tag
             let deviceelse = []
             let deviceInfos = []
+
             for (let i in this.data[device][item].f_items) {
               let defects = ''
 
@@ -1224,11 +1276,13 @@ export default {
                 if (defects != '') {
                   console.log('有隐患items', items)
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}${items.f_else ? items.f_else : ''}`)
+                  this.deviceImgs.push({f_overall_path:items.f_path})
                 }
               } else if ((items.type === 'string' || items.type === 'number') && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                this.deviceImgs.push({f_overall_path:items.f_path})
 
               } else if (items.f_item_name == '金额异常差值') {
                 var deviation = this.$appdata.getSingleValue('金额异常差值允许误差')
@@ -1280,6 +1334,7 @@ export default {
             this.$set('deviceCollect.else', deviceelse)
             console.log('deviceCollect.devices', this.deviceCollect.devices)
             console.log('deviceCollect.else', this.deviceCollect.else)
+            console.log('deviceCollect.imgs', this.deviceCollect.imgs)
             //tag)
             if (this.deviceCollect.name) {
               //tag
@@ -1326,8 +1381,8 @@ export default {
           this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
         }
         if (Vue.config.safecheck.ApproveConfig.hiddendanger != undefined) {
-          if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 3) {
-            this.hiddenDangerImgNumber = 3
+          if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 5) {
+            this.hiddenDangerImgNumber = 5
           } else {
             this.hiddenDangerImgNumber = parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger)
           }
@@ -1828,7 +1883,7 @@ export default {
         } else if (this.role == 'androidview') {
           id = this.item.f_paper_id
         }
-        this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
+        this.$resetpost(`rs/logic/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
             //tag
             if (respanse.data.length != 0) {
               // 包含 其它 特殊处理的数组

package/src/components/pc/SecurityCheckLedger.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">小区名称</label>
+                <input type="text" class="input_search" v-model="model.f_residential_area"
+                       style="width: 60%" placeholder="小区名称" condition="ta.f_residential_area = '{}'">
+              </div>
+              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                     @click="$parent.$parent.hiddenr()"></div>
+                <export-excel-safe :data="$parent.$parent.searchData"
+                              :field="$parent.$parent.excelHeaders"
+                              :choose-col="true"
+                              sqlurl="rs/logic/SafeExportExcel" sql-name="securityCheckLedger" template-name='安检台账'></export-excel-safe>
+                <button class="button_spacing button_search" @click="search()">查询</button>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>小区名称</nobr>
+              </th>
+              <th>
+                <nobr>小区用户数</nobr>
+              </th>
+              <th>
+                <nobr>所属计划</nobr>
+              </th>
+              <th>
+                <nobr>计划内用户数</nobr>
+              </th>
+              <th>
+                <nobr>计划下发时间</nobr>
+              </th>
+              <th>
+                <nobr>计划执行时间</nobr>
+              </th>
+              <th>
+                <nobr>计划结束时间</nobr>
+              </th>
+              <th>
+                <nobr>执行周期</nobr>
+              </th>
+              <th>
+                <nobr>周期单位</nobr>
+              </th>
+              <th>
+                <nobr>距离下周期时间（天）</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.f_residential_area}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.area_num}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.f_plan_name}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.plan_num}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.f_issue_time}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.first_check_date}}</td>
+            <td style="text-align: center " @click="$parent.$parent.$parent.showList(row)">{{row.f_use_end_time}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.zq_value}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.dw_value}}</td>
+            <td :style="{ 'text-align': 'center', color: row.difference_day <= 100 ? 'red' : '' }" @click="$parent.$parent.$parent.showList(row)">{{ row.difference_day }}</td>
+            <td style="text-align: center">
+              <button class="button_spacing button_search" @click="$parent.$parent.$parent.showUser(row)">计划下发</button>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+export default {
+  title: '安检台账',
+  data() {
+    return {
+      model: new PagedList('rs/sql/securityCheckLedger', 20),
+      searchData: {
+        condition: "1=1"
+      },
+      excelHeaders: {
+        'f_residential_area': '小区名称',
+        'area_num': '小区用户数',
+        'f_plan_name': '所属计划',
+        'plan_num': '计划内用户数',
+        'f_issue_time': '计划下发时间',
+        'first_check_date': '计划执行时间',
+        'f_use_end_time': '计划结束时间',
+        'zq_value': '执行周期',
+        'dw_value': '周期单位',
+        'difference_day': '距离下周期时间（天）'
+      }
+      }
+    },
+    methods: {
+      hiddenr() {
+        this.$parent.isdetail = !this.$parent.isdetail
+      },
+      showList(row){
+        row.val = row
+        this.$parent.selected(row)
+      },
+      showUser(row){
+        row.val = row
+        this.$parent.selected2(row)
+      },
+      selfSearch(args) {
+        this.model.search(args.condition, args.model, args.condValue)
+      }
+    },
+    ready() {
+
+    },
+  watch: {
+    'model.condition'(val) {
+      if (val) {
+        this.searchData.condition = val
+      }
+    }
+  },
+  computed: {
+    selected() {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+
+  }
+</script>

package/src/components/pc/SecurityCheckList.vue

@@ -0,0 +1,160 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">计划名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_plan_name" placeholder='计划名称'
+                     condition="f_plan_name = '{}'" @keyup.enter="search()">
+            </div>
+<!--            <div class="form-group col-sm-4" >-->
+<!--              <label class="font_normal_body">用户类型</label>-->
+<!--              <v-select style="width:60% "-->
+<!--                        class="select select_list"-->
+<!--                        :value.sync="model.f_user_type"-->
+<!--                        v-model="model.f_user_type"-->
+<!--                        :options='$parent.$parent.userType'-->
+<!--                        placeholder='用户类型'-->
+<!--                        condition="f_user_type = '{}'"-->
+<!--                        close-on-select>-->
+<!--              </v-select>-->
+<!--            </div>-->
+<!--            <div class="form-group col-sm-4" >-->
+<!--              <label class="font_normal_body">是否已检</label>-->
+<!--              <v-select style="width:60% "-->
+<!--                        class="select select_list"-->
+<!--                        :value.sync="model.f_state"-->
+<!--                        v-model="model.f_state"-->
+<!--                        :options='$parent.$parent.checkState'-->
+<!--                        placeholder='是否已检'-->
+<!--                        condition="f_state = '{}'"-->
+<!--                        close-on-select>-->
+<!--              </v-select>-->
+<!--            </div>-->
+<!--            <div class="form-group col-sm-4" >-->
+<!--              <label class="font_normal_body">安检状态</label>-->
+<!--              <v-select style="width:60% "-->
+<!--                        class="select select_list"-->
+<!--                        :value.sync="model.f_entry_status"-->
+<!--                        v-model="model.f_entry_status"-->
+<!--                        :options='$parent.$parent.entry_status'-->
+<!--                        placeholder='安检状态'-->
+<!--                        condition="f_entry_status = '{}'"-->
+<!--                        close-on-select>-->
+<!--              </v-select>-->
+<!--            </div>-->
+          </div>
+<!--          <div class="row" v-show="$parent.$parent.criteriaShow">-->
+<!--            <div class="form-group col-sm-4" >-->
+<!--              <label class="font_normal_body">气表编号</label>-->
+<!--              <input type="text" class="input_search" style="width:60%" v-model="model.f_meternumber" placeholder='气表编号'-->
+<!--                     condition="f_meternumber = '{}'" @keyup.enter="search()">-->
+<!--            </div>-->
+<!--            <div class="form-group col-sm-4" >-->
+<!--              <label class="font_normal_body">气表品牌</label>-->
+<!--              <input type="text" class="input_search" style="width:60%" v-model="model.f_meter_brand" placeholder='气表品牌'-->
+<!--                     condition="f_meter_brand like '%{}%'" @keyup.enter="search()">-->
+<!--            </div>-->
+<!--          </div>-->
+          <div class="row">
+            <div class="form-group col-sm-2 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+<!--              <export-excel-safe   :data="$parent.$parent.exportParameter"-->
+<!--                                   :field="$parent.$parent.excelHeaders"-->
+<!--                                   sqlurl="rs/logic/SafeExportExcel" sql-name="getCheckPlanUserList"-->
+<!--                                   template-name='安检情况明细' :choose-col="true">-->
+<!--              </export-excel-safe>-->
+<!--              &lt;!&ndash;展示下方条件或隐藏&ndash;&gt;-->
+<!--              <div class="span" style="float:right;">-->
+<!--                <div class="button_spacing" style="float: right;margin-left:10px"-->
+<!--                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
+<!--                     @click="$parent.$parent.hidden()">-->
+<!--                </div>-->
+<!--              </div>-->
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr>计划名称</nobr></th>
+            <th>
+              <nobr>计划内用户数</nobr>
+            </th>
+            <th>
+              <nobr>计划下发时间</nobr>
+            </th>
+            <th>
+              <nobr>计划执行时间</nobr>
+            </th>
+            <th>
+              <nobr>计划结束时间</nobr>
+            </th>
+            <th><nobr>入户数</nobr></th>
+            <th><nobr>到访不遇数</nobr></th>
+            <th><nobr>拒检数</nobr></th>
+            <th><nobr>安检率</nobr></th>
+            <th><nobr>入户率</nobr></th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td style="text-align:center"><span>{{row.f_plan_name}}</span></td>
+            <td style="text-align:center"><span>{{row.f_plan_name}}</span></td>
+            <td style="text-align:center"><span>{{row.f_issue_time}}</span></td>
+            <td style="text-align:center"><span>{{row.min_f_last_check_date}}</span></td>
+            <td style="text-align:center"><span>{{row.max_f_last_check_date}}</span></td>
+            <td style="text-align:center">{{row.f_ruhu}}</td>
+            <td style="text-align:center">{{row.f_buyu}}</td>
+            <td style="text-align:center">{{row.f_jujian}}</td>
+            <td style="text-align:center">{{row.f_check_bv}}</td>
+            <td style="text-align:center">{{row.f_ruhu_bv}}</td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+export default {
+  title: '安检情况明细',
+  data () {
+    return {
+      model: new PagedList('rs/sql/securityCheckList', 50, {}),
+    }
+  },
+  props: ['checkrow'],
+  ready () {
+    this.search()
+    // this.getfield = this.config.excelHeaders
+  },
+  methods: {
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    async selfSearch (args) {
+      if(!this.checkrow){
+        return
+      }
+      let condition = {
+        condition1: `f_residential_area = '${this.checkrow.f_residential_area}'`,
+        condition2: args.condition
+      }
+      const res = await new HttpResetClass().load('post','/rs/sql/securityCheckList',{data:{condition: condition}})
+      this.model.rows = res.data
+      // this.model.search(condition, args.model)
+    },
+  },
+  watch: {
+    'checkrow' () {
+      this.search()
+    }
+  }
+}
+</script>

package/src/components/pc/SecurityCheckManage.vue

@@ -0,0 +1,113 @@
+<template>
+  <div id="unit" class="flex-row" v-if="listpage" >
+    <div :class="{'basic-main':((!isdetail) && (!usershow) && (!isdetail2)),'binary-left':isdetail||usershow||isdetail2}" >
+      <security-check-ledger1 v-ref:list :row="row"></security-check-ledger1>
+    </div>
+    <div class="binary-right" style="overflow-y: scroll" v-if="isdetail">
+      <security-check-ledger2 :checkrow="checkrow" ></security-check-ledger2>
+    </div>
+    <div class="binary-right" style="overflow-y: scroll" v-if="isdetail2">
+      <security-check-ledger3 :checkrow="checkrow" ></security-check-ledger3>
+    </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+
+export default {
+  title: '安检情况汇总',
+  data () {
+    return {
+      f_userinfo_id: '',
+      f_filialeid: this.$login.f.orgid,
+      config: {
+        isLimit: false, // 限购
+        audit: false,  // 启用审核
+        heatingSeason: false, // 采暖季
+        deductionWay: 'cycle'  // 'cycle: 周期扣费； day: 日运算扣费； singleHS: 采暖季独立扣费； dayHS: 采暖季日扣费；' 此值不配置默认周期扣费
+      },
+      listpage: true,
+      row: null,
+      checkrow: null,
+      parentData: '',
+      isdetail: false,
+      isdetail2: false,
+      gasPriceShow: false,
+      usershow: false,
+      // 控制气价信息界面和变更操作记录界面的展示
+      changeView: false,
+      nocivilshow:true,
+      modalshow:false,
+    }
+  },
+  ready () {
+  },
+  methods: {
+    cancel(obj) {
+      this.listpage = true
+    },
+    dealMsg(val) {
+      this.listpage = false
+      this.f_userinfo_id = val.f_userinfo_id
+    },
+    selected (obj) {
+      this.checkrow = obj.val
+      this.isdetail = true
+      this.isdetail2 = false
+      this.usershow = false
+      this.listpage = true
+    },
+    selected2 (obj) {
+      this.checkrow = obj.val
+      this.isdetail = false
+      this.isdetail2 = true
+      this.usershow = false
+      this.listpage = true
+    },
+    refresh () {
+      this.row = null
+      this.gasPriceShow = false
+      this.isdetail = false
+      this.usershow =false
+      this.listpage=true
+      this.$refs.list.search()
+    }
+  },
+  events: {
+    'success' (name, row, res) {
+      this.row = row
+      this.gasPriceShow = false
+      this.isdetail = false
+      this.usershow =false
+      this.listpage=true
+      this.$refs.list.search()
+    },
+    'error' (name, row, res) {
+      this.row = row
+      this.gasPriceShow = false
+      this.isdetail = false
+      this.usershow =false
+      this.listpage=true
+      this.$refs.list.search()
+    },
+    'close' (res) {
+      this.row = null
+      this.gasPriceShow = false
+      this.isdetail = false
+      this.usershow =false
+      this.listpage=true
+    },
+    'search' () {
+      this.row = null
+      this.gasPriceShow = false
+      this.isdetail = false
+      this.usershow =false
+      this.listpage=true
+      // this.$refs.list.search()
+    }
+  }
+}
+</script>
+<style>
+
+</style>