safecheck-client 3.0.35-36 → 3.0.35-39

package/src/components/pc/AddPlanItemYyChange.vue

@@ -98,7 +98,7 @@ import * as Util from '../../components/Util'
 let select = function* (self) {
   let http = new HttpResetClass()
   let getGasman = yield http.load('POST', '/rs/search', {
-    source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+    source: 'this.getParentByType($organization$).getChildByName($安检员$).getUsers()',
     userid: self.$login.f.id
   }, { resolveMsg: null, rejectMsg: null })
   //tag

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)
           }

package/src/components/pc/SecurityCheckLedger.vue

@@ -1,133 +1,133 @@
-<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>
-            </tr>
-          </template>
-          <template partial='body'>
-            <td style="text-align: center">{{row.f_residential_area}}</td>
-            <td style="text-align: center">{{row.area_num}}</td>
-            <td style="text-align: center">{{row.f_plan_name}}</td>
-            <td style="text-align: center">{{row.plan_num}}</td>
-            <td style="text-align: center">{{row.f_issue_time}}</td>
-            <td style="text-align: center">{{row.f_use_end_time}}</td>
-            <td style="text-align: center">{{row.first_check_date}}</td>
-            <td style="text-align: center">{{row.zq_value}}</td>
-            <td style="text-align: center">{{row.dw_value}}</td>
-            <td :style="{ 'text-align': 'center', color: row.difference_day <= 100 ? 'red' : '' }">{{ row.difference_day }}</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': '计划下发时间',
-        'f_use_end_time': '计划下发时间',
-        'first_check_date': '执行时间',
-        'zq_value': '执行周期',
-        'dw_value': '周期单位',
-        'difference_day': '距离下周期时间（天）'
-      }
-      }
-    },
-    methods: {
-      hiddenr() {
-        this.$parent.isdetail = !this.$parent.isdetail
-      },
-      showList(row){
-        row.val = row
-        this.$parent.selected(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>
+<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>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center">{{row.f_residential_area}}</td>
+            <td style="text-align: center">{{row.area_num}}</td>
+            <td style="text-align: center">{{row.f_plan_name}}</td>
+            <td style="text-align: center">{{row.plan_num}}</td>
+            <td style="text-align: center">{{row.f_issue_time}}</td>
+            <td style="text-align: center">{{row.f_use_end_time}}</td>
+            <td style="text-align: center">{{row.first_check_date}}</td>
+            <td style="text-align: center">{{row.zq_value}}</td>
+            <td style="text-align: center">{{row.dw_value}}</td>
+            <td :style="{ 'text-align': 'center', color: row.difference_day <= 100 ? 'red' : '' }">{{ row.difference_day }}</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': '计划下发时间',
+        'f_use_end_time': '计划下发时间',
+        'first_check_date': '执行时间',
+        'zq_value': '执行周期',
+        'dw_value': '周期单位',
+        'difference_day': '距离下周期时间（天）'
+      }
+      }
+    },
+    methods: {
+      hiddenr() {
+        this.$parent.isdetail = !this.$parent.isdetail
+      },
+      showList(row){
+        row.val = row
+        this.$parent.selected(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>