safecheck-client 3.0.35-3 → 3.0.35-30

package/src/components/pc/SecurityCheckLedger.vue

@@ -0,0 +1,113 @@
+<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 like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
+                <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>
+            </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.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">{{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': '计划下发时间',
+        'first_check_date': '执行时间',
+        'zq_value': '执行周期',
+        'dw_value': '周期单位',
+        'difference_day': '距离下周期时间（天）'
+      }
+      }
+    },
+    methods: {
+      selfSearch(args) {
+        this.model.search(args.condition, args.model, args.condValue)
+      }
+    },
+    ready() {
+
+    },
+  watch: {
+    'model.condition'(val) {
+      if (val) {
+        this.searchData.condition = val
+      }
+    }
+  }
+
+  }
+</script>

package/src/components/phonestate/MonthlyTraffic.vue

@@ -1,66 +1,66 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <div novalidate class="form-inline auto" partial>
-          <div class="form-group">
-            <label class="col-sm-12 control-label">选择年月：</label>
-            <div class="col-sm-12">
-              <datepicker placeholder="请选择年月"
-                :value.sync="$parent.$parent.model.f_ym"
-                :disabled-days-of-Week="[]"
-                :format="'yyyy-MM'">
-              </datepicker>
-              <button class="btn btn-default" @click="search()">查询</button>
-              <div class="form-group">
-                部门:
-                <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
-              </div>
-              {{$parent.$parent.model.chosenOrg.fullname}}
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>手机使用者</th>
-            <th>流量Mb</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td v-on:click.stop.prevent='$parent.$parent.$parent.dailyTraffic(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
-          <td>{{row.f_traffic}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import * as Util from '../Util'
-
-export default {
-  title: '月流量统计',
-  props: ['f'],
-  data () {
-    let model = new PagedList('rs/rcq/月度流量统计', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id', f_ym: 'this.f_ym'})
-    model.f_ym = Util.toStandardYearMonth()
-    model.chosenOrg = {id:0}
-    return {
-      model: model,
-    }
-  },
-  methods: {
-    dailyTraffic (row) {
-      this.$goto('daily-traffic', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name, f_ym: this.model.f_ym}, 'self')
-    }
-  },
-  ready () {
-    this.model.f_loggedOnUserId = this.f.id
-    this.model.chosenOrg.id = this.f.parent.id
-    this.model.search()
-  }
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <div class="form-group">
+            <label class="col-sm-12 control-label">选择年月：</label>
+            <div class="col-sm-12">
+              <datepicker placeholder="请选择年月"
+                :value.sync="$parent.$parent.model.f_ym"
+                :disabled-days-of-Week="[]"
+                :format="'yyyy-MM'">
+              </datepicker>
+              <button class="btn btn-default" @click="search()">查询</button>
+              <div class="form-group">
+                部门:
+                <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
+              </div>
+              {{$parent.$parent.model.chosenOrg.fullname}}
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>手机使用者</th>
+            <th>流量Mb</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td v-on:click.stop.prevent='$parent.$parent.$parent.dailyTraffic(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
+          <td>{{row.f_traffic}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import * as Util from '../Util'
+
+export default {
+  title: '月流量统计',
+  props: ['f'],
+  data () {
+    let model = new PagedList('rs/rcq/月度流量统计', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id', f_ym: 'this.f_ym'})
+    model.f_ym = Util.toStandardYearMonth()
+    model.chosenOrg = {id:0}
+    return {
+      model: model,
+    }
+  },
+  methods: {
+    dailyTraffic (row) {
+      this.$goto('daily-traffic', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name, f_ym: this.model.f_ym}, 'self')
+    }
+  },
+  ready () {
+    this.model.f_loggedOnUserId = this.f.id
+    this.model.chosenOrg.id = this.f.parent.id
+    this.model.search()
+  }
+}
+</script>

package/src/components/phonestate/MonthlyTrafficRouter.vue

@@ -1,15 +1,15 @@
-<template>
-  <div>
-    <route :comp="{name: 'void-page'}" name="traffic-router"></route>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '月流量统计',
-  props: ['f'],
-  ready () {
-    this.$goto('monthly-traffic-list', {f: this.f}, 'self')
-  }
-}
-</script>
+<template>
+  <div>
+    <route :comp="{name: 'void-page'}" name="traffic-router"></route>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '月流量统计',
+  props: ['f'],
+  ready () {
+    this.$goto('monthly-traffic-list', {f: this.f}, 'self')
+  }
+}
+</script>

package/src/components/phonestate/PostMap.vue

@@ -1,82 +1,82 @@
-<template>
-  <div class="auto">
-    <button type="button" class="btn btn-default" @click="this.$back('ass')">&lt;&lt;</button>
-    <div id="allmap2" :style="mapStyle"></div>
-  </div>
-</template>
-
-<script>
-// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
-
-import Vue from 'vue'
-
-export default {
-  title: '岗位图',
-  props: ['lonlats'],
-  data () {
-    return {
-      mapStyle: {
-        width: (this.$parent.$el.clientWidth -30) + 'px',
-        height: (this.$parent.$el.clientHeight - 80) + 'px'
-      },
-      markers : []
-    }
-  },
-  ready () {
-    this.lonlats.filter((item) => {
-      return item.f_longitude != 0 && item.f_latitude != 0
-    }).forEach((item) => {
-      this.markers.push({
-        longitude: item.f_longitude,
-        latitude: item.f_latitude,
-        hint: item.f_user_name + '[' + item.f_datetime + ']'
-      })
-    })
-    if(Vue.mapLoaded) {
-      this.render()
-    } else {
-      window.__mapCallback__ = this.mapCallback
-      let element = document.createElement('script')
-      element.setAttribute("type","text/javascript")
-      element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
-      document.body.appendChild(element)
-    }
-  },
-  methods: {
-    mapCallback () {
-      Vue.mapLoaded = true
-      this.render()
-    },
-    patch () {
-      let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
-      if(a.length != 0) {
-        a[0].style.height = 'auto'
-      } else {
-        window.setTimeout(this.patch, 500)
-      }
-    },
-    render () {
-      window.map = new BMap.Map("allmap2")
-      window.map.clearOverlays();
-      if(this.markers.length == 0)
-        window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
-      else
-        window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
-      window.map.addControl(new BMap.NavigationControl())
-      this.markers.forEach(function(pos) {
-        var point = new BMap.Point(pos.longitude,pos.latitude)
-      	var marker = new BMap.Marker(point)  // 创建标注
-        var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
-        marker.setLabel(label)
-        label.setStyle({ border : '0px', padding: '0px'})
-      	window.map.addOverlay(marker)              // 将标注添加到地图中
-      // 	var infoWindow = new BMap.InfoWindow(pos.hint)  // 创建信息窗口对象
-      // 	marker.addEventListener("click", function(){
-      // 		window.map.openInfoWindow(infoWindow,point) //开启信息窗口
-      // 	})
-      })
-      this.patch()
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto">
+    <button type="button" class="btn btn-default" @click="this.$back('ass')">&lt;&lt;</button>
+    <div id="allmap2" :style="mapStyle"></div>
+  </div>
+</template>
+
+<script>
+// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
+
+import Vue from 'vue'
+
+export default {
+  title: '岗位图',
+  props: ['lonlats'],
+  data () {
+    return {
+      mapStyle: {
+        width: (this.$parent.$el.clientWidth -30) + 'px',
+        height: (this.$parent.$el.clientHeight - 80) + 'px'
+      },
+      markers : []
+    }
+  },
+  ready () {
+    this.lonlats.filter((item) => {
+      return item.f_longitude != 0 && item.f_latitude != 0
+    }).forEach((item) => {
+      this.markers.push({
+        longitude: item.f_longitude,
+        latitude: item.f_latitude,
+        hint: item.f_user_name + '[' + item.f_datetime + ']'
+      })
+    })
+    if(Vue.mapLoaded) {
+      this.render()
+    } else {
+      window.__mapCallback__ = this.mapCallback
+      let element = document.createElement('script')
+      element.setAttribute("type","text/javascript")
+      element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
+      document.body.appendChild(element)
+    }
+  },
+  methods: {
+    mapCallback () {
+      Vue.mapLoaded = true
+      this.render()
+    },
+    patch () {
+      let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
+      if(a.length != 0) {
+        a[0].style.height = 'auto'
+      } else {
+        window.setTimeout(this.patch, 500)
+      }
+    },
+    render () {
+      window.map = new BMap.Map("allmap2")
+      window.map.clearOverlays();
+      if(this.markers.length == 0)
+        window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
+      else
+        window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
+      window.map.addControl(new BMap.NavigationControl())
+      this.markers.forEach(function(pos) {
+        var point = new BMap.Point(pos.longitude,pos.latitude)
+      	var marker = new BMap.Marker(point)  // 创建标注
+        var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
+        marker.setLabel(label)
+        label.setStyle({ border : '0px', padding: '0px'})
+      	window.map.addOverlay(marker)              // 将标注添加到地图中
+      // 	var infoWindow = new BMap.InfoWindow(pos.hint)  // 创建信息窗口对象
+      // 	marker.addEventListener("click", function(){
+      // 		window.map.openInfoWindow(infoWindow,point) //开启信息窗口
+      // 	})
+      })
+      this.patch()
+    }
+  }
+}
+</script>

package/src/components/planmanage/PlanManage.vue

@@ -251,6 +251,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="createPlan.isShare=='是' && ismulchecker">
+              <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="createPlan.checkers"
+                v-model="createPlan.checkers"
+                :options='checker'
+                placeholder='请选择'
+                :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -350,6 +362,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='是' && ismulchecker">
+              <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+              <v-select
+                class="select select_list"
+                :value.sync="upCheckPlan.checkers"
+                v-model="upCheckPlan.checkers"
+                :options='checker'
+                placeholder='请选择'
+                :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="upCheckPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -396,6 +420,7 @@
         title: '计划管理',
         data() {
           return {
+            ismulchecker:this.$appdata.getSingleValue('计划安检员多选')?true:false,
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
@@ -410,7 +435,9 @@
               f_checker_id:'',
               isShare:'',
               f_checker:'',
-              checker:{}
+              f_checkerstr:'',
+              checker:{},
+              checkers:[]
             },
             isSend:false,
             createPlan:{
@@ -421,7 +448,9 @@
               f_issued:'否',
               f_checker_id:null,
               checker:{},
+              checkers:[],
               f_checker:null,
+              f_checkerstr:null,
               f_safecheck_type:'',
             },
             planCondition:{},
@@ -523,6 +552,12 @@
             return
           }
           if(this.createPlan.isShare=="是"){
+              if(this.ismulchecker && this.createPlan.checkers.length > 0){
+                this.createPlan.checkers.forEach((value) => {
+                  this.createPlan.f_checkerstr += `${value.name},`
+                })
+                this.createPlan.f_checkerstr = this.createPlan.f_checkerstr.slice(0, -1)
+              }
             this.createPlan.f_checker_id=null
             this.createPlan.f_checker=null
           }else{
@@ -545,7 +580,9 @@
               f_issued:'否',
               f_checker_id:null,
               checker:{},
+              checkers:[],
               f_checker:null,
+              f_checkerstr:null,
               f_safecheck_type:'',
               f_create_operator:''
           }
@@ -608,7 +645,7 @@
         //按条件查询所有安检计划
         async loadCheckPlan() {
           this.isSend=true
-          this.checkplan.check.checkes=[]
+          this.checkplan.check.checkescheckes=[]
           let fieldValue=''
           switch(this.currentorder){
             case "按时间降序":
@@ -677,6 +714,12 @@
           console.log(this.upCheckPlan)
 
           if(this.upCheckPlan.isShare=="是"){
+            if(this.ismulchecker && this.upCheckPlan.checkers.length > 0){
+              this.upCheckPlan.checkers.forEach((value) => {
+                this.upCheckPlan.f_checkerstr += `${value.name},`
+              })
+              this.upCheckPlan.f_checkerstr = this.upCheckPlan.f_checkerstr.slice(0, -1)
+            }
             this.upCheckPlan.f_checker_id=null
             this.upCheckPlan.f_checker=null
           }else{
@@ -686,6 +729,8 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
             data:{
+              checkers:this.createPlan.checkers,
+              f_checkerstr:this.createPlan.f_checkerstr,
               f_checker:this.upCheckPlan.f_checker,
               f_safecheck_type:this.upCheckPlan.f_safecheck_type,
               f_checker_id:this.upCheckPlan.f_checker_id,