vue2-client 1.14.31 → 1.14.33

package/Users/objecrt/af-vue2-client/src/base-client/components/his/XShiftSchedule/XShiftSchedule.vue

@@ -0,0 +1,36 @@
+<script>
+export default {
+  props: {
+    weekDays: {
+      type: Array,
+      default: () => []
+    }
+  },
+  computed: {
+    columns () {
+      const baseColumns = [
+        { title: '序号', dataIndex: 'index', width: 60 },
+        { title: '科室', dataIndex: 'department', width: 120 },
+        { title: '医生', dataIndex: 'doctor', width: 100 },
+        { title: '上/下/晚', dataIndex: 'shiftType', width: 80 },
+      ]
+
+      // 增加防御判断，确保 weekDays 存在
+      const dayColumns = this.weekDays.length > 0
+        ? this.weekDays.map((day, dayIndex) => ({
+            title: `${day.label} ${day.date}`,
+            dataIndex: `shifts-${dayIndex}`, // 改为字符串形式
+            dayIndex: dayIndex,
+            width: 120,
+          }))
+        : []
+
+      const tailColumns = [
+        { title: '排班数', dataIndex: 'count', width: 80 }
+      ]
+
+      return [...baseColumns, ...dayColumns, ...tailColumns]
+    }
+  }
+}
+</script>

package/package.json

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

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/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/XReportTrGroup.vue

@@ -25,7 +25,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -63,7 +63,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -124,7 +124,8 @@ export default {
     XTitle: () => import('@vue2-client/base-client/components/his/XTitle/XTitle.vue'),
     XSelect: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
     XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue'),
-    XThreeTestOrders: () => import('@vue2-client/base-client/components/his/threeTestOrders/threeTestOrders.vue')
+    XThreeTestOrders: () => import('@vue2-client/base-client/components/his/threeTestOrders/threeTestOrders.vue'),
+    XShiftSchedule: () => import('@vue2-client/base-client/components/his/XShiftSchedule/XShiftSchedule.vue')
   },
   props: {
     // 每一行的配置

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -10,7 +10,7 @@
     :rowKey="tableContext.rowKey"
     :showSummary="tableContext.showSummary"
     :rowSelection="tableContext.rowSelection"
-    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight } "
+    :scroll="{ x: tableContext.scrollXWidth, y: tableContext.scrollYHeight }"
     :showPagination="tableContext.showPagination"
     :hidePagination="tableContext.simpleMode"
     :showSelected="!tableContext.simpleMode"

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

@@ -131,6 +131,8 @@ export default {
   name: 'XHDescriptions',
   data () {
     return {
+      // 隐藏配置 当数据结果 = -1^ 该数据字段会被delete
+      hiddenConfig: '-1^',
       data: null,
       config: null,
       showAllItems: false // 控制是否显示所有标签
@@ -190,9 +192,17 @@ export default {
       this.showAllItems = false
       getConfigByName(data, 'af-his', res => {
         this.config = res
+        const hiddenConfig = this.config?.hiddenConfig ?? 0 === 1
         console.log(this.config)
-        const parameter = { ...res.parameter, ...this.parameter, ...parameterData  }
+        const parameter = { ...res.parameter, ...this.parameter, ...parameterData }
         runLogic(res.logicName, parameter, 'af-his').then(result => {
+          if (hiddenConfig) {
+            for (const key in result) {
+              if (Object.prototype.hasOwnProperty.call(result, key) && result[key] === this.hiddenConfig) {
+                delete result[key]
+              }
+            }
+          }
           this.data = result
         })
       })