vue2-client 1.15.112 → 1.15.115

package/src/base-client/components/his/XChart/dome.vue

@@ -1,19 +1,19 @@
-<template>
-  <XChart :queryParamsName="queryParamsName"></XChart>
-</template>
-
-<script>
-import XChart from './XChart.vue'
-
-export default {
-  name: 'Dome',
-  components: {
-    XChart
-  },
-  data () {
-    return {
-      queryParamsName: 'qualityInspectionReportConfig'
-    }
-  }
-}
-</script>
+<template>
+  <XChart :queryParamsName="queryParamsName"></XChart>
+</template>
+
+<script>
+import XChart from './XChart.vue'
+
+export default {
+  name: 'Dome',
+  components: {
+    XChart
+  },
+  data () {
+    return {
+      queryParamsName: 'qualityInspectionReportConfig'
+    }
+  }
+}
+</script>

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

@@ -39,9 +39,7 @@
 <!--              >-->
 <!--                使用-->
 <!--              </a-button>-->
-              <a-button type="primary" @click="Recording" v-if="this.resId !== -1" v-model="recording">
-                {{recording? '停止' : '录音'}}
-              </a-button>
+
               <a-button type="primary" @click="openRenameModal" v-if="this.resId !== -1">
                 重命名
               </a-button>
@@ -78,7 +76,7 @@
               <a-modal
                 title="保存"
                 :visible="saveVisible"
-                :confirm-loading = "false"
+                confirm-loading = false
                 @ok="handleSaveConfirm"
                 @cancel="saveVisible = false"
               >
@@ -157,7 +155,6 @@ export default {
   },
   data () {
     return {
-      recording: false, // 是否正在录音
       readonly: false,
       ready: false,
       loading: false,
@@ -200,7 +197,6 @@ export default {
       ],
       // 编辑器实例
       editorRef: null,
-
       // 文档资源列表
       resList: [],
       // 文档资源ID
@@ -418,51 +414,6 @@ export default {
     changeMode (e) {
       this.editorRef.execCommand(this.modeType)
     },
-    // 启动录音功能
-    async Recording () {
-      this.recording = !this.recording
-      if (this.recording) {
-        const recording = await this.$recording.startRecording()
-        this.$message.warn(recording.msg)
-      } else {
-        try {
-          // 1. 获取录音和接口数据
-          const recording = this.$recording.stopRecording()
-          this.$message.warn(recording.msg)
-          const data = await this.$recording.getRecordingData()
-          const result = await this.runLogic('communacation', {record_content: data}, 'af-his')
-          // 验证基础结构
-          if (!result || typeof result.value !== 'string') {
-            throw new Error('接口返回格式错误，缺少有效的value字段')
-          }
-          // 2. 处理外层JSON字符串（关键修复）
-          let outerJsonStr = result.value
-          // 修复1：处理布尔值
-          outerJsonStr = outerJsonStr.replace(/\bTrue\b/g, 'true')
-          // 修复2：移除所有控制字符
-          outerJsonStr = outerJsonStr.replace(/[\x00-\x1F]/g, '')
-          // 修复3：精准转义data字段内的双引号
-          // 匹配 "data": "..." 结构并转义内容中的双引号
-          outerJsonStr = outerJsonStr.replace(/"data":\s*"([^"]*)"/g, (match, content) => {
-            // 转义内容中的双引号为\"
-            const escapedContent = content.replace(/"/g, '\\"')
-            return `"data": "${escapedContent}"`
-          })
-          // 直接在整个字符串里匹配 ```json{...}```
-          const regex = /```json([\s\S]*?)```/
-          const match = outerJsonStr.match(regex)
-          let extractedJsonStr = ''
-          if (match && match[1]) {
-            extractedJsonStr = match[1].trim()
-          }
-          const outerObj = JSON.parse(extractedJsonStr)
-          console.log("outerObj = ", outerObj)
-        } catch (e) {
-          console.error('总错误:', e.message)
-          this.$message.error(`解析失败: ${e.message}`)
-        }
-      }
-    },
     // 打开文档信息修改面板
     openRenameModal () {
       this.resDataModalMode = 'modify'

package/src/base-client/components/his/XHisEditor/index.js

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

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

@@ -27,18 +27,18 @@
     </a-table>
   </div>
   <div v-else-if="pattern == 'form'">
-    <a-table :columns="columns" :data-source='data' :row-selection="rowSelection" bordered :scroll="{ y: configData.height == null? '70%' : configData.height }">
+    <a-table :columns="columns" :data-source="data" :row-selection="rowSelection" bordered :scroll="{ y: configData.height == null? '70%' : configData.height }">
       <template v-for="(n, i) in inputColumns" :slot="n.dataIndex" slot-scope="text, record">
-         <div class="a-div" :key="i">
-           <a-input
-             v-for="(item, index) in n.row"
-             :key="index"
-             placeholder=""
-             class="ant-input"
-             v-model="record[n.dataIndex][index + 1]"
-             @input="handleInputChange(record, n.dataIndex, index + 1, $event.target.value)"
-             :disabled="!isRowSelected(record.key)"/>
-         </div>
+        <div class="a-div" :key="i">
+          <a-input
+            v-for="(item, index) in (Array.isArray(n.row) ? n.row : Array(Number(n.row) || 1).fill(1))"
+            :key="index"
+            placeholder=""
+            class="ant-input"
+            v-model="record[n.dataIndex][index + 1]"
+            @input="handleInputChange(record, n.dataIndex, index + 1, $event.target.value)"
+            :disabled="!isRowSelected(record.key)"/>
+        </div>
       </template>
       <div class="a-div" v-for="(n, i) in numberColumns" :slot="n.dataIndex" :key="i">
         <div v-for="(item, index) in n.row" :key="index" class="number">{{item}}</div>
@@ -205,27 +205,64 @@ export default {
             }
           } else if (this.pattern == 'form') {
             const inputFields = this.configData.columns.filter(col => col.type === 'input').map(col => col.dataIndex)
-            this.data = res.map((item, index) => {
+
+            // 处理项目数据，将参数数据关联到对应的项目
+            this.data = res.project.map((projectItem, index) => {
               const newItem = {
-                ...item,
-                key: item.id || `form_row_${index}_${Date.now()}` // 确保每行有唯一的key
+                ...projectItem,
+                key: projectItem.id || `form_row_${index}_${Date.now()}` // 确保每行有唯一的key
               }
+
+              // 查找当前项目对应的参数数据
+              const projectParameters = res.parameter.filter(param => param.id === projectItem.id)
+              const parameterByMaterialId = new Map(projectParameters.map(p => [p.material_id, p]))
+
               inputFields.forEach(field => {
                 const column = this.configData.columns.find(col => col.dataIndex === field)
                 if (column && column.type === 'input' && column.row) {
-                  const rowCount = column.row.length || 1 // 默认长度1
+                  const rowCount = Array.isArray(column.row) ? column.row.length : Number(column.row) || 1 // 支持数字或数组
                   // 创建对象格式的数据，键为1,2,3...，值为空字符串
                   const fieldData = {}
                   for (let i = 1; i <= rowCount; i++) {
-                    fieldData[i] = ''
+                    const matchedParam = parameterByMaterialId.get(i)
+                    // 如果有对应的参数数据，则填充对应的值
+                    if (matchedParam) {
+                      // 根据字段名映射到参数数据中的对应字段
+                      let paramValue = ''
+                      switch (field) {
+                        case 'targetValue':
+                          paramValue = matchedParam.target_value || ''
+                          break
+                        case 'SD':
+                          paramValue = matchedParam.sd || ''
+                          break
+                        case 'reagent':
+                          paramValue = matchedParam.reagent || ''
+                          break
+                        case 'wavelength':
+                          paramValue = matchedParam.wavelength || ''
+                          break
+                        case 'method':
+                          paramValue = matchedParam.method || ''
+                          break
+                        case 'batchNumber':
+                          paramValue = matchedParam.lot_number || ''
+                          break
+                        default:
+                          paramValue = matchedParam[field] || ''
+                      }
+                      fieldData[i] = paramValue
+                    } else fieldData[i] = ''
                   }
                   newItem[field] = fieldData
                 } else {
-                  newItem[field] = item[field] || ''
+                  newItem[field] = projectItem[field] || ''
                 }
               })
               return newItem
             })
+            // 备份原始数据以便筛选/重置使用
+            this.originalData = JSON.parse(JSON.stringify(this.data))
           }
         })
       })

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

@@ -1,207 +1,207 @@
-<template>
-  <div>
-    <div class="text-card">
-      <div
-        v-for="(item, index) in displayItems"
-        :key="index"
-        class="text-item"
-        @click="handleItemClick(index, item.id)"
-        @contextmenu.prevent="handleContextMenu(index, item.id)">
-        <div class="text-content" :class="{ 'is-empty': !item.content }">
-          {{ item.content || '+' }}
-        </div>
-      </div>
-      <!-- 编辑弹出框 -->
-      <div
-        v-if="showEdit"
-        class="edit-overlay"
-        @click.self="handleOverlayClick">
-        <div class="edit-card">
-          <a-textarea
-            v-model="editingContent"
-            :autoSize="{ minRows: 3 }"
-            @keyup.enter="handleSave"
-            ref="textarea"/>
-        </div>
-      </div>
-      <!-- 删除确认弹框 -->
-      <a-modal
-        v-model="showDeleteModal"
-        title="确认删除"
-        okText="确认"
-        cancelText="取消"
-        @ok="handleDeleteConfirm">
-        <p>确定要删除这条内容吗？</p>
-      </a-modal>
-    </div>
-  </div>
-</template>
-
-<script>
-import { runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XTextCard',
-  props: {
-    // logic配置名,要求返回一个数组[{ id: , content: }]
-    queryParamsName: {
-      type: String,
-      default: 'memorandumLOGIC'
-    },
-    queryParams: {
-      type: Object,
-      default: () => { return {} }
-    },
-    // 请求参数
-    parameter: {
-      type: Object,
-      default: () => { return {} }
-    }
-  },
-  data () {
-    return {
-      localItems: [], // 本地数据
-      showEdit: false, // 是否显示编辑框
-      editingIndex: -1, // 当前编辑的索引
-      editingContent: '', // 编辑框的内容
-      showDeleteModal: false, // 是否显示删除确认框
-      deleteIndex: -1, // 要删除的项目索引
-      ID: 0
-    }
-  },
-  computed: {
-    // 显示的列表，始终保持一个空行
-    displayItems () {
-      const items = [...this.localItems]
-      // 如果最后一项不是空的，添加一个空项
-      if (!items.length || items[items.length - 1].content) {
-        items.push({ content: '' })
-      }
-      return items
-    }
-  },
-  methods: {
-    // 点击项目
-    handleItemClick (index, id) {
-      this.ID = id
-      this.editingIndex = index
-      this.editingContent = this.displayItems[index].content
-      this.showEdit = true
-      this.$nextTick(() => {
-        this.$refs.textarea?.focus()
-      })
-    },
-    // 点击遮罩层保存
-    handleOverlayClick () {
-      this.handleSave()
-    },
-    // 保存内容
-    handleSave () {
-      if (this.editingContent.trim()) {
-        if (this.editingIndex === this.localItems.length) {
-          // 如果是在最后一个空行添加，push新内容
-          this.localItems.push({ content: this.editingContent.trim() })
-        } else {
-          // 否则更新现有内容
-          this.localItems[this.editingIndex].content = this.editingContent.trim()
-        }
-        const addData = { data: this.editingContent.trim(), ID: this.ID }
-        // 触发更新事件
-        this.$emit('add', addData)
-      }
-      this.showEdit = false
-      this.editingIndex = -1
-      this.editingContent = ''
-    },
-    // 初始化数据
-    async initData (data, parameter) {
-      // 从配置中获取数据
-      const resData = await runLogic(data, parameter, 'af-his')
-      this.localItems = resData
-      return resData
-    },
-    // 处理右键菜单
-    handleContextMenu (index, id) {
-      // 如果是最后一个空行，不显示删除框
-      if (index === this.localItems.length) {
-        return
-      }
-      this.ID = id
-      this.deleteIndex = index
-      this.showDeleteModal = true
-    },
-    // 确认删除
-    handleDeleteConfirm () {
-      if (this.deleteIndex > -1) {
-        this.localItems.splice(this.deleteIndex, 1)
-        const deleteData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
-        this.$emit('deleteData', deleteData)
-        this.deleteIndex = -1
-      }
-      this.showDeleteModal = false
-    }
-  },
-  watch: {
-    queryParamsName: {
-      immediate: true,
-      handler (newVal) {
-        this.initData(newVal, this.parameter)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.text-card {
-  position: relative;
-  width: 100%;
-  .text-item {
-    padding: 8px 12px;
-    border-bottom: 1px solid #f0f0f0;
-    cursor: pointer;
-    transition: all 0.3s;
-    user-select: none;
-
-    &:hover {
-      background-color: #f5f5f5;
-    }
-
-    .text-content {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      line-height: 1.5;
-
-      &.is-empty {
-        color: #5D5C5C;
-        font-weight: 400;
-      }
-    }
-  }
-  .edit-overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.45);
-    z-index: 1000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    .edit-card {
-      background: white;
-      padding: 16px;
-      border-radius: 8px;
-      width: 90%;
-      max-width: 500px;
-      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12);
-      .ant-input {
-        width: 100%;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div>
+    <div class="text-card">
+      <div
+        v-for="(item, index) in displayItems"
+        :key="index"
+        class="text-item"
+        @click="handleItemClick(index, item.id)"
+        @contextmenu.prevent="handleContextMenu(index, item.id)">
+        <div class="text-content" :class="{ 'is-empty': !item.content }">
+          {{ item.content || '+' }}
+        </div>
+      </div>
+      <!-- 编辑弹出框 -->
+      <div
+        v-if="showEdit"
+        class="edit-overlay"
+        @click.self="handleOverlayClick">
+        <div class="edit-card">
+          <a-textarea
+            v-model="editingContent"
+            :autoSize="{ minRows: 3 }"
+            @keyup.enter="handleSave"
+            ref="textarea"/>
+        </div>
+      </div>
+      <!-- 删除确认弹框 -->
+      <a-modal
+        v-model="showDeleteModal"
+        title="确认删除"
+        okText="确认"
+        cancelText="取消"
+        @ok="handleDeleteConfirm">
+        <p>确定要删除这条内容吗？</p>
+      </a-modal>
+    </div>
+  </div>
+</template>
+
+<script>
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XTextCard',
+  props: {
+    // logic配置名,要求返回一个数组[{ id: , content: }]
+    queryParamsName: {
+      type: String,
+      default: 'memorandumLOGIC'
+    },
+    queryParams: {
+      type: Object,
+      default: () => { return {} }
+    },
+    // 请求参数
+    parameter: {
+      type: Object,
+      default: () => { return {} }
+    }
+  },
+  data () {
+    return {
+      localItems: [], // 本地数据
+      showEdit: false, // 是否显示编辑框
+      editingIndex: -1, // 当前编辑的索引
+      editingContent: '', // 编辑框的内容
+      showDeleteModal: false, // 是否显示删除确认框
+      deleteIndex: -1, // 要删除的项目索引
+      ID: 0
+    }
+  },
+  computed: {
+    // 显示的列表，始终保持一个空行
+    displayItems () {
+      const items = [...this.localItems]
+      // 如果最后一项不是空的，添加一个空项
+      if (!items.length || items[items.length - 1].content) {
+        items.push({ content: '' })
+      }
+      return items
+    }
+  },
+  methods: {
+    // 点击项目
+    handleItemClick (index, id) {
+      this.ID = id
+      this.editingIndex = index
+      this.editingContent = this.displayItems[index].content
+      this.showEdit = true
+      this.$nextTick(() => {
+        this.$refs.textarea?.focus()
+      })
+    },
+    // 点击遮罩层保存
+    handleOverlayClick () {
+      this.handleSave()
+    },
+    // 保存内容
+    handleSave () {
+      if (this.editingContent.trim()) {
+        if (this.editingIndex === this.localItems.length) {
+          // 如果是在最后一个空行添加，push新内容
+          this.localItems.push({ content: this.editingContent.trim() })
+        } else {
+          // 否则更新现有内容
+          this.localItems[this.editingIndex].content = this.editingContent.trim()
+        }
+        const addData = { data: this.editingContent.trim(), ID: this.ID }
+        // 触发更新事件
+        this.$emit('add', addData)
+      }
+      this.showEdit = false
+      this.editingIndex = -1
+      this.editingContent = ''
+    },
+    // 初始化数据
+    async initData (data, parameter) {
+      // 从配置中获取数据
+      const resData = await runLogic(data, parameter, 'af-his')
+      this.localItems = resData
+      return resData
+    },
+    // 处理右键菜单
+    handleContextMenu (index, id) {
+      // 如果是最后一个空行，不显示删除框
+      if (index === this.localItems.length) {
+        return
+      }
+      this.ID = id
+      this.deleteIndex = index
+      this.showDeleteModal = true
+    },
+    // 确认删除
+    handleDeleteConfirm () {
+      if (this.deleteIndex > -1) {
+        this.localItems.splice(this.deleteIndex, 1)
+        const deleteData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
+        this.$emit('deleteData', deleteData)
+        this.deleteIndex = -1
+      }
+      this.showDeleteModal = false
+    }
+  },
+  watch: {
+    queryParamsName: {
+      immediate: true,
+      handler (newVal) {
+        this.initData(newVal, this.parameter)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.text-card {
+  position: relative;
+  width: 100%;
+  .text-item {
+    padding: 8px 12px;
+    border-bottom: 1px solid #f0f0f0;
+    cursor: pointer;
+    transition: all 0.3s;
+    user-select: none;
+
+    &:hover {
+      background-color: #f5f5f5;
+    }
+
+    .text-content {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      line-height: 1.5;
+
+      &.is-empty {
+        color: #5D5C5C;
+        font-weight: 400;
+      }
+    }
+  }
+  .edit-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.45);
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .edit-card {
+      background: white;
+      padding: 16px;
+      border-radius: 8px;
+      width: 90%;
+      max-width: 500px;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12);
+      .ant-input {
+        width: 100%;
+      }
+    }
+  }
+}
+</style>