safecheck-client 4.0.1-8 → 4.0.1-80

package/src/components/android/DailyworkloadQuery.vue

@@ -276,6 +276,7 @@ import Vue from 'vue'
 import { PagedList,HttpResetClass } from 'vue-client'
 import * as Util from '../Util'
 import co from 'co'
+import {isEmpty} from "../Util";
 
 export default {
   title: '无计划安检查询',
@@ -405,7 +406,7 @@ export default {
       // this.getPlanCount()
       //let condition = `f_filialeid='${Vue.user.orgid}' and f_checker_id='${Vue.user.id}' `
       let condition = "1=1 "
-      if (this.f_checker_id){
+      if (!isEmpty(this.f_checker_id)){
         condition += " and f_checker_id = '"+ this.f_checker_id + "'"
       }
       if(this.$refs.paged.$refs.cri.model.f_user_name){

package/src/components/android/NewCheckpaperAndroid.vue

@@ -53,11 +53,6 @@ div {
 
 <template>
   <div class="basic-main" style="height: 100%">
-    <!--    <div class="page-header app-header auto" style="padding: 15px;margin-right: 10px;right: 0%;height: 7%">-->
-    <!--      <div @click="back()">-->
-    <!--        <img src="../../assets/back.png" style="margin: 0px"/>-->
-    <!--      </div>-->
-    <!--    </div>-->
     <work-busy :is-busy="loading"></work-busy>
     <div class="container-fluid" style="overflow: scroll">
       <div class="row">
@@ -387,51 +382,15 @@ import Vue from 'vue'
 import * as Util from '../../components/Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
-
+import {isEmpty} from "../../components/Util";
 let asyncReady = async function (self) {
-  // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', `${self.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-      data: {
-        items: 'name,f_dir',
-        tablename: 't_organization',
-        condition: `id  = '${self.item.f_filialeid}'`,
-        orderitem: 'id'
-      }
-    })/*.then(res=>{*/
-    //tag
-    //tag)
-    if (res.data.length === 0) {
-      // self.$showMessage("该公司无组织目录，无法获取配置文件，将使用默认配置文件")
-      return
-    }
-    if (!res.data[0].f_dir) {
-      // self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
-    } else {
-      //this.f_dir=res.data[0].f_dir
-      try {
-        let res1 = await new HttpResetClass().load('GET', `${self.$androidUtil.getProxyUrl()}/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取居民配置项成功！',
-          rejectMsg: '获取居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesConfig = res1.data
-        /*})*/
-        let res2 = await new HttpResetClass().load('GET', `${self.$androidUtil.getProxyUrl()}/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取非居民配置项成功！',
-          rejectMsg: '获取非居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesSetConfig = res2.data
-        /*}).then(res=> {
-        })*/
-
-      } catch (e) {
-        // self.$showMessage("获取配置文件失败" + e)
-      }
-    }
+    let res = await new HttpResetClass().load('GET',`${self.$androidUtil.getProxyUrl()}/api/af-safecheck/vue`,null, {resolveMsg: null, rejectMsg: null})
+    self.delConfigKey(res.data)
+    Vue.config.safecheck=res.data
+    Vue.config.safecheck.DevicesConfig =res.data.DevicesConfig
+    Vue.config.safecheck.DevicesSetConfig = res.data.DevicesSetConfig
+    console.log('获取配置结果===', res.data)
   } catch (error) {
     // 忽略704,文件找不到异常R
     if (error.status !== 704) {
@@ -565,7 +524,22 @@ export default {
     }
   },
   methods: {
+    delConfigKey(obj){
+      // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
+      Object.keys(obj).forEach(key =>{
+        Object.keys(obj[key]).forEach(col => {
+          // 检查键是否以$开头
+          if (col.startsWith('$')) {
+            // 使用delete操作符删除键
+            delete obj[key][col];
+          }
+        })
+      })
+    },
     getimg(val){
+      if(isEmpty(val)){
+        return  ''
+      }
       console.log(`${this.$androidUtil.getProxyUrl()}/${val}`)
 
       return `${this.$androidUtil.getProxyUrl()}/${val}`

package/src/components/android/SafecheckOrderV.vue

@@ -1306,6 +1306,12 @@
           }else if(res.code == 309){
             this.$showMessage('该安检单已作废!')
             this.$dispatch('confirm')
+          }else if(res.code == 310){
+            this.$showMessage('该单已成功入户，请勿重复上传!')
+            this.$dispatch('confirm')
+          }else if(res.code == 311){
+            this.$showMessage('该单已上传，请勿重复上传!')
+            this.$dispatch('confirm')
           }else if(res.code == 710){
             this.$showMessage('上传照片失败,请检查网络是否正常！'+res.msg)
             this.onlySave = true

package/src/components/android/SwitchValve.vue

@@ -295,7 +295,7 @@ export default {
         meternumberf: this.thisOneData.f_meternumber,  //表号
         contentData: {isOpen: msg=='开阀' ? 1 : 0},  // oper 为true 时为开阀   false 为关阀
       }
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/iot_saveInstruct`, {data: data}).then((row) => {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/openapi/iot_saveInstruct`, {data: data}).then((row) => {
         this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
         //tag
         this.thisOneData = '';

package/src/components/checkplan/CheckDetail.vue

@@ -111,7 +111,7 @@ export default {
     'check' (val) {
       let condition
       //tag
-      condition = `tt.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
+      condition = `c.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
       if(this.checkstatus){
         condition += ` and cp.f_entry_status = '${this.checkstatus}'`
       }

package/src/components/map/SecurityCheckCoordinates.vue

@@ -0,0 +1,361 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main" style="flex:7">
+      <div id="check_map" style="height:100%">
+      </div>
+    </div>
+    <div id="zzz" class="basic-main" style="flex:1;margin-left: 0px;overflow: hidden">
+      <div class="panel panel-info" style="margin-top:0px; height: 100%; display: flex; flex-direction: column;">
+        <div class="panel-heading" style="height: 50px">
+          <h3 class="panel-title">状态选择</h3>
+        </div>
+        <div class="panel-body">
+          <ul class="safe_ul_sty">
+            <li class="safe_li_sty"><input class="safe_checkbox_sty" v-model="mulchs.level1" @change="enableChange('level1',mulchs.level1)" type="checkbox"/><img class="safe_deimg" src="../../assets/警告 (3).png"/>拒检</li>
+            <li class="safe_li_sty"><input class="safe_checkbox_sty" v-model="mulchs.level3" @change="enableChange('level3',mulchs.level3)" type="checkbox"/><img class="safe_deimg" src="../../assets/警告 (4).png"/>到访不遇</li>
+            <li class="safe_li_sty"><input class="safe_checkbox_sty" v-model="mulchs.problems" @change="enableChange('problems',mulchs.problems)" type="checkbox"/><img class="safe_deimg" src="../../assets/警告 (5).png"/>正常</li>
+          </ul>
+        </div>
+        <div class="panel-heading" style="height: 50px">
+          <h3 class="panel-title">时间选择</h3>
+        </div>
+        <div class="panel-body">
+          <div class="row" style="height: 50px">
+            <datepicker
+              :value.sync="f_check_start"
+              placeholder='开始时间'
+              :disabled-days-of-week="[]"
+              @change="safeRefresh"
+              :format="'yyyy-MM-dd'"
+              :show-rest-button="reset"
+              v-model="f_check_start">
+            </datepicker>
+          </div>
+
+          <div class="row" style="height: 50px">
+            <datepicker
+              :value.sync="f_check_end"
+              placeholder='结束时间'
+              :disabled-days-of-week="[]"
+              @change="safeRefresh"
+              :format="'yyyy-MM-dd'"
+              :show-rest-button="reset"
+              v-model="f_check_end">
+            </datepicker>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../Util'
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '用户安检定位信息',
+  data() {
+    return {
+      loading: false,
+      f_check_start:'',
+      f_check_end:'',
+      map:null,
+      infoWindow:null,
+      level1Mulchs:null,//拒检点位
+      level3Mulchs:null,//到访不遇点位
+      problemsMulchs:null,//正常点位
+      level1:[],
+      level3:[],
+      problems:[],
+      defectList:{rows:[]},
+      intervalNum:'',
+      mulchs:{//覆盖物控制显示
+        level1:true,
+        level3:true,
+        problems:true
+      },
+      styleObject :[
+        {
+          url: require('../../assets/警告 (3).png'), //拒检图标URL
+          anchor: new AMap.Pixel(14, 8),  // 图标偏移位置
+          size: new AMap.Size(26, 28)  //图标大小
+        },
+        {
+          url: require('../../assets/警告 (4).png'), //到访不遇图标URL
+          anchor: new AMap.Pixel(14, 8),  // 图标偏移位置
+          size: new AMap.Size(26, 28)  //图标大小
+        },
+        {
+          url: require('../../assets/警告 (5).png'), //正常图标URL
+          anchor: new AMap.Pixel(14, 8),  // 图标偏移位置
+          size: new AMap.Size(26, 28)  //图标大小
+        }
+      ]
+    }
+  },
+  async ready(){
+    this.initMap()
+    await this.getNewData(`f_longitude is not null and f_latitude is not null`)
+    this.assemblyData()
+    this.intervalNum=window.setInterval(this.safeRefresh, 240000)
+  },
+  methods: {
+    async getNewData (condition) {
+      this.loading = true
+      let arr = await new HttpResetClass().load('POST', `api/af-safecheck/sql/safe_singleTable_OrderBy`,
+        {
+          data: {
+            items:'tcp.*,tab.f_adjustable_name,tr.f_name  as  f_region_name  ',
+            tablename: 't_check_paper tcp left join t_userfiles uf on uf.f_userinfo_id = tcp.f_userinfoid  left  join  t_adjustablebox   tab   on  tab.id=uf.f_adjustable_id  left  join   t_region  tr  on tab.f_region_id=tr.id',
+            condition: condition,
+            orderitem: 'tcp.f_entry_status'
+          }}, {resolveMsg: null, rejectMsg: null})
+      if (arr.data) {
+        this.level1 = []
+        this.level3 = []
+        this.problems = []
+        arr.data.forEach((defect) => {
+          if (defect.f_entry_status == '拒检' ) {
+            this.level1.push(defect)
+          } else if (defect.f_entry_status == '到访不遇' ) {
+            this.level3.push(defect)
+          } else {
+            this.problems.push(defect)
+          }
+        })
+      }
+      this.loading = false
+      this.defectList.rows = arr.data
+    },
+    getDefectContent(row){
+      return `
+             <div style="padding:0px;margin-left: 8px;"><b>安检内容</b></div>
+              <div class="panel panel-default" style="background-color: azure;border-radius: 5px;margin-left: 8px;">
+                <div class="panel-body">
+                  <ul style="list-style-type: none;font-size: 15px;">
+                      <li style="margin: 3px 0;">用户姓名: ${row.f_user_name}</li>
+                      <li style="margin: 3px 0;">用户地址: ${row.f_address}</li>
+                      <li style="margin: 3px 0;">安检状态: ${row.f_entry_status}</li>
+                      <li style="margin: 3px 0;">安检时间: ${row.f_offsite_time}</li>
+                      <li style="margin: 3px 0;">安检人员: ${row.f_checker_name}</li>
+                      <li style="margin: 3px 0;">调压箱: ${row.f_adjustable_name?row.f_adjustable_name:'无'}</li>
+                       <li style="margin: 3px 0;">所属区域: ${row.f_region_name?row.f_region_name:'无'}</li>
+                  </ul>
+                </div>
+              </div>`
+    },
+    assemblyData(){
+      let a2=[]
+      for(let i=0;i<this.level1.length;i++){
+        a2.push({
+          lnglat: [this.level1[i].f_longitude, this.level1[i].f_latitude], //点标记位置
+          name: '拒检',
+          id:i,
+          rowstr:this.level1[i]
+        })
+      }
+      this.level1Mulchs.setData(a2);
+      this.level1Mulchs.setMap(this.map);
+
+      let a4=[]
+      for(let p=0;p<this.level3.length;p++){
+        if (this.level3[p].f_longitude&&this.level3[p].f_latitude){
+          a4.push({
+            lnglat: [this.level3[p].f_longitude, this.level3[p].f_latitude], //点标记位置
+            name: '到访不遇',
+            id:p,
+            rowstr:this.level3[p]
+          })
+        }
+      }
+      this.level3Mulchs.setData(a4);
+      this.level3Mulchs.setMap(this.map);
+
+      let a5=[]
+      for(let l=0;l<this.problems.length;l++){
+        if (this.problems[l].f_longitude&&this.problems[l].f_latitude){
+          a5.push({
+            lnglat: [this.problems[l].f_longitude, this.problems[l].f_latitude], //点标记位置
+            name: '正常',
+            id:l,
+            rowstr:this.problems[l]
+          })
+        }
+      }
+      this.problemsMulchs.setData(a5);
+      this.problemsMulchs.setMap(this.map);
+    },
+    enableChange(vname,val){
+      switch(vname){
+        case 'level1':
+          if(val){
+            this.level1Mulchs.show()
+          }else{
+            this.level1Mulchs.hide()
+          }
+          break;
+        case 'level3':
+          if(val){
+            this.level3Mulchs.show()
+          }else{
+            this.level3Mulchs.hide()
+          }
+          break;
+        case 'problems':
+          if(val){
+            this.problemsMulchs.show()
+          }else{
+            this.problemsMulchs.hide()
+          }
+          break;
+        default:
+      }
+    },
+    initMap(){
+      let that=this
+      this.map = new AMap.Map('check_map', {
+        zoom: 17,
+        viewMode: '2D',
+        lang: 'zh_cn',
+        zindex: 99,
+        zooms: [3, 18], // 设置地图缩放范围为3到18级
+        center: [110.121181, 37.088921],
+      });
+      AMap.plugin(
+        ['AMap.ToolBar','AMap.Geolocation'], () => {
+          var geolocation = new AMap.Geolocation({
+            enableHighAccuracy: true,
+            showbutton: true,
+            timeout: 10000,
+            buttonOffset: new AMap.Pixel(10, 20),
+            buttonPosition: 'LB'
+          })
+          that.map.addControl(geolocation)
+          geolocation.getCurrentPosition();
+          that.map.addControl(new AMap.ToolBar())
+        });
+      this.map.setDefaultCursor('move');
+      this.infoWindow = new AMap.InfoWindow({
+        anchor: 'bottom-center',
+        autoMove:true,
+        content: '',
+        offset: new AMap.Pixel(0, -25)
+      })
+
+      this.level1Mulchs=new AMap.MassMarks([], {
+        opacity: 0.8,
+        zIndex: 111,
+        cursor: 'pointer',
+        style: this.styleObject[0]
+      });
+      this.level1Mulchs.on('mouseover',function (e) {
+        let defectContent=that.getDefectContent(e.data.rowstr)
+        that.infoWindow.setContent(defectContent)
+        that.infoWindow.open(that.map, e.data.lnglat);
+      })
+      this.level1Mulchs.on('mouseout',function (e) {
+        that.infoWindow.close();
+      })
+      this.level3Mulchs=new AMap.MassMarks([], {
+        opacity: 0.8,
+        zIndex: 111,
+        cursor: 'pointer',
+        style: this.styleObject[1]
+      });
+      this.level3Mulchs.on('mouseover',function (e) {
+        let defectContent=that.getDefectContent(e.data.rowstr)
+        that.infoWindow.setContent(defectContent)
+        that.infoWindow.open(that.map, e.data.lnglat);
+      })
+      this.level3Mulchs.on('mouseout',function (e) {
+        that.infoWindow.close();
+      })
+      this.problemsMulchs=new AMap.MassMarks([], {
+        opacity: 0.8,
+        zIndex: 111,
+        cursor: 'pointer',
+        style: this.styleObject[2]
+      });
+      this.problemsMulchs.on('mouseover',function (e) {
+        let defectContent=that.getDefectContent(e.data.rowstr)
+        that.infoWindow.setContent(defectContent)
+        that.infoWindow.open(that.map, e.data.lnglat);
+      })
+      this.problemsMulchs.on('mouseout',function (e) {
+        that.infoWindow.close();
+      })
+    },
+    async safeRefresh(){
+      let condition =`f_longitude is not null and f_latitude is not null`
+      if (this.f_check_start){
+        condition += ` and f_offsite_time >=  '${this.f_check_start} 00:00:00'`
+      }
+      if (this.f_check_end){
+        condition += ` and f_offsite_time <=  '${this.f_check_end} 23:59:59'`
+      }
+      await this.getNewData(condition)
+      this.assemblyData()
+    }
+  },
+  destroyed() {
+    window.clearInterval(this.intervalNum)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+.time-picker-container {
+  display: flex;
+  align-items: center;
+}
+
+.time-picker-container /deep/ .v-datepicker {
+  width: 100% !important;
+}
+
+.date-separator {
+  padding: 0 5px;
+}
+
+.safe_checkbox_sty{
+  vertical-align:text-bottom;
+  margin-right: 3px;
+
+}
+.safe_ul_sty{
+  list-style-type: none;
+  font-size: 13px;
+  padding-left: 5px;
+}
+.safe_li_sty{
+  font-size: 13px;
+  margin-top: 5px;
+}
+.safe_p{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin: 0 0 0 10px;
+
+  font-size: 12px;
+}
+.safe_list_li{
+  margin-top: 5px;
+  background-color: #ffffff;
+  border: solid 1px #f0f4fa !important;
+  color: #666666 !important;
+  font-size: 1.3rem !important;
+  font-family: PINGFANG-MEDIUM !important;
+  padding: 8px;
+}
+.safe_list_li:hover{
+  background-color: rgb(203,234,241);
+}
+.safe_deimg{
+  vertical-align: text-bottom;
+  width: 15px;
+  margin-right: 3px;
+}
+</style>

package/src/components/paper/PaperList.vue

@@ -268,6 +268,11 @@
                 <input type="text" class="input_search" v-model="model.f_card_id"
                        style="width: 60%" placeholder="客户卡号" condition="f_card_id like '%{}%'">
               </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_repair_approved_note"
+                       style="width: 60%" placeholder="备注" condition="f_repair_approved_note like '%{}%'">
+              </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">距上次安检天数</label>
                 <input type="number" class="input_search" v-model="model.f_check_date"

package/src/components/pc/DefectDeal.vue

@@ -34,7 +34,7 @@
                               progress="safeGetExportProgress"
                               sqlurl="api/af-safecheck/logic/exportfile" sql-name="defectDetails" template-name='隐患处置'></export-excel>
                 <button style="margin-left: 4px" class="button_search button_spacing" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
-                <button style="margin-left: 4px" class="button_search button_spacing"  @click="$parent.$parent.toRepair" v-if="$parent.$parent.canToRepair == '是'">转维修</button>
+                <button style="margin-left: 4px" class="button_search button_spacing"  @click="$parent.$parent.toRepair()" v-if="$parent.$parent.canToRepair == '是'">转维修</button>
                 <button style="margin-left: 4px" class="button_search button_spacing" @click="search()">查询</button>
                 <div
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -985,6 +985,7 @@
       selfSearch(args) {
         ////tag
         // args.condition += ` and f_is_repaired = '未处理'`
+        args.condition += ` and f_filialeid='${this.$login.f.orgid}'`
         this.model.search(args.condition, args.model, args.condValue)
       }
     },

package/src/components/pc/DefectMaterialLook.vue

@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">材料名称</th>
+          <th class="textNoLineBreak">规格、型号</th>
+          <th class="textNoLineBreak">单价</th>
+          <th class="textNoLineBreak">数量</th>
+          <th class="textNoLineBreak">金额</th>
+          <th class="textNoLineBreak">操作人</th>
+          <th class="textNoLineBreak">操作时间</th>
+          <th class="textNoLineBreak">备注</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_name}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_typenumber}}</nobr>
+          </td>
+
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_price}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_number}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_fee}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_remarks}}</nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+export default {
+  name: '隐患明细材料查看',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data () {
+    return {
+      onetomany: {
+        rows: []
+      }
+    }
+  },
+  ready(){
+    this.getOnetoManyData()
+  },
+  methods: {
+    /*获取工单收费添加的材料*/
+    async getOnetoManyData () {
+      let http = new HttpResetClass()
+      let data = {
+        items: '*',
+        tablename: 't_material_service',
+        condition: `f_process_id = '${this.selectdata.f_defect_id}'`,
+        orderitem: 'id'
+      }
+      http.load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '获取数据失败'
+      }).then(res => {
+        this.onetomany.rows = res.data
+      })
+    }
+  },
+  events: {
+  },
+}
+
+</script>
+
+<style scoped>
+
+</style>