Merge remote-tracking branch 'origin/knowledgePlat' into test

src/components/knowledgeExtra/RuleManager.vue

@@ -52,12 +52,12 @@
                 <el-table-column
                         prop="parDescription"
                         label="规则名称"
-                        width="180">
+                        width="160">
                     <template slot-scope="scope">
-                        <el-tooltip v-if="scope.row.parDescription.length>10" class="item" effect="dark" :content="scope.row.parDescription" placement="top">
-                            <span>{{scope.row.parDescription.slice(0,10)+'...'}}</span>
+                        <el-tooltip v-if="scope.row.parDescription.length>8" class="item" effect="dark" :content="scope.row.parDescription" placement="top">
+                            <span>{{scope.row.parDescription.slice(0,8)+'...'}}</span>
                         </el-tooltip>
-                        <span v-if="scope.row.parDescription.length<11">{{scope.row.parDescription}}</span>
+                        <span v-if="scope.row.parDescription.length<9">{{scope.row.parDescription}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -71,12 +71,12 @@
                 <el-table-column
                         prop="parConceptName"
                         label="医学标准术语"
-                        width="180">
+                        width="160">
                     <template slot-scope="scope">
-                        <el-tooltip v-if="scope.row.parConceptName.length>10" class="item" effect="dark" :content="scope.row.parConceptName" placement="top">
-                            <span>{{scope.row.parConceptName.slice(0,10)+'...'}}</span>
+                        <el-tooltip v-if="scope.row.parConceptName.length>8" class="item" effect="dark" :content="scope.row.parConceptName" placement="top">
+                            <span>{{scope.row.parConceptName.slice(0,8)+'...'}}</span>
                         </el-tooltip>
-                        <span v-if="scope.row.parConceptName.length<11">{{scope.row.parConceptName}}</span>
+                        <span v-if="scope.row.parConceptName.length<9">{{scope.row.parConceptName}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -96,6 +96,12 @@
                         prop="parMsg"
                         label="附加信息"
                         width="160">
+                    <template slot-scope="scope">
+                        <el-tooltip v-if="scope.row.parMsg.length>8" class="item" effect="dark" :content="scope.row.parMsg" placement="top">
+                            <span>{{scope.row.parMsg.slice(0,8)+'...'}}</span>
+                        </el-tooltip>
+                        <span v-if="scope.row.parMsg.length<9">{{scope.row.parMsg}}</span>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         label="状态">
@@ -106,7 +112,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                        prop="modifier"
+                        prop="modifierName"
                         label="操作人">
                 </el-table-column>
                 <el-table-column

src/components/knowledgeExtra/SubConditions.vue

@@ -195,8 +195,9 @@
             'firstPlace':{
                 handler:function(val) {
                     if (!val) return;
-                    const types = val.checkedType.split("-");
-                    const sub = this.baseTypes.find((it) => it.ruleType === +types[0] && it.type === 2);
+                    const dict = localStorage.getItem("zskDicts").match(new RegExp(val.checkedType+'-\\d+','g'))||[];
+                    const types = dict[0].split("-");
+                    const sub = this.baseTypes.find((it) => it.ruleType === +types[0] && it.type === +types[2]);
                     this.groupData.subType = sub.type;
                     this.baseTermTypeList = sub.subMenuList;
                     this.groupData.subLenCode = this.baseTermTypeList.find((it) => it.ruleType === +types[0]).code;

src/routes.js

@@ -594,16 +594,6 @@ export default [
                 component: AddTerm,
                 name: 'AddTerm',
             },
-            {
-                path: 'LT-ZSKKZWH-JTXXWH',
-                component: StaticInfo,
-                name: 'StaticInfo',
-            },
-            {
-                path: 'LT-ZSKKZWH-JTXXWH-EDIT',
-                component: AddDevKnow,
-                name: 'AddDevKnow',
-            },
             {
                 path: 'LT-ZSKKZWH-GZWH',
                 component: ZskRuleManager,
@@ -614,105 +604,6 @@ export default [
                 component: AddZskRule,
                 name: 'AddZskRule',
             },
-
-    { path: 'LT-CDSSSJWH-YYGL', component: HospitalCDSS, name: 'HospitalCDSS' }, //医院管理
-    { path: 'LT-CDSSSJWH-YYGLEDIT', component: AddHospitalCDSS, name: 'AddHospitalCDSS' }, //医院管理--新增编辑
-    { path: 'LT-CDSSSJWH-YYYHGL', component: HospitalUserCDSS, name: 'HospitalUserCDSS' }, //医院用户管理
-    {
-        path: 'LT-CDSSSJWH-YYYHGLEDIT',
-        component: AddHospitalUserCDSS,
-        name: 'AddHospitalUserCDSS',
-    }, //医院用户管理--添加用户
-    { path: 'LT-CDSSSJWH-BBWH', component: VersionCDSS, name: 'VersionCDSS' }, //CDSS版本信息维护
-    { path: 'LT-CDSSSJWH-BBWHEDIT', component: AddVersionCDSS, name: 'AddVersionCDSS' }, //CDSS版本信息维护--新增编辑
-    { path: 'LT-CDSSSJWH-BBWHDETAIL', component: VersionDetailCDSS, name: 'VersionDetailCDSS' }, //CDSS版本信息维护--详情
-    { path: 'LT-CDSSSJWH-MZSMWH', component: DisclaimerCDSS, name: 'DisclaimerCDSS' }, //免责声明维护
-    { path: 'LT-CDSSSJWH-MZSMWHEDIT', component: AddDisclaimerCDSS, name: 'AddDisclaimerCDSS' }, //免责声明维护--新增编辑
-    {
-        path: 'LT-CDSSSJWH-MZSMWHDETAIL',
-        component: DisclaimerDetailCDSS,
-        name: 'DisclaimerDetailCDSS',
-    }, //免责声明维护--新增编辑
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS',
-        component: KnowledgeMapRuleTest,
-        name: 'KnowledgeMapRuleTest',
-    }, //知识图谱规则测试
-    {
-        path: 'LT-YYSYZDHCS-JTZSYSCS',
-        component: StaticKnowledgeMapTest,
-        name: 'StaticKnowledgeMapTest',
-    }, //静态知识映射测试
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-TYGZCS',
-        component: BillCommonTest,
-        name: 'BillCommonTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-SXGZCS',
-        component: BillFusionTest,
-        name: 'BillFusionTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-SYSJCGZCS',
-        component: CriticalLabTest,
-        name: 'CriticalLabTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-FZJCGZCS',
-        component: CriticalAuxTest,
-        name: 'CriticalAuxTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-GWYPGZCS',
-        component: HighRiskDrugTest,
-        name: 'HighRiskDrugTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-GWSSZHGZCS',
-        component: HighRiskOperationTest,
-        name: 'HighRiskOperationTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-QTHYGZCS',
-        component: OtherAssayRuleTest,
-        name: 'OtherAssayRuleTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-QTFJGZCS',
-        component: OtherAuxRuleTest,
-        name: 'OtherAuxRuleTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-ZSTPGZCS-QTFXGZCS',
-        component: OtherFusionRuleTest,
-        name: 'OtherFusionRuleTest',
-    },
-    {
-        path: 'LT-YYSYZDHCS-JTZSYSCS-WYSZD',
-        component: LessStaticOrNoMap,
-        name: 'LessStaticOrNoMap',
-    },
-    {
-        path: 'LT-ZSKJCWH-JCSYWH',
-        component: BasicTermsMaintenance,
-        name: 'BasicTermsMaintenance',
-    },
-    {
-        path: 'LT-ZSKJCWH-JCCXWH',
-        component: BasicPartOfSpeech,
-        name: 'BasicPartOfSpeech',
-    },
-    {
-        path: 'LT-ZSKJCWH-JCGXLXWH',
-        component: BasicRelationship,
-        name: 'BasicRelationship',
-    },
-    {
-        path: 'LT-ZSKJCWH-JCSYWH-EDIT',
-        component: AddTerm,
-        name: 'AddTerm',
-    },
     {
         path: 'LT-ZSKKZWH-JTXXWH',
         component: StaticInfo,