safecheck-client 3.0.39-7 → 3.0.39-70

package/src/filiale/tongchuan/pc/PaperList.vue

@@ -170,16 +170,6 @@
               <!--              <right-tree @re-res="$parent.$parent.getRes" :initresid="$parent.$parent.$login.f.orgid">-->
               <!--              </right-tree>-->
               <!--            </div>-->
-              <div class="col-sm-4 form-group" v-show="$parent.$parent.criteriaShow" style="margin: 0">
-                <role-selector-safe
-                  role-name="安检员"
-                  role-lable="安&nbsp;检&nbsp;员&nbsp;"
-                  @re-res="$parent.$parent.getRes"
-                  :value.sync="model.f_checker_id"
-                  v-model="model.f_checker_id"
-                  condition="f_checker_name = '{}'">
-                </role-selector-safe>
-              </div>
               <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">操作人员</label>
                 <input type="text" class="input_search" v-model="model.f_checker"
@@ -222,6 +212,28 @@
                           :value-single="true">
                 </v-select>
               </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <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 class="col-sm-4 form-group" v-show="$parent.$parent.criteriaShow" style="margin: 0">
+                <role-selector-safe
+                  role-name="安检员"
+                  role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                  @re-res="$parent.$parent.getRes"
+                  :value.sync="model.f_checker_id"
+                  v-model="model.f_checker_id"
+                  condition="f_checker_name = '{}'">
+                </role-selector-safe>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -432,6 +444,7 @@ export default {
         value: ''
       }, ...this.$appdata.getParam('安检状态')] : [{label: '全部', value: ''}],
       f_checkplans: this.$appdata.getParam('有无计划'),
+      users:[{label: '全部', value: ''}],
       showcheckmsg: false,
       checkInfo: {},
       orderDefault: "'f_offsite_time'",
@@ -629,6 +642,26 @@ export default {
         })
       })
     },
+    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)
+            }
+          }
+        });
+      })
+    }
   },
 
   ready() {
@@ -641,6 +674,7 @@ export default {
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     co(gen)
     this.getTableBrands()
+    this.initBookChecker()
   },
   watch: {
     'model.f_no_checkplan'(val) {

package/src/filiale/tongchuan/pc/PersonTrack.vue

@@ -0,0 +1,269 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <div class="row">
+      <div class="col-sm-9 amap-main">
+        <div class="form-horizontal select-overspread container-fluid auto">
+          <div class="row">
+            <div class="col-sm-3 form-input-group" style="width: 20%">
+              <label class="control-label">公&emsp;&emsp;司</label>
+              <right-tree-safe @re-res="getRes"  >
+              </right-tree-safe>
+            </div>
+            <div class="col-sm-3 form-input-group" style="width: 20%">
+              <label class="control-label" >轨迹时间</label>
+              <datepicker placeholder="轨迹时间"
+                          :value.sync="searchCondition.date"
+                          v-model="searchCondition.date"
+                          :format="'yyyy-MM-dd'">
+              </datepicker>
+            </div>
+            <div class="col-sm-3 form-input-group" style="width: 20%">
+              <label class="control-label">安检员</label>
+              <v-select :value.sync="searchCondition.userId" v-model='searchCondition.userId'
+                        :value-single="true" clear-button search
+                        :options='searchUserEndOption' placeholder='请选择'
+              ></v-select>
+            </div>
+            <div class="col-sm-3 form-input-group" style="width: 20%">
+              <label class="control-label">班组</label>
+              <v-select :value.sync="searchCondition.departmentId" v-model='searchCondition.departmentId'
+                        :value-single="true" clear-button search
+                        :options='searchDepartmentOption' placeholder='请选择'
+              ></v-select>
+            </div>
+            <div class="col-sm-3 form-input-group" style="width: 20%">
+              <label class="control-label">网格员</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="f_book_checker" v-model="f_book_checker"
+                        :options='users'
+                        filer-key="name"
+                        close-on-select clear-button
+                        :value-single="true">
+              </v-select>
+            </div>
+            <div class="col-sm-3 form-input-group" style="width: 20%;float:right;">
+              <button class="btn btn-primary"  @click="search">查询</button>
+            </div>
+          </div>
+        </div>
+        <a-map-trajectory-new :outerlinedata.sync="outerlinedata" :pathnavigatorstyle="pathnavigatorstyle" :dom="dom"></a-map-trajectory-new>
+      </div>
+      <div class="col-sm-3">
+        <div id="zzz" class="basic-main" style="flex:1;margin-left: 0px;overflow: hidden">
+          <div class="flex">
+            <div class="panel panel-info" style="flex: 4;margin-top:0px;height: 50%">
+              <div class="panel-heading" style="height: auto">
+                <h3 class="panel-title">轨迹记录</h3>
+              </div>
+              <div class="panel-body" style="overflow: scroll; height: 700px">
+                <accordion :one-at-a-time="true" v-if="reponData.length>0">
+                  <template v-for="row in reponData">
+                    <panel is-open="false"  type="primary"  @click="chengeLocation(row)">
+                      <strong slot="header">人员姓名：{{row.name}}</strong>
+<!--                      <div v-for="(idx,item) in row.result" @click="chengeLocation(item)"  :class="{'alert alert-info':idx%2===0,'alert alert-success':idx%2!==0}">-->
+<!--                        轨迹时间段：{{item.f_start_date}} ~ {{item.f_end_date}}-->
+<!--                      </div>-->
+                    </panel>
+                  </template>
+                </accordion>
+                <h4 class="panel-title" v-else>暂无相关数据</h4>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import { douglasPeuckerForAMap } from '../../../components/map/douglasPeuckerForAMap'
+
+export default {
+  title: "安检员轨迹展示",
+  data() {
+    return {
+      showTaskPoints: [],
+      taskModel: {},
+      //  当前分公司下所有的用户id
+      toUserIds: '',
+      // 当前公司的所有安检员
+      searchUserEndOption: [],
+      searchDepartmentOption: [],
+      // 请求到的结果集合
+      reponData: [],
+      // 点集
+      outerlinedata: [],
+      pathnavigatorstyle: {
+        // 图标宽度
+        width: 16,
+        // 图标高度
+        height: 32,
+        // 图标地址（外链地址或者Base64）
+        iconBase64: 'https://webapi.amap.com/ui/1.1/ui/misc/PathSimplifier/examples/imgs/car.png'
+      },
+      // 分公司ids
+      f_filialeids: '',
+      path: [],
+      aMap: null,
+      map: null,
+      filialeOptions: [],
+      userid: null,
+      dom: 'amapIdLOCUS' + Math.round(Math.random() * 10) + Math.round(Math.random() * 10),
+      rootSubmenuKeys: ['1', '2'],
+      users:[{label: '全部', value: ''}],
+      f_book_checker:'',
+      openKeys: ['1'],
+      searchCondition: {
+        condition: '1 = 1',
+        orderTime: 'ps.f_realtime asc',
+        date: '',
+        userId: undefined,
+        departmentId: undefined
+      }
+    }
+  },
+  methods: {
+    chengeLocation(row) {
+      const points = douglasPeuckerForAMap(row.points, 2, 'tm')
+      this.outerlinedata = [{ path: points, speed: Math.ceil(points.length / 2), name: `${this.searchCondition.date}的轨迹` }]
+    },
+    search() {
+      var condition = '1 = 1'
+      if (!this.f_filialeids) {
+        return this.$showMessage('请选择需要查询的分公司')
+      }
+      if (!this.searchCondition.date) {
+        return this.$showMessage('请选择需要查看的轨迹时间')
+      }
+      // if (!this.searchCondition.userId[0]) {
+      //   return this.$showMessage('请选择需要查看的轨迹所属人员')
+      // }
+
+      if (typeof this.searchCondition.date !== 'string') {
+        this.searchCondition.date = this.searchCondition.date.format('YYYY-MM-DD')
+      }
+      condition += " and ps.f_realtime >= '" + this.searchCondition.date + " 00:00:00' and ps.f_realtime <= '" + this.searchCondition.date + " 23:59:59'"
+      let userIds = []
+      if (this.searchCondition.userId && !userIds.includes(this.searchCondition.userId)) {
+        userIds.push(this.searchCondition.userId)
+      }
+      if (this.f_book_checker && !userIds.includes(this.f_book_checker)) {
+        userIds.push(this.f_book_checker)
+      }
+      if (userIds.length > 0) {
+        const idsStr = userIds.map(id => `'${id}'`).join(',')
+        condition += ` and ps.f_user_id in (${idsStr})`
+      }
+      let condition2 = '1 = 1'
+      if(this.searchCondition.departmentId){
+        condition2 += ` and d.id = '${this.searchCondition.departmentId}'`
+      }
+      this.searchCondition.condition = condition
+      this.$resetpost('rs/logic/getPhoneState', { condition: this.searchCondition.condition, condition2, orderTime: this.searchCondition.orderTime }, {resolveMsg: "轨迹记录查询成功", rejectMsg: "轨迹记录查询失败"}).then((response)=>{
+        if (response.data.state === 'success') {
+          this.reponData = response.data.result
+          // const points = douglasPeuckerForAMap(response.data.result, 2, 'tm')
+          // this.outerlinedata = [{ path: points, speed: Math.ceil(points.length / 2), name: `${this.searchCondition.date}的轨迹` }]
+        } else {
+          this.$showMessage("该用户当日使用app时间较短或行程较少,不足够生成轨迹")
+        }
+      })
+    },
+    getRes(obj){
+      // this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      if (obj.res != undefined && obj.res.length > 0 && obj.res[0] != undefined) {
+        this.getNewData(obj.res[0])
+      }
+      this.f_filialeids = this.$login.convertToIn(obj.resids);
+    },
+    //获取定位人员类表
+    async getNewData(organization){
+      // let organization = '公司名称'
+      // let userRolestr  = '需要定位人员'
+      let userRolestr  = '安检员'
+      let res =await new HttpResetClass().load('POST', '/rs/search', {
+        // source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($需要定位人员$) != -1))',
+        source: "this.getParentByName($"+organization+"$).getAllChildrens().where(row.getAttributes().get($resourcetype$)==$user$).where(row.getAttributes().get($rolestr$)!=null).where(row.getAttributes().get($rolestr$).indexOf($"+userRolestr+"$)!=-1)",
+        userid: this.$login.f.id
+      }, {resolveMsg: null, rejectMsg: null})
+      let dataEnd = [{label:'全部',value:''}]
+      let idsEnd = []
+      res.data.forEach(res=>{
+        let h=true
+        dataEnd.forEach(per=>{
+          if(res.id==per.value){
+            h=false
+          }
+        })
+        if(h){
+          dataEnd.push({label:res.name,value:res.id})
+          idsEnd.push(res.id)
+        }
+      })
+      this.toUserIds = this.$login.convertToIn(idsEnd); //所有的员工ID
+      this.searchUserEndOption = dataEnd
+
+      let resp = await new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items:'*',
+          tablename: 't_department',
+          condition: `parentid = '${this.$login.f.orgid}' and f_dep_type = '部门'`,
+          orderitem:'id'
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      //tag)
+      const departments = [{label: '全部', value: ''}]
+      for (const item of resp.data) {
+        departments.push({
+          label: item.name,
+          value: item.id
+        })
+      }
+      this.searchDepartmentOption = departments
+    },
+    toStandardDateString () {
+      const dt = new Date()
+      const month = dt.getMonth() + 1
+      const date = dt.getDate()
+      return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+    },
+    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.id})
+              addedNames.add(user.name)
+            }
+          }
+        })
+        console.log(this.users)
+      })
+    },
+
+  },
+  ready(){
+    this.searchCondition.date = this.toStandardDateString()
+    this.initBookChecker()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.amap-main {
+  height: 90%;
+  padding-right:10px;
+}
+</style>

package/src/filiale/tongchuan/pc/SelectCheckPlan.vue

@@ -59,6 +59,17 @@
                 :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}">
+              <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
+                        :value-single="true">
+              </v-select>
+            </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-->
@@ -144,6 +155,7 @@
 </template>
 <script>
   import {PagedList} from 'vue-client'
+  import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
 
 
   export default {
@@ -184,6 +196,7 @@
           f_start_time:'',
           f_end_time:''
         },
+        users:[{label: '全部', value: ''}],
         checker: this.$login.f,
         checkers: [],
         checkersname: [],
@@ -225,10 +238,16 @@
           condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
         }
         if (this.$refs.paged.$refs.cri.model.f_checker_id){
-          debugger
           condition3 += ` AND f_checker in ${this.$refs.paged.$refs.cri.model.f_checker_id} `
-          condition2 += ` AND f_checker_name in ${this.$refs.paged.$refs.cri.model.f_checker_id} `
+          condition2 += ` AND tcp.f_checker_name in ${this.$refs.paged.$refs.cri.model.f_checker_id} `
         }
+
+        if (this.$refs.paged.$refs.cri.model.f_book_checker){
+          condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_book_checker}'  `
+          condition2 += ` AND tcp.f_checker_name = '${this.$refs.paged.$refs.cri.model.f_book_checker}' `
+          condition2 += ` AND tcb.f_checker_name like '%${this.$refs.paged.$refs.cri.model.f_book_checker}%' `
+        }
+
         this.model.f_start_time=this.f_start_time
         this.model.f_end_time=this.f_end_time
         this.model.condition1=condition1
@@ -239,12 +258,33 @@
       getRes(obj){
         this.model.f_filialeids = this.$login.convertToIn(obj.resids);
         //tag
+      },
+      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)
+              }
+            }
+          });
+        })
       }
     },
     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
+      this.initBookChecker()
     },
 
     watch: {

package/src/filiale/tongchuan/pc.js

@@ -14,6 +14,8 @@ let specialComp = {
   'check-book-entry': (resolve) => { require(['./pc/CheckBookEntry'], resolve) },
   'check-book-details': (resolve) => { require(['./pc/CheckBookDetails'], resolve) },
   'check-book-list': (resolve) => { require(['./pc/CheckBookList'], resolve) },
+  'amap-trail-show-zk': (resolve) => { require(['./pc/AMapTrailShowZk'], resolve) },
+  'person-track': (resolve) => { require(['./pc/PersonTrack'], resolve) },
 
   // 安检结果查看列表
   'defect-paper': (resolve) => { require(['./pc/DefectPaper'], resolve) },
@@ -23,6 +25,7 @@ let specialComp = {
   'check-plan': (resolve) => { require(['./pc/CheckPlan'], resolve) },
   'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
   'CheckPlanCountChartArea': (resolve) => { require(['./pc/CheckPlanCountChartArea'], resolve) },
+  'CheckPlanCountChartAreaByWangGeYuan': (resolve) => { require(['./pc/CheckPlanCountChartAreaByWangGeYuan'], resolve) },
   'check_screen': (resolve) => { require(['./pc/repairScreen'], resolve) },
   'hiddensituation': (resolve) => { require(['./pc/HiddenSituation'], resolve) },
   'role-selector-safe': (resolve) => { require(['./pc/RoleSelector'], resolve) },