bugbugbugbug

src/components/icss/CommonTemplate.vue

@@ -122,7 +122,7 @@
             class="tagName  ellipsis"
             :title="'[ '+item.tagName+' ]'"
           >{{item.tagName}} 
-            <!-- <i class="tagFlag">{{item.flag?(item.flag == 4?2:1):''}}</i> -->
+            <i class="tagFlag">子</i>
             </p>
           <p
             v-if="item.type !== 'input' && item.type !== 'sub'"
@@ -473,8 +473,9 @@ export default {
         "tagName": this.searchVal,
         "type": this.type == 4?3:1,
         "noIds": notIds,
+        "notTagType":[3,4,8,10]
       }
-      api.getQuestionInfos(param).then((res) => {
+      api.searchTagList(param).then((res) => {
         if (res.data.code === '0') {
           this.leftTagsList = res.data.data
           this.selectLeftTagsList = []

src/components/icss/PubTagPartDetail.vue

@@ -559,15 +559,20 @@ export default {
                     }
                   }
                 }else{
-                  if(tmpArr[0].tagType != 4){
+                  let plus = 0;
+                  for(let l = 0;l < tmpArr.length;l++){
+                    if(tmpArr[l].tagType != 4){
+                      ++plus
+                    }
+                  }
+                  if(plus > 0){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',
                         type: 'warning'
                     });
-                    return
                   }else{
-                    this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
+                      this.poolDetailList[idx] = (this.poolDetailList[idx]).concat(tmpArr);
                   }
                 }
                 this.poolDetailListAll = Array.prototype.concat.apply([],this.poolDetailList);     //二维转一维
@@ -576,13 +581,18 @@ export default {
               }else{
                 ++num;
                 if(num == 6){
-                  if(tmpArr[0].tagType != 4){
+                  let plus = 0;
+                  for(let l = 0;l < tmpArr.length;l++){
+                    if(tmpArr[l].tagType != 4){
+                      ++plus
+                    }
+                  }
+                  if(plus > 0){
                     this.$message({
                         showClose: true,
                         message: '添加的数据有误',
                         type: 'warning'
                     });
-                    return
                   }else{
                     for(let i = 2;i < this.poolDetailList.length;i++){
                       let ids = [];

src/components/icss/TemplateMaintenanceWrap.vue

@@ -78,7 +78,7 @@ export default {
           type: 'warning'
         });
         return;
-      }else if(detailLis[0].text == '' && detailLis[0].questionId == ''){
+      }else if(detailLis[0].questionId == ''){
         this.$message({
           message: '保存模版时，无法保存单独的输入栏',
           type: 'warning'

vue.config.js

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