Merge remote-tracking branch 'origin/diagBaseCopy' into testedMerge

# Conflicts:
#	src/components/icss/ChemicalAndCommonMapping.vue

src/api/utils.js

@@ -420,5 +420,9 @@ export default {
       $(document).on('mousemove', handleMove)
       $(document).on('mouseup', handleUp)
     }
+  },
+  getCurrentPage(currentChange, total, pageSize) {
+    const currentPage =  currentChange > Math.ceil(total/pageSize) ? Math.ceil(total/pageSize) : currentChange
+    return currentPage;
   }
 }

src/components/diagBase/AddDiagBase.vue

@@ -188,7 +188,7 @@
         const userLoginDTO = JSON.parse(localStorage.getItem('userLoginDTO'))
         this.modifier = userLoginDTO && userLoginDTO.linkman
         this.getDropList()
-        const { isEdit, data } = this.$route.params;
+        const { isEdit,isCopy, data } = this.$route.params;
         if(isEdit) {
             if(isEdit) {
                 this.isEdit = isEdit;
@@ -204,8 +204,37 @@
                 } 
                 this.hasQuestion = data.hasQuestion
             } 
-        } else {
-            
+        } else if(isCopy) {
+             this.isEdit = isEdit;
+                this.titleText = '添加';
+                this.disName = ''
+                this.id = ''
+                this.disNameExist = true
+                if(data.disFeature.length) {
+                    const disFeatureCopy = JSON.parse(JSON.stringify(data.disFeature))
+                    for(let i = 0; i < disFeatureCopy.length; i++) {
+                        disFeatureCopy[i].verifyCode == ""
+                        disFeatureCopy[i].verifyFormula == ""
+                        disFeatureCopy[i].verifyRelation == ""
+                        disFeatureCopy[i].verifyResult == ""
+                        disFeatureCopy[i].verifyStandard == ""
+                        disFeatureCopy[i].verifyUnique == ""
+                    }
+                    this.disFeatureList = disFeatureCopy
+                }   
+                if(data.disformula.length) {
+                    const disformulaCopy = JSON.parse(JSON.stringify(data.disformula))
+                     for(let i = 0; i < disformulaCopy.length; i++) {
+                        disformulaCopy[i].verifyCode == ""
+                        disformulaCopy[i].verifyFormula == ""
+                        disformulaCopy[i].verifyRelation == ""
+                        disformulaCopy[i].verifyResult == ""
+                        disformulaCopy[i].verifyStandard == ""
+                        disformulaCopy[i].verifyUnique == ""
+                    }
+                    this.disFormulaList = disformulaCopy
+                } 
+                this.hasQuestion = 1
         }
     },
    mounted(){

src/components/diagBase/DiagBase.vue

@@ -69,6 +69,8 @@
                     <template slot-scope="scope">
                         <el-button  @click="modifyDiagBase(scope.row, 'modify')" type="text" size="small">修改</el-button>
                         <span style="margin:0 3px;">|</span>
+                        <el-button  @click="modifyDiagBase(scope.row,'copy')" type="text" size="small">复制</el-button>
+                        <span style="margin:0 3px;">|</span>
                         <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
                         
                     </template>
@@ -93,6 +95,7 @@
 import api from '@api/diagBase.js';
 import apis from '@api/icss.js';
 import config from '@api/config.js';
+import utils from '@api/utils.js';
 
 export default {
     name: 'diagBase',
@@ -141,6 +144,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
         getDropList() {
@@ -156,7 +160,14 @@ export default {
             setTimeout(()=>{
               this.searched = true;
             },0)
+            const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
             api.diagBasePage(param).then((res) => {
+                loading.close()
                 this.list = res.data.data.records
                 this.total = res.data.data.total;
               if(this.inCurrentPage!==undefined){

src/components/diagBase/QuestionWords.vue

@@ -132,6 +132,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
         getValue(val) {
@@ -155,7 +156,14 @@ export default {
         getDataList() {
             const param = this.getFilterItems();
             this.searched = true;
+            const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
             api.queryQuestionPage(param).then((res) => {
+                loading.close()
                 const list = res.data.data.records
                 for (var i = 0; i < list.length; i++) {
                     for (var z =  0; z < this.Adscriptions.length; z++) {

src/components/icss/AssaySon.vue

@@ -84,6 +84,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'AssaySon',   //慢病指标值关联维护
@@ -126,12 +127,20 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
             this.searched = true;
+            const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
             api.getAssaySon(param).then((res) => {
+                loading.close()
                 if(res.data.code == '0') {
                     this.list = res.data.data.records;
                     this.total = res.data.data.total;

src/components/icss/ChemicalAndCommonMapping.vue

@@ -88,6 +88,7 @@
 <script>
 import api from '@api/icss.js';
 import config from '@api/config.js';
+import utils from '@api/utils.js';
 
 export default {
     name: 'ChemicalAndCommonMapping',   //化验大小项和公表维护
@@ -133,21 +134,29 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
           this.searched = true;
-            api.getLisMappingPage(param).then((res) => {
-                if(res.data.code == '0') {
-                    this.list = res.data.data.records
-                }
-                this.total = res.data.data.total;
-              if(this.inCurrentPage!==undefined){
-                this.currentPage=this.inCurrentPage;
-                this.inCurrentPage = undefined;
-              }
-            })
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          });
+          api.getLisMappingPage(param).then((res) => {
+            loading.close()
+            if(res.data.code == '0') {
+                this.list = res.data.data.records
+            }
+            this.total = res.data.data.total;
+            if(this.inCurrentPage!==undefined){
+              this.currentPage=this.inCurrentPage;
+              this.inCurrentPage = undefined;
+            }
+          })
         },
         filterDatas() {
             this.currentPage = 1;

src/components/icss/ChronicAndIndexRelation.vue

@@ -79,6 +79,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'ChronicAndIndexRelation',   //慢病指标值关联维护
@@ -120,12 +121,20 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
             this.searched = true;
+            const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
             api.queryIndexConfigPages(param).then((res) => {
+                 loading.close()
                 if(res.data.code == '0') {
                     this.list = res.data.data.records;
                     this.total = res.data.data.total;

src/components/icss/ChronicDiseaseStructureList.vue

@@ -87,6 +87,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'TemplateMaintenance',
@@ -138,6 +139,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       getDropList() {
@@ -156,7 +158,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.scaleContentStructure(param).then((res) => {
+          loading.close()
           const list = res.data.data.records;
           // for (var i = 0; i < list.length; i++) {
           //   for (var j =  0; j < this.tagTypes.length; j++) {

src/components/icss/ConceptRelation.vue

@@ -91,6 +91,7 @@
 <script>
 import api from '@api/icss.js';
 import config from '@api/config.js';
+import utils from '@api/utils.js';
 
 export default {
     name: 'ConceptRelation',   //诊断量表关联维护
@@ -138,6 +139,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
         toggTab(item){
@@ -150,7 +152,14 @@ export default {
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
             this.searched = true;
+            const loading = this.$loading({
+                lock: true,
+                text: 'Loading',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
             api.getConceptRelation(param).then((res) => {
+              loading.close()
               if(res.data.code == '0') {
                 this.list = res.data.data.records
                 this.total = res.data.data.total;

src/components/icss/DisclaimerInformation.vue

@@ -142,7 +142,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.discInformation(param).then((res) => {
+          loading.close()
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;

src/components/icss/IndeptLabel.vue

@@ -146,6 +146,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       getValue(val) {
@@ -165,7 +166,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.getTagList(param).then((res) => {
+          loading.close()
           const list = [...res.data.data.records];
           for (var i = 0; i < list.length; i++) {
             for (var j =  0; j < this.tagTypes.length; j++) {

src/components/icss/LabelGroup.vue

@@ -101,6 +101,7 @@
 <script>
 import api from '@api/icss.js';
 import config from '@api/config.js';
+import utils from '@api/utils.js';
 
 export default {
     name: 'tag-group',
@@ -147,6 +148,7 @@ export default {
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
         getValue(val) {
@@ -171,7 +173,14 @@ export default {
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
           this.searched = true;
-            api.getTagList(param).then((res) => {
+          const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+          });
+            api.getTagList(param).then((res) => { 
+                 loading.close()
                 const list = res.data.data.records
                 for (var i = 0; i < list.length; i++) {
                     for (var j =  0; j < this.tagTypes.length; j++) {

src/components/icss/MedicalMultRelation.vue

@@ -75,6 +75,8 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
+  
   export default {
     name: 'MedicalName',
     data: function () {
@@ -125,6 +127,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       addMedicalMultR(){
@@ -169,7 +172,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        }); 
         api.multContactList(param).then((res) => {
+          loading.close()
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;

src/components/icss/MedicalName.vue

@@ -120,7 +120,8 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
-
+  import utils from '@api/utils.js';
+  
   export default {
     name: 'MedicalName',
     data: function () {
@@ -175,6 +176,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       reloadLib(){
@@ -213,7 +215,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.knowledgeName(param).then((res) => {
+          loading.close()
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;

src/components/icss/MedicalRelation.vue

@@ -121,6 +121,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'MedicalRelation',
@@ -178,6 +179,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       addMedicalR(){
@@ -196,7 +198,14 @@
       getDataList(flag,isTurnPage) {
         const params = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.knowledgeRelation(params).then((res) => {
+          loading.close()
           if (res.data.code == '0') {
             const data = res.data.data;
             for(let j = 0;j < data.records.length;j++){

src/components/icss/MedicinePrompt.vue

@@ -94,6 +94,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'MedicinePrompt',
@@ -149,6 +150,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       addMedicalPrompt(){
@@ -192,7 +194,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.getConceptKnowledgeList(param).then((res) => {
+          loading.close()
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;

src/components/icss/PhysicalExamTemplate.vue

@@ -81,6 +81,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'PhysicalExamTemplate',
@@ -127,6 +128,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       addModule() {
@@ -176,7 +178,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.getPhysicalExamTempList(param).then((res) => {
+           loading.close()
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;

src/components/icss/TemplateMaintenance.vue

@@ -102,6 +102,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'TemplateMaintenance',
@@ -197,6 +198,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       getSubTemplate() {
@@ -222,7 +224,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.getModuleInfoList(param).then((res) => {
+           loading.close()
           if(res.data.code == 0){
             const list = res.data.data.records;
             for (var i = 0; i < list.length; i++) {

src/components/icss/VersionInfo.vue

@@ -91,6 +91,7 @@
 <script>
   import api from '@api/icss.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'VersionInfo',
@@ -138,6 +139,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       getProdType(item){
@@ -182,7 +184,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.versionInfo(param).then((res) => {
+          loading.close()
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;

src/components/medicalTerm/AssistCheckMultRelation.vue

@@ -154,7 +154,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        }); 
         api.assistCheckMultContactList(param).then((res) => {
+          loading.close()
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;

src/components/medicalTerm/AssistCheckSon.vue

@@ -84,6 +84,7 @@
 <script>
   import api from '@api/medicalTerm.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'AssistCheckSon',   //慢病指标值关联维护
@@ -126,12 +127,20 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
         getDataList(isTurnPage) {
             const param = this.getFilterItems(isTurnPage);
             this.searched = true;
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            });
             api.assistCheckPacsSonContactList(param).then((res) => {
+                loading.close()
                 if(res.data.code == '0') {
                     this.list = res.data.data.records;
                     this.total = res.data.data.total;

src/components/preTreat/CombinQuestion.vue

@@ -99,6 +99,7 @@
 <script>
   import api from '@api/preTreat.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'combinQuestion',
@@ -143,6 +144,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       getDropList() {
@@ -160,7 +162,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.getQuestionList(param).then((res) => {
+          loading.close()
           const list = [...res.data.data.records];
           for (var i = 0; i < list.length; i++) {
             for (var j =  0; j < this.tagTypes.length; j++) {

src/components/preTreat/QuestionModules.vue

@@ -99,6 +99,7 @@
 <script>
   import api from '@api/preTreat.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'QuestionModules',
@@ -143,6 +144,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       getDropList() {
@@ -172,7 +174,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        }); 
         api.getModuleList(param).then((res) => {
+           loading.close()
           if (res.data.code === '0') {
             const list = res.data.data&&res.data.data.records?[...res.data.data.records]:[];
             for (var i = 0; i < list.length; i++) {

src/components/preTreat/SimpleQuestion.vue

@@ -107,6 +107,7 @@
 <script>
   import api from '@api/preTreat.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js';
 
   export default {
     name: 'simpleQuestion',
@@ -153,6 +154,7 @@
     methods: {
       handleSizeChange(val){
         this.pageSize = val;
+        this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
         this.getDataList();
       },
       getDropList() {
@@ -170,7 +172,14 @@
       getDataList(isTurnPage) {
         const param = this.getFilterItems(isTurnPage);
         this.searched = true;
+        const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+        });
         api.getQuestionList(param).then((res) => {
+          loading.close()
           const list = [...res.data.data.records];
           for (var i = 0; i < list.length; i++) {
             for (var j =  0; j < this.tagTypes.length; j++) {