update

src/views/message/modelForm.vue

@@ -229,7 +229,7 @@
     right: -15px;
     color: red;
   }
-  // 批注弹窗
+  // 注释弹窗
   /deep/.noteDialog .el-form-item__content {
     margin-right: 0px !important;
     margin-left: 0px !important;
@@ -297,18 +297,20 @@
   }
 }
 .tool_text {
-  width: 205px;
+  width: 315px;
   p {
     margin-bottom: 10px;
   }
   .toolText_img {
     img {
       width: 100px;
+      height: 100px;
       margin-bottom: 5px;
-    }
-    img:nth-child(odd) {
       margin-right: 5px;
     }
+    // img:nth-child(odd) {
+    //   margin-right: 5px;
+    // }
   }
 }
 </style>
@@ -411,7 +413,7 @@
                       >必填</el-checkbox
                     >
                     <span class="ctl_btn ctl_btn_note" @click="addNote(item)"
-                      >批注</span
+                      >注释</span
                     >
                     <span
                       class="ctl_btn ctl_btn_edit"
@@ -447,7 +449,7 @@
                       >必填</el-checkbox
                     >
                     <span class="ctl_btn ctl_btn_note" @click="addNote(item)"
-                      >批注</span
+                      >注释</span
                     >
                     <span
                       @click="item.edit = !item.edit"
@@ -502,7 +504,7 @@
                       >必填</el-checkbox
                     >
                     <span class="ctl_btn ctl_btn_note" @click="addNote(item)"
-                      >批注</span
+                      >注释</span
                     >
                     <span
                       @click="item.edit = !item.edit"
@@ -557,7 +559,7 @@
                       >必填</el-checkbox
                     >
                     <span class="ctl_btn ctl_btn_note" @click="addNote(item)"
-                      >批注</span
+                      >注释</span
                     >
                     <span
                       @click="item.edit = !item.edit"
@@ -589,6 +591,7 @@
                     list-type="picture-card"
                     :on-preview="handlePreview"
                     :on-remove="handleRemove"
+                    limit="9"
                   >
                     <i class="el-icon-plus"></i>
                   </el-upload>
@@ -597,7 +600,7 @@
                       >必填</el-checkbox
                     >
                     <span class="ctl_btn ctl_btn_note" @click="addNote(item)"
-                      >批注</span
+                      >注释</span
                     >
                     <span
                       @click="item.edit = !item.edit"
@@ -688,7 +691,7 @@
                         <span
                           class="ctl_btn ctl_btn_note"
                           @click="addNote(iitem)"
-                          >批注</span
+                          >注释</span
                         >
                         <span
                           class="ctl_btn ctl_btn_edit"
@@ -720,7 +723,7 @@
                         <span
                           class="ctl_btn ctl_btn_note"
                           @click="addNote(iitem)"
-                          >批注</span
+                          >注释</span
                         >
                         <span
                           class="ctl_btn ctl_btn_edit"
@@ -777,7 +780,7 @@
                         <span
                           class="ctl_btn ctl_btn_note"
                           @click="addNote(iitem)"
-                          >批注</span
+                          >注释</span
                         >
                         <span
                           @click="iitem.edit = !iitem.edit"
@@ -834,7 +837,7 @@
                         <span
                           class="ctl_btn ctl_btn_note"
                           @click="addNote(iitem)"
-                          >批注</span
+                          >注释</span
                         >
                         <span
                           @click="iitem.edit = !iitem.edit"
@@ -864,6 +867,7 @@
                         list-type="picture-card"
                         :on-preview="handlePreview"
                         :on-remove="handleRemove"
+                        limit="9"
                       >
                         <i class="el-icon-plus"></i>
                       </el-upload>
@@ -874,7 +878,7 @@
                         <span
                           class="ctl_btn ctl_btn_note"
                           @click="addNote(iitem)"
-                          >批注</span
+                          >注释</span
                         >
                         <span
                           @click="iitem.edit = !iitem.edit"
@@ -905,7 +909,7 @@
             >
           </div>
         </el-form>
-        <!-- 添加批注 -->
+        <!-- 添加注释 -->
         <el-dialog
           class="noteDialog"
           :title="dialogTitle"
@@ -923,7 +927,7 @@
             <el-form-item>
               <el-input
                 v-model="noteDesc"
-                placeholder="请输入批注信息"
+                placeholder="请输入注释信息"
               ></el-input>
             </el-form-item>
             <el-form-item>
@@ -936,10 +940,14 @@
                 </li>
                 <li>
                   <el-upload
+                    multiple
                     :on-success="imgchange"
                     action="/api/admin/uploadfile"
                     :show-file-list="false"
                     list-type="picture-card"
+                    :limit="9"
+                    :on-exceed="limitUploadNum"
+                    :file-list="fileList"
                   >
                     <i class="el-icon-plus"></i>
                   </el-upload>
@@ -1074,7 +1082,7 @@
                 >
               </el-form-item>
             </el-form>
-            <!-- 展示批注信息 -->
+            <!-- 展示注释信息 -->
             <!-- <div class="noteInfoDialog">
                 <div class="body">
                     <el-button size="mini">关闭</el-button>
@@ -1082,7 +1090,7 @@
             </div> -->
           </div>
         </div>
-        <!-- 批注信息展示 -->
+        <!-- 注释信息展示 -->
         <el-dialog
           class="noteDialog"
           :title="dialogTitle1"
@@ -1114,6 +1122,7 @@ export default {
   components: { vuedraggable, fuEditor },
   data() {
     return {
+      fileList:[],
       noteDesc: "",
       noteImgs: [],
       realImgs: [],
@@ -1229,6 +1238,9 @@ export default {
     };
   },
   methods: {
+    limitUploadNum(files,fileList){
+      this.$message.alert("最多只能上传9张图片!")
+    },
     showNoteInfo() {
       // this.dialogTitle1 = true
       // this.dialogVisible1 = true;
@@ -1236,10 +1248,13 @@ export default {
     activeItem(index) {
       var widgetList = this.widgetList;
       for (let i = 0; i < widgetList.length; i++) {
-        if (i == index) {
-          this.$set(widgetList[i], "active", 1);
-        } else {
-          this.$set(widgetList[i], "active", 0);
+        if(widgetList[i].type=="group"){
+          if (i == index) {
+            this.$set(widgetList[i], "active", !widgetList[i].active);
+          } else {
+            this.$set(widgetList[i], "active", 0);
+          }
+          // this.$set(widgetList[i], "active", !widgetList[i].active);
         }
       }
       this.widgetList = widgetList;
@@ -1263,7 +1278,7 @@ export default {
       this.noteDesc = item.noteDesc;
       this.noteImgs = item.noteImgs ? item.noteImgs : [];
       this.curItem = item;
-      this.dialogTitle = "为" + '"' + item.label + '"添加批注信息';
+      this.dialogTitle = "为" + '"' + item.label + '"添加注释信息';
       this.dialogVisible = true;
     },
     saveNote(item) {