vue2-client 1.14.63 → 1.14.65

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

@@ -4,16 +4,27 @@
     <a-row class="box">
       病历号&nbsp;&nbsp;<a-input v-model="vitalSignsId" style="width: 160px"></a-input>
       <a-button-group style="margin-left: 20px;">
-        <a-button plain type="primary" @click="showVitalSignsModal('create')" :loading="loading" :disabled="!editorReady">创建体温单</a-button>
-        <a-button plain type="primary" @click="showVitalSignsModal('update')" :loading="loading" :disabled="!editorReady">更新体温单</a-button>
+        <a-button v-if="showCreateButton"
+                  plain
+                  type="primary"
+                  @click="showVitalSignsModal('create')"
+                  :loading="loading"
+                  :disabled="!editorReady">创建体温单</a-button>
+        <a-button v-if="showUpdateButton"
+                  plain
+                  type="primary"
+                  @click="showVitalSignsModal('update')"
+                  :loading="loading"
+                  :disabled="!editorReady">更新体温单</a-button>
       </a-button-group>
-      <a-button-group style="margin: 0 20px;">
+      <a-button-group v-if="showClearButton" style="margin: 0 20px;">
         <a-button plain type="primary" @click="execCommand('print')" :loading="loading" :disabled="!editorReady">打印</a-button>
       </a-button-group>
       <!-- 修改清空体温单按钮样式，使其更加醒目 -->
       <a-button
         type="primary"
         danger
+        v-if="showClearButton"
         @click="clearVitalSigns"
         :loading="loading"
         :disabled="!editorReady"
@@ -70,19 +81,45 @@ const modalTitles = {
   update: '更新体温单'
 }
 
+// 接受父组件传递的属性
+defineProps({
+  showCreateButton: {
+    type: Boolean,
+    default: false
+  },
+  showUpdateButton: {
+    type: Boolean,
+    default: false
+  },
+  // 添加打印按钮是否显示属性
+  showPrintButton: {
+    type: Boolean,
+    default: false
+  },
+  showClearButton: {
+    type: Boolean,
+    default: false
+  },
+  // 时间模式 -2 ~ 2
+  adjustHour: {
+    type: Number,
+    default: 0
+  }
+})
+
 // 显示弹窗
-const showVitalSignsModal = (type) => {
+function showVitalSignsModal (type) {
   modalType.value = type
   modalVisible.value = true
 }
 
 // 关闭弹窗
-const closeModal = () => {
+function closeModal () {
   modalVisible.value = false
 }
 
 // 编辑器初始化
-const onEditorReady = (editorObj) => {
+function onEditorReady (editorObj) {
   try {
     if (!editorObj) {
       throw new Error('传入的editor对象为null或undefined')
@@ -108,7 +145,7 @@ const onEditorReady = (editorObj) => {
 }
 
 // 执行命令
-const execCommand = (cmd) => {
+function execCommand (cmd) {
   if (!editorReady.value || !editor) return
   loading.value = true
   try {
@@ -122,15 +159,13 @@ const execCommand = (cmd) => {
 }
 
 // 清空体温单
-const clearVitalSigns = async () => {
+async function clearVitalSigns () {
   if (!editorReady.value || !editor) {
     message.error('体温单编辑器未加载完成，请等待或刷新页面重试')
     return
   }
-
   loading.value = true
   generating.value = true
-
   try {
     // 重新加载editor.html页面来完全重置编辑器
     try {
@@ -145,7 +180,6 @@ const clearVitalSigns = async () => {
           try {
             // 等待iframe重新加载完成
             await new Promise(resolve => setTimeout(resolve, 500))
-
             // 获取新的editor对象
             const newEditorObj = iframe.contentWindow.editor
             if (newEditorObj) {
@@ -158,7 +192,6 @@ const clearVitalSigns = async () => {
                       resolve()
                     }
                   }, 100)
-
                   // 最多等待5秒
                   setTimeout(() => {
                     clearInterval(checkInterval)
@@ -166,7 +199,6 @@ const clearVitalSigns = async () => {
                   }, 5000)
                 })
               }
-
               // 更新全局editor引用
               editor = newEditorObj
               window.iframeEditor = newEditorObj
@@ -183,7 +215,6 @@ const clearVitalSigns = async () => {
             iframe.onload = null
           }
         }
-
         // 重新加载iframe
         iframe.src = currentSrc + '?t=' + new Date().getTime()
         return
@@ -191,7 +222,6 @@ const clearVitalSigns = async () => {
     } catch (reloadErr) {
       console.warn('重新加载iframe失败，将尝试其他方法清空体温单:', reloadErr)
     }
-
     // 备用清空方法
     try {
       const iframe = editorComponent.value.$refs.editorIframe
@@ -259,8 +289,10 @@ const clearVitalSigns = async () => {
     generating.value = false
   }
 }
+
 // 处理表单提交
-const handleSubmit = async (formData) => {
+async function handleSubmit (formData) {
+  console.log('表单数据:', formData)
   if (!editorReady.value || !editor) {
     message.error('体温单编辑器未加载完成，请等待或刷新页面重试')
     return
@@ -286,7 +318,7 @@ const handleSubmit = async (formData) => {
     } catch (err) {
       // 备用方案
       if (editor && typeof editor.createVitalSigns === 'function') {
-        result = editor.createVitalSigns(formData)
+        editor.createVitalSigns(formData)
       } else {
         throw new Error('无法调用createVitalSigns方法')
       }
@@ -326,16 +358,20 @@ onMounted(() => {
 defineExpose({
   // 属性
   vitalSignsId,
-  // 方法
+  // 清空体温单方法
   clearVitalSigns,
+  // 展示更新和创建弹框 创建参数：(String) create, 更新参数：(String) update
   showVitalSignsModal,
+  // 触发打印函数 参数：(String) print
   execCommand,
   // 获取当前体温单ID的方法
   getVitalSignsId: () => vitalSignsId.value,
   // 设置体温单ID的方法
   setVitalSignsId: (id) => {
     vitalSignsId.value = id
-  }
+  },
+  // 创建体温单 参数：(Object) data
+  handleSubmit
 })
 </script>
 

package/src/utils/routerUtil.js

@@ -458,6 +458,9 @@ function parsefunc (func) {
       if (row.configName) {
         route.meta.configName = row.configName
       }
+      if (row.component) {
+        route.meta.type = row.component
+      }
     }
     if (row.children && row.children.length > 0) {
       route.children = parsefunc(row.children)

package/vue.config.js

@@ -1,220 +1,220 @@
-const path = require('path')
-const webpack = require('webpack')
-const ThemeColorReplacer = require('webpack-theme-color-replacer')
-const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
-const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
-const CompressionWebpackPlugin = require('compression-webpack-plugin')
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
-// const CopyPlugin = require('copy-webpack-plugin')
-
-const productionGzipExtensions = ['js', 'css']
-const isProd = process.env.NODE_ENV === 'production'
-
-// v4 产品演示
-const v3Server = 'http://aote-office.8866.org:31567'
-// const gateway = 'http://192.168.50.67:31467'
-// const testUpload = 'http://123.60.214.109:8406'
-const OSSServerDev = 'http://192.168.50.67:30351'
-// const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://aote-office.8866.org:31567'
-// const OSSServerProd = 'http://192.168.50.67:31351'
-// const testUploadLocal = 'http://127.0.0.1:9001'
-// v3 铜川
-// const v3Server = 'http://61.134.55.234:8405'
-// const gateway = 'http://61.134.55.234:8456/webmeter'
-// v3 涉县
-// const v3Server = 'http://221.193.244.147:9600'
-// const gateway = 'http://221.193.244.147:9600/webmeter'
-// 本地
-// const local = 'http://localhost:8080'
-
-module.exports = {
-  devServer: {
-    // development server port 8000
-    port: 8020,
-    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
-    proxy: {
-      // '/apply-image': {
-      //   target: revenue,
-      // },
-      '/rs': {
-        target: v3Server,
-        ws: false,
-        changeOrigin: true
-      },
-      // '/api/af-system/resource': {
-      //   pathRewrite: { '^/api/af-system': '/' },
-      //   target: testUpload,
-      //   changeOrigin: true
-      // },
-      '/api/af-revenue/logic/openapi/': {
-        // pathRewrite: { '^/api/af-revenue/logic/openapi/': '/logic/' },
-        target: revenue,
-        changeOrigin: true
-      },
-      '/api/af-scada': {
-        target: revenue,
-        changeOrigin: true
-      },
-      '/api/af-runtime': {
-        pathRewrite: { '^/api/af-runtime/': '/' },
-        target: 'http://127.0.0.1:9001',
-        // target: revenue,
-        changeOrigin: true
-      },
-      '/api/af-revenue': {
-        // pathRewrite: { '^/api/af-revenue/': '/' },
-        target: revenue,
-        changeOrigin: true
-      },
-      '/api/af-liuli': {
-        // pathRewrite: { '^/api/af-liuli/': '/' },
-        // target: 'http://127.0.0.1:9014',
-        target: revenue,
-        changeOrigin: true
-      },
-      '/api/af-gaslink': {
-        // pathRewrite: { '^/api/af-gaslink/': '/' },
-        // target: 'http://127.0.0.1:9036',
-        target: revenue,
-        changeOrigin: true
-      },
-      '/api': {
-        // v3用
-        // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
-        // pathRewrite: { '^/api/': '/' },
-        target: revenue,
-        changeOrigin: true
-      },
-      '/devApi': {
-        // v3用
-        // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
-        // pathRewrite: { '^/api/': '/' },
-        target: revenue,
-        changeOrigin: true
-      },
-      '/resource': {
-        // pathRewrite: { '^/resource': '/' },
-        target: revenue,
-        changeOrigin: true
-      },
-      '/ai': {
-        target: 'http://192.168.50.67:31761',
-        pathRewrite: { '^/ai': '/' },
-        changeOrigin: true
-      },
-      '/oss': {
-        target: OSSServerDev,
-        pathRewrite: { '^/oss': '/' },
-        changeOrigin: true
-      },
-    },
-    client: {
-      overlay: false
-    }
-  },
-  pluginOptions: {
-    'style-resources-loader': {
-      preProcessor: 'less',
-      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
-    }
-  },
-  configureWebpack: config => {
-    config.devtool = 'inline-source-map'
-    // 忽略.md文件
-    config.module.rules.push(
-      {
-        test: /\.md$/,
-        exclude: /node_modules/,
-        use: 'ignore-loader'
-      }
-    )
-    config.context = path.resolve(__dirname, './')
-    config.resolve = {
-      extensions: ['.js', '.vue', '.json'],
-      alias: {
-        '@vue2-client': path.resolve('src'),
-        '@': path.resolve('src'),
-      }
-    }
-    config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']
-    config.performance = {
-      hints: false
-    }
-    if (isProd) {
-      config.plugins.push(
-        new ThemeColorReplacer({
-          fileName: 'css/theme-colors-[contenthash:8].css',
-          matchColors: getThemeColors(),
-          injectCss: true,
-          resolveCss
-        })
-      )
-    }
-    // Ignore all locale files of moment.js
-    config.plugins.push(new webpack.IgnorePlugin({
-      resourceRegExp: /^\.\/locale$/,
-      contextRegExp: /moment$/
-    }))
-
-    config.plugins.push(
-      // new CopyPlugin({
-      //   patterns: [{ from: 'node_modules/amis/sdk', to: 'amis/sdk' }],
-      // })
-    )
-
-    // 生产环境下将资源压缩成gzip格式
-    if (isProd) {
-      // add `CompressionWebpack` plugin to webpack plugins
-      config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: 'gzip',
-        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-        threshold: 10240,
-        minRatio: 0.8
-      }))
-    }
-    // if prod, add externals
-    // if (isProd) {
-    //   config.externals = assetsCDN.externals
-    // }
-  },
-  chainWebpack: config => {
-    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
-    if (isProd) {
-      config.optimization.minimizer('css').use(CssMinimizerPlugin, [{
-        minimizerOptions: {
-          preset: [
-            'default',
-            {
-              discardComments: { removeAll: true },
-              colormin: false,
-            }
-          ],
-          ignoreOrder: true
-        }
-      }])
-    }
-    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
-  },
-  css: {
-    extract: !isProd
-      ? {
-        filename: 'css/[name].css',
-        chunkFilename: 'css/[name].css',
-      }
-      : true,
-    loaderOptions: {
-      less: {
-        lessOptions: {
-          modifyVars: modifyVars(),
-          javascriptEnabled: true
-        }
-      },
-      sass: {}
-    }
-  },
-  publicPath: process.env.VUE_APP_PUBLIC_PATH,
-  outputDir: 'dist',
-  assetsDir: 'static',
-  productionSourceMap: false
-}
+const path = require('path')
+const webpack = require('webpack')
+const ThemeColorReplacer = require('webpack-theme-color-replacer')
+const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
+const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
+const CompressionWebpackPlugin = require('compression-webpack-plugin')
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
+// const CopyPlugin = require('copy-webpack-plugin')
+
+const productionGzipExtensions = ['js', 'css']
+const isProd = process.env.NODE_ENV === 'production'
+
+// v4 产品演示
+const v3Server = 'http://aote-office.8866.org:31567'
+// const gateway = 'http://192.168.50.67:31467'
+// const testUpload = 'http://123.60.214.109:8406'
+const OSSServerDev = 'http://192.168.50.67:30351'
+// const revenue = 'http://aote-office.8866.org:31567'
+const revenue = 'http://aote-office.8866.org:31567'
+// const OSSServerProd = 'http://192.168.50.67:31351'
+// const testUploadLocal = 'http://127.0.0.1:9001'
+// v3 铜川
+// const v3Server = 'http://61.134.55.234:8405'
+// const gateway = 'http://61.134.55.234:8456/webmeter'
+// v3 涉县
+// const v3Server = 'http://221.193.244.147:9600'
+// const gateway = 'http://221.193.244.147:9600/webmeter'
+// 本地
+// const local = 'http://localhost:8080'
+
+module.exports = {
+  devServer: {
+    // development server port 8000
+    port: 8020,
+    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
+    proxy: {
+      // '/apply-image': {
+      //   target: revenue,
+      // },
+      '/rs': {
+        target: v3Server,
+        ws: false,
+        changeOrigin: true
+      },
+      // '/api/af-system/resource': {
+      //   pathRewrite: { '^/api/af-system': '/' },
+      //   target: testUpload,
+      //   changeOrigin: true
+      // },
+      '/api/af-revenue/logic/openapi/': {
+        // pathRewrite: { '^/api/af-revenue/logic/openapi/': '/logic/' },
+        target: revenue,
+        changeOrigin: true
+      },
+      '/api/af-scada': {
+        target: revenue,
+        changeOrigin: true
+      },
+      '/api/af-runtime': {
+        pathRewrite: { '^/api/af-runtime/': '/' },
+        target: 'http://127.0.0.1:9001',
+        // target: revenue,
+        changeOrigin: true
+      },
+      '/api/af-revenue': {
+        // pathRewrite: { '^/api/af-revenue/': '/' },
+        target: revenue,
+        changeOrigin: true
+      },
+      '/api/af-liuli': {
+        // pathRewrite: { '^/api/af-liuli/': '/' },
+        // target: 'http://127.0.0.1:9014',
+        target: revenue,
+        changeOrigin: true
+      },
+      '/api/af-gaslink': {
+        // pathRewrite: { '^/api/af-gaslink/': '/' },
+        // target: 'http://127.0.0.1:9036',
+        target: revenue,
+        changeOrigin: true
+      },
+      '/api': {
+        // v3用
+        // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
+        // pathRewrite: { '^/api/': '/' },
+        target: revenue,
+        changeOrigin: true
+      },
+      '/devApi': {
+        // v3用
+        // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
+        // pathRewrite: { '^/api/': '/' },
+        target: revenue,
+        changeOrigin: true
+      },
+      '/resource': {
+        // pathRewrite: { '^/resource': '/' },
+        target: revenue,
+        changeOrigin: true
+      },
+      '/ai': {
+        target: 'http://192.168.50.67:31761',
+        pathRewrite: { '^/ai': '/' },
+        changeOrigin: true
+      },
+      '/oss': {
+        target: OSSServerDev,
+        pathRewrite: { '^/oss': '/' },
+        changeOrigin: true
+      },
+    },
+    client: {
+      overlay: false
+    }
+  },
+  pluginOptions: {
+    'style-resources-loader': {
+      preProcessor: 'less',
+      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
+    }
+  },
+  configureWebpack: config => {
+    config.devtool = 'inline-source-map'
+    // 忽略.md文件
+    config.module.rules.push(
+      {
+        test: /\.md$/,
+        exclude: /node_modules/,
+        use: 'ignore-loader'
+      }
+    )
+    config.context = path.resolve(__dirname, './')
+    config.resolve = {
+      extensions: ['.js', '.vue', '.json'],
+      alias: {
+        '@vue2-client': path.resolve('src'),
+        '@': path.resolve('src'),
+      }
+    }
+    config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']
+    config.performance = {
+      hints: false
+    }
+    if (isProd) {
+      config.plugins.push(
+        new ThemeColorReplacer({
+          fileName: 'css/theme-colors-[contenthash:8].css',
+          matchColors: getThemeColors(),
+          injectCss: true,
+          resolveCss
+        })
+      )
+    }
+    // Ignore all locale files of moment.js
+    config.plugins.push(new webpack.IgnorePlugin({
+      resourceRegExp: /^\.\/locale$/,
+      contextRegExp: /moment$/
+    }))
+
+    config.plugins.push(
+      // new CopyPlugin({
+      //   patterns: [{ from: 'node_modules/amis/sdk', to: 'amis/sdk' }],
+      // })
+    )
+
+    // 生产环境下将资源压缩成gzip格式
+    if (isProd) {
+      // add `CompressionWebpack` plugin to webpack plugins
+      config.plugins.push(new CompressionWebpackPlugin({
+        algorithm: 'gzip',
+        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+        threshold: 10240,
+        minRatio: 0.8
+      }))
+    }
+    // if prod, add externals
+    // if (isProd) {
+    //   config.externals = assetsCDN.externals
+    // }
+  },
+  chainWebpack: config => {
+    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
+    if (isProd) {
+      config.optimization.minimizer('css').use(CssMinimizerPlugin, [{
+        minimizerOptions: {
+          preset: [
+            'default',
+            {
+              discardComments: { removeAll: true },
+              colormin: false,
+            }
+          ],
+          ignoreOrder: true
+        }
+      }])
+    }
+    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
+  },
+  css: {
+    extract: !isProd
+      ? {
+        filename: 'css/[name].css',
+        chunkFilename: 'css/[name].css',
+      }
+      : true,
+    loaderOptions: {
+      less: {
+        lessOptions: {
+          modifyVars: modifyVars(),
+          javascriptEnabled: true
+        }
+      },
+      sass: {}
+    }
+  },
+  publicPath: process.env.VUE_APP_PUBLIC_PATH,
+  outputDir: 'dist',
+  assetsDir: 'static',
+  productionSourceMap: false
+}