Merge remote-tracking branch 'origin/ruleSearch220222' into ruleSearch220222

# Conflicts:
#	package-lock.json

babel.config.js

@@ -1,5 +1,14 @@
 module.exports = {
   presets: [
     '@vue/app'
+  ],
+  "plugins": [
+	[
+	  "component",
+	  {
+		"libraryName": "umy-ui",
+		"styleLibraryName": "theme-chalk"
+	  }
+	]
   ]
 }

package.json

@@ -8,6 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "babel-plugin-component": "^1.1.1",
     "js-md5": "^0.7.3",
     "quill-image-extend-module": "^1.1.2",
     "umy-ui": "^1.1.6",

src/less/common.less

@@ -239,4 +239,8 @@
 }
 .el-message {
   top: 49% !important;
+}
+/***规则查询查看弹窗表格tooltip***/
+.elx-table--tooltip-wrapper{
+  z-index: 9999!important;
 }

src/routes.js

@@ -75,8 +75,8 @@ export default [
       { path: 'LT-KSGLWH-TJHYDXXYGBXDY', component: AddDept, name: 'AddDept' }, //科室关联维护--添加关联
       { path: 'YXSYK-HLGLWH', component: Nursing, name: 'Nursing' }, //护理关联维护
       { path: 'LT-HLGLWH-TJHYDXXYGBXDY', component: AddNursing, name: 'AddNursing' }, //护理关联维护--添加关联
-	  { path: 'YXSYK-GYTJGLWH', component: Drugroute, name: 'Drugroute' }, //给药途径关联维护
-	  { path: 'LT-GYTJGLWH-TJHYDXXYGBXDY', component: AddDrugroute, name: 'AddDrugroute' }, //给药途径关联维护--添加关联
+      { path: 'YXSYK-GYTJGLWH', component: Drugroute, name: 'Drugroute' }, //给药途径关联维护
+      { path: 'LT-GYTJGLWH-TJHYDXXYGBXDY', component: AddDrugroute, name: 'AddDrugroute' }, //给药途径关联维护--添加关联
       { path: 'YXSYK-ZYJBGLWH', component: Tcmdisease, name: 'Tcmdisease' }, //中医疾病关联维护
       { path: 'LT-ZYJBGLWH-TJHYDXXYGBXDY', component: AddTcmdisease, name: 'AddTcmdisease' }, //中医疾病关联维护
       { path: 'YXSYK-ZYZHGLWH', component: Tcmdrome, name: 'Tcmdrome' }, //中医疾病关联维护
@@ -96,11 +96,11 @@ export default [
         component: ZskRuleManager,
         name: 'ZskRuleManager',
       },
-	  {
-	    path: 'GZWH-GZCX',
-	    component: ZskRuleCheck,
-	    name: 'ZskRuleCheck',
-	  },
+      {
+        path: 'GZWH-GZCX',
+        component: ZskRuleCheck,
+        name: 'ZskRuleCheck',
+      },
       { // 接口管理-调用记录
         path: 'JKGL-DYJL',
         component: CallRecordManager,

yarn.lock

@@ -129,6 +129,14 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-module-imports@7.0.0-beta.35":
+  "integrity" "sha512-vaC1KyIZSuyWb3Lj277fX0pxivyHwuDU4xZsofqgYAbkDxNieMg2vuhzP5AgMweMY7fCQUMTi+BgPqTLjkxXFg=="
+  "resolved" "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.35.tgz"
+  "version" "7.0.0-beta.35"
+  dependencies:
+    "@babel/types" "7.0.0-beta.35"
+    "lodash" "^4.2.0"
+
 "@babel/helper-module-transforms@^7.1.0":
   "integrity" "sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA=="
   "resolved" "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz"
@@ -657,6 +665,15 @@
     "lodash" "^4.17.10"
     "to-fast-properties" "^2.0.0"
 
+"@babel/types@7.0.0-beta.35":
+  "integrity" "sha512-y9XT11CozHDgjWcTdxmhSj13rJVXpa5ZXwjjOiTedjaM0ba5ItqdS02t31EhPl7HtOWxsZkYCCUNrSfrOisA6w=="
+  "resolved" "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.35.tgz"
+  "version" "7.0.0-beta.35"
+  dependencies:
+    "esutils" "^2.0.2"
+    "lodash" "^4.2.0"
+    "to-fast-properties" "^2.0.0"
+
 "@intervolga/optimize-cssnano-plugin@^1.0.5":
   "integrity" "sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA=="
   "resolved" "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"
@@ -1420,6 +1437,13 @@
     "mkdirp" "^0.5.1"
     "util.promisify" "^1.0.0"
 
+"babel-plugin-component@^1.1.1":
+  "integrity" "sha512-WUw887kJf2GH80Ng/ZMctKZ511iamHNqPhd9uKo14yzisvV7Wt1EckIrb8oq/uCz3B3PpAW7Xfl7AkTLDYT6ag=="
+  "resolved" "https://registry.npmjs.org/babel-plugin-component/-/babel-plugin-component-1.1.1.tgz"
+  "version" "1.1.1"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-beta.35"
+
 "babel-plugin-dynamic-import-node@^2.2.0":
   "integrity" "sha512-fP899ELUnTaBcIzmrW7nniyqqdYWrWuJUyPWHxFa/c7r7hS6KC8FscNfLlBNIoPSc55kYMGEEKjPjJGCLbE1qA=="
   "resolved" "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.2.0.tgz"
@@ -4733,7 +4757,7 @@
   "resolved" "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
   "version" "4.5.0"
 
-"lodash@^4.13.1", "lodash@^4.17.10", "lodash@^4.17.11", "lodash@^4.17.3", "lodash@^4.17.4", "lodash@^4.17.5", "lodash@^4.3.0":
+"lodash@^4.13.1", "lodash@^4.17.10", "lodash@^4.17.11", "lodash@^4.17.3", "lodash@^4.17.4", "lodash@^4.17.5", "lodash@^4.2.0", "lodash@^4.3.0":
   "integrity" "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
   "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"
   "version" "4.17.11"