vue2-client 1.19.42 → 1.19.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.19.42",
+  "version": "1.19.44",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -106,7 +106,10 @@ export default {
       previewVisible: false,
       previewImage: '',
       previewImageName: '',
-      showScanner: false
+      showScanner: false,
+      uploadQueue: [],
+      isUploading: false,
+      uploadControllers: new Map()
     }
   },
   props: {
@@ -159,10 +162,10 @@ export default {
     }
   },
   computed: {
-    ...mapState('account', { currUser: 'user' }),
+    ...mapState('account', {currUser: 'user'}),
     ...mapState('setting', ['compatible'])
   },
-  created () {
+  created() {
     const list = this.model.type === 'file' ? [...this.files] : [...this.images]
     if (this.model.useType) {
       // {uid,url,name,f_use_type?,f_form_type?}
@@ -180,7 +183,7 @@ export default {
     }
   },
   methods: {
-    async handlePreview (file) {
+    async handlePreview(file) {
       if (this.isImageFile(file)) {
         // 图片文件：预览
         this.previewImage = file.url
@@ -192,7 +195,7 @@ export default {
       }
     },
 
-    async handleDownload (file) {
+    async handleDownload(file) {
       const link = document.createElement('a')
       link.href = file.url
       link.download = file.name || 'download'
@@ -202,13 +205,13 @@ export default {
       document.body.removeChild(link)
     },
 
-    isImageFile (file) {
+    isImageFile(file) {
       const imageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
       const fileName = file.name ? file.name.toLowerCase() : ''
       return imageExtensions.some(ext => fileName.endsWith(ext))
     },
 
-    confirmPhoto (img) {
+    confirmPhoto(img) {
       const fileName = `GaoPaiYi_${moment().format('YYYYMMDDHHmmss')}.png`
       const file = base64ToFile(img, fileName)
       file.uid = fileName
@@ -218,21 +221,50 @@ export default {
       this.uploadFiles(info)
     },
 
-    useScannerUpload (e) {
+    useScannerUpload(e) {
       // 打开高拍仪
       this.showScanner = true
     },
 
-    handleCancelScanner () {
+    handleCancelScanner() {
       // 关闭高拍仪弹窗
       this.showScanner = false
     },
+    uploadFiles(info) {
+      // 添加到上传队列
+      this.uploadQueue.push(info)
+      // 如果当前没有上传任务，开始处理队列
+      if (!this.isUploading) {
+        this.processUploadQueue()
+      }
+    },
+
+    // 处理上传队列
+    async processUploadQueue() {
+      if (this.uploadQueue.length === 0) {
+        this.isUploading = false
+        return
+      }
+      this.isUploading = true
+      // 从队列中取出第一个任务
+      const info = this.uploadQueue.shift()
+      await this.singleFileUpload(info)
+      // 继续处理队列中的下一个任务
+      this.processUploadQueue()
+    },
 
-    uploadFiles (info) {
+    // 单个文件上传
+    async singleFileUpload(info) {
+      // 检查文件数量限制
       if (this.uploadedFileList.length >= this.model.acceptCount) {
         this.$message.error(`当前表单限制仅可上传 ${this.model.acceptCount} 个文件`)
         return
       }
+
+      // 创建取消控制器
+      const controller = new AbortController()
+      this.uploadControllers.set(info.file.uid, controller)
+
       // 初始化文件信息
       const fileInfo = {
         uid: info.file.uid,
@@ -241,66 +273,118 @@ export default {
         response: '',
         url: '',
       }
-      // 放入上传列表中，以便于显示上传进度
-      this.uploadedFileList.push(fileInfo)
-      // 组装上传数据
-      const headers = {
-        'Content-Type': 'multipart/form-data',
-      }
-      const formData = new FormData()
-      formData.append('avatar', info.file)
-      formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
-      if (this.model.pathKey) {
-        formData.append('pathKey', this.model.pathKey ?? 'Default')
-      }
-      // formData.append('stockAlias', this.model.stockAlias)
-      formData.append('formType', this.model.type)
-      formData.append('useType', this.model.useType ?? 'Default')
-      formData.append('resUploadStock', this.model.resUploadStock ?? 1)
-      formData.append('filename', info.file.name)
-      formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
-      formData.append('f_operator', this.currUser ? this.currUser.username : '')
 
-      upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }).then(res => {
-        // 根据服务端返回的结果判断成功与否，设置文件条目的状态
+      // 使用不可变更新，避免状态冲突
+      this.uploadedFileList = [...this.uploadedFileList, fileInfo]
+
+      try {
+        // 组装上传数据
+        const headers = {
+          'Content-Type': 'multipart/form-data',
+        }
+        const formData = new FormData()
+        formData.append('avatar', info.file)
+        formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
+        if (this.model.pathKey) {
+          formData.append('pathKey', this.model.pathKey ?? 'Default')
+        }
+        formData.append('formType', this.model.type)
+        formData.append('useType', this.model.useType ?? 'Default')
+        formData.append('resUploadStock', this.model.resUploadStock ?? 1)
+        formData.append('filename', info.file.name)
+        formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
+        formData.append('f_operator', this.currUser ? this.currUser.username : '')
+
+        const res = await upload(formData, this.serviceName, {
+          headers,
+          timeout: 600 * 1000,
+          signal: controller.signal // 添加取消信号
+        })
+
+        // 根据服务端返回的结果判断成功与否
         if (res.success || res.id) {
-          fileInfo.status = 'done'
-          let dataObj
-          if (res.id) {
-            dataObj = res
-          } else if (typeof res.data === 'string') {
-            dataObj = JSON.parse(res.data)
-          } else {
-            dataObj = res.data
-          }
-          fileInfo.response = dataObj
-          fileInfo.id = dataObj.id
-          // 如果新上传的图片是V4，需要携带serviceName前缀，但是同时也要回显老系统图片
-          if (this.imgPrefix) {
-            fileInfo.url = this.imgPrefix + dataObj.f_downloadpath
-          } else {
-            fileInfo.url = dataObj.f_downloadpath
-          }
-          if (this.outerContainerIndex !== undefined) {
-            this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done'), this.outerContainerIndex)
-          } else {
-            this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
-            this.$emit('setFilesAllInfo', this.uploadedFileList.filter(item => item.status === 'done').map(item => item))
-          }
+          this.updateFileStatus(info.file.uid, 'done', res)
           this.$message.success('上传成功！')
         } else {
-          fileInfo.status = 'error'
-          fileInfo.response = res.data
+          this.updateFileStatus(info.file.uid, 'error', res.data)
+          this.$message.error('上传失败！')
+        }
+      } catch (error) {
+        if (error.name !== 'AbortError') {
+          // 非取消错误才显示错误信息
+          this.updateFileStatus(info.file.uid, 'error', error)
           this.$message.error('上传失败！')
         }
-      }).catch((e) => {
-        fileInfo.status = 'error'
-        fileInfo.response = e
+      } finally {
+        // 清理取消控制器
+        this.uploadControllers.delete(info.file.uid)
+      }
+    },
+
+    // 更新文件状态
+    updateFileStatus(uid, status, response) {
+      this.uploadedFileList = this.uploadedFileList.map(item => {
+        if (item.uid === uid) {
+          const updatedItem = {
+            ...item,
+            status,
+            response
+          }
+
+          if (status === 'done') {
+            let dataObj
+            if (response.id) {
+              dataObj = response
+            } else if (typeof response.data === 'string') {
+              dataObj = JSON.parse(response.data)
+            } else {
+              dataObj = response.data
+            }
+
+            updatedItem.response = dataObj
+            updatedItem.id = dataObj.id
+            // 如果新上传的图片是V4，需要携带serviceName前缀
+            if (this.imgPrefix) {
+              updatedItem.url = this.imgPrefix + dataObj.f_downloadpath
+            } else {
+              updatedItem.url = dataObj.f_downloadpath
+            }
+          }
+
+          return updatedItem
+        }
+        return item
       })
+
+      this.emitFilesUpdate()
+    },
+
+    // 触发文件更新事件
+    emitFilesUpdate() {
+      const doneFiles = this.uploadedFileList.filter(item => item.status === 'done')
+
+      if (this.outerContainerIndex !== undefined) {
+        this.$emit('setFiles', doneFiles, this.outerContainerIndex)
+      } else {
+        this.$emit('setFiles', doneFiles.map(item => item.id))
+        this.$emit('setFilesAllInfo', doneFiles)
+      }
+    },
+
+    // 取消上传（可选功能）
+    cancelUpload(uid) {
+      const controller = this.uploadControllers.get(uid)
+      if (controller) {
+        controller.abort()
+
+        // 从上传列表中移除
+        this.uploadedFileList = this.uploadedFileList.filter(item => item.uid !== uid)
+        this.emitFilesUpdate()
+      }
     },
 
     // 删除文件
-    deleteFileItem (file) {
+    deleteFileItem(file) {
       const that = this
       this.$confirm({
         title: '提醒',
@@ -309,35 +393,38 @@ export default {
         okType: 'danger',
         cancelText: '取消',
         zIndex: 2000,
-        onOk () {
+        onOk() {
+          // 如果文件正在上传，先取消上传
+          if (file.status === 'uploading') {
+            that.cancelUpload(file.uid)
+          }
+
           //  阳春博能工单信息V4页面有时会删除V3照片, V3照片不能通过这个请求删除, 已经在外层进行删除处理
           if (file.id && !file.version) {
             switch (that.compatible) {
               case 'V3':
-                fileDelete({ id: file.id, f_state: '删除' })
+                fileDelete({id: file.id, f_state: '删除'})
                   .then(res => {
                   }).catch(e => {
                 })
                 break
               case 'V4':
-                fileDeleteV4({ id: file.id, resDeleteMode: 'server' })
+                fileDeleteV4({id: file.id, resDeleteMode: 'server'})
                   .then(res => {
                   }).catch(e => {
                 })
                 break
             }
           }
-          // 找到当前文件所在列表的索引
-          const index = that.uploadedFileList.indexOf(file)
           // 从列表中移除该文件
-          that.uploadedFileList.splice(index, 1)
+          that.uploadedFileList = that.uploadedFileList.filter(item => item.uid !== file.uid)
           if (that.outerContainerIndex !== undefined) {
             that.$emit('setFiles', that.uploadedFileList.filter(item => item.status === 'done'), that.outerContainerIndex)
           } else {
             that.$emit('setFiles', that.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
           }
         },
-        onCancel () {
+        onCancel() {
           console.log('取消删除')
         },
       })

package/src/base-client/components/his/HAi/HAi.vue

@@ -67,6 +67,7 @@
         <div class="workflow-content">
           <div data-step="1" class="workflow-section">
             <PreliminaryDiagnosis
+              :key="componentKey"
               ref="preliminaryDiagnosisRef"
               :patientComplaint="patientComplaint"
               @question-asked="handleQuestionAsked"
@@ -184,6 +185,9 @@ const doctorQuestions = ref([])
 const examinationOrder = ref(null)
 const aiDiagnosis = ref(null)
 
+// 添加重置key来强制重新渲染子组件
+const componentKey = ref(0)
+
 const workflowSteps = ref([
   {
     key: 'preliminary',
@@ -401,9 +405,60 @@ const setPatientComplaint = (complaint) => {
   patientComplaint.value = complaint
 }
 
+// 重置方法 - 将组件恢复到初始状态
+const reset = () => {
+  console.log('重置方法被调用了 - 开始重置')
+
+  // 重置所有状态到初始值
+  currentStep.value = 1
+  selectedStep.value = 1
+  patientComplaint.value = ''
+  doctorQuestions.value = []
+  examinationOrder.value = null
+  aiDiagnosis.value = null
+  doctorInputText.value = ''
+  isPlaying.value = false
+  isRecording.value = false
+
+  // 递增组件key来强制重新渲染子组件
+  componentKey.value += 1
+
+  // 重置工作流步骤
+  workflowSteps.value = [
+    { key: 'preliminary', title: '初步诊断', completed: false },
+    { key: 'examination', title: '检查检验', completed: false },
+    { key: 'diagnosis', title: '诊断建议', completed: false },
+    { key: 'prescription', title: '医嘱建议', completed: false }
+  ]
+
+  console.log('状态重置完成:', {
+    currentStep: currentStep.value,
+    selectedStep: selectedStep.value,
+    hasPatientComplaint: !!patientComplaint.value,
+    doctorQuestionsCount: doctorQuestions.value.length,
+    componentKey: componentKey.value,
+    workflowSteps: workflowSteps.value
+  })
+
+  // 使用nextTick确保DOM更新
+  nextTick(() => {
+    // 重新初始化文本框
+    autoResizeTextarea()
+
+    // 滚动到顶部
+    const chatArea = document.querySelector('.chat-area')
+    if (chatArea) {
+      chatArea.scrollTop = 0
+    }
+
+    console.log('重置完成 - DOM已更新')
+  })
+}
+
 // 暴露方法和子组件给父组件使用
 defineExpose({
   setPatientComplaint,
+  reset,
   getPreliminaryDiagnosis: () => preliminaryDiagnosisRef.value,
   getExaminationOrder: () => examinationOrderRef.value,
   getDiagnosisSuggestion: () => diagnosisSuggestionRef.value,

package/src/base-client/components/his/HAi/PreliminaryDiagnosis.vue

@@ -68,6 +68,9 @@
 <script setup>
 import { ref, computed, watch, onMounted } from 'vue'
 
+// AI 服务配置 - 暂时使用完整地址（代理配置待修复）
+const AI_API_URL = 'http://192.168.50.67:30556/predict'
+
 // Props
 const props = defineProps({
   patientComplaint: {
@@ -118,16 +121,13 @@ const generatePreliminaryDiagnosis = (complaint) => {
 const fetchAISuggestions = async () => {
   try {
     const requestData = {
-      'known_facts': [
-        '症状特征.胸痛.起病时间=今天',
-        '伴随表现.呼吸困难.是否=是'
-      ],
+      'known_facts': props.patientComplaint ? [props.patientComplaint] : [],
       'top_n': 5,
       'step_id': 0,
       'asked_count': 0
     }
 
-    const response = await fetch('http://192.168.50.67:30556/predict', {
+    const response = await fetch(AI_API_URL, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -113,10 +113,10 @@
       <a-spin tip="加载中，马上好" :spinning="loading">
         <iframe
           id="x-editor"
-          src="/his/editor/editor.html"
+          :src="iframeSrc"
           v-bind="objectOfAttrs"
           @load="onload"
-          style="height: calc(-200px - 3rem + 100vh);">
+          :style="iframeStyle">
         </iframe>
       </a-spin>
     </div>
@@ -145,6 +145,12 @@ import { initDiagnosisDropdown } from './diagnosisAutocomplete'
 
 export default {
   name: 'XHisEditor',
+  props: {
+    hideEditorToolbar: {
+      type: Boolean,
+      default: true
+    }
+  },
   computed: {
     resListCp () {
       const list = this.resList
@@ -158,12 +164,38 @@ export default {
     // 过滤字段列表 - 提取重复逻辑
     filterFields () {
       return this.fieldFilter ? this.fieldFilter.split(',').map(f => f.trim()).filter(f => f) : []
+    },
+    // iframe样式
+    iframeStyle () {
+      const baseStyle = {
+        height: 'calc(-200px - 3rem + 100vh)'
+      }
+
+      return baseStyle
+    },
+    // iframe src
+    iframeSrc () {
+      let src = '/his/editor/editor.html'
+
+      if (this.hideEditorToolbar) {
+        // 使用最直接的参数名，确保编辑器能识别
+        src += '?toolbar=false&menubar=false&hideToolbar=true&hideMenubar=true'
+        console.log('iframe URL设置为隐藏工具栏:', src)
+      } else {
+        src += '?toolbar=true&menubar=true'
+        console.log('iframe URL设置为显示工具栏:', src)
+      }
+
+      return src
     }
   },
   created() {
     // 初始化字段过滤器
     this.fieldFilter = this.$attrs.fieldFilter
   },
+  mounted() {
+    // 组件挂载时不需要隐藏，等待iframe onload事件
+  },
   beforeDestroy() {
     // 清理防抖定时器
     if (this.debounceTimer) {
@@ -420,11 +452,16 @@ export default {
         this.editorRef = e.target.contentWindow.editor
         this.$emit('init', {})
 
+        // 隐藏工具栏
+        if (this.hideEditorToolbar) {
+          setTimeout(() => this.hideToolbar(), 500)
+        }
+
         // 如果配置了字段过滤，延迟初始化监听器
         if (this.fieldFilter && this.fieldFilter.trim()) {
           setTimeout(() => {
             this.setupInputEndListener()
-          }, 1000) // 等待数据完全加载
+          }, 1000)
         }
       }
     },
@@ -478,6 +515,7 @@ export default {
         this.loadResList()
       }
     },
+
     // 加载文档
     loadFile (fileUrl, bindObject, currResData) {
       this.loading = true
@@ -524,7 +562,6 @@ export default {
     },
     // 加载文档列表
     loadResList () {
-      console.log("getTemplateListLogic=======",this.logicExtraParams)
       runLogic('getTemplateListLogic', this.logicExtraParams, this.serviceName).then(res => {
         this.resList = res
         this.toggleResId = this.resId
@@ -906,6 +943,34 @@ export default {
     handleExportMenuClick (e) {
       const key = e.key
       this.editorRef.execCommand(key)
+    },
+    // 隐藏工具栏
+    hideToolbar () {
+      if (!this.hideEditorToolbar) return
+
+      try {
+        // 通过iframe访问文档
+        const iframe = document.getElementById('x-editor')
+        if (!iframe || !iframe.contentDocument) return
+
+        const doc = iframe.contentDocument
+
+        // 注入CSS样式隐藏工具栏并调整布局
+        const style = doc.createElement('style')
+        style.textContent = `
+          #_toolbar { display: none !important; }
+          #_tool-tab { display: none !important; }
+          .tool-bar { display: none !important; }
+          #_main {
+            top: 0px !important;
+            height: 100% !important;
+          }
+        `
+        doc.head.appendChild(style)
+
+      } catch (error) {
+        // 静默失败
+      }
     }
   }
 }
@@ -966,4 +1031,10 @@ export default {
     background-color: rgb(0, 87, 254) !important;
   }
 }
+
+/* 隐藏工具栏的样式 - 当iframe不可访问时使用 */
+:deep(#x-editor.hide-toolbar) {
+  /* 当工具栏隐藏时，可以在这里调整iframe的样式 */
+  margin-top: -50px; /* 向上移动以减少空白 */
+}
 </style>

package/vue.config.js

@@ -133,6 +133,13 @@ module.exports = {
         target: OSSServerDev,
         pathRewrite: { '^/oss': '/' },
         changeOrigin: true
+      },
+      '/hai-api': {
+        target: 'http://192.168.50.67:30556',
+        pathRewrite: { '^/hai-api': '' },
+        changeOrigin: true,
+        secure: false,
+        ws: false
       }
     },
     client: {