vue2-client 1.12.14 → 1.12.16

package/package.json

@@ -1,107 +1,107 @@
-{
-  "name": "vue2-client",
-  "version": "1.12.14",
-  "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:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "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": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "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",
-    "marked": "^4",
-    "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",
-    "@jest/globals": "^29.7.0",
-    "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": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "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.12.16",
+  "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:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "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": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "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",
+    "marked": "^4",
+    "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",
+    "@jest/globals": "^29.7.0",
+    "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": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "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/XCardSet/XCardSet.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="card-box">
+  <div class="card-box" v-if="!configurationParameters.drawerMode">
     <div
       class="section-tab"
-      v-bind:innerText="configurationParameters"
+      :innerText="configurationParameters"
       contenteditable="true"
       :style="{ backgroundColor: configurationParameters.tabBackgroundColor }">
       <a-icon :type="configurationParameters.icon" style="margin-left: 2%;font-size: medium;"/>
@@ -32,6 +32,47 @@
       </div>
     </div>
   </div>
+  <div v-else class="card-box">
+    <div
+      class="section-tab"
+      :innerText="configurationParameters"
+      contenteditable="true"
+      :style="{ backgroundColor: configurationParameters.tabBackgroundColor }">
+      <a-icon :type="configurationParameters.icon" style="margin-left: 2%;font-size: medium;"/>
+      {{ configurationParameters.tab }}
+    </div>
+    <a-collapse accordion class="accordion" :activeKey="activeKey" @change="switchDrawers">
+      <a-collapse-panel
+        v-for="(time, rowId) in times"
+        :header="time"
+        :style="{backgroundColor:rowId === rowIndex ? configurationParameters.tabBackgroundColor : '#fff'}"
+        :key="rowId" >
+        <div class="patient-overview">
+          <div
+            class="overview-section"
+            v-for="(item,index) in data"
+            :key="index"
+            :style="{borderBottom: index === data.length - 1 ? 'none' : '1px solid #ddd'}">
+            <div class="section-header" :style="{ backgroundColor: item.backgroundColor, color: item.fontColor }">
+              {{ item.titleName }}({{ item.messageNumber }})
+            </div>
+            <div class="patient-list-container">
+              <div class="patient-list">
+                <div
+                  v-for="(patient, i) in item.showData"
+                  :key="i"
+                  class="patient-item"
+                  :title="`${patient.room_number} - ${patient.patient_name}`">
+                  <span class="card_data" :style="{ color: item.fontColor }">{{ patient.room_number }}</span>
+                  <span class="card_data" >{{ patient.patient_name }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-collapse-panel>
+    </a-collapse>
+  </div>
 </template>
 
 <script>
@@ -39,22 +80,29 @@
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 
 export default {
-  name: 'XCardSet',
+  name: 'CardComponent',
   data () {
     return {
       tab: 'container',
       data: [
         { room_number: '', patient_name: '' }
       ],
+      activeKey: '0',
+      times: [],
+      DateTimes: [],
+      rowIndex: 0,
       /* 配置参数(titleName：行标题名，dataSource：数据源，parameter：参数，fontColor：文字颜色，backgroundColor：背景颜色，
-     pageSize：分页数量，tabBackgroundColor：标签背景颜色，isPrimarySource：是否取mainDataSource中的元素) */
+     pageSize：分页数量，tabBackgroundColor：标签背景颜色，isPrimarySource：是否取mainDataSource中的元素)， drawerMode：是否选用抽屉模式
+     times：如果选用抽屉 */
       configurationParameters: {
+        drawerMode: false,
         tab: '',
         icon: '',
         tabBackgroundColor: '',
         mainDataSource: '',
         serverName: '',
         parameter: { pageSize: 8 },
+        times: 4,
         configurationData: [
           {
             titleName: '',
@@ -80,28 +128,79 @@ export default {
     async getData (data) {
       this.data = []
       getConfigByName(data, 'af-his', res => {
-        this.configurationParameters = res
-        console.log(this.configurationParameters)
-        runLogic(res.mainDataSource, res.parameter, 'af-his').then(result => {
-          for (let i = 0; i < res.configurationData.length; i++) {
-            const ConfigureDisplayData = {
-              titleName: res.configurationData[i].titleName,
-              fontColor: res.configurationData[i].fontColor,
-              backgroundColor: res.configurationData[i].backgroundColor,
-              messageNumber: result[res.configurationData[i].dataSource + 'Total'][0].total,
-              showData: []
-            }
-            this.data.push(ConfigureDisplayData)
-            this.data[i].showData = result[res.configurationData[i].dataSource]
+        if (!res.drawerMode) {
+          this.renderDeck(res)
+        } else { this.renderData(res) }
+      })
+    },
+    // 渲染卡片组数据
+    async renderDeck (res, times) {
+      this.configurationParameters = await res
+      if (res.drawerMode) {
+        res.parameter.times = await times
+      }
+      runLogic(res.mainDataSource, res.parameter).then(result => {
+        for (let i = 0; i < res.configurationData.length; i++) {
+          const ConfigureDisplayData = {
+            titleName: res.configurationData[i].titleName,
+            fontColor: res.configurationData[i].fontColor,
+            backgroundColor: res.configurationData[i].backgroundColor,
+            messageNumber: result[res.configurationData[i].dataSource + 'Total'][0].total,
+            showData: []
           }
-        })
+          this.data.push(ConfigureDisplayData)
+          this.data[i].showData = result[res.configurationData[i].dataSource]
+        }
       })
+    },
+    formatTime (date) {
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      const hours = String(date.getHours()).padStart(2, '0')
+      return `${year}-${month}-${day} ${hours}:00`
+    },
+    getTimes (n) {
+      const times = []
+      const now = new Date()
+      for (let i = 0; i <= n; i++) {
+        const time = new Date(now.getTime() + i * 60 * 60 * 1000)
+        times.push(this.formatTime(time))
+      }
+      return times
+    },
+    formatTimeToHHMM (timeString) {
+      const date = new Date(timeString)
+      const hours = String(date.getHours()).padStart(2, '0')
+      const minutes = String(date.getMinutes()).padStart(2, '0')
+      return `${hours}:${minutes}`
+    },
+    // 获取数据并渲染数据
+    renderData (data) {
+      this.times = []
+      this.DateTimes = []
+      const time = this.getTimes(data.times)
+      for (let i = 0; i < data.times; i++) {
+        const startTime = this.formatTimeToHHMM(time[i])
+        const endTime = this.formatTimeToHHMM(time[i + 1])
+        this.times.push(`${startTime} ~ ${endTime}`)
+        this.DateTimes.push(`${time[i]} and ${time[i + 1]}`)
+      }
+      this.renderDeck(data, `${time[0]} and ${time[1]}`)
+    },
+    // 切换抽屉
+    switchDrawers (activeKey) {
+      if (activeKey !== undefined) {
+        console.log('Active Header:', this.DateTimes[activeKey])
+        this.data = []
+        this.renderDeck(this.configurationParameters, this.DateTimes[activeKey])
+        this.rowIndex = activeKey
+      }
     }
   },
   watch: {
     queryParamsName: {
       handler (newValue) {
-        console.log(newValue)
         this.getData(newValue)
       },
       deep: true
@@ -111,6 +210,9 @@ export default {
 </script>
 
 <style scoped>
+.accordion{
+  width: 100%;
+}
 .patient-overview {
   width: 100%;
   padding: 0.5%;
@@ -136,7 +238,7 @@ export default {
   width: 100%;
   padding-left: 1%;
 }
-.overview-section {
+.overview-section{
   display: flex;
   flex-wrap: nowrap;
   align-items: center;
@@ -188,7 +290,7 @@ export default {
   flex-direction: row;
   height: 100%;
 }
-.card_data {
+.card_data{
   display: inline-block;
   max-width: 5ch; /* 最多显示 3 个字符 */
   white-space: nowrap;

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

@@ -44,18 +44,6 @@ export default {
         return null
       },
     },
-    setGlobalData: {
-      default: () => () => {
-        console.warn('setGlobalData is not provided.')
-        return null
-      },
-    },
-    getGlobalData: {
-      default: () => () => {
-        console.warn('getGlobalData is not provided.')
-        return null
-      },
-    },
     getSelectedData: {
       default: () => () => {
         console.warn('getSelectedData is not provided.')
@@ -166,6 +154,7 @@ export default {
           question: userMessage,
           additionalInfo: this.additionalInfo
         }, this.serviceName)
+        this.additionalInfo.f_dialog_id = response.id
         this.messages.push({ type: 'bot', text: response.value })
       } else if (this.renderConfig.api) {
         // 通过api获取消息
@@ -195,6 +184,18 @@ export default {
         )
       }
     },
+    setHistoryMessages (messages) {
+      console.log(messages)
+      // 清空现有消息
+      this.messages = []
+      // 添加历史消息
+      messages.forEach(msg => {
+        this.messages.push({
+          type: msg.role === 'user' ? 'user' : 'bot',
+          text: msg.content
+        })
+      })
+    }
   },
   mounted () {
     this.setAddtionalInfo(this.getMixinData())

package/src/base-client/components/common/XConversation/XConversationDemo.vue

@@ -19,6 +19,7 @@ export default {
       serviceName: 'af-his'
     })
     this.$refs.XConversation.setAddtionalInfo({ patient_id: 37 })
+    this.$refs.XConversation.setHistoryMessages([{ role: 'user', content: '111' }, { role: 'bot', content: '222' }])
   }
 }
 </script>