safecheck-client 3.0.39-5 → 3.0.39-51

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

@@ -0,0 +1,226 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <div>
+      <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="requestData.chengeDate"
+                          v-model="requestData.chengeDate"
+                          :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="selUserIds" v-model='selUserIds'
+                        :value-single="false" clear-button search multiple
+                        :options='searchUserEndOption' 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="requestData.f_book_checker" v-model="requestData.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>
+        <amap-trajectory :outerlinedata.sync="outerlinedata" :pathnavigatorstyle="pathnavigatorstyle" ></amap-trajectory>
+      </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">
+                <accordion :one-at-a-time="true" v-if="reponData.length>0">
+                  <template v-for="row in reponData">
+                    <panel is-open="false"  type="primary">
+                      <strong slot="header">用户编号:{{row.f_user_id}} 用户姓名：{{row.f_user_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 co from 'co'
+import * as Util from '../../Util'
+import {HttpResetClass} from 'vue-client'
+
+/**
+ * 1. 首先获取当前选择的分公司下所有带定位角色的所有用户
+ * 2. 根据查询出来的所有用户的id和选择的时间去轨迹表查询，获取具体轨迹的时间段
+ * 3. 渲染给前台页面，前台根据选择的用户和时间端获取轨迹信息去渲染轨迹，每次只可以渲染一组轨迹
+ */
+
+
+export default {
+  title: "安检员轨迹展示",
+  data() {
+    return {
+        toUserIds: '', //当前分公司下所有的用户id
+        selUserIds:[], // 当前选择的用户Id
+        requestData: {
+          chengeDate: Util.toStandardDateString(),
+          f_book_checker:'',
+          userIds: '',
+        },
+        searchUserEndOption: [], //当前公司的所有安检员
+        reponData: [], // 请求到的结果集合
+        outerlinedata: [], //点集
+      users:[{label: '全部', value: ''}],
+      pathnavigatorstyle: {
+          width: 16, //图标宽度
+          height: 32, // 图标高度
+          iconBase64: 'https://webapi.amap.com/ui/1.1/ui/misc/PathSimplifier/examples/imgs/car.png'//图标地址（外链地址或者Base64）
+        },
+        f_filialeids: '', //分公司ids
+        path: [],
+    }
+  },
+  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.id})
+              addedNames.add(user.name)
+            }
+          }
+        })
+        console.log(this.users)
+      })
+    },
+    search() {
+        if (this.selUserIds.length==0&&!this.requestData.userIds) {
+          this.requestData.userIds = this.toUserIds
+        }
+        if (this.requestData.f_book_checker){
+          const content = this.requestData.userIds.slice(1, -1)
+          const elements = content.split(',')
+          elements.push(`'${this.requestData.f_book_checker}'`)
+          this.requestData.userIds = `(${elements.join(',')})`
+        }
+        if (!this.f_filialeids) {
+          return this.$showMessage("请选择需要查询的分公司")
+        }
+        if (!this.requestData.chengeDate) {
+          return  this.$showMessage("请选择需要查看的轨迹时间")
+        }
+        this.$resetpost('rs/logic/QueryUserTracksByCompany',this.requestData,{resolveMsg: "轨迹记录查询成功", rejectMsg: "轨迹记录查询失败"}).then((response)=>{
+          if (response!=undefined && response.data.code == 200) {
+              this.reponData = response.data.data
+          }else if (response!=null && response.data.code == 404) {
+              this.reponData = []
+            this.$showMessage("未查询到当前用户的相关轨迹信息")
+          } else if (response!=null && response.data.code == 555) {
+            this.$showMessage("查询轨迹信息错误！错误原因:"+response.data.msg)
+          }
+        })
+    },
+    getRes(obj){
+      // this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      console.log(obj)
+      if (obj.res != undefined && obj.res.length > 0 && obj.res[0] != undefined) {
+        this.getNewData(obj.res[0])
+        this.initBookChecker(obj.res[0])
+      }
+      this.f_filialeids = this.$login.convertToIn(obj.resids);
+    },
+    chengeLocation(row) {
+      console.log(row)
+      this.$resetpost('rs/logic/queryRemoteLocationMapData',{data:{id:row.id}},{resolveMsg: "查询渲染轨迹成功", rejectMsg:"查询渲染轨迹失败！"}).then((response)=>{
+        if (response!=undefined && response.data!=undefined) {
+            this.path = response.data
+            let name = `${row.f_user_name},${row.f_start_date}~${row.f_end_date}轨迹`
+            this.outerlinedata = [{path:this.path,speed:Math.ceil(this.path.length / 2),name:name}]
+        }
+      })
+    },
+    //获取定位人员类表
+    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 = [];
+      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
+    },
+  },
+  ready(){
+    this.initBookChecker()
+  },
+  watch: {
+    'selUserIds':function (val) {
+      if (val=='') {
+        this.requestData.userIds = ''
+      }else {
+        this.requestData.userIds = this.$login.convertToIn(val)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.amap-main {
+  height: 90%;
+  padding-right:10px;
+}
+</style>

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

@@ -217,6 +217,18 @@
                 :value-single="true"
                 close-on-select clear-button></v-select>
             </div>
+            <div :class="$parent.$parent.style" 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>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -324,7 +336,18 @@
                 :value-single="true"
                 close-on-select clear-button></v-select>
             </div>
-
+            <div :class="$parent.$parent.style" 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>
           <div class="row" v-show="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
@@ -536,6 +559,7 @@
           timetype: "'dd'",
           f_defect_content: 'this.f_defect_content'
         }),
+        users:[{label: '全部', value: ''}],
         f_defect_content: "CASE WHEN CHARINDEX( '\"result\":\"正常\"', ua.f_last_check_result ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( ua.f_last_check_result, len( ua.f_last_check_result ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END",
         orgstrs: [{label: '全部', value: ''}],
         checkersid: [],
@@ -609,8 +633,30 @@
       this.Mreadibook(`('${this.$login.f.orgid}')`)
       this.getAllMeterBook(`('${this.$login.f.orgid}')`)
       this.getTableBrands()
+      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)
+              }
+            }
+          });
+        })
+      },
       getTableBrands() {
         new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
           {data: {items: "*", tablename: "t_gasbrand", orderitem: "id", condition: ` 1=1 `}},

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

@@ -157,6 +157,18 @@
                         :value-single="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <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>
@@ -334,6 +346,18 @@
                         :value-single="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <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>
@@ -431,6 +455,7 @@
         gasproperties:[{label:'全部',value:''},...this.$appdata.getParam("民用"),...this.$appdata.getParam("非民用")],
         gasproperties2:[],
         modelval: [],
+        users:[{label: '全部', value: ''}],
         checkersid: [],
         sliceArea: [],
         pcds:[],
@@ -553,6 +578,26 @@
           })
         }
       },
+      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)
+              }
+            }
+          });
+        })
+      },
       hiddenr() {
         this.$parent.showItem = !this.$parent.showItem
       },
@@ -587,6 +632,7 @@
     },
     ready() {
       this.$refs.paged.$refs.criteria.model.f_has_defect = '有隐患'
+      this.initBookChecker()
       let gen = select(this)
       // this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)

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

@@ -44,6 +44,18 @@
                     condition="f_upload_date <='{} '">
                   </datepicker>
                 </div>
+                <div class="col-sm-3 form-group form-input-group" style="width: 20%;">
+                  <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-3 form-group form-input-group" style="width: 20%;float: right;">
                   <report-print class="button_export button_spacing" style="width:28%" id='tongchuan'></report-print>
                   <export-excel-safe :data="$parent.$parent.searchData"
@@ -145,6 +157,7 @@ export default {
       source: 'tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))', //获取公司参数
       userid: this.$login.f.id,
       orgname: '',
+      users:[{label: '全部', value: ''}],
       // checker:{},
       searchData: {
         condition: '',
@@ -182,6 +195,26 @@ export default {
       this.searchData.f_filiale_id = this.f_filiale_id //导出
       this.searchData.condition=args.condition //导出
       this.model.search(args.condition, args.model)
+    },
+    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)
+            }
+          }
+        });
+      })
     }
   },
   computed: {
@@ -197,6 +230,7 @@ export default {
     //tag
     this.$refs.paged.$refs.cri.model.startDate=Util.toStartDateString() +' 00:00:00'
     this.$refs.paged.$refs.cri.model.endDate=Util.toEndDateString() +' 23:59:59'
+    this.initBookChecker()
 
   }
 

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

@@ -190,6 +190,18 @@
                           clear-button condition="is_repaired='{}'" :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>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal>
               <div slot="modal-header" class="modal-header">
@@ -523,6 +535,7 @@
         },
         fun: this.$login.f,
         checkersid: [],
+        users:[{label: '全部', value: ''}],
         safetype: this.getSafeParam('安检类型'),
         criteriaShow: false,
         repaireds: [{ label: '全部', value: '' }, { label: '已修', value: '已修' }, { label: '未修', value: '未修' }],
@@ -1006,6 +1019,26 @@
           })
         })
       },
+      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() {
@@ -1013,6 +1046,7 @@
       this.readConfig()
       this.function = this.f
       this.getPcds(`('${this.$login.f.orgid}')`)
+      this.initBookChecker()
       let gen = select(this)
       // this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)

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