ソースを参照

merge from 'diagBase_ll'

zhangxc 6 年 前
コミット
2674271c05

+ 22 - 9
package-lock.json

@@ -4839,12 +4839,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4859,17 +4861,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4986,7 +4991,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4998,6 +5004,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5012,6 +5019,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5019,12 +5027,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5043,6 +5053,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5123,7 +5134,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5135,6 +5147,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5256,6 +5269,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -8593,8 +8607,7 @@
     "quill-image-extend-module": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/quill-image-extend-module/-/quill-image-extend-module-1.1.2.tgz",
-      "integrity": "sha512-yHJWZWlTjNZzV34zuT4H55ttDwMxmVJ7JUgKnt/Wd3ejUNcaPOV57/sKG8VEMU5mL7bKZPIKmBdb3weM0M5UeA==",
-      "dev": true
+      "integrity": "sha512-yHJWZWlTjNZzV34zuT4H55ttDwMxmVJ7JUgKnt/Wd3ejUNcaPOV57/sKG8VEMU5mL7bKZPIKmBdb3weM0M5UeA=="
     },
     "randombytes": {
       "version": "2.0.6",

+ 2 - 2
src/api/config.js

@@ -1,6 +1,6 @@
 export default {
   host:'http://192.168.2.241:5050',
-  imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
+  imgHost:'http://192.168.2.121:82',      //富文本编辑器图片回传地址
   urls: {
     /* 登录注册相关接口 */
     'getImgVerification': '/api/user/userver/getImgVerification',
@@ -232,7 +232,7 @@ export default {
      'exportDiagnosticAll': '/api/knowledgeman/diagnose/exportDiagnosticAll', //诊断依据--导出诊断依据
      'exportDiagnosticBasis': '/api/knowledgeman/diagnose/exportDiagnosticBasis', //诊断依据--导出诊断依据问题
      'importDiagnosticBasis': '/api/knowledgeman/diagnose/importDiagnosticBasis', //诊断依据--导入诊断依据数据
-     'queryQuestionPage': '/api/knowledgeman/diagnose/queryQuestionPage', //诊断依据--问题词分页查询
+     'queryQuestionPage': '/api/knowledgeman/queryQuestionPage', //诊断依据--问题词分页查询
      'diagBaseDelete': '/api/knowledgeman/delete', //诊断依据--删除
      'diagBaseGetDetail': '/api/knowledgeman/getDetail', //诊断依据--获取详情
      'diagBaseIndex': '/api/knowledgeman/index', //诊断依据--诊断检索

+ 23 - 5
src/api/diagBase.js

@@ -4,11 +4,29 @@ import config from '@api/config.js';
 const urls = config.urls;
 export default {
     exportDiagnosticAll(param){ //诊断依据--导出诊断依据
-        return axios.post(urls.exportDiagnosticAll, param)
-    },
-    exportDiagnosticBasis(param){ //诊断依据--导出诊断依据问题
-        return axios.post(urls.exportDiagnosticBasis, param)
-    },
+        // return axios.post(urls.exportDiagnosticAll, param)
+        return axios({
+            method:'post',
+            url:urls.exportDiagnosticAll,
+            param,
+            contentType: "application/vnd.ms-excel" ,
+            responseType: 'blob'//必须添加,否则会乱码
+        })
+    },
+    exportDiagnosticBasis(data){ //诊断依据--导出诊断依据问题
+        // return axios.post(urls.exportDiagnosticBasis, param,{
+        //     contentType: "application/vnd.ms-excel" ,
+        //     responseType: 'blob' //必须添加,否则会乱码
+        // })
+        return axios({
+            method:'post',
+            url:urls.exportDiagnosticBasis,
+            data,
+            contentType: "application/vnd.ms-excel" ,
+            responseType: 'blob'//必须添加,否则会乱码
+        })
+    },
+    
     importDiagnosticBasis(param){ //诊断依据--导入诊断依据数据
         return axios.post(urls.importDiagnosticBasis, param)
     },

+ 224 - 0
src/components/diagBase/QuestionWords.vue

@@ -0,0 +1,224 @@
+<template>
+    <div>
+        <crumbs title="标签组维护" style="min-width: 980px">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="诊断名称:">
+                    <el-input size="mini" v-model="filter.disName" placeholder="诊断名称" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="问题词:">
+                    <el-input size="mini" v-model="filter.questionName" placeholder="问题词" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="类型:">
+                    <el-select size="mini" v-model="filter.type" @change="getValue"  placeholder="类型" clearable>
+                        <el-option v-for="item in tagTypes" :label="item.name" :value="item.val" :key="item.id" ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
+                    <el-button size="mini" type="warning" @click="addTagGroup">导出</el-button>
+                </el-form-item>
+            </el-form>
+        </crumbs>
+        <div class="contents">
+            <el-table
+                :data="list"
+                border
+                style="width: 100%">
+                <el-table-column
+                    :resizable = "false"
+                    type="index"
+                    :index = 'indexMethod'
+                    label="编号"
+                    width="60">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="gmtModified"
+                    label="操作时间"
+                    width="180">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="disName"
+                    label="诊断名称">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="questionName"
+                    label="问题词">
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="typeNm"
+                        label="类型">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="typeCn"
+                    label="类型">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="modifier"
+                    label="操作人">
+                </el-table-column>
+            </el-table>
+        <div class="pagination">
+            <el-pagination v-if="total>pageSize"
+                       :current-page.sync="currentPage"
+                       @current-change="currentChange"
+                       background
+                       :page-size="pageSize"
+                       layout="total,prev, pager, next, jumper"
+                       :total="total">
+            </el-pagination>
+        </div>
+        
+        </div>
+    </div>
+</template>
+
+<script>
+import api from '@api/diagBase.js';
+import apis from '@api/icss.js';
+import utils from '@api/utils.js';
+
+export default {
+    name: 'QuestionWords',
+    data: function() {
+        return {
+            list: [],
+            tagTypes: [],
+            Adscriptions: [],   //标签归属列表
+            tagTypesList: [],   //标签类型列表
+            searched: false,
+            filter: {
+                disName: '', //诊断名称
+                questionCode: "",//问题词
+                questionName: "",//问题词
+                questionType: "",//问题词归属
+                type:""
+            },
+            currentPage: 1,
+            pageSize: 10,
+            total: 0,
+        }
+    },
+    created() {
+        this.getDropList().then(() => {
+            this.getDataList()
+        })
+        
+    },
+  watch: {
+    'filter': {
+      handler: function () {
+        this.searched = false;
+      },
+      deep: true
+    }
+  },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      //const pm = to.param;
+      Object.assign(vm, to.params);
+    })
+  },
+    methods: {
+        getValue(val) {
+            // console.log('changeVal', val, this.filter.tagAdscription)
+        },
+        getDropList() {
+            return apis.getknowledgeList().then((res) =>{
+                if(res.data.code === '0') {
+                    // this.Adscriptions = res.data.data[1];
+                    let tmpLis = res.data.data[4]
+                    // this.Adscriptions = tmpLis.filter(item => item.val);
+                    this.Adscriptions = tmpLis;
+                    this.tagTypes =  res.data.data[2];
+                    // for (var i = 0; i < this.tagTypes.length; i++) {
+                    //     this.tagTypesList.push(this.tagTypes[i].val)
+                    // }
+                }
+                 
+            })
+        },
+        getDataList() {
+            const param = this.getFilterItems();
+            this.searched = true;
+            api.queryQuestionPage(param).then((res) => {
+                const list = res.data.data.records
+                for (var i = 0; i < list.length; i++) {
+                    for (var z =  0; z < this.Adscriptions.length; z++) {
+                        if(list[i].questionType == this.Adscriptions[z].val) {
+                            list[i].typeCn = this.Adscriptions[z].name
+                        }
+                    }
+                    for (var m =  0; m < this.tagTypes.length; m++) {
+                        if(list[i].type == this.tagTypes[m].val) {
+                            list[i].typeNm = this.tagTypes[m].name
+                        }
+                    }
+                }
+                this.list = list;
+                this.total = res.data.data.total;
+            })
+        },
+        filterDatas() {
+            this.currentPage = 1;
+            this.getDataList();
+        },
+        addTagGroup() {
+          const data = {
+            disName: this.filter.disName,
+            question: this.filter.questionName,
+            type: this.filter.questionType
+          };
+          api.exportDiagnosticBasis(data).then((res) => {
+              utils.downloadExportedData(res.data,'问题词.xls')
+          })
+        },
+        currentChange(next) {
+            this.currentPage = next;
+            this.getDataList();
+        },
+        getFilterItems() {
+            const param = {
+                current: this.currentPage,
+                size: this.pageSize,
+                disName: this.filter.disName,
+                questionCode: this.filter.questionName,
+                type: this.filter.type
+            };
+            return param;
+        },
+        indexMethod(index) {
+            return ((this.currentPage - 1) * this.pageSize) + index + 1;
+        },
+        getTagType(val) {
+            return val
+        },
+        warning(msg,type){
+          this.$message({
+            showClose: true,
+            message:msg,
+            type:type||'warning'
+          })
+        },
+    }
+}
+</script>
+
+
+<style lang="less">
+    @import "../../less/admin.less";
+    .delete{
+       color: red;
+    }
+    .delete:hover {
+        color: red;
+    } 
+    .pagination {
+        min-width: 1010px;
+    }
+</style>

+ 1 - 1
src/components/icss/CommonTemplate.vue

@@ -572,7 +572,7 @@ export default {
         "tagName": this.searchVal,
         "type": tmpTypeSin,
         "notIds": notIds,
-        "notTagType": (this.type==2 || this.type==22 || this.type==32 || this.type==322 || this.type==4)?[4,8,10]:[3,4,8,10]//查体没有症状尾巴有血压,其他史有症状尾巴无血压
+        "notTagType": (this.type==2 || this.type==22 || this.type==32 || this.type==322 || this.type==4)?[4,8,10]:[3,4,8,10]
       }
       let params = {
         "notIds": notIds,

+ 3 - 0
src/routes.js

@@ -96,6 +96,8 @@ import AddQuestionModules from '@components/preTreat/AddQuestionModules.vue';
 import DiagBase from '@components/diagBase/DiagBase.vue';  //诊断依据--诊断依据数据维护
 import AddDiagBase from '@components/diagBase/AddDiagBase.vue';  //诊断依据--诊断依据数据维护
 
+import QuestionWords from '@components/diagBase/QuestionWords.vue';
+
 export default [
   {
     path: '/',
@@ -259,6 +261,7 @@ export default [
 
       {path:'LT-ZDYJWH-ZDYJSJWH',component:DiagBase,name:'DiagBase'},  //诊断依据-诊断依据维护
       {path:'LT-ZDYJWH-TJZDYJSJ',component:AddDiagBase,name:'AddDiagBase'},  //诊断依据-添加诊断依据
+      {path:'LT-ZDYJWH-WTCSJWH',component:QuestionWords,name:'QuestionWords'},  //问题列表
 
     ]
   }

+ 1 - 2
vue.config.js

@@ -1,7 +1,6 @@
 const path = require('path');
-// const proxy_path = 'http://192.168.2.236:80';
-// const proxy_path = 'http://192.168.2.241:88';
 const proxy_path = 'http://192.168.2.236:88';
+// const proxy_path = 'http://192.168.2.241:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.115:5050';