safecheck-client 3.0.39-2 → 3.0.39-20

package/src/components/pc/SafeCheckOrder/SafeCheckOrderList.vue

@@ -68,6 +68,18 @@
                      condition="f_userinfo_code = '{}'"
                      placeholder="用户编号"/>
             </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">网&ensp;格&ensp;员</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.f_book_checker" v-model="model.f_book_checker"
+                        :options='$parent.$parent.users'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
           </div>
         </div>
       </div>
@@ -145,6 +157,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         // f_orgids: '1522.255', //测试使用
         suggetsShow: false,
         f_suggest: '',
+        users:[{label: '全部', value: ''}],
 
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
@@ -155,8 +168,29 @@ import {HttpResetClass, PagedList} from 'vue-client'
     ready(){
       // 默认查询待处理状态预约
       this.search()
+      this.initBookChecker()
     },
     methods: {
+      initBookChecker(){
+        new HttpResetClass().load('POST', '/rs/search', {
+          data: {
+            source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($网格员$) != -1)`,
+            userid: this.$login.f.id
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          let data = res.data
+          const addedNames = new Set()
+          this.users = []
+          data.forEach(user => {
+            if (user.state === '在职') {
+              if (!addedNames.has(user.name)) {
+                this.users.push({ label: user.name, value: user.name })
+                addedNames.add(user.name)
+              }
+            }
+          });
+        })
+      },
       getPcds(val) {
         this.pcds = [{label: '全部', value: ''}]
         new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,

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/querycheckpaper/PaperItem.vue

@@ -1,59 +1,59 @@
-<template>
-  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
-    <div class="auto">
-      <partial-view v-ref:pv>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户姓名:</label>
-          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户地址:</label>
-          <span class = "col-sm-8">{{rowdata.f_address}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">安检人:</label>
-          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
-          <label class = "col-sm-3 control-label">安检状态:</label>
-          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">入户时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">离开时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">用户评价:</label>
-          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
-        </div>
-      </partial-view>
-    </div>
-    <check-paper-items :row="rowdata"></check-paper-items>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import co from 'co'
-
-  export default {
-    title: '安检项信息',
-    name: 'CheckPaperItem',
-    props: ['row'],
-    data () {
-      return {
-        rowdata: this.row
-      }
-    },
-    ready () {
-      this.rowdata = this.row
-    },
-    watch: {
-      'row' (val) {
-        this.rowdata = val
-      }
-    }
-  }
-</script>
+<template>
+  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
+    <div class="auto">
+      <partial-view v-ref:pv>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户姓名:</label>
+          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户地址:</label>
+          <span class = "col-sm-8">{{rowdata.f_address}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">安检人:</label>
+          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
+          <label class = "col-sm-3 control-label">安检状态:</label>
+          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">入户时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">离开时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户评价:</label>
+          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
+        </div>
+      </partial-view>
+    </div>
+    <check-paper-items :row="rowdata"></check-paper-items>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import co from 'co'
+
+  export default {
+    title: '安检项信息',
+    name: 'CheckPaperItem',
+    props: ['row'],
+    data () {
+      return {
+        rowdata: this.row
+      }
+    },
+    ready () {
+      this.rowdata = this.row
+    },
+    watch: {
+      'row' (val) {
+        this.rowdata = val
+      }
+    }
+  }
+</script>