luolei %!s(int64=4) %!d(string=hai) anos
pai
achega
9de00eae23

+ 3 - 3
src/api/config.js

@@ -489,7 +489,8 @@ export default {
     'getCaseResultList': '/api/cdssman/test/rule/getCaseResultList', 
     'billRuleTest': '/api/cdssman/test/rule/billRuleTest',   
     'getResultBillPage': '/api/cdssman/test/rule/getResultBillPage', 
-    'exportRuleExcel': '/api/cdssman/test/rule/exportExcel', 
+    // 'exportRuleExcel': '/api/cdssman/test/rule/exportExcel', 
+    'exportRuleExcel':'http://192.168.2.121:88/api/cdssman/test/rule/exportExcel',
     'ruleAllTest': '/api/cdssman/test/rule/ruleTest', 
     'getResultCriticalPage': '/api/cdssman/test/rule/getResultCriticalPage',   //危急值测试列表
     'criticalRuleTest': '/api/cdssman/test/rule/criticalRuleTest',   //危急值规则测试
@@ -558,11 +559,10 @@ export default {
     'staticKnowledgeBaseInfo':'/api/cdssman/kl/conceptInfo/staticKnowledgeIndexWithoutInfo',
     //规则测试相关
     'allRuleTest':'/api/cdssman/test/rule/allRuleTest',
-    'autoExportExcel':'/api/cdssman/test/rule/exportExcel',
     'autoGetCaseResultList':'/api/cdssman/test/rule/getCaseResultList',
     'getDroplistData':'/api/cdssman/test/rule/getDroplistData',
     'getResultRulePage':'/api/cdssman/test/rule/getResultRulePage',
-    'ruleExportExcel':'/api/cdssman/test/rule/ruleExportExcel',
+    // 'ruleExportExcel':'/api/cdssman/test/rule/ruleExportExcel',
     'autoRuleTest':'/api/cdssman/test/rule/ruleTest',
   },
   menuIconList: { //菜单对应图标

+ 4 - 1
src/api/knowledgeTree.js

@@ -76,7 +76,7 @@ export default {
     return axios.post(urls.allRuleTest, param);
   },
   autoExportExcel(param) {
-    return axios.post(urls.autoExportExcel, param);
+    return axios.post(urls.exportRuleExcel, param);
   },
   autoGetCaseResultList(param) {
     return axios.post(urls.autoGetCaseResultList, param);
@@ -105,4 +105,7 @@ export default {
   getTypesList(param) {
     return axios.post(urls.zskTypeList, param);
   },
+  zskgetDict(param) {
+    return axios.post(urls.zskgetDict, param);
+  },
 };

+ 56 - 30
src/components/autoTest/AutoBillCommonTest.vue

@@ -50,7 +50,7 @@
         </el-form-item>
       </el-form>
     </crumbs>
-    <div style="margin: 60px 20px 0">
+    <div style="margin: 100px 20px 0">
       <el-table :data="list" border>
         <el-table-column
           :resizable="false"
@@ -63,43 +63,44 @@
           :resizable="false"
           prop="gmtModified"
           label="测试时间"
+          :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
           :resizable="false"
           prop="ruleLibTypeName"
           label="规则术语类型"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
           :resizable="false"
           prop="ruleLibName"
           label="规则医学标准术语"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
           :resizable="false"
           prop="ruleHisName"
           label="规则医院术语"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
           :resizable="false"
           prop="ruleHisDetailName"
           label="规则医院术语细项"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
           :resizable="false"
           prop="groupType"
           label="规则组别"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
           :resizable="false"
           prop="ruleBaseType"
-          label="基础规则类型"
-          show-overflow-tooltip
           className="collectTwo"
+          :show-overflow-tooltip="true"
+          label="基础规则类型"
         >
           <template slot-scope="scope">
             <div v-html="returnDom(scope.row.baseRules,'ruleBaseType')"></div>
@@ -109,7 +110,8 @@
           :resizable="false"
           prop="ruleBaseLibTypeName"
           label="基础规则术语类型"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
+          className="collectTwo"
         >
           <template slot-scope="scope">
             <div v-html="returnDom(scope.row.baseRules,'ruleBaseLibTypeName')"></div>
@@ -119,7 +121,8 @@
           :resizable="false"
           prop="ruleBaseLibName"
           label="基础规则医学标准术语"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
+          className="collectTwo"
         >
           <template slot-scope="scope">
             <div v-html="returnDom(scope.row.baseRules,'ruleBaseLibName')"></div>
@@ -129,7 +132,8 @@
           :resizable="false"
           prop="ruleBaseHisName"
           label="基础规则医院术语"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
+          className="collectTwo"
         >
           <template slot-scope="scope">
             <div v-html="returnDom(scope.row.baseRules,'ruleBaseHisName')"></div>
@@ -139,7 +143,8 @@
           :resizable="false"
           prop="ruleBaseHisDetailName"
           label="基础规则医院术语细则"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
+          className="collectTwo"
         >
           <template slot-scope="scope">
             <div v-html="returnDom(scope.row.baseRules,'ruleBaseHisDetailName')"></div>
@@ -149,7 +154,8 @@
           :resizable="false"
           prop="ruleBaseInputValue"
           label="基础规则输入值"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
+          className="collectTwo"
         >
           <template slot-scope="scope">
             <div v-html="returnDom(scope.row.baseRules,'ruleBaseInputValue')"></div>
@@ -159,7 +165,8 @@
           :resizable="false"
           prop="referenceValue"
           label="基础规则参考值"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
+          className="collectTwo"
         >
           <template slot-scope="scope">
             <div v-html="returnDom(scope.row.baseRules,'referenceValue')"></div>
@@ -169,13 +176,13 @@
           :resizable="false"
           prop="output"
           label="实际结果"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
           :resizable="false"
           prop="expectedOutput"
           label="预期结果"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
         ></el-table-column>
 
         <el-table-column label="测试结果">
@@ -188,7 +195,7 @@
           :resizable="false"
           prop="message"
           label="失败原因"
-          show-overflow-tooltip
+          :show-overflow-tooltip="true"
         ></el-table-column>
       </el-table>
       <div class="pagination pagepage">
@@ -228,7 +235,7 @@ export default {
       baseType:'',
       typeBaseList:[],
       baseHosTxt:'',
-      whyTxt:''
+      whyTxt:'',
     };
   },
   created() {
@@ -251,14 +258,28 @@ export default {
     returnDom(list,name){
       let str = ''
       if(name === 'ruleBaseType'){
-        const params = JSON.parse(localStorage.getItem("getTypesList"));
-        console.log(params)
-      }
-      for(let i = 0;i < list.length;i++){
-        str += `<p>
-              ${list[i][name]||'no'}
-          </p>`
+        const params = JSON.parse(localStorage.getItem("zskDicts"));
+        for(let i = 0;i < list.length;i++){
+          for(let j = 0;j < params.length;j++){
+            if(list[i].ruleBaseType == params[j].val){
+              if(params[j].name){
+                str += `<p style="padding:0 10px;border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
+                      ${params[j].name||' '}
+                  </p>`
+              }
+            }
+          }
+        }
+      }else{
+        for(let i = 0;i < list.length;i++){
+          if(list[i][name]){
+            str += `<p style="padding:0 10px;border-bottom:${(i == list.length-1)||(list[i+1]&&!list[i+1][name])?'0':'1px solid #EBEEF5'};overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" class="collTxt">
+                  ${list[i][name]||' '}
+              </p>`
+          }
+        }
       }
+      //  str += `<p style="padding:0 10px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;border-bottom:${i == list.length-1?'0':'1px solid #EBEEF5'};" class="collTxt">
       return str
     },
     getDroplistData(params){
@@ -349,7 +370,7 @@ export default {
               this.$message({ message: '导出成功', type: 'success' });
               utils.downloadExportedData(
                 res.data,
-                `${hospitalName}-开单合理性提醒规则测试结果.xls`
+                `${hospitalName}-开单合理性提醒规则测试结果.xlsx`
               );
             }
           });
@@ -360,7 +381,12 @@ export default {
 };
 </script>
 
-<style lang="less" scored>
+<style lang="less">
+.collectTwo .cell {
+  padding:0;
+}
+</style>
+<style lang="less" scoped>
 @import '../../less/admin.less';
 .topBack {
   height:80px !important;
@@ -377,9 +403,9 @@ export default {
   float:right;
 }
 .collectTwo {
-  .cell.el-tooltip {
-    padding:0;
-    p {
+  .cell {
+    padding:0 !important;
+    .collTxt {
       padding:0 10px;
       overflow: hidden;
       text-overflow: ellipsis;

+ 13 - 16
src/components/autoTest/AutoKnowledgeMapRuleTest.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <crumbs title="知识图谱规则测试ss" class="topBack">
+    <crumbs title="知识图谱规则测试" class="topBack">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item label class="selectMedicine" style="marginbottom: -1px">
           <el-select size="mini" v-model="hospitalId" placeholder="选择医院" @change="handleChange">
@@ -98,7 +98,7 @@ export default {
   },
   created() {
     this._getHospitalInfoCDSS();
-    this.getTypeList()
+    this.zskgetDict()
     // this._getRunningStatus()   // 进入页面立即确认状态
     this.timer = setInterval(this._getRunningStatus, 20 * 1000);
   },
@@ -115,19 +115,16 @@ export default {
     });
   },
   methods: {
-    getTypeList(){
-        const typeListData = JSON.parse(localStorage.getItem("getTypesList"));
-        if(!typeListData){
-          api.getTypesList({}).then((res) => {
-              if (res.data.code == '0') {
-                  const data = res.data.data;
-                  localStorage.setItem("getTypesList",JSON.stringify(data));
-              }
-          }).catch((error) => {
-              console.log(error);
-          });
-        }
-
+    zskgetDict(){
+        api.zskgetDict().then((res) => {
+            if (res.data.code == '0') {
+                const data = res.data.data;
+                const arr =data['31'];
+                localStorage.setItem("zskDicts",JSON.stringify(arr));
+            }
+        }).catch((error) => {
+            console.log(error);
+        });
     },
     _getRunningStatus() {
       const { hospitalId } = this;
@@ -370,6 +367,6 @@ export default {
 };
 </script>
 
-<style lang="less" scored>
+<style lang="less" scoped>
 @import '../../less/admin.less';
 </style>