vue2-client 1.9.98 → 1.9.100

package/package.json

@@ -1,102 +1,102 @@
-{
-  "name": "vue2-client",
-  "version": "1.9.98",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-draggable-resizable": "^2",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-jest": "^26.6.3",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^26.6.3",
-    "jest-environment-jsdom": "^26.6.2",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.9.100",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-draggable-resizable": "^2",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-jest": "^26.6.3",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^26.6.3",
+    "jest-environment-jsdom": "^26.6.2",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

package/src/base-client/components/common/AMisRender/index.js

@@ -1,3 +1,3 @@
-import AMisRender from './index.vue'
-
-export default AMisRender
+import AMisRender from './index.vue'
+
+export default AMisRender

package/src/base-client/components/common/XReport/index.js

@@ -1,3 +1,3 @@
-import XReport from './XReport'
-
-export default XReport
+import XReport from './XReport'
+
+export default XReport

package/src/base-client/components/common/XStepView/XStepView.vue

@@ -1,252 +1,252 @@
-<template>
-  <div>
-    <a-row type="flex">
-      <a-col :span="stepStyle.flex">
-        <a-steps
-          :type="stepStyle.type"
-          :current="current"
-          :direction="stepStyle.direction"
-          :labelPlacement="stepStyle.labelPlacement"
-          :progressDot="stepStyle.false"
-          :size="stepStyle.size"
-          :initial="initial"
-          :status="status"
-          @chaneg="onChange"
-        >
-          <a-step
-            v-for="(item, index) in this.configContent.step.steps"
-            :key="'step-'+item.name"
-            :title="item.title"
-            :description="item.description"
-            :sub-title="item.subTitle"
-            :disabled="item.disabled">
-            <a-icon v-if="current === index" slot="icon" :type="iconType" />
-          </a-step>
-        </a-steps>
-      </a-col>
-      <a-col :span="panelStyle.flex">
-        <template v-for="(item, index) in this.configContent.step.steps">
-          <a-card
-            v-if="current === index"
-            :bordered="false"
-            :key="'stepCard-'+item.name">
-            <template v-if="item.content.card.type === 'text'">
-              <p>{{ item.content.card.value }}</p>
-            </template>
-            <x-add-native-form v-else-if="item.content.card.type === 'form'" :ref="'XAddNativeForm'+ item.name" @onSubmit="submit"/>
-            <x-table v-else-if="item.content.card.type === 'table'" :fixed-query-form="item.content.card.queryFrom" @action="action" :query-params-name="item.content.card.queryParamsName" :ref="'XAddNativeForm'+item.name" />
-            <a-button v-if="status === 'error'" @click="success" style="color: v-bind()">下一步</a-button>
-          </a-card>
-        </template>
-      </a-col>
-    </a-row>
-  </div>
-</template>
-
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { post } from '@vue2-client/services/api'
-import XTable from '@vue2-client/base-client/components/common/XTable/XTable.vue'
-
-export default {
-  name: 'XStepView',
-  components: { XTable, XAddNativeForm },
-  computed: {
-    stepStyle () {
-      const style = this.configContent.step.style
-      if (style) {
-        return style
-      } else {
-        return {
-          flex: 5,
-          type: 'default',
-          progressDot: 'false',
-          direction: 'horizontal',
-          labelPlacement: 'horizontal',
-          size: 'default',
-        }
-      }
-    },
-    panelStyle () {
-      const style = this.configContent.panelStyle
-      if (style) {
-        return style
-      } else {
-        return {
-          flex: 19
-        }
-      }
-    }
-
-  },
-  props: {
-    params: {
-      type: Object,
-      required: true,
-    },
-    configContent: {
-      type: Object,
-      required: true,
-    }
-  },
-  data () {
-    return {
-      current: -1,
-      initial: 0,
-      status: 'wait',
-      iconType: 'loading',
-      timeOut: undefined
-    }
-  },
-  watch: {
-    async current (newValue) {
-      this.changeIcon()
-      if (this.timeOut !== undefined) { window.clearTimeout(this.timeOut) }
-
-      const setpes = this.configContent.step.steps[newValue]
-      const type = setpes.content.card.type
-      const formValue = setpes.content.card.value
-      console.warn('formValue = ', formValue)
-      if (setpes.before) {
-        const postName = setpes.before.name.split('@')
-        this.timeOut = window.setTimeout(() => {
-          post('/api/af-system/' + postName[0] + '/' + postName[1], setpes.before.params).then(res => {
-            console.warn(setpes.before.name + '执行结果', res)
-            if (res.code === 200) {
-              window.clearInterval(this.timeOut)
-              this.success()
-            } else {
-              setpes.content.card.value = res.msg
-            }
-          }).catch(e => {
-            console.warn(setpes.before.name + '执行结果', e)
-            window.clearInterval(this.timeOut)
-            this.error()
-          })
-        }, 10 * 1000)
-      }
-      if (type === 'form') {
-        this.$nextTick(() => {
-          const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
-          stepsss.init({
-            formItems: formValue
-          })
-        })
-      } else if (type === 'table') {
-        console.warn('formValue = ', formValue)
-        this.$nextTick(() => {
-          const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
-          stepsss.init({
-            tableColumns: formValue,
-            buttonState: {
-              add: false,
-              edit: true,
-              delete: false,
-              import: false,
-              export: false
-            }
-          })
-        })
-      } else {
-        if (setpes.run) {
-          post('/api/af-system/logic/' + setpes.run.name, setpes.run.params).then(t => {
-            console.warn(setpes.run.name + '执行结果', t)
-            if (t.code === 200) {
-              this.success()
-            } else {
-              setpes.content.card.value = t.msg
-            }
-          }).catch(e => {
-            console.warn(setpes.run.name + '执行结果', e)
-            this.error()
-          })
-        }
-      }
-    }
-  },
-  mounted () {
-    let paramsStr = JSON.stringify(this.configContent.step)
-    for (const item in this.params) {
-      const regex = new RegExp('\\$\\{' + item + '\\}', 'g')
-      paramsStr = paramsStr.replace(regex, this.params[item])
-    }
-    const params = JSON.parse(paramsStr)
-    this.init({ step: params })
-    this.current++
-  },
-  methods: {
-    init (params) {
-      const {
-        style,
-        panel,
-        step
-      } = params
-      if (style) {
-        this.stepStyle = style
-      }
-      if (panel) {
-        this.panelStyle = panel
-      }
-      if (step) {
-        this.configContent.step = step
-      }
-    },
-    steps () {
-      return this.steps
-    },
-    onChange (current) {
-      this.current = current
-    },
-    submit (res) {
-      console.warn('res', res)
-      const setpes = this.configContent.step.steps[this.current]
-      if (setpes.run) {
-        post('/api/af-system/logic/' + setpes.run.name, res.realForm).then(t => {
-          console.warn(setpes.run.name + '执行结果', t)
-          if (t.code === 200) {
-            this.success()
-          }
-        }).catch(e => {
-          console.warn(setpes.run.name + '执行结果', e)
-          this.error()
-        })
-      }
-    },
-    error () {
-      this.status = 'error'
-      this.iconType = 'close-circle'
-    },
-    success () {
-      this.changeIcon()
-
-      this.current++
-    },
-    changeIcon () {
-      this.status = 'wait'
-      this.iconType = 'loading'
-    },
-    previous () {
-      this.current--
-    },
-    action (record, id, actionType) {
-      console.warn('record', record)
-      console.warn('id', id)
-      console.warn('actionType', actionType)
-      const setpes = this.configContent.step.steps[this.current]
-      if (setpes.run) {
-        post('/api/af-system/logic/' + setpes.run.name, { data: record }).then(t => {
-          console.warn(setpes.run.name + '执行结果', t)
-          if (t.code === 200) {
-            this.success()
-          }
-        }).catch(e => {
-          console.warn(setpes.run.name + '执行结果', e)
-          this.error()
-        })
-      }
-    }
-  },
-}
-</script>
-
-<style lang="less" scoped></style>
+<template>
+  <div>
+    <a-row type="flex">
+      <a-col :span="stepStyle.flex">
+        <a-steps
+          :type="stepStyle.type"
+          :current="current"
+          :direction="stepStyle.direction"
+          :labelPlacement="stepStyle.labelPlacement"
+          :progressDot="stepStyle.false"
+          :size="stepStyle.size"
+          :initial="initial"
+          :status="status"
+          @chaneg="onChange"
+        >
+          <a-step
+            v-for="(item, index) in this.configContent.step.steps"
+            :key="'step-'+item.name"
+            :title="item.title"
+            :description="item.description"
+            :sub-title="item.subTitle"
+            :disabled="item.disabled">
+            <a-icon v-if="current === index" slot="icon" :type="iconType" />
+          </a-step>
+        </a-steps>
+      </a-col>
+      <a-col :span="panelStyle.flex">
+        <template v-for="(item, index) in this.configContent.step.steps">
+          <a-card
+            v-if="current === index"
+            :bordered="false"
+            :key="'stepCard-'+item.name">
+            <template v-if="item.content.card.type === 'text'">
+              <p>{{ item.content.card.value }}</p>
+            </template>
+            <x-add-native-form v-else-if="item.content.card.type === 'form'" :ref="'XAddNativeForm'+ item.name" @onSubmit="submit"/>
+            <x-table v-else-if="item.content.card.type === 'table'" :fixed-query-form="item.content.card.queryFrom" @action="action" :query-params-name="item.content.card.queryParamsName" :ref="'XAddNativeForm'+item.name" />
+            <a-button v-if="status === 'error'" @click="success" style="color: v-bind()">下一步</a-button>
+          </a-card>
+        </template>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { post } from '@vue2-client/services/api'
+import XTable from '@vue2-client/base-client/components/common/XTable/XTable.vue'
+
+export default {
+  name: 'XStepView',
+  components: { XTable, XAddNativeForm },
+  computed: {
+    stepStyle () {
+      const style = this.configContent.step.style
+      if (style) {
+        return style
+      } else {
+        return {
+          flex: 5,
+          type: 'default',
+          progressDot: 'false',
+          direction: 'horizontal',
+          labelPlacement: 'horizontal',
+          size: 'default',
+        }
+      }
+    },
+    panelStyle () {
+      const style = this.configContent.panelStyle
+      if (style) {
+        return style
+      } else {
+        return {
+          flex: 19
+        }
+      }
+    }
+
+  },
+  props: {
+    params: {
+      type: Object,
+      required: true,
+    },
+    configContent: {
+      type: Object,
+      required: true,
+    }
+  },
+  data () {
+    return {
+      current: -1,
+      initial: 0,
+      status: 'wait',
+      iconType: 'loading',
+      timeOut: undefined
+    }
+  },
+  watch: {
+    async current (newValue) {
+      this.changeIcon()
+      if (this.timeOut !== undefined) { window.clearTimeout(this.timeOut) }
+
+      const setpes = this.configContent.step.steps[newValue]
+      const type = setpes.content.card.type
+      const formValue = setpes.content.card.value
+      console.warn('formValue = ', formValue)
+      if (setpes.before) {
+        const postName = setpes.before.name.split('@')
+        this.timeOut = window.setTimeout(() => {
+          post('/api/af-system/' + postName[0] + '/' + postName[1], setpes.before.params).then(res => {
+            console.warn(setpes.before.name + '执行结果', res)
+            if (res.code === 200) {
+              window.clearInterval(this.timeOut)
+              this.success()
+            } else {
+              setpes.content.card.value = res.msg
+            }
+          }).catch(e => {
+            console.warn(setpes.before.name + '执行结果', e)
+            window.clearInterval(this.timeOut)
+            this.error()
+          })
+        }, 10 * 1000)
+      }
+      if (type === 'form') {
+        this.$nextTick(() => {
+          const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
+          stepsss.init({
+            formItems: formValue
+          })
+        })
+      } else if (type === 'table') {
+        console.warn('formValue = ', formValue)
+        this.$nextTick(() => {
+          const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
+          stepsss.init({
+            tableColumns: formValue,
+            buttonState: {
+              add: false,
+              edit: true,
+              delete: false,
+              import: false,
+              export: false
+            }
+          })
+        })
+      } else {
+        if (setpes.run) {
+          post('/api/af-system/logic/' + setpes.run.name, setpes.run.params).then(t => {
+            console.warn(setpes.run.name + '执行结果', t)
+            if (t.code === 200) {
+              this.success()
+            } else {
+              setpes.content.card.value = t.msg
+            }
+          }).catch(e => {
+            console.warn(setpes.run.name + '执行结果', e)
+            this.error()
+          })
+        }
+      }
+    }
+  },
+  mounted () {
+    let paramsStr = JSON.stringify(this.configContent.step)
+    for (const item in this.params) {
+      const regex = new RegExp('\\$\\{' + item + '\\}', 'g')
+      paramsStr = paramsStr.replace(regex, this.params[item])
+    }
+    const params = JSON.parse(paramsStr)
+    this.init({ step: params })
+    this.current++
+  },
+  methods: {
+    init (params) {
+      const {
+        style,
+        panel,
+        step
+      } = params
+      if (style) {
+        this.stepStyle = style
+      }
+      if (panel) {
+        this.panelStyle = panel
+      }
+      if (step) {
+        this.configContent.step = step
+      }
+    },
+    steps () {
+      return this.steps
+    },
+    onChange (current) {
+      this.current = current
+    },
+    submit (res) {
+      console.warn('res', res)
+      const setpes = this.configContent.step.steps[this.current]
+      if (setpes.run) {
+        post('/api/af-system/logic/' + setpes.run.name, res.realForm).then(t => {
+          console.warn(setpes.run.name + '执行结果', t)
+          if (t.code === 200) {
+            this.success()
+          }
+        }).catch(e => {
+          console.warn(setpes.run.name + '执行结果', e)
+          this.error()
+        })
+      }
+    },
+    error () {
+      this.status = 'error'
+      this.iconType = 'close-circle'
+    },
+    success () {
+      this.changeIcon()
+
+      this.current++
+    },
+    changeIcon () {
+      this.status = 'wait'
+      this.iconType = 'loading'
+    },
+    previous () {
+      this.current--
+    },
+    action (record, id, actionType) {
+      console.warn('record', record)
+      console.warn('id', id)
+      console.warn('actionType', actionType)
+      const setpes = this.configContent.step.steps[this.current]
+      if (setpes.run) {
+        post('/api/af-system/logic/' + setpes.run.name, { data: record }).then(t => {
+          console.warn(setpes.run.name + '执行结果', t)
+          if (t.code === 200) {
+            this.success()
+          }
+        }).catch(e => {
+          console.warn(setpes.run.name + '执行结果', e)
+          this.error()
+        })
+      }
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped></style>

package/src/base-client/plugins/Recording.js

@@ -64,22 +64,14 @@ export default {
           }
           if (!this.isRecording) {
             this.ws.close()
-            this.resRecordingData()
-
-            // 停止麦克风流
-            if (this.audioStream) {
-              this.audioStream.getTracks().forEach((track) => track.stop())
-            }
-
-            if (this.audioContext) {
-              this.audioContext.close()
-            }
-
-            this.resolvePromise(this.inputData)
           }
         }
 
-        this.ws.onclose = () => console.log('WebSocket closed.')
+        this.ws.onclose = () => {
+          console.log('WebSocket closed.')
+          this.resRecordingData()
+          this.resolvePromise(this.inputData)
+      }
         this.ws.onerror = (error) => console.error('WebSocket error:', error)
       },
 
@@ -113,7 +105,12 @@ export default {
 
             // Convert to 16-bit PCM and send via WebSocket
             const byteArray = this.convertTo16BitPCM(resampledData)
-            this.ws.send(byteArray)
+
+            const finalData = new Uint8Array(1 + byteArray.length) // 创建最终数据数组
+            finalData[0] = 1 // 第一个字节为类型，值为1
+            finalData.set(byteArray, 1) // 设置实际数据
+
+            this.ws.send(finalData) // 发送最终数据
           }
 
           source.connect(processor)
@@ -133,6 +130,21 @@ export default {
 
       stopRecording () {
         console.log('停止录音')
+
+        // 停止麦克风流
+        if (this.audioStream) {
+          this.audioStream.getTracks().forEach((track) => track.stop())
+        }
+
+        if (this.audioContext) {
+          this.audioContext.close()
+        }
+
+        // 发送结束信号
+        const endSignal = new Uint8Array(1) // 创建一个长度为1的Uint8Array
+        endSignal[0] = 2 // 直接发送类型，值为2
+        this.ws.send(endSignal) // 发送结束信号
+
         this.isRecording = false
 
         return {

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -1,50 +1,50 @@
-<template>
-  <div>
-    <a-list v-show="!loading" size="small" :data-source="data">
-      <a-list-item slot="renderItem" slot-scope="item">
-        <div>
-          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
-          <p>{{ item.date }}</p>
-        </div>
-        <a class="delete_item">
-          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
-        </a>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'FavoriteList',
-  data () {
-    return {
-      data: [],
-      loading: false
-    }
-  },
-  mounted () {
-    this.loadData()
-  },
-  methods: {
-    loadData () {
-      indexedDB.getAll((data) => {
-        const realData = data.filter(item => item.data && item.data.uuid)
-          .map(item => item.data)
-        this.data = realData
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.delete_item {
-  margin-left: 8px;
-  color: #333;
-}
-p {
-  margin: 0
-}
-</style>
+<template>
+  <div>
+    <a-list v-show="!loading" size="small" :data-source="data">
+      <a-list-item slot="renderItem" slot-scope="item">
+        <div>
+          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
+          <p>{{ item.date }}</p>
+        </div>
+        <a class="delete_item">
+          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
+        </a>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'FavoriteList',
+  data () {
+    return {
+      data: [],
+      loading: false
+    }
+  },
+  mounted () {
+    this.loadData()
+  },
+  methods: {
+    loadData () {
+      indexedDB.getAll((data) => {
+        const realData = data.filter(item => item.data && item.data.uuid)
+          .map(item => item.data)
+        this.data = realData
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.delete_item {
+  margin-left: 8px;
+  color: #333;
+}
+p {
+  margin: 0
+}
+</style>

package/src/services/api/entity.js

@@ -1,18 +1,18 @@
-import { post } from '@vue2-client/services/api/restTools'
-
-const entityApi = {
-  // 根据ID查询数据
-  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
-  },
-  // 根据ID集合查询所有数据
-  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
-  },
-  // 查询实体的总数量
-  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
-  }
-}
-
-export { entityApi }
+import { post } from '@vue2-client/services/api/restTools'
+
+const entityApi = {
+  // 根据ID查询数据
+  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
+  },
+  // 根据ID集合查询所有数据
+  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
+  },
+  // 查询实体的总数量
+  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
+  }
+}
+
+export { entityApi }

package/src/utils/waterMark.js

@@ -1,31 +1,31 @@
-/**
- * @description: createWaterMark.js 加水印功能
- */
-let waterMarkDOM
-
-const clearWaterMark = () => {
-  if (waterMarkDOM) waterMarkDOM.remove()
-}
-/**
- * @description: 创建水印
- * @param waterMarkName 水印内容
- */
-export default function createWaterMark (waterMarkName) {
-  clearWaterMark()
-  if (!waterMarkName) {
-    return
-  }
-  const width = window.parseInt(document.body.clientWidth)
-  const canvasWidth = width / window.parseInt(width / 320)
-  const fontFamily = window.getComputedStyle(document.body)['font-family']
-  const fragment = document.createDocumentFragment()
-  waterMarkDOM = document.createElement('div')
-  waterMarkDOM.className = 'water-mark-wrap'
-  let spanStr = ''
-  for (let i = 0; i < 100; i++) {
-    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
-  }
-  waterMarkDOM.innerHTML = spanStr
-  fragment.appendChild(waterMarkDOM)
-  document.body.appendChild(fragment)
-}
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}