vue2-client 1.14.78 → 1.14.81

package/src/base-client/components/TreeList/TreeList.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="tree-container">
+    <div class="tree-list">
+      <tree-node 
+        v-for="node in treeData" 
+        :key="node.id"
+        :node="node"
+        @toggle="toggleNode"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import TreeNode from './TreeNode.vue'
+
+export default {
+  name: 'TreeList',
+  components: {
+    TreeNode
+  },
+  data() {
+    return {
+      treeData: [
+        {
+          id: '1',
+          title: '体征',
+          expanded: false,
+          children: [
+            {
+              id: '1-1',
+              title: '一般情况'
+            },
+            {
+              id: '1-2',
+              title: '皮肤粘膜'
+            },
+            {
+              id: '1-3',
+              title: '头颈',
+              expanded: false,
+              children: [
+                {
+                  id: '1-3-1',
+                  title: '头部'
+                },
+                {
+                  id: '1-3-2',
+                  title: '颈部'
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  },
+  methods: {
+    toggleNode(node) {
+      node.expanded = !node.expanded
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tree-container {
+  width: 240px;
+  height: 400px;
+  border: 1px solid #e8e8e8;
+  overflow-y: auto;
+  padding: 8px;
+}
+
+/* 自定义滚动条样式 */
+.tree-container::-webkit-scrollbar {
+  width: 6px;
+}
+
+.tree-container::-webkit-scrollbar-thumb {
+  background-color: #ccc;
+  border-radius: 3px;
+}
+
+.tree-container::-webkit-scrollbar-track {
+  background-color: #f5f5f5;
+}
+
+.tree-list {
+  font-size: 14px;
+}
+</style> 

package/src/base-client/components/TreeList/TreeNode.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="tree-node">
+    <div class="node-content" @click="handleClick">
+      <span v-if="hasChildren" class="toggle-icon">
+        {{ node.expanded ? '-' : '+' }}
+      </span>
+      <span class="node-title">{{ node.title }}</span>
+    </div>
+    <div v-if="hasChildren && node.expanded" class="node-children">
+      <tree-node
+        v-for="child in node.children"
+        :key="child.id"
+        :node="child"
+        @toggle="$emit('toggle', $event)"
+        :level="level + 1"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TreeNode',
+  props: {
+    node: {
+      type: Object,
+      required: true
+    },
+    level: {
+      type: Number,
+      default: 0
+    }
+  },
+  computed: {
+    hasChildren() {
+      return this.node.children && this.node.children.length > 0
+    }
+  },
+  methods: {
+    handleClick() {
+      if (this.hasChildren) {
+        this.$emit('toggle', this.node)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tree-node {
+  margin: 2px 0;
+}
+
+.node-content {
+  display: flex;
+  align-items: center;
+  padding: 4px 0;
+  user-select: none;
+}
+
+.toggle-icon {
+  width: 16px;
+  text-align: center;
+  font-size: 14px;
+  color: #666;
+  margin-right: 4px;
+  cursor: pointer;
+}
+
+.node-title {
+  flex: 1;
+  cursor: default;
+}
+
+.node-content:hover {
+  background-color: #f5f5f5;
+}
+
+.node-children {
+  padding-left: 20px;
+}
+</style> 

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

@@ -6,6 +6,7 @@
     width="80%"
     height="60%"
     okText="提交"
+    :footer="showButtons ? undefined : null"
     @cancel="close"
     @ok="onSubmit"
     v-bind="attr">
@@ -67,6 +68,8 @@ export default {
       outEnv: {},
       // 外部传递来的 modal 参数
       attr: {},
+      // 是否显示对话框按钮
+      showButtons: true,
     }
   },
   provide () {
@@ -110,13 +113,15 @@ export default {
         selectedId = null,
         outEnv = {},
         mixinData = {},
-        attr = {}
+        attr = {},
+        showButtons = true,
       } = params
       this.configName = configName
       this.serverName = serverName
       this.displayOnly = displayOnly
       this.visible = true
       this.attr = attr
+      this.showButtons = showButtons
       // 有选中项，给选中项赋值
       if (selectedId) {
         this.selectedId = selectedId

package/src/base-client/components/common/XCardSet/XTiltle.vue

@@ -0,0 +1,191 @@
+<template>
+  <a-row
+    class="title_box"
+    :style="{backgroundColor: requiredParameters.backgroundColor,height:requiredParameters.height}"
+    type="flex"
+    v-model="requiredParameters">
+    <a-col class="title_col_left" :flex="3">
+      <div class="title_img_box">
+        <img src="../img/header10086.png" class="title_img" alt="">
+      </div>
+      <div class="title_name">{{ requiredParameters.title }}</div>
+    </a-col>
+    <a-col class="title_col_right" id="titleSelect" :flex="3" style="padding-right: 3%" v-model="dateData">
+      <div class="title_date_box">
+        <div class="title_data">{{ dateData.date }}</div>
+        <div class="title_week">{{ dateData.dayOfWeek }}</div>
+      </div>
+      <div class="title_time">{{ dateData.time }}</div>
+      <div style="font-size: x-large;margin-left: 1%">|</div>
+      <div class="title_refresh" @click="refreshTitle"><a-icon type="undo" style="font-size: x-large;"/></div>
+      <div class="title_refresh_box">
+        <div class="title_refresh_time">{{ dateData.refreshTime }}</div>
+        <div class="latest_update_time">最新更新时间</div>
+      </div>
+    </a-col>
+  </a-row>
+</template>
+
+<script>
+
+export default {
+  name: 'TitleComponent',
+  components: {},
+  data () {
+    return {
+      dateData: {
+        date: '',
+        dayOfWeek: '',
+        time: '',
+        refreshTime: ''
+      },
+      timer: null
+    }
+  },
+  props: {
+    requiredParameters: {
+      type: Object,
+      default: () => ({
+        title: '',
+        backgroundColor: '',
+        height: ''
+      }),
+    }
+  },
+  created () {
+    this.updateDateData()
+    this.startTimer()
+  },
+  beforeDestroy () {
+    this.stopTimer()
+  },
+  methods: {
+    // 刷新页面
+    refreshTitle () {
+      this.$forceUpdate()
+      const now = new Date()
+      this.dateData.refreshTime = now.toLocaleTimeString()
+      this.$emit('refreshTitle')
+    },
+    updateDateData () {
+      const now = new Date()
+      const options = { weekday: 'long' }
+      this.dateData.date = this.formatDate(now)
+      this.dateData.time = this.formatTime(now)
+      this.dateData.dayOfWeek = now.toLocaleDateString(undefined, options)
+      this.dateData.refreshTime = now.toLocaleTimeString()
+    },
+    formatDate (date) {
+      const month = date.getMonth() + 1
+      const day = date.getDate()
+      return `${month}月${day}日`
+    },
+    formatTime (date) {
+      const hours = String(date.getHours()).padStart(2, '0')
+      const minutes = String(date.getMinutes()).padStart(2, '0')
+      return `${hours}:${minutes}`
+    },
+    startTimer () {
+      this.timer = setInterval(() => {
+        const now = new Date()
+        this.dateData.time = this.formatTime(now)
+      }, 10000) // 每秒更新一次
+    },
+    stopTimer () {
+      if (this.timer) {
+        clearInterval(this.timer)
+        this.timer = null
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.title_box {
+  width: 100%;
+  min-height:42px;
+}
+.title_col_left {
+  height: 100%;
+  color: white;
+  display: flex;
+  align-content: center;
+  align-items: center;
+}
+.title_col_right {
+  height: 100%;
+  color: white;
+  display: flex;
+  align-content: center;
+  align-items: center;
+  justify-content: flex-end;
+}
+.title_img_box {
+  height: 80%;
+  width: auto;
+  margin-left: 1%;
+  border-radius: 50%;
+  background-color: #35baf6;
+}
+.title_img{
+  width: 100%;
+  height: 100%;
+}
+.title_name {
+  font-size: medium !important;
+  font-weight: bold;
+  margin-left: 1%;
+}
+.title_date_box{
+  width: 20%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.title_data{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: smaller;
+}
+.title_week{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: smaller;
+}
+.title_time{
+  font-size: x-large;
+}
+.title_refresh{
+  margin-left: 1%;
+  height: 100%;
+  align-content: center;
+  align-items: center;
+  cursor: pointer;
+  display: flex;
+  width: 7%;
+  justify-content: center;
+  min-width: 31px;
+}
+.title_refresh:hover{
+  background-color: rgb(31, 138, 137);
+}
+.title_refresh:active{
+  background-color: rgb(26, 129, 128);
+}
+.title_refresh_box{
+  margin-right: 1%;
+}
+.latest_update_time{
+  font-size: x-small;
+}
+.title_refresh_time{
+  display: flex;
+  font-size: x-small;
+  align-content: center;
+  justify-content: center;
+}
+</style>

package/src/base-client/components/common/XReportGrid/XReport.vue

@@ -85,7 +85,7 @@ export default {
       type: String,
       default: undefined,
     },
-    // 本地配��，调试用
+    // 本地配置，调试用
     localConfig: {
       type: Object,
       default: undefined,
@@ -244,7 +244,8 @@ export default {
       currUser: this.currUser,
       getGlobalData: this.getGlobalData,
       setGlobalData: this.setGlobalData,
-      findComponentByName: this.findComponentByName
+      findComponentByName: this.findComponentByName,
+      closeAddReport: this.closeAddReport,
     }
   },
   methods: {
@@ -284,6 +285,27 @@ export default {
     listClick (data) {
       this.$emit('listClick', data)
     },
+    closeAddReport () {
+      if (this.$refs.xAddReport) {
+        this.$refs.xAddReport.close()
+      }
+      let parent = this.$parent
+      while (parent) {
+        if (parent.$refs && parent.$refs.xAddReport) {
+          const addReportRefs = parent.$refs.xAddReport
+          if (Array.isArray(addReportRefs)) {
+            addReportRefs.forEach(ref => {
+              if (ref && typeof ref.close === 'function') {
+                ref.close()
+              }
+            })
+          } else if (typeof addReportRefs.close === 'function') {
+            addReportRefs.close()
+          }
+        }
+        parent = parent.$parent
+      }
+    },
     slotRendered () {
       if (this.config?.mountedFunction) {
         let func = this.config.mountedFunction
@@ -402,7 +424,7 @@ export default {
      * @param outEnv 其他传递给打开窗口的数据
      * @param attr 传递给Modal弹框用的信息
      */
-    openDialog (configName, selectedId, mixinData, outEnv = {}, attr = {}) {
+    openDialog (configName, selectedId, mixinData, outEnv = {}, attr = {}, showButtons = true) {
       console.log('openDialog', configName, selectedId)
       this.$refs.xAddReport.init({
         configName: configName,
@@ -410,6 +432,7 @@ export default {
         mixinData: mixinData,
         outEnv: outEnv,
         attr,
+        showButtons: showButtons
       })
     },
     openDrawer (configName, selectedId, mixinData, outEnv = {}, attr = {}) {
@@ -455,7 +478,7 @@ export default {
             targetData = targetData[path]
           }
         }
-        // 将修改的数���，添加update = true属性
+        // 将修改的数据，添加update = true属性
         targetData.update = true
       })
       return tempData
@@ -723,7 +746,7 @@ export default {
           titleCellFlag = false
           firstSubLine = false
         }
-        // 保存上一个的colspan���保持生成的格子与原格式一致
+        // 保存上一个的colspan保持生成的格子与原格式一致
         preColSpan = cell.colSpan
       })
 

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -216,7 +216,7 @@ export default {
       }
     }
   },
-  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget', 'findComponentByName'],
+  inject: ['openDialog', 'emitEvent', 'registerComponent', 'setColSpanByName', 'setGlobalData', 'getGlobalData', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser', 'isWidget', 'findComponentByName', 'closeAddReport'],
   methods: {
     getWindow,
     isMicroAppEnv,

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

@@ -291,10 +291,10 @@ export default {
             }
           }
           // 拿取多于模板中的数据
-          const diff = Object.fromEntries(
+          const diff = this.bindObject? Object.fromEntries(
             Object.entries(this.bindObject)
               .filter(([key]) => !(key in this.editorRef.getBindObject()))
-          )
+          ) : {}
           this.codeData = {...this.codeData,...diff}
           this.changeMode()
           this.fileUrl = fileUrl

package/src/base-client/components/his/XQuestionnaire/XQuestionnaire.json

@@ -1,7 +1,8 @@
 {
 	"config":{
 	  "title":"",
-	  "split":""
+	  "split":"",
+	  "style":""//TODO 居中方式
 	},
  	"content": [
 		{
@@ -12,15 +13,19 @@
 					"type":"",
 					"key": "",
 					"value": {},
-					"configName":"" // 通过后端获配置单选多选
+
+					"configName":"", // 通过后端获配置单选多选
+					"button-type":"",
+
+
 				}
 			]
 		}
 	]
 }
 //常量取值 checkBox多选
-type [radio,selectionBox,text,input,time,describe]
-justifyContent = ['flex-start', 'flex-end', 'center', 'space-between', 'space-around']
+type [radio,selectionBox,text,input,time,describe,button]
+style = ['flex-start', 'flex-end', 'center', 'space-between', 'space-around']
 
 "results": [{
    "row_key": "",

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

@@ -11,6 +11,7 @@
         <div >{{ config.header }}</div>
       </template>
       <a-list-item
+        :class="{'header-row': item.type === 'header'}"
         slot="renderItem"
         slot-scope="item, index">
         <div
@@ -42,6 +43,22 @@
             <template v-else-if="column.type === 'describe'">
               <span :key="`row-${index}-item-${idx}`" :class="['column-item','item-describe']"> {{ column.value }} </span>
             </template>
+            <template v-else-if="column.type === 'header'">
+              <span :key="`row-${index}-item-${idx}`" :class="['item-header']"> {{ column.value }} </span>
+            </template>
+            <template v-else-if="column.type === 'button'">
+              <a-button
+                :class="['column-item']"
+                :key="`row-${index}-item-${idx}`"
+                :disabled="column.disabled"
+                :icon="column.icon"
+                :loading="column.loading"
+                :type="column.buttonType || 'default'"
+                @click="handleButtonClick(column)"
+              >
+                {{ column.label }}
+              </a-button>
+            </template>
             <template v-else>
               <span :key="`row-${index}-item-${idx}`" :class="['column-item','item-text']"> {{ column.value }} </span>
             </template>
@@ -89,10 +106,6 @@ export default {
     async getData (queryParamsName) {
       const that = this
       getConfigByName(queryParamsName, 'af-his', res => {
-        if (!res.config.split) {
-          res.config.split = true
-        }
-        that.config = res.config
         that.config = {
           ...that.config,
           ...res.config
@@ -124,6 +137,11 @@ export default {
       })
     },
     refreshList (param) {
+      // 清空当前数据和映射关系
+      this.data = []
+      this.results = []
+      this.mapping = []
+      this.results = []
       this.getData(this.queryParamsName, param)
     },
     // 行数据排量方式
@@ -145,6 +163,24 @@ export default {
       } else if (column.type === 'radio' || column.type === 'time') {
         this.results[resultIndex][column.key] = e
       }
+    },
+    handleButtonClick (item) {
+      item.loading = true
+      const callback = () => {
+        item.loading = false
+      }
+      if (item.clickEventName && this.$listeners[item.clickEventName]) {
+        // 交由父级处理
+        this.$emit(item.clickEventName, item, callback)
+      } else {
+        this.defaultAction(item.clickEventName, item, callback)
+      }
+    },
+    defaultAction (clickEventName, item, callback) {
+      setTimeout(() => {
+        this.$message.warn(`已触发按钮 [${item.key}]，注册事件名 [${clickEventName}]，未实现事件函数`)
+        callback()
+      }, 200)
     }
   },
   watch: {
@@ -162,36 +198,40 @@ export default {
 </script>
 
 <style scoped>
+
 .list-wrapper {
-  max-height: 240px;
-  overflow-y: auto;
-  padding-right: 2px;
+  border: 1px solid #f0f0f0;
 }
-
 .list-container {
   width: 100%;
 }
 
-/* 自定义滚动条样式 */
-.list-wrapper::-webkit-scrollbar {
-  width: 6px;
-}
-
-.list-wrapper::-webkit-scrollbar-thumb {
-  background-color: #d9d9d9;
-  border-radius: 3px;
-}
+/** 自定义滚动条样式
+    .list-wrapper {
+      max-height: 240px;
+      overflow-y: auto;
+      padding-right: 2px;
+    }
+    .list-wrapper::-webkit-scrollbar {
+      width: 6px;
+    }
 
-.list-wrapper::-webkit-scrollbar-track {
-  background-color: #f0f0f0;
-}
+    .list-wrapper::-webkit-scrollbar-thumb {
+      background-color: #d9d9d9;
+      border-radius: 3px;
+    }
 
+    .list-wrapper::-webkit-scrollbar-track {
+      background-color: #f0f0f0;
+    }
+*/
 /* header样式 */
 .list-wrapper ::v-deep .ant-list-header {
   background-color: #F4F4F4; /* 自定义背景色 */
   display: flex;
   justify-content: center;
 }
+
 .list-wrapper ::v-deep .x-radio-item {
   margin-bottom: 0;
 }
@@ -204,10 +244,16 @@ export default {
 .list-wrapper ::v-deep .x-time-select {
   width: auto !important;
 }
+.list-wrapper ::v-deep .header-row {
+  background-color: #F4F4F4; /* 自定义背景色 */
+  height: 45px !important;
+}
 /*每一行的整体样式*/
 .row-item{
+  width: 100%;
   display: flex;
   align-items: center;
+  padding: 2px;
 }
 /*行中每一列的数据*/
 .column-item{
@@ -220,7 +266,10 @@ export default {
   color: #808080 ;
 }
 .item-input{
-  flex: 1;
+  width: auto !important;
+}
+.item-header {
+  color: rgba(0, 0, 0, 0.65)
 }
 
 </style>