safecheck-client 3.0.34-3 → 3.0.34-31

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.34-3",
+  "version": "3.0.34-31",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/App-/345/215/225/351/241/265/351/235/242/346/211/223/345/214/205/347/224/250.vue

@@ -0,0 +1,55 @@
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <route :comp="{name: 'load-data', props: {componentName: 'user-examples'}}"></route>
+      </article>
+    </div>
+  </app-base>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        lastTime: null, // 最后一次点击的时间
+        currentTime: null, // 当前点击的时间
+        // 获取一次不在获取控制
+        getConfig: false,
+        config: {
+          timeOut: 0, // 单位: 分钟
+          exitPrompt: '因您长时间未操作, 请重新登陆!'
+        },
+      }
+    },
+    created () {
+      this.lastTime = new Date().getTime()
+    },
+    methods: {
+      async isTimeOut () {
+        // 获取config配置
+        if (!this.getConfig && this.$login.f && this.$login.f.dir) {
+          await this.$getConfig(this, 'App')
+          this.getConfig = true
+        }
+        // 无配置,不开启
+        if (this.config.timeOut <= 0) return
+        // 记录这次点击的时间
+        this.currentTime = new Date().getTime()
+        // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
+        if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
+          // 如果是登录状态
+          if (this.$login.f.id) {
+            await this.$showMessage(this.config.exitPrompt)
+            window.location.reload()
+          } else {
+            this.lastTime = new Date().getTime()
+          }
+        } else {
+          // 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
+          this.lastTime = new Date().getTime()
+        }
+      }
+    }
+  }
+</script>

package/src/components/LoadData.vue

@@ -0,0 +1,62 @@
+<template>
+<!--  石泉单页面打包用-->
+  <div class="loadingdata" :class="{'loaderror': show, 'loadsuccess': !show}">
+    <!-- <h2 style="margin: 0" v-if="show">{{msg}}</h2> -->
+    <h2 style="margin: 0" v-if="show">参数加载失败，请检查网络状态和服务状态...</h2>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from "vue";
+
+let saveGen = function* (self) {
+  try {
+    yield self.$login.login()
+    yield self.$appdata.load()
+  } catch (ret) {
+    console.error('登录失败', ret)
+  }
+}
+export default {
+  title: '加载参数',
+  data () {
+    return {
+      msg: '',
+      show: false
+    }
+  },
+  props: {
+    componentName: {}
+  },
+  ready () {
+    if (!this.componentName) {
+      this.componentName = Vue.$login.getUrlParames('goto')
+    }
+    console.log('跳转页面', this.componentName)
+    let gen = saveGen(this)
+    co(gen).then(() => {
+      this.$goto(this.componentName)
+    }).catch(() => {
+      this.$goto(this.componentName)
+    })
+  }
+}
+</script>
+<style media="screen">
+.loadingdata {
+  position: fixed;
+  background: #fff;
+  opacity: 0.6;
+  top: 0;
+  width: 100%;
+}
+
+.loaderror {
+  opacity: 1;
+}
+
+.loadsuccess {
+  display: none;
+}
+</style>

package/src/components/android/AndroidDefectDeal.vue

@@ -497,6 +497,7 @@
         if (this.deletebacklistisselect){
           this.deletebacklist()
         }
+        this.deal.f_other_dealpath = this.deal.f_deal_path
         HostApp.__this__ = this
         HostApp.logicWithHint({
           'logic': 'safe_dealWithDefect', 'callback': 'javascript: HostApp.__this__.commitCallBack()',

package/src/components/android/AreaPlan.vue

@@ -424,13 +424,7 @@
           {label: '未检', value: '未检'},
           {label: '已检', value: '已检'},
         ],
-        last_check_states: [
-          {label: '请选择上次安检状态', value: ''},
-          {label: '入户', value: '入户'},
-          {label: '拒检', value: '拒检'},
-          {label: '到访不遇', value: '到访不遇'},
-          {label: '未使用天然气', value: '未使用天然气'}
-        ],
+        last_check_states: Vue.$appdata.getParam('安检状态'),
         upload_states: [
           {label: '请选择上传状态', value: ''},
           {label: '未传', value: '未传'},

package/src/components/android/PaperFeedback.vue

@@ -610,7 +610,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -631,6 +630,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

package/src/components/android/PaperFeedbackTemp.vue

@@ -610,7 +610,6 @@
         HostApp.__this__ = null
       },
       takePic(prop, title, index) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         ////tag
@@ -631,6 +630,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         HostApp._open_a_page({

package/src/components/android/QRCode/QRCodeBinding.vue

@@ -0,0 +1,247 @@
+<template>
+  <div style="height: 100%">
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">负责人姓名:</label>
+          <input v-model="bindingData.f_head_name" class="form-control rightipt" type="text"/>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">负责人职务:</label>
+          <input v-model="bindingData.f_head_post" class="form-control rightipt" type="text"/>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">负责人电话:</label>
+          <input v-model="bindingData.f_head_phone" class="form-control rightipt" type="text"/>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">绑定类型:</label>
+          <v-select v-model="bindingData.f_type" :options='types' :value.sync="bindingData.f_type" :width="'60%'"
+                    class="input-font" clear-button close-on-select placeholder='类型' style="margin-left: 5%;"
+                    value-single></v-select>
+        </div>
+      </div>
+    </div>
+    <div v-if="bindingData.f_type == '小区'" class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">小区名称:</label>
+          <v-select v-model="bindingData.f_user_name" :options='residentialAreas' :value.sync="bindingData.f_user_name" :width="'60%'"
+                    class="input-font" clear-button close-on-select placeholder='小区名称'
+                    style="margin-left: 5%;" value-single></v-select>
+        </div>
+      </div>
+    </div>
+    <div v-if="bindingData.f_type == '用户'" class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">用户名称:</label>
+          <v-select v-model="bindingData.f_user_name" :options='userNames' :value.sync="bindingData.f_user_name" :width="'60%'"
+                    class="input-font" clear-button close-on-select placeholder='用户名称'
+                    style="margin-left: 5%;"
+                    value-single></v-select>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div class="panel-body">
+        <label class="row auto text-left col-md-4 col-xs-4">备注</label>
+        <div class="col-md-12 col-sm-12 col-xs-12">
+          <textarea v-model="bindingData.f_comments" class="form-control"></textarea>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div  class="panel-body ">
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">图片:</label>
+          <div class="col-xs-6" style="height: 160px;width:160px;overflow: scroll;top: 1px">
+            <img-self v-if="bindingData.f_head_pic" :src="bindingData.f_head_pic" width="140" height="140"></img-self>
+            <button v-if="!bindingData.f_head_pic" type="button" name="button" class="btn btn-primary" @click="takePictures('com.aofeng.hybrid.android.peripheral.CameraActivity')">拍照</button>
+            <button v-if="!bindingData.f_head_pic" type="button" name="button" class="btn btn-primary" @click="takePictures('com.aofeng.hybrid.android.peripheral.ActionMultiplePickActivity')">相册</button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="panel auto">
+      <div class="panel-body">
+        <div style="display: flex;justify-content: center;">
+          <button class="col-sm-3 btn btn-primary" @click="binding()">绑定</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
+
+
+export default {
+  title: '二维码绑定',
+  data() {
+    return {
+      bindingData: {},
+      residentialAreas: [{label: '请选择', value: ''}],
+      userNames: [{label: '请选择', value: ''}],
+      types: [{label: '请选择', value: ''}, {label: '小区', value: '小区'}, {label: '用户', value: '用户'}]
+    }
+  },
+  props: {
+    row: {
+      type: Object
+    }
+  },
+  methods: {
+    cameraCallBack(prop,fileName) {
+      this.$set('bindingData.f_head_pic',fileName)
+    },
+    takePictures(page){
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let prop = 'QRCode'
+      this.fileName = Util.guid() +'.jpg'
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: page,
+        param: {
+          file: this.fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
+          watermark: ''
+        }
+      })
+    },
+    async binding() {
+      let tableImages = []
+      tableImages.push({
+        path:this.bindingData.f_head_pic
+      })
+      let data = {
+        tableImages: tableImages
+      }
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        'logic': 'imagesUploadAndroid', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
+        'data': data, 'backresult': 1
+      })
+    },
+    async commitCallBack(jo) {
+      if (jo.state == 'ok') {
+        const res = JSON.parse(jo.result)
+        let sql = `update t_qr_code set f_head_name = '${this.bindingData.f_head_name}',f_head_post = '${this.bindingData.f_head_post}',f_head_phone = '${this.bindingData.f_head_phone}',f_type = '${this.bindingData.f_type}',f_user_name = '${this.bindingData.f_user_name}',f_userinfo_id = '${this.bindingData.f_userinfo_id}',f_comments = '${this.bindingData.f_comments}',f_head_pic='${res.images[0].imgfileName}' where id = '${this.bindingData.id}'`
+        new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/runSQL`, {data: {sql: sql}}).then(res=>{
+          this.$showMessage('绑定成功')
+          this.$dispatch('confirm')
+        }).catch(e=>{
+          this.$showMessage('绑定失败')
+        })
+      }else {
+        this.$showMessage('图片上传失败')
+      }
+    },
+  },
+  async ready() {
+    this.bindingData = JSON.parse(JSON.stringify(this.row))
+    let residentialArea = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      data: {
+        items: 'f_residential_area,id',
+        tablename: 't_area',
+        condition: `1=1 and f_residential_area is not null`,
+        orderitem: '1'
+      }
+    })
+    residentialArea.data.forEach(item => {
+      this.residentialAreas.push({label: item.f_residential_area, value: `${item.f_residential_area}:${item.id}`});
+    })
+    let users = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      data: {
+        items: 'ui.f_user_name,ui.f_userinfo_id',
+        tablename: 't_userinfo ui LEFT JOIN t_userfiles uf on ui.f_userinfo_id = uf.f_userinfo_id',
+        condition: `1=1 and f_user_name is not null and uf.f_user_type = '非民用' and uf.f_table_state in ('正常','停用')`,
+        orderitem: '1'
+      }
+    })
+    users.data.forEach(item => {
+      this.userNames.push({label: item.f_user_name, value: `${item.f_user_name}:${item.f_userinfo_id}`});
+    })
+  }
+}
+</script>
+<style lang="less" scoped>
+.butt3 {
+  float: right;
+  width: 12px;
+  margin: 1% 2% 0 0;
+}
+
+.rightipt {
+  width: 60%;
+  float: left;
+  margin-left: 5%;
+}
+
+.righttxt {
+  border: none;
+  margin-left: 5px;
+  /*border-left: 5px solid #A2C2EB;*/
+  float: left;
+  width: 25%;
+  margin-bottom: 3px;
+  text-align: left;
+  word-wrap: break-word;
+  white-space: normal;
+}
+
+.spanboder {
+  border-bottom: 2px solid #499edf;
+  padding-bottom: 8px
+}
+
+#upuserinfo_sel /deep/ ul {
+  width: 100% !important;
+  left: 0 !important;
+}
+
+.btn-photo {
+  border: 0;
+  border-radius: 7px;
+  background-color: #7dc1f4;
+  font: 15px PingFang-SC-Bold;
+  height: 20%;
+}
+
+.panel-self {
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+
+.div-photo {
+  width: auto;
+  height: auto;
+  /* margin-top: 10px; */
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+</style>
+<style lang="less">
+#upuserinfo_sel ul {
+  width: 100% !important;
+  left: 0 !important;
+}
+</style>

package/src/components/android/QRCode/QRCodePage.vue

@@ -0,0 +1,199 @@
+<template>
+  <div class="auto">
+    <criteria-paged :model="model"  v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">二维码编号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font" style="width: 70%" placeholder="请输入或扫码" v-model="model.id"/>
+                <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">负责人：</label>
+              </div>
+              <div class="col-xs-8">
+                <v-select :value.sync="model.f_head_name" class="input-font"
+                          :options='$parent.$parent.head_names' placeholder='请选择负责人' :value-single="true"
+                          v-model="model.f_head_name" close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">小区名称/用户名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font" v-model="model.f_user_name" placeholder="请输入小区名称/用户名称（可模糊查询）">
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="$parent.$parent.search">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+
+      <list :model="model" partial='list'>
+        <div partial>
+          <div class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">二维码编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.id  }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">负责人二维码编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_head_code  }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">安检情况二维码编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_safecheck_code }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">负责人姓名</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_head_name }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">小区/用户名称</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_name}}</p>
+                </div>
+                <div class="row">
+                  <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="$parent.$parent.$parent.handle(row)">处理</button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+export default {
+  title: '二维码绑定',
+  data () {
+    return {
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, 50, {
+        items: '"id,f_head_code,f_safecheck_code,f_head_name,f_user_name,f_head_post,f_head_phone,f_type"',
+        tablename: '"t_qr_code"',
+        orderitem: '"1"'
+      }),
+      QRCode:{},
+      head_names:[{ label: '请选择', value: '' }]
+    }
+  },
+  ready () {
+    new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
+        items: 'f_head_name',
+        tablename: 't_qr_code',
+        condition: `1=1 and f_head_name is not null`,
+        orderitem: '1'
+      }}).then(res=>{
+      res.data.forEach(item=>{
+        this.head_names.push({label:item.f_head_name,value:item.f_head_name})
+      })
+    })
+  },
+  computed: {
+    reload(){
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+    },
+    selected () {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  },
+  methods:{
+    scan(){
+      HostApp.__this__=this,
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
+    },
+    getCode(){
+      let datapa = HostApp.getCode().data;
+      this.this.$refs.paged.$refs.cri.model.id=datapa
+    },
+    handle(row){
+      var pardate = {
+        _this:this,
+        tittle:'二维码绑定',
+        safe:true
+      }
+      this.$dispatch('gotoson',pardate)
+      this.$goto('qr-code-binding', {row: row}, 'self')
+    },
+    search(){
+      let condition = `1=1`
+      if (this.$refs.paged.$refs.cri.model.id) {
+        condition += ` and (qr.f_head_code = '${this.$refs.paged.$refs.cri.model.id}' or qr.f_safecheck_code= '${this.$refs.paged.$refs.cri.model.id}')`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_head_name) {
+        condition += ` and qr.f_head_name = ${this.$refs.paged.$refs.cri.model.f_head_name}`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_user_name) {
+        condition += ` and ui.f_user_name = ${this.$refs.paged.$refs.cri.model.f_user_name}`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_residential_area) {
+        condition += ` and ua.f_residential_area = ${this.$refs.paged.$refs.cri.model.f_residential_area}`
+      }
+      this.model.search(condition)
+    }
+
+  }
+}
+</script>
+<style scoped>
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+</style>