Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue

@@ -700,11 +700,11 @@ export default {
     // 提取 `
     // 提取 `
     handleExtract() {
     handleExtract() {
       const id = this.form.id;
       const id = this.form.id;
+      console.log(id, "id");
       syncNotice(id).then((res) => {
       syncNotice(id).then((res) => {
-        this.tableFirstData = res;
-        this.tableSecondData = res;
-        this.tableThirdData = res;
-        this.tableForthData = res;
+        console.log(id, "id");
+        console.log("res提取", res);
+        this.$modal.msgSuccess("提取成功");
       });
       });
     },
     },
     //弹窗确定按钮
     //弹窗确定按钮

ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue

@@ -42,7 +42,7 @@
           <el-carousel :interval="4000" height="100px">
           <el-carousel :interval="4000" height="100px">
             <el-carousel-item v-for="(item, index) in scope.row.schoolAccessoryList" :key="index">
             <el-carousel-item v-for="(item, index) in scope.row.schoolAccessoryList" :key="index">
               <el-image style="width: 100px; height: 100px" :src="pev + item.accessoryUrl"
               <el-image style="width: 100px; height: 100px" :src="pev + item.accessoryUrl"
-                :preview-src-list="[item.accessoryUrl]"></el-image>
+                :preview-src-list="[pev + item.accessoryUrl]"></el-image>
             </el-carousel-item>
             </el-carousel-item>
           </el-carousel>
           </el-carousel>
         </template>
         </template>
@@ -164,10 +164,7 @@
       </div>
       </div>
     </el-dialog>
     </el-dialog>
 
 
-    <el-dialog ref="previewDialog" title="预览图片" :visible.sync="previewDialogVisible">
-      <el-image style="width: 100%; max-height: 80vh; object-fit: contain" :src="previewImageUrl"
-        fit="contain"></el-image>
-    </el-dialog>
+
   </div>
   </div>
 </template>
 </template>
 
 

ruoyi-ui/src/views/smartSchool/massOrganization/communityStyle/index.vue

@@ -153,13 +153,16 @@
             :on-success="handleAvatarSuccess"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
             :before-upload="beforeAvatarUpload"
           >
           >
-            <div v-if="form.file">
+            <div v-if="form.file.length > 0">
               <img
               <img
                 v-for="(item, index) in form.file"
                 v-for="(item, index) in form.file"
                 :key="index"
                 :key="index"
-                :src="pev + item"
+                :src="pev + form.file"
                 class="avatar"
                 class="avatar"
               />
               />
+              {{ form.file }}
+              <br />
+              {{ pev + form.file }}
             </div>
             </div>
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
           </el-upload>
@@ -206,7 +209,7 @@ export default {
   data() {
   data() {
     return {
     return {
       //图片上传列表
       //图片上传列表
-      uploadList: {},
+      uploadList: [],
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       pev: process.env.VUE_APP_BASE_API,
       pev: process.env.VUE_APP_BASE_API,
       // 输入框字数限制
       // 输入框字数限制
@@ -260,7 +263,7 @@ export default {
       form: {
       form: {
         id: "",
         id: "",
         theme: "",
         theme: "",
-        file: "",
+        file: [],
       },
       },
       // 表单校验
       // 表单校验
       rules: {
       rules: {
@@ -361,6 +364,7 @@ export default {
         picUrl: null,
         picUrl: null,
         seqencing: null,
         seqencing: null,
         isShow: 0,
         isShow: 0,
+        file: [],
       };
       };
       this.imageUrl = "";
       this.imageUrl = "";
       this.resetForm("form");
       this.resetForm("form");
@@ -401,6 +405,8 @@ export default {
         this.form = response.data;
         this.form = response.data;
         this.form.file = response.data.file.split(",");
         this.form.file = response.data.file.split(",");
         this.imageUrl = this.pev + this.form.picUrl;
         this.imageUrl = this.pev + this.form.picUrl;
+        console.log(this.form.file, "this.form.file222222222");
+        // console.log(this.imageUrl, "this.imageUrl");
         this.open = true;
         this.open = true;
         this.title = "修改园区照片";
         this.title = "修改园区照片";
       });
       });
@@ -424,9 +430,14 @@ export default {
       console.log("response上传成功回调", res);
       console.log("response上传成功回调", res);
       console.log("file上传成功回调", file);
       console.log("file上传成功回调", file);
       if (res.code == 200) {
       if (res.code == 200) {
-        this.uploadList.push(this.pev + res.fileName);
+        this.uploadList.push(res.fileName);
         this.form.file = this.uploadList;
         this.form.file = this.uploadList;
+        console.log("this.form.file", this.form.file);
       }
       }
+      console.log(this.uploadList, "this.uploadList");
+      console.log(this.form.file, "this.form.file");
+      console.log(this.pev, "this.pev");
+      console.log(res.fileName, "res.fileName");
 
 
       //   this.imageUrl = res.data.url;
       //   this.imageUrl = res.data.url;
       //   console.log(file);
       //   console.log(file);

ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue

@@ -97,49 +97,22 @@
         min-width="200"
         min-width="200"
       >
       >
         <template slot-scope="scope">
         <template slot-scope="scope">
-          <!--已发布 未填写/已驳回 已填写-->
+          <!-- 未填写 -->
           <div>
           <div>
-            <el-button
-              v-if="check === '1' ? true : false"
-              size="mini"
-              type="text"
-              @click="handleEdit(scope.row)"
+            <el-button size="mini" type="text" @click="handleEdit(scope.row)"
               >填写
               >填写
             </el-button>
             </el-button>
-            <el-button
-              v-if="check === '1' ? true : false"
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-              >提交
-            </el-button>
-          </div>
-          <!--已发布 未填写/已驳回 已填写-->
-          <div>
-            <el-button
-              v-if="
-                check === '2' || check === '3' || check === '5' || check === '9'
-                  ? true
-                  : false
-              "
-              size="mini"
-              type="text"
-              @click="handleEdit(scope.row)"
+            <el-button size="mini" type="text" @click="handleEdit(scope.row)"
               >修改
               >修改
             </el-button>
             </el-button>
-            <el-button
-              v-if="check == '4' ? true : false"
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-              >提交
-            </el-button>
-          </div>
-          <!--已结束 已填写 / 已结束 级部已确认-->
-          <div>
             <el-button size="mini" type="text" @click="handleCheck(scope.row)"
             <el-button size="mini" type="text" @click="handleCheck(scope.row)"
               >查看
               >查看
             </el-button>
             </el-button>
+            <el-button size="mini" type="text" @click="handleSubmit(scope.row)"
+              >提交
+            </el-button>
+            <!-- </div> -->
+            <!-- <div> -->
           </div>
           </div>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -613,15 +586,12 @@ export default {
 
 
     // 提取 `
     // 提取 `
     handleExtract() {
     handleExtract() {
-      const fid = this.form.fid;
-      console.log(fid, "fid");
-      //   syncNotice(fid).then((res) => {
-      // console.log("res提取", res);
-      //   this.tableFirstData = res;
-      //   this.tableSecondData = res;
-      //   this.tableThirdData = res;
-      //   this.tableForthData = res;
-      //   });
+      const id = this.form.id;
+      syncNotice(id).then((res) => {
+        console.log(id, "id");
+        console.log("res提取", res);
+        this.$modal.msgSuccess("提取成功");
+      });
     },
     },
     //  搜索按钮
     //  搜索按钮
     handleQuery() {
     handleQuery() {