vue2-client 1.10.14 → 1.10.16

package/src/base-client/components/layout/XPageView/XPageView.vue

@@ -1,155 +1,155 @@
-<script setup>
-import { getConfigByName } from '@vue2-client/services/api/common'
-import { reactive, ref, provide } from 'vue'
-import RenderRow from './RenderRow'
-import Exp500 from '@vue2-client/pages/exception/500.vue'
-
-const layout = ref(null)
-
-// 加载状态，0：加载中，1：已加载，2：出现错误
-const loaded = ref(0)
-
-// 声明组件总数
-const componentTotal = ref(0)
-
-// 注册组件总数
-const registerComponentTotal = ref(0)
-
-// 组件注册集
-const componentRefMap = reactive({})
-
-// 通用参数
-const data = {
-  comps: componentRefMap,
-  func: {
-    getConfigByName: getConfigByName
-  }
-}
-
-/**
- * 初始化构建页面组件
- * @param params
- */
-function init (params) {
-  const {
-    configName,
-    configValue,
-    serviceName
-  } = params
-  loaded.value = 0
-  const getConfigAfter = (res) => {
-    if (res == null) {
-      loaded.value = 2
-      return
-    }
-    layout.value = res
-    // 设置组件总量
-    setComponentTotal(layout.value.children)
-    loaded.value = 1
-  }
-  if (configName) {
-    getConfigByName(configName, serviceName, getConfigAfter)
-  } else {
-    getConfigAfter(JSON.parse(configValue))
-  }
-}
-
-/**
- * 注册组件
- * @param name 组件名称
- * @param vm 组件实例
- */
-function registerComponent (name, vm) {
-  componentRefMap[name] = vm
-  registerComponentTotal.value = registerComponentTotal.value + 1
-  console.info(`总组件数量：${componentTotal.value}，已注册数量：${registerComponentTotal.value}`)
-  // 初始化页面
-  initPage()
-  if (registerComponentTotal.value >= componentTotal.value) {
-    // 注册事件
-    registerEvents(layout.value.children)
-  }
-}
-provide('registerComponent', registerComponent)
-
-/**
- * 初始化页面
- */
-function initPage () {
-  if (layout.value.onMounted) {
-    // eslint-disable-next-line no-eval
-    const onMountedFun = eval('(' + layout.value.onMounted + ')')
-    onMountedFun(data)
-  }
-}
-
-/**
- * 设置需要注册的组件总数
- * @param children 组件集合
- */
-function setComponentTotal (children) {
-  children.forEach((child) => {
-    // 如果不是row类型，追加组件数量
-    if (child.type !== 'row') {
-      componentTotal.value = componentTotal.value + 1
-    }
-    // 递归追加子组件数量
-    if (child.children) {
-      setComponentTotal(child.children)
-    }
-  })
-}
-
-/**
- * 注册组件事件
- * @param children 组件集合
- */
-function registerEvents (children) {
-  children.forEach((child) => {
-    // 如果有事件，注册它们
-    if (child.event) {
-      Object.entries(child.event).forEach(([eventName, handler]) => {
-        // eslint-disable-next-line no-eval
-        const eventHandler = eval('(' + handler + ')')
-        const componentInstance = componentRefMap[child.id]
-        if (componentInstance) {
-          // 创建一个包装函数以传递额外参数
-          const wrappedHandler = function (...args) {
-            // 这里可以传递额外的参数，例如：
-            eventHandler.call(componentInstance, ...args, data)
-          }
-          componentInstance.$on(eventName, wrappedHandler)
-        }
-      })
-    }
-
-    // 递归注册子组件的事件
-    if (child.children) {
-      registerEvents(child.children)
-    }
-  })
-}
-
-defineExpose({
-  init
-})
-
-</script>
-
-<template>
-  <div class="liuli_page">
-    <div class="liuli_page_main" v-if="loaded === 1">
-      <render-row
-        v-for="row in layout.children"
-        :key="row.id"
-        :row="row"
-      />
-    </div>
-    <div class="liuli_page_error" v-else-if="loaded === 2">
-      <exp500></exp500>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="less">
-</style>
+<script setup>
+import { getConfigByName } from '@vue2-client/services/api/common'
+import { reactive, ref, provide } from 'vue'
+import RenderRow from './RenderRow'
+import Exp500 from '@vue2-client/pages/exception/500.vue'
+
+const layout = ref(null)
+
+// 加载状态，0：加载中，1：已加载，2：出现错误
+const loaded = ref(0)
+
+// 声明组件总数
+const componentTotal = ref(0)
+
+// 注册组件总数
+const registerComponentTotal = ref(0)
+
+// 组件注册集
+const componentRefMap = reactive({})
+
+// 通用参数
+const data = {
+  comps: componentRefMap,
+  func: {
+    getConfigByName: getConfigByName
+  }
+}
+
+/**
+ * 初始化构建页面组件
+ * @param params
+ */
+function init (params) {
+  const {
+    configName,
+    configValue,
+    serviceName
+  } = params
+  loaded.value = 0
+  const getConfigAfter = (res) => {
+    if (res == null) {
+      loaded.value = 2
+      return
+    }
+    layout.value = res
+    // 设置组件总量
+    setComponentTotal(layout.value.children)
+    loaded.value = 1
+  }
+  if (configName) {
+    getConfigByName(configName, serviceName, getConfigAfter)
+  } else {
+    getConfigAfter(JSON.parse(configValue))
+  }
+}
+
+/**
+ * 注册组件
+ * @param name 组件名称
+ * @param vm 组件实例
+ */
+function registerComponent (name, vm) {
+  componentRefMap[name] = vm
+  registerComponentTotal.value = registerComponentTotal.value + 1
+  console.info(`总组件数量：${componentTotal.value}，已注册数量：${registerComponentTotal.value}`)
+  // 初始化页面
+  initPage()
+  if (registerComponentTotal.value >= componentTotal.value) {
+    // 注册事件
+    registerEvents(layout.value.children)
+  }
+}
+provide('registerComponent', registerComponent)
+
+/**
+ * 初始化页面
+ */
+function initPage () {
+  if (layout.value.onMounted) {
+    // eslint-disable-next-line no-eval
+    const onMountedFun = eval('(' + layout.value.onMounted + ')')
+    onMountedFun(data)
+  }
+}
+
+/**
+ * 设置需要注册的组件总数
+ * @param children 组件集合
+ */
+function setComponentTotal (children) {
+  children.forEach((child) => {
+    // 如果不是row类型，追加组件数量
+    if (child.type !== 'row') {
+      componentTotal.value = componentTotal.value + 1
+    }
+    // 递归追加子组件数量
+    if (child.children) {
+      setComponentTotal(child.children)
+    }
+  })
+}
+
+/**
+ * 注册组件事件
+ * @param children 组件集合
+ */
+function registerEvents (children) {
+  children.forEach((child) => {
+    // 如果有事件，注册它们
+    if (child.event) {
+      Object.entries(child.event).forEach(([eventName, handler]) => {
+        // eslint-disable-next-line no-eval
+        const eventHandler = eval('(' + handler + ')')
+        const componentInstance = componentRefMap[child.id]
+        if (componentInstance) {
+          // 创建一个包装函数以传递额外参数
+          const wrappedHandler = function (...args) {
+            // 这里可以传递额外的参数，例如：
+            eventHandler.call(componentInstance, ...args, data)
+          }
+          componentInstance.$on(eventName, wrappedHandler)
+        }
+      })
+    }
+
+    // 递归注册子组件的事件
+    if (child.children) {
+      registerEvents(child.children)
+    }
+  })
+}
+
+defineExpose({
+  init
+})
+
+</script>
+
+<template>
+  <div class="liuli_page">
+    <div class="liuli_page_main" v-if="loaded === 1">
+      <render-row
+        v-for="row in layout.children"
+        :key="row.id"
+        :row="row"
+      />
+    </div>
+    <div class="liuli_page_error" v-else-if="loaded === 2">
+      <exp500></exp500>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+</style>

package/src/components/HeightScanner/index.vue

@@ -5,6 +5,7 @@
     width="50vw"
     :footer="null"
     :zIndex="1050"
+    @cancel="handleCancel"
     :maskClosable="false"
   >
     <div class="scanner-container">
@@ -102,11 +103,12 @@
         </a-col>
       </a-row>
     </template>
+    <div id="result"></div>
   </a-modal>
 </template>
 
 <script>
-import { post } from '@vue2-client/services/api'
+import axios from 'axios'
 
 let ws
 const SERVER_ADDR = 'ws://127.0.0.1:38088'
@@ -356,40 +358,52 @@ export default {
         tryConnect() // 开始首次连接
       })
     },
+    newInstancePost (url, data) {
+      // 重新创建是为了 避免axios的拦截器影响写卡读卡请求
+      // 请求 如果携带了 Cookie，token到卡服务 会导致请求失败
+      // 需要注意的是因为没有增加响应拦截器 所以返回结果的res里面会多一层data
+      const instance = axios.create()
+      return instance.post(url, data, {
+        withCredentials: false,
+        headers: {
+          'Content-Type': 'text/plain;charset=UTF-8',
+          Accept: '*/*',
+        }
+      })
+    },
     // 打开视频
     switchCamera (data) {
       this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=' + data + '&tid=' + Date.parse(new Date())
     },
     // 关闭视频
-    closeVideo () {
+    async closeVideo () {
       const params = ''
       const url = this.cameraurl.replace('stream', 'close')
       this.cameraurl = ''
-      post(url, params).then((msg) => { // 截图
-        if (msg.data.code != '0') {
-          document.getElementById('result').innerHTML = msg.data.message
-        }
-      })
+      const msg = await this.newInstancePost('http://127.0.0.1:38088/card=idcard', params)
+      if (msg.data.code != '0') {
+        document.getElementById('result').innerHTML = msg.data.message
+      }
     },
     // 获取设备状态
-    getVideoStatus () {
+    async getVideoStatus () {
       document.getElementById('result').innerHTML = ''
       const params = ''
       const url = 'http://127.0.0.1:38088/video=status'
       this.cameraurl = ''
-      post(url, params).then((msg) => { // 截图
-        if (msg.data.code != '0') {
-          document.getElementById('result').innerHTML = '获取设备状态失败，返回代码 = ' + msg.data.code + '，返回信息 = ' + msg.data.message
-        } else {
-          document.getElementById('result').innerHTML = '文档摄像头:' + msg.data.video0 +
-            ', 人像1:' + msg.data.video1
-        }
-      })
+      const msg = await this.newInstancePost(url, params)
+      if (msg.data.code != '0') {
+        document.getElementById('result').innerHTML = '获取设备状态失败，返回代码 = ' + msg.data.code + '，返回信息 = ' + msg.data.message
+      } else {
+        document.getElementById('result').innerHTML = '文档摄像头:' + msg.data.video0 +
+          ', 人像1:' + msg.data.video1
+      }
+
     },
     openApp () {
       window.location.href = 'cameraServicetis:0' // 启动 CameraService 服务程序
     },
-    capturePhoto () {
+    async capturePhoto () {
       // if (!this.name) {
       //  return this.$showMessage('请输入照片名称')
       // }
@@ -408,29 +422,27 @@ export default {
       const param = {
         camidx: camidx
       }
-      post('http://127.0.0.1:38088/video=grabimage', param).then((msg) => { // 截图
-        if (msg.data.code != '0') {
-          this.$message.info(msg.data.message)
-          return
-        }
-        this.previewImage = 'data:image/jpg;base64,' + msg.data.photoBase64
-        this.output('base64 长度 : ' + this.previewImage)
-        this.$emit('photo-finish', { img: this.previewImage })
-        this.name = ''
-      })
+      const msg = await this.newInstancePost('http://127.0.0.1:38088/video=grabimage',param)
+      if (msg.data.code != '0') {
+        this.$message.info(msg.data.message)
+        return
+      }
+      this.previewImage = 'data:image/jpg;base64,' + msg.data.photoBase64
+      this.output('base64 长度 : ' + this.previewImage)
+      this.$emit('photo-finish', { img: this.previewImage })
+      this.name = ''
+      // post('http://127.0.0.1:38088/video=grabimage', param)
     },
     // 读身份证
-    startReadCard () {
-      post('http://127.0.0.1:38088/card=idcard', {}).then((msg) => {
-        if (msg.data.code != '0') {
-          this.$message.info(msg.data.message, 2000)
-          return
-        } else {
-          this.updateIdCardInfo(msg.data.IDCardInfo)
-        }
-
-        this.output('读取身份证')
-      })
+    async startReadCard () {
+      const msg = await this.newInstancePost('http://127.0.0.1:38088/card=idcard', param)
+      if (msg.data.code != '0') {
+        this.$message.info(msg.data.message, 2000)
+        return
+      } else {
+        this.updateIdCardInfo(msg.data.IDCardInfo)
+      }
+      this.output('读取身份证')
       this.output('开始读卡')
     },
     // 停止读身份证