apply-clients 3.4.3 → 3.4.4

package/src/components/android/AppSign.vue

@@ -1,142 +1,154 @@
-<template>
-  <div class="panel">
-    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
-      <div class="row form-group" style="height: 240px;overflow: scroll;">
-        <img :src="f_sign_path" width="100%" height="100%" />
-      </div>
-      <div class="row text-right form-group">
-        <button class="btn" style="background-color: #f1e404;border-radius: 5px;margin-right: 10px" @click="clean" v-if="isclean">清除</button>
-        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click="sign" v-if="issign">签名</button>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import {getNowDate, guid, isEmpty} from '../Util'
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-import QRCode from 'qrcodejs2'
-import Vue from "vue";
-
-export default {
-  title: '签字',
-  props: ['filePath', 'isclean', 'issign'],
-  data () {
-    return {
-      f_sign_path: null,
-      fileName: null
-    }
-  },
-  ready () {
-    this.f_sign_path = this.filePath
-  },
-  methods: {
-    clean () {
-      this.f_sign_path = null
-      this.fileName = null
-      this.$emit('sign-clean')
-    },
-    sign () {
-      this.delAudioFile(this.f_sign_path)
-      this.fileName = guid() + '.jpg'
-      HostApp.__callback__ = this.signCallback
-      HostApp.__this__ = this
-      HostApp.getSignature({
-        file: this.fileName,
-        requestCode: 111,
-        callback: 'javascript:HostApp.__callback__("f_sign_path", "%s");'
-      })
-    },
-    // 签名回调
-    signCallback (prop, signPath) {
-      console.log('==============签字回调============')
-      console.log(signPath)
-      HostApp.__this__.$set(prop, signPath)
-      console.log(HostApp.__this__.f_sign_path)
-
-      HostApp.__this__.uploadFile()
-
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    },
-    uploadFile () {
-      console.log('===================签字文件上传==============')
-      let data = {
-        username: Vue.user.name,
-        fremarks: '报装手机签字文件',
-        fileName: HostApp.__this__.fileName,
-        fileUrl: HostApp.__this__.f_sign_path
-      }
-
-      console.log('-----------bzLogic-----------------')
-      console.log(JSON.stringify(data))
-      let res = HostApp.bzLogic({
-        'logic': 'appFileUpload',
-        'data': data
-      })
-      console.log('===============上传回调=================')
-      console.log(JSON.stringify(res))
-      HostApp.__this__.getFiles(res.id)
-    },
-    async getFiles (fileid) {
-      let http = new HttpResetClass()
-
-      let data = {
-        tablename: 't_files',
-        condition: `id = '${fileid}'`
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
-        // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
-        warnMsg: null,
-        resolveMsg: null
-      })
-
-      console.log('=========查询回调===============')
-      let fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
-      console.log(fileUrl)
-      // HostApp.__this__.$set('f_sign_path', fileUrl)
-      // HostApp.__this__.f_sign_path = fileUrl
-      this.f_sign_path = fileUrl
-
-      this.$emit('sign-success', fileUrl)
-    },
-    delAudioFile (signPath) {
-      if (!signPath) {
-        return
-      }
-      HostApp.delfile(signPath)
-      this.f_sign_path = null
-      this.fileName = null
-    }
-  },
-  events: {
-  },
-  computed: {
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped lang="less">
-.qrcode {
-  display: inline-block !important;
-  margin: 10px 0px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.vertical-center {
-  display: flex;
-  align-items: center;
-  text-align: center;
-}
-/*清除model中的浮动*/
-.clearfix:after,.clearfix:before{
-  display: table;
-}
-.clearfix:after{
-  clear: both;
-}
-</style>
+<template>
+  <div class="panel">
+    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
+      <div class="row form-group" style="height: 240px;overflow: scroll;">
+        <img :src="f_sign_path" width="100%" height="100%" />
+      </div>
+      <div class="row text-right form-group">
+        <button class="btn" style="background-color: #f1e404;border-radius: 5px;margin-right: 10px" @click="clean">清除</button>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click="sign">签名</button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {getNowDate, guid, isEmpty} from '../Util'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import QRCode from 'qrcodejs2'
+import Vue from "vue";
+
+export default {
+  title: '签字',
+  props: ['filePath','blobid','type', 'defname'],
+  data () {
+    return {
+      f_sign_path: null,
+      fileName: null
+    }
+  },
+  ready () {
+    console.log('在ready里打印一下this.filePath',this.filePath)
+    this.f_sign_path = this.filePath
+    console.log('在ready里打印一下this.f_sign_path',this.f_sign_path)
+    // this.getFiles()
+  },
+  methods: {
+    clean () {
+      this.f_sign_path = null
+      this.fileName = null
+      this.$emit('sign-clean')
+    },
+    sign () {
+      debugger
+      this.type='手机签字'
+      console.log('==============签字打印this============',this)
+      this.delAudioFile(this.f_sign_path)
+      this.fileName = guid() + '.jpg'
+      HostApp.__callback__ = this.signCallback
+      HostApp.__this__ = this
+      HostApp.getSignature({
+        file: this.fileName,
+        requestCode: 111,
+        callback: 'javascript:HostApp.__callback__("f_sign_path", "%s");'
+      })
+    },
+    // 签名回调
+    signCallback (prop, signPath) {
+      console.log('==============签字回调============')
+      console.log(signPath)
+      HostApp.__this__.$set(prop, signPath)
+      console.log(HostApp.__this__.f_sign_path)
+
+      HostApp.__this__.uploadFile()
+
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    },
+    uploadFile () {
+      console.log('===================签字文件上传==============')
+      console.log('===================打印id==============',HostApp.__this__.blobid)
+      let data = {
+        defname:HostApp.__this__.defname,
+        type:HostApp.__this__.type,
+        blodid: HostApp.__this__.blobid,
+        username: Vue.user.name,
+        fremarks: '报装手机签字文件',
+        fileName: HostApp.__this__.fileName,
+        fileUrl: HostApp.__this__.f_sign_path
+      }
+
+      console.log('-----------bzLogic-----------------')
+      console.log(JSON.stringify(data))
+      let res = HostApp.bzLogic({
+          'logic': 'appFileUpload',
+         'data': data
+      })
+      console.log('===============上传回调=================')
+      console.log(JSON.stringify(res))
+      HostApp.__this__.getFiles(res.id)
+    },
+    async getFiles (fileid) {
+      debugger
+      console.log('=========进来===============')
+      let http = new HttpResetClass()
+      console.log('=========进来===============')
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.blobid}' and fremarks='报装手机签字文件' `
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
+        // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      console.log('=========查询回调===============')
+      let fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      console.log(fileUrl)
+      // HostApp.__this__.$set('f_sign_path', fileUrl)
+      // HostApp.__this__.f_sign_path = fileUrl
+      this.f_sign_path = fileUrl
+
+      this.$emit('sign-success', fileUrl)
+    },
+    delAudioFile (signPath) {
+      if (!signPath) {
+        return
+      }
+      HostApp.delfile(signPath)
+      this.f_sign_path = null
+      this.fileName = null
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped lang="less">
+.qrcode {
+  display: inline-block !important;
+  margin: 10px 0px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.vertical-center {
+  display: flex;
+  align-items: center;
+  text-align: center;
+}
+/*清除model中的浮动*/
+.clearfix:after,.clearfix:before{
+  display: table;
+}
+.clearfix:after{
+  clear: both;
+}
+</style>

package/src/components/android/AppTakePic.vue

@@ -52,7 +52,7 @@ export default {
         condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
       }
       let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
-        // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
+      // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
         warnMsg: null,
         resolveMsg: null
       })
@@ -129,15 +129,15 @@ export default {
 </script>
 
 <style lang="less">
-.fileType {
-  float: left;
-  .select-style {
-    background: #f8f8f8;
-    border: 0px;
-  }
-  input {
-    border-left: none;
-    width: 100%;
+  .fileType {
+    float: left;
+    .select-style {
+      background: #f8f8f8;
+      border: 0px;
+    }
+    input {
+      border-left: none;
+      width: 100%;
+    }
   }
-}
 </style>

package/src/components/android/AreaSelect/AppQrcodeReader.vue

@@ -0,0 +1,73 @@
+<template>
+  <div>
+      <button v-show="isshow" type="button" name="button" class="btn btn-primary" @click="scan()" >开始扫码</button>
+      <!--<div>这是扫码结果：{{ results }}</div>-->
+      <!--<div>这是错误信息：{{ errors }}</div>-->
+  </div>
+</template>
+
+<script>
+
+export default {
+  title: "AppQrcodeReader",
+  props: {
+    istype: {
+      type: Object,
+      default: {}
+    },
+    index: "",
+  },
+  data() {
+    return {
+      results: "",
+      errors: "",
+      isshow:true
+    }
+  },
+  methods: {
+    async downScan() {
+
+    },
+    scan() {
+      HostApp.__this__ = this
+      // if (this.istype.f_material_name === '报警器-汉威'){
+      //   HostApp.scanPhoneCode({callback: "javascript:HostApp.__this__.scanCallbackHanWei();"})
+      // } else {}
+        HostApp.scanPhoneCode({callback: "javascript:HostApp.__this__.scanCallbackHanWei();"})
+    },
+    scanCallbackHanWei() {
+      console.log("这是扫码输出:",this.index)
+      this.results = ""
+
+      let response = HostApp.getPhoneCode()
+      if (response.code == 200) {
+        let aray =  response.data.split(",")
+        if (aray.length > 0){
+          for (let i = 0; i < aray.length; i++) {
+            let tem = (aray[i]).split("=")
+            if (tem[0] === "ID"){
+              this.results = tem[1].trim().replaceAll("'","").trim()
+              this.$parent.$parent.materials[this.index].f_bjq_sid  = this.results
+              break;
+            }
+          }
+        }
+      } else {
+        this.$showMessage('无法识别该条形码/二维码，请调整手机聚焦重试。')
+      }
+    }
+  },
+  watch: {
+    // 'istype'(){
+    //   // console.log("这是监听值:",this.istype)
+    //   if (this.istype){
+    //     if (this.istype.f_material_name === '报警器-汉威'){
+    //       this.isshow = true
+    //     } else {
+    //       this.isshow = false
+    //     }
+    //   }
+    // },
+  }
+}
+</script>

package/src/components/android/AreaSelect/AppResAreaMapGroup.vue

@@ -0,0 +1,148 @@
+<template>
+
+  <list :model="model" partial='list'>
+    <div partial class="auto app-text panel">
+      <div class="panel-body panel-self">
+        <div class="row">
+          <p class="col-xs-3 text-left font"><b>经&emsp;&emsp;度</b></p>
+          <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_bjq_lng }}</p>
+        </div>
+        <div class="row">
+          <p class="col-xs-3 text-left font"><b>纬&emsp;&emsp;度</b></p>
+          <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_bjq_lat }}</p>
+        </div>
+
+
+      </div>
+    </div>
+  </list>
+
+  <div class="row text-right">
+    <button
+      type="button"
+      class="btn btn-info"
+      @click="openModalApp()"
+    >
+      选择定位
+    </button>
+  </div>
+  <modal :show.sync="mapShowApp" v-if="mapShowApp"  v-ref:modal :large="true" :backdrop="fals e" title="设置坐标" width="95%" >
+    <header slot="modal-header" class="modal-header">
+    </header>
+    <article slot="modal-body" class="modal-body" >
+      <amap-location :islocationclearmark="false":usenative="true"  dom="addboxmap"  v-ref:positionInfo @getmylocation="getmylocation"></amap-location>
+      <!--        <app-onetomanymap :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></app-onetomanymap>-->
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="mapShowApp" type="button" class="btn btn-primary" @click='closeModalApp'>取消</button>
+      <button v-show="mapShowApp" type="button" class="btn btn-primary" @click='confirmLocation'>确认</button>
+    </footer>
+  </modal>
+</template>
+<script>
+
+import { HttpResetClass } from 'vue-client'
+import Vue from "vue";
+export default {
+  title: '地图定位',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      model: {
+        rows: null
+      },
+      templng: '',  //  临时经度
+      templat: '', //  临时纬度
+      userfile: null,
+      mapShowApp: false
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods:{
+    //地图调试
+    openModalApp () {
+      this.mapShowApp = true
+    },
+    closeModalApp () {
+      this.mapShowApp = false
+    },
+    getmylocation (res) {
+      this.templng = res.position.lng
+      this.templat = res.position.lat
+    },
+    async confirmLocation() {
+      //转换坐标
+      let datamap = {
+        lnglat: this.templng+','+this.templat
+
+      }
+
+      let resmap = await this.$resetpost(
+         `${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/gdMapTransBMap`,
+       // `/rs/logic/gdMapTransBMap`,
+        datamap
+      )
+    //存储坐标
+      let data = {
+        f_bjq_gaode_lat: this.templat,
+        f_bjq_gaode_lng: this.templng,
+        f_bjq_baidu_lng: resmap.data.result[0].x,
+        f_bjq_baidu_lat: resmap.data.result[0].y,
+        selectdata: this.selectdata,
+        userfile: this.userfile
+
+      }
+      // console.log("====3333")
+      // console.log(data)
+      let res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/applyBjqMap`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '坐标添加失败！！！'}
+      )
+
+     this.mapShowApp = false
+
+      this.$dispatch('breakControl')
+    },
+    async search () {
+      let http = new HttpResetClass()
+     let data = {
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+       }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getapplyBjqMap`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '获取坐标失败！！！'
+      })
+      // console.log('=================================')
+      //
+      // console.log(res.data)
+
+        if (res.data == ""){
+          this.$showMessage('请正确添加报警器设备后再设置坐标!')
+        }
+
+      this.model.rows = res.data
+      this.$parent.$parent.$parent.areaData.mapvalue = res.data
+      this.$parent.$parent.$parent.disableButton()
+    },
+  },
+  watch: {
+
+  }
+}
+</script>
+<style lang="less">
+#addboxmap {
+  height: 300px;
+}
+</style>

package/src/components/android/AreaSelect/AppResAreaSelect.vue

@@ -0,0 +1,108 @@
+<template>
+  <!--<v-select :options='options' placeholder='请选择'-->
+  <!--          :value.sync="selectres"-->
+  <!--          :multiple="isMul"-->
+  <!--          :search="issearch"-->
+  <!--          :close-on-select="!isMul"-->
+  <!--          @change="resChange"-->
+  <!--          :value-single="true"-->
+  <!--&gt;-->
+  <!--</v-select>-->
+  <area-select :options='options' placeholder='请选择'
+               :value.sync="selectres"
+               :multiple="!isMul"
+               :search="issearch"
+               :close-on-select="isMul"
+               @change="resChange"
+               :value-single="true"
+  >
+  </area-select>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '资源管理',
+  props: {
+
+    //资源类型
+    restype:'',
+    //资源数据
+    resObj:{},
+    options:[],
+    isMul: {
+      type: Boolean,
+      default: true
+    },
+    issearch: {
+      type: Boolean,
+      default: true
+    },
+    //资源初始化数据 默认选中值
+    initresid: {
+      type: Array,
+      default() { return [] },
+    },
+    //父层id
+    parentresid: {
+      type: Array,
+      default() { return [] },
+    },
+  },
+  data () {
+    return {
+      //资源数据
+      resObj:{},
+      //资源数据列表
+      resoptions:[],
+      //选中资源数据
+      selectres: [],
+    }
+  },
+  ready () {
+    //获取资源列表
+    this.getResList()
+  },
+  methods:{
+    //资源改变
+    resChange(val){
+      let orgnames=[]
+      Object.keys(this.options).forEach((key) => {
+        if(this.selectres.includes(this.options[key].value))
+          orgnames.push(this.options[key].label)
+      })
+      // console.log("资源变化:",this.selectres, orgnames,this.options)
+      this.$dispatch('res-select', this.selectres, orgnames,this.options)
+    },
+    //获取资源数据
+    async getResList() {
+      this.dealdata()
+    },
+    dealdata(){
+      //赋值资源数据选中初始值
+      let arryselect=[]
+      this.options.forEach((item) => {
+        if(this.initresid.length>0){
+          this.initresid.forEach((init) => {
+            if(item.value==init){
+              arryselect.push(item.value)
+            }
+          })
+        }
+      })
+      //赋值资源选中初始值
+      this.selectres=arryselect
+    }
+  },
+  watch: {
+    //监听初始化资源id
+    'initresid.length'(){
+      this.dealdata()
+    },
+    //监听初始化资源id
+    'parentresid'(){
+      this.dealdata()
+    },
+  },
+}
+</script>