safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/map/PersonTrack.vue

@@ -0,0 +1,224 @@
+<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%;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 * as Util from '../Util'
+import {HttpResetClass} from 'vue-client'
+import { douglasPeuckerForAMap } from './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'],
+      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'"
+      if(this.searchCondition.userId){
+        condition += ` and ps.f_user_id = '${this.searchCondition.userId}'`
+      }
+      let condition2 = '1 = 1'
+      if(this.searchCondition.departmentId){
+        condition2 += ` and d.id = '${this.searchCondition.departmentId}'`
+      }
+      this.searchCondition.condition = condition
+      this.$resetpost('api/af-safecheck/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', `/api/af-safecheck/sql/singleTable`, {
+        data: {
+          tablename: 't_department',
+          condition: `parentid = '${this.$login.f.orgid}' and f_dep_type = '部门'`,
+        }
+      }, {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)
+    }
+  },
+  ready(){
+    this.searchCondition.date = this.toStandardDateString()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.amap-main {
+  height: 90%;
+  padding-right:10px;
+}
+</style>

package/src/components/map/douglasPeuckerForAMap.js

@@ -0,0 +1,88 @@
+function calculationDistance (point1, point2) {
+  const lat1 = point1[1]
+  const lat2 = point2[1]
+  const lng1 = point1[0]
+  const lng2 = point2[0]
+  const radLat1 = lat1 * Math.PI / 180.0
+  const radLat2 = lat2 * Math.PI / 180.0
+  const a = radLat1 - radLat2
+  const b = (lng1 * Math.PI / 180.0) - (lng2 * Math.PI / 180.0)
+  const s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)))
+    return s * 6370996.81
+}
+
+function distToSegment (start, end, center) {
+  const a = Math.abs(calculationDistance(start, end))
+  const b = Math.abs(calculationDistance(start, center))
+  const c = Math.abs(calculationDistance(end, center))
+  const p = (a + b + c) / 2.0
+  const s = Math.sqrt(Math.abs(p * (p - a) * (p - b) * (p - c)))
+    return s * 2.0 / a
+}
+
+function compressLine (coordinate, result, start, end, dMax) {
+    if (start < end) {
+      let maxDist = 0
+      let currentIndex = 0
+      const startPoint = coordinate[start]
+      const endPoint = coordinate[end]
+        for (let i = start + 1; i < end; i++) {
+          const currentDist = distToSegment(startPoint, endPoint, coordinate[i])
+            if (currentDist > maxDist) {
+                maxDist = currentDist
+                currentIndex = i
+            }
+        }
+        if (maxDist >= dMax) {
+            //  将当前点加入到过滤数组中
+            result.push(coordinate[currentIndex])
+            //  将原来的线段以当前点为中心拆成两段，分别进行递归处理
+            compressLine(coordinate, result, start, currentIndex, dMax)
+            compressLine(coordinate, result, currentIndex, end, dMax)
+        }
+    }
+    return result
+}
+
+// 调用此方法
+// 第一个参数为GPS点位数组，格式为[[x:lng,y:lat,dateKey:xxx],[x:lng,y:lat,dateKey:xxx],[x:lng,y:lat,dateKey:xxx]...]
+// 第二个参数为误差，大于多少m的误差就保留
+// 第三个参数为时间的key
+export function douglasPeuckerForAMap (originalArr, dMax, dateKey) {
+    const coordinate = []
+
+    for (let index = 0; index < originalArr.length; index++) {
+        const element = originalArr[index]
+        const x = Number(element.x)
+        const y = Number(element.y)
+        const tempArr = [x, y]
+        coordinate.push(tempArr)
+    }
+
+    if (!coordinate || !(coordinate.length > 2)) {
+        return null
+    }
+    coordinate.forEach((item, index) => {
+        item.key = index
+    })
+
+    const result = compressLine(coordinate, [], 0, coordinate.length - 1, dMax)
+
+    result.push(coordinate[0])
+    result.push(coordinate[coordinate.length - 1])
+    const resultLatLng = result.sort((a, b) => {
+        if (a.key < b.key) {
+            return -1
+        } else if (a.key > b.key) {
+          return 1
+        }
+        return 0
+    })
+
+    resultLatLng.forEach((item) => {
+        const originalDate = originalArr[item.key][dateKey]
+        item.push(originalDate)
+    })
+
+    return resultLatLng
+}

package/src/components/metterfiles/AddUserfiles.vue

@@ -184,7 +184,7 @@ let saveGen = function * (self) {
   let p = self.f_checker_selected[0].indexOf('-')
   self.model.f_checker = self.f_checker_selected[0].substring(0, p)
   self.model.f_checker_id = self.f_checker_selected[0].substring(p+1)
-  yield self.$post('rs/logic/人工录入', { data: self.model })
+  yield self.$post('api/af-safecheck/logic/人工录入', { data: self.model })
   // 通知项目保存成功。
   self.$back()
 }

package/src/components/metterfiles/MetterFiles.vue

@@ -49,7 +49,7 @@ import co from 'co'
 let info = function * (self) {
   self.f_userinfoid = self.user.f_userinfoid
   self.f_userfile_id = self.user.id
-  let back = yield self.$post('rs/sql/用户表档案', {data: {f_userinfoid: self.f_userinfoid,
+  let back = yield self.$post('api/af-safecheck/sql/用户表档案', {data: {f_userinfoid: self.f_userinfoid,
     f_userfile_id: self.f_userfile_id}}, {resolveMsg: null, rejectMsg: null})
   self.model.rows = back.data
   // self.$back()
@@ -60,7 +60,7 @@ export default {
   props: ['user', 'f', 'flag'],
   data () {
     return {
-    //   model: new PagedList('rs/sql/用户表档案', 20, {f_userinfoid: this.user.f_userinfoid,
+    //   model: new PagedList('api/af-safecheck/sql/用户表档案', 20, {f_userinfoid: this.user.f_userinfoid,
     // f_userfile_id: this.user.id})
       model: {
         rows: []
@@ -78,7 +78,7 @@ export default {
       this.$goto('metterfiles-add', {ro: this.user}, 'self', this.callback)
     },
     del (row, index) {
-      this.$post('rs/logic/删除表档案', {data: row}, {resolveMsg: null, rejectMsg: null})
+      this.$post('api/af-safecheck/logic/删除表档案', {data: row}, {resolveMsg: null, rejectMsg: null})
       this.model.rows.splice(index, 1)
     },
     callback () {

package/src/components/metterfiles/MetterfilesChange.vue

@@ -106,7 +106,7 @@ let info = function * (self) {
   self.model.f_meter_measurement = self.f_meter_measurement[0]
   self.model.f_meter_diameter = self.f_meter_diameter[0]
   console.log('表修改model', self.model)
-  // yield self.$post('rs/logic/修改表档案', {data: self.model}, {resolveMsg: null, rejectMsg: null})
+  // yield self.$post('api/af-safecheck/logic/修改表档案', {data: self.model}, {resolveMsg: null, rejectMsg: null})
   self.$back(self.model)
 }
 

package/src/components/metterfiles/UserFiles.vue

@@ -80,7 +80,7 @@ export default {
   props: ['f'],
   data () {
     return {
-      model: new PagedList('rs/sql/getuser', 20, {f_username: 'this.model.f_username',
+      model: new PagedList('api/af-safecheck/sql/getuser', 20, {f_username: 'this.model.f_username',
       f_user_type: 'this.f_user_type[0]', f_userid: 'this.model.f_userid',
         f_districtname: 'this.model.f_districtname'}),
       f_user_type: [''],
@@ -129,7 +129,7 @@ export default {
       this.$goto('userfileschange', {f: this.f, flag: 0}, 'self', this.callback)
     },
     del (row, index) {
-      this.$resetpost('rs/logic/人工录入删除', {data: row}, {resolveMsg: null, rejectMsg: null})
+      this.$resetpost('api/af-safecheck/logic/人工录入删除', {data: row}, {resolveMsg: null, rejectMsg: null})
       .then((res) => {
         this.model.rows.splice(index, 1)
       })

package/src/components/metterfiles/Userfileschange.vue

@@ -225,14 +225,14 @@ let saveGen = function * (self) {
     self.model.f_user_type = self.f_user_type[0]
     self.model.f_state = self.f_state[0]
     self.model.f_last_check_state = self.f_last_check_state[0]
-    yield self.$resetpost('rs/logic/人工录入修改', { data: self.model }, {resolveMsg: null, rejectMsg: null})
+    yield self.$resetpost('api/af-safecheck/logic/人工录入修改', { data: self.model }, {resolveMsg: null, rejectMsg: null})
   } else {
     self.model.f_sign = '1'
     self.model.f_subcompany = self.f_subcompany[0]
     self.model.f_user_type = self.f_user_type[0]
     self.model.f_last_check_state = self.f_last_check_state[0]
     self.model.f_state = self.f_state[0]
-    yield self.$resetpost('rs/logic/人工录入', { data: self.model }, {resolveMsg: null, rejectMsg: null})
+    yield self.$resetpost('api/af-safecheck/logic/人工录入', { data: self.model }, {resolveMsg: null, rejectMsg: null})
     .catch((res) => {
       window.alert('请确认用户编号是否重复')
     })
@@ -360,7 +360,7 @@ export default {
       this.f_state = ['点火']
     }
     if (this.flag === 1) {
-      this.$resetpost('rs/sql/用户表档案', {data: {f_userid: this.row.f_userid,
+      this.$resetpost('api/af-safecheck/sql/用户表档案', {data: {f_userid: this.row.f_userid,
         f_userfile_id: this.row.id}}, {resolveMsg: null, rejectMsg: '提取表档案失败'})
         .then((res) => {
           for (var i = 0; i < res.data.length; i++) {

package/src/components/newfile/NewfileList.vue

@@ -0,0 +1,114 @@
+<template>
+  <div :style="{'height':needRepair?'60%':'100%'}">
+    <criteria-paged :model="model" :pager="false" v-ref:paged>
+      <data-grid :model="$parent.model" partial='list' class="table_sy">
+        <template partial='head'>
+          <tr>
+            <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">
+            <nobr>{{row.f_checker_name}}</nobr>
+          </td>
+          <td style="text-align: center">
+            <nobr>{{row.f_onsite_time}}</nobr>
+          </td>
+          <td style="text-align: center">
+            <nobr>{{row.f_offsite_time}}</nobr>
+          </td>
+          <td style="text-align: center">
+            <nobr>{{row.f_entry_status}}</nobr>
+          </td>
+          <td style="text-align: center">
+            <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.goDetail(row)'>查看</button>
+          </td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import Vue from "vue";
+let asyncReady = async function (self) {
+  // 获取配置信息
+  try {
+    let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+    Vue.config = res.data
+  } catch (error) {
+    // 忽略704,文件找不到异常R
+    if (error.status !== 704) {
+      throw error
+    }
+  }
+}
+ export default {
+   title: '安检记录',
+   props: ['check'],
+   data(){
+     return{
+       model: new PagedList('api/af-safecheck/sql/QueryCheckPaper', 100, {
+         f_userinfo_code:"''",
+         f_plan_id:"''",
+         f_approved:"''",
+         f_entry_status:"''",
+         f_no_checkplan:"''",
+         f_filialeid:"''",//查值 通过id
+         orderitem:"'f_onsite_time'"
+       }),
+       model1: [{f_device_type:'111',f_item_name:'123',f_item_value:'133',f_repaire_type:'153'}]
+     }
+
+   },
+   methods: {
+     //查看的方法
+     goDetail(row){
+       row.f_upload_state = '已传'
+       this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+     }
+   },
+   watch: {                                            //监听check
+     'check'() {
+       console.log('11111111111'+JSON.stringify(this.check))
+       //console.log('11111111111'+JSON.stringify(this.model))
+      // this.model.paramSource.f_userinfo_code = this.check.f_userinfo_code
+       console.log('22222222222'+JSON.stringify(this.model))
+       this.model.search(`tcp.f_userinfo_code = '${this.check.f_userinfo_code}'`)
+     }
+   },
+
+   ready(){
+     console.log("7777777777777777"+JSON.stringify(this.check)+JSON.stringify(this.model))
+     this.model.search(`tcp.f_userinfo_code = '${this.check.f_userinfo_code}'`,{}) //发送请求
+   },
+   }
+
+
+</script>
+
+
+<style lang="less" scoped>
+.select-error {
+button {
+  border-bottom: 1px solid #a94442 !important;
+}
+}
+</style>
+

package/src/components/newfile/NewfileList1.vue

@@ -0,0 +1,84 @@
+<template>
+  <div :style="{'height':needRepair?'60%':'100%'}">
+    <criteria-paged :model="model" :pager="false" v-ref:paged>
+      <data-grid :model="$parent.model" partial='list' class="table_sy">
+        <template partial='head'>
+          <tr>
+            <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">
+            <nobr>{{row.f_user_name}}</nobr>
+          </td>
+          <td style="text-align: center">
+            <nobr>{{row.f_pregas}}</nobr>
+          </td>
+          <td style="text-align: center">
+            <nobr>{{row.f_operate_date}}</nobr>
+          </td>
+          <td style="text-align: center">
+            <nobr>{{row.f_preamount}}</nobr>
+          </td>
+
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  title: '购气记录',
+  props: ['check'],
+  data(){
+    return{
+      model: new PagedList('api/af-safecheck/sql/NewfileList1', 100, {
+
+      })
+    }
+
+  },
+  watch: {
+    'check'() {
+      console.log('1111111哈哈哈哈1111'+JSON.stringify(this.check))
+      console.log('11111111111'+JSON.stringify(this.model))  //打印
+      this.model.paramSource.f_userinfo_id = this.check.f_userinfo_id
+      console.log('22222222222'+JSON.stringify(this.model))
+      this.model.search(`f_userinfo_id = '${this.check.f_userinfo_id}'`)
+    }
+  },
+  ready(){
+    console.log("7777777777777777"+JSON.stringify(this.check))
+    this.model.search(`f_userinfo_id = '${this.check.f_userinfo_id}'`)
+  },
+  methods:{
+  }
+}
+
+
+</script>
+
+
+<style lang="less" scoped>
+.select-error {
+  button {
+    border-bottom: 1px solid #a94442 !important;
+  }
+}
+</style>
+