apply-clients 7.1.37 → 7.1.40

package/src/components/product/VueUtils/ApplyUpload.vue

@@ -30,7 +30,6 @@
               <img v-if="row.f_filetype === 'pdf'" src="../../image/pdf.jpg" alt="" />
               <img v-if="row.f_filetype === 'xls'||row.f_filetype === 'xlsx'" src="../../image/excel.jpg" alt=""  />
               <img v-if="row.f_filetype === 'doc'||row.f_filetype === 'docx'" src="../../image/doc.jpg" alt=""  />
-              <img v-if="row.f_filetype === 'txt'" src="../../image/TXT.png" alt=""  />
               <img v-if="row.f_filetype === 'dwg'" src="../../image/dwg.png" alt=""  />
               <img v-if="row.f_filetype === 'dxf'" src="../../image/dxf.png" alt=""  />
             </a>
@@ -46,14 +45,21 @@
               <a v-if="row.f_filetype === 'dwg' || row.f_filetype==='dxf'" style="background:#6aa6e2" class="btn btn-primary" :href="row.f_downloadURL" role="button" download>下载</a>
               <a v-if="row.f_filetype !=='jpg' && row.f_filetype !=='png' && row.f_filetype !=='gif' && row.f_filetype !=='bmp' && row.f_filetype !=='dxf' && row.f_filetype !=='dwg'"
                  @click="downloadfile(row.f_downloadURL)" style="background:#6aa6e2" class="btn btn-primary" role="button">下载</a>
-              <a v-if="isdelete" @click="delet($index, row)" href="#" class="btn btn-default" role="button" role="button">删除</a>
+              <a v-if="isdelete && row.defname === defname" @click="delet($index, row)" href="#" class="btn btn-default" role="button" role="button">删除</a>
             </p>
           </div>
         </div>
       </div>
     </div>
   </div>
-  <high-meter v-if="showhighmeter" :show.sync="showhighmeter" @photo-finish="newPhoto" v-ref:ltgao ></high-meter>
+  <apply-high-meter
+    v-if="showhighmeter"
+    :show.sync="showhighmeter"
+    :isusetype="isusetype"
+    :isremark="isremark"
+    @photo-finish="newPhoto"
+    v-ref:ltgao
+  ></apply-high-meter>
   <modal  :show.sync="showUpload" v-ref:modal backdrop="false">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="close"><span class="glyphicon glyphicon-remove"></span></button>
@@ -62,7 +68,7 @@
     <article slot="modal-body" class="modal-body form-horizontal">
       <div class="form-group" style="text-align: center">
         <file-upload class="my-file-uploader" :name="'myFile' + blodid"
-                     action="apply/rs/file/uploadFile" tagname="文件上传" :headers="headers" multiple v-ref:file></file-upload>
+                     action="rs/file/uploadFile" tagname="文件上传" :headers="headers" multiple v-ref:file></file-upload>
       </div>
       <div class="form-group" v-if="isusetype">
         <label class="col-sm-2 control-label">文件类型：</label>
@@ -91,6 +97,7 @@
 
 <script>
 import {HttpResetClass} from 'vue-client'
+import {isEmpty} from "../../Util";
 export default {
   title: '附件',
   props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'isdelete', 'bootstraped', 'issearch'],
@@ -128,6 +135,7 @@ export default {
     // 关闭文件上传对话框
     close () {
       this.showUpload = false
+      this.showhighmeter = false
       // 将选的文件清空
       this.$refs.file.$el.querySelector('input').value = ''
       this.headers.fusetype = ''
@@ -142,29 +150,33 @@ export default {
       }else{
         condition = `f_blobid= '${this.headers.blodid}' `
       }
-      if(this.useType){
+      if (!isEmpty(this.useType)) {
         condition += `and fusetype like '${this.useType}'`
       }
-      var http = new HttpResetClass()
+      let http = new HttpResetClass()
       let data = {
         tablename: 't_files',
         condition: condition + ` order by f_uploaddate desc `
       }
-      let getFile = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+      let getFile = await http.load('POST', 'rs/sql/applySingleTable', {data: data}, {
         warnMsg: null,
         resolveMsg: null
       })
 
       for (var i = 0; i < getFile.data.length; i++) {
         // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
-        // if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
-        //   getFile.data.splice(i,1)
-        //   i--
-        //   continue
-        // }
+        if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
+          getFile.data.splice(i,1)
+          i--
+          continue
+        }
         let temp = getFile.data[i].f_downloadpath
-        let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
-        getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
+        if (temp.includes('http:')){
+          getFile.data[i].f_downloadURL = temp
+        } else {
+          let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+          getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
+        }
       }
       this.fileInfoData = []
       this.fileInfoData = getFile.data
@@ -177,7 +189,10 @@ export default {
       this.showhighmeter = !this.showhighmeter
     },
     // 高拍仪回调
-    newPhoto(Imgbase64) {
+    newPhoto(Imgbase64, fusetype, fremarks) {
+      this.headers.fusetype = fusetype
+      this.headers.fremarks = fremarks
+
       let form = new FormData()
       let xhr = new XMLHttpRequest()
       let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
@@ -192,7 +207,7 @@ export default {
       }
       xhr.send(form)
       setTimeout(() => {
-        this.load()
+        this.close()
       }, 5000)
     },
     convertBase64ToBlob(base64String) {
@@ -227,40 +242,40 @@ export default {
 </script>
 
 <style scoped>
-  .clears{
-    overflow:hidden;
-    text-overflow:ellipsis;
-    white-space:nowrap;
-  }
-  .showData {
-    padding: 15px 10px 0px 10px;
-    box-sizing: border-box;
-    height: 230px;
-    font-family: "微软雅黑";
-  }
-  .showData .item{
-    padding-bottom: 10px;
-    border-bottom: solid 1px #c1c1c1;
-  }
-  .left {
-    padding-right: 10px;
-  }
-  .left img{
-    height: 100%;
-    width: 100%;
-  }
-  .right{
-    height: 100%;
-    /*display: -webkit-flex;*/
-    /*display: flex;*/
-    /*flex-direction: column;*/
-    /*justify-content: space-around;*/
-  }
-  .item_btn{
-    width: 80%;
-    background-color: #6aa6e2;
-    border-radius: 4px;
-    color: #FFFFFF;
-    font-family: PingFang;
-  }
+.clears{
+  overflow:hidden;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+}
+.showData {
+  padding: 15px 10px 0px 10px;
+  box-sizing: border-box;
+  height: 230px;
+  font-family: "微软雅黑";
+}
+.showData .item{
+  padding-bottom: 10px;
+  border-bottom: solid 1px #c1c1c1;
+}
+.left {
+  padding-right: 10px;
+}
+.left img{
+  height: 100%;
+  width: 100%;
+}
+.right{
+  height: 100%;
+  /*display: -webkit-flex;*/
+  /*display: flex;*/
+  /*flex-direction: column;*/
+  /*justify-content: space-around;*/
+}
+.item_btn{
+  width: 80%;
+  background-color: #6aa6e2;
+  border-radius: 4px;
+  color: #FFFFFF;
+  font-family: PingFang;
+}
 </style>

package/src/components/product/VueUtils/HighMeter.vue

@@ -0,0 +1,208 @@
+<template>
+  <modal  :show.sync="show" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="show = !show"><span class="glyphicon glyphicon-remove"></span></button>
+      <h4 class="modal-title" style="text-align: center">高拍仪</h4>
+    </header>
+    <article slot="modal-body" class="modal-body form-horizontal">
+      <div class="form-group" v-if="isusetype">
+        <label class="col-sm-2 control-label">文件类型：</label>
+        <div class="col-sm-10">
+          <input-select
+            class="select select_list"
+            :value.sync="fusetype"
+            v-model="fusetype"
+            :options="$appdata.getParam('使用类型')"
+            :valueSingle="true"></input-select>
+        </div>
+      </div>
+      <div class="form-group" v-if="isremark">
+        <label class="col-sm-2 control-label">文件说明：</label>
+        <div class="col-sm-10">
+          <input class="form-control input_view" style=""
+                 v-model="fremarks"
+                 :value="fremarks"/>
+        </div>
+      </div>
+      <div class="form-group">
+        <img id="cam" :src="cameraurl" style="height: 100%;width: 100%">
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="photo()">确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+export default {
+  title: '高拍仪',
+  data () {
+    return {
+      cameraurl: null,
+      fusetype: null,
+      fremarks: null
+    }
+  },
+  props: ['show', 'isusetype', 'isremark'],
+  methods: {
+    // 打开视频
+    cam_switch (capID) {
+      if (capID === 1) {
+        this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=0'
+      }
+      if (capID === 2) {
+        this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=1'
+      }
+    },
+    async photo () {
+      let camidx = 0
+      if (this.cameraurl === 'http://127.0.0.1:38088/video=stream&camidx=0') {
+        camidx = 0
+      } else if (this.cameraurl === 'http://127.0.0.1:38088/video=stream&camidx=1') {
+        camidx = 1
+      } else {
+        this.$showAlert('请先打开视频', 'warning', 2000)
+        return
+      }
+      let param = {
+        camidx: camidx
+      }
+      let res = await this.$resetpost(
+        'http://127.0.0.1:38088/video=grabimage',
+        param,
+        {warnMsg: null, resolveMsg: null}
+      )
+      if (res.data.code != '0') {
+        this.$showAlert(res.data.message, 'warning', 2000)
+        return
+      }
+      this.$dispatch('photo-finish', res.data.photoBase64, this.fusetype, this.fremarks)
+    }
+  },
+  ready () {
+    this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=0'
+  }
+}
+</script>
+
+<style scoped>
+.modal-bk{
+  border-radius:18px 0;
+}
+.header{
+  background-color: #d8e9f3;
+  height: 88px;
+}
+.title{
+  position: absolute;
+  font-family:PingFang-SC-Bold;
+  font-size:36px;
+  color: #666666;
+  margin-top: 32px;
+  margin-left: 300px;
+  margin-bottom: 0px;
+}
+.operation{
+  font-family:PingFang-SC-Medium;
+  font-size: 22px;
+  color:#666666;
+  line-height: 5px;
+}
+.operation-group{
+  margin-left: 36px;
+  margin-top: 20px;
+}
+.photo{
+  font-family: PingFang-SC-Medium;
+  font-size: 20px;
+  color: #ffffff;
+  margin-left: 20px;
+  border-radius: 4px;
+  background-color: #2fadf5;
+  height: 32px;
+  width: 92px;
+  line-height:12px;
+}
+.readIDCard{
+  font-family: PingFang-SC-Medium;
+  font-size: 20px;
+  color: #ffffff;
+  border-radius: 4px;
+  background-color: #2fadf5;
+  margin-left: 20px;
+  width: 120px;
+  height: 32px;
+  line-height: 12px;
+}
+.stop{
+  border-radius: 4px;
+  border: 1px solid #2fadf5;
+  font-family: PingFang-SC-Medium;
+  font-size: 20px;
+  color: #2fadf5;
+  width: 120px;
+  height: 32px;
+  line-height: 12px;
+}
+.showInfo{
+  float: left;
+  width: 640px;
+  display: inline-block;
+  margin-top: 20px;
+  margin-left: 36px;
+}
+#Console{
+  margin-left: 18px;
+  border-radius: 4px;
+  border: 1px solid #b5b5b5;
+  height:300px;
+  width:322px;
+  resize:none;
+  background-color: #f6f6f6;
+}
+.img{
+  height:300px;
+  width:300px;
+  float: left;
+  border-radius: 4px;
+  border: 1px solid #b5b5b5;
+}
+#cam{
+  border-radius: 4px;
+  border:1px solid #b5b5b5;
+  display: inline-block
+}
+.IdCard{
+  height: 950px;
+  width: 692px;
+  display: inline-block;
+  border-radius: 20px;
+  background-color: #fafafa;
+  border: 1px solid #d8f1ff;
+  margin-left: 40px;
+  margin-top: 20px;
+}
+.IdInput{
+  border-radius: 4px;
+  border: 1px solid #939393;
+  width: 400px;
+  height: 38px;
+  margin-left: 20px;
+}
+.IdInputDiv{
+  margin-top: 20px;
+  margin-left: 100px;
+}
+.IdHint{
+  font-family: PingFang-SC-Medium;
+  font-size: 18px;
+  color: #7e7c81;
+}
+#PhotoBuffer,#PhotoDisplay{
+  border-radius: 4px;
+  background-color: #ffffff;
+  border: 1px solid #939393;
+  margin-left: 20px;
+}
+</style>