Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -186,13 +186,14 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 }
             }
             //充当审批人员参与的项目
-            List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+            List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId()));
             if (projectss.size() > 0) {
                 for (ProjectApprove projectUser : projectss) {
                     set.add(projectUser.getProjectId());
                 }
             }
             List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
+            System.out.println(set + "_____" +  moulds);
             List<Integer> mouldIds = new ArrayList<>();
             for (Mould mould : moulds) {
                 mouldIds.add(mould.getId());

ys_vue/src/views/detection/maintenance.vue

@@ -32,7 +32,20 @@
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="maintainUserName" label="保养人" width="100" sortable></el-table-column>
       <el-table-column prop="maintainType" label="保养方案" sortable></el-table-column>
-      <el-table-column prop="fileName" label="保养照片" width="200" sortable></el-table-column>
+      <el-table-column prop="fileName" label="保养照片" width="200" sortable>
+        <template slot-scope="scope" v-if="scope.row.fileUrl != null">
+          <a
+            style="color: #409EFF; cursor: pointer; text-decoration: none;"
+            :href="scope.row.fileUrl"
+            :download="scope.row.fileName"
+          >
+            <!-- 大图加载 -->
+            <div class="demo-image__preview">
+              <el-image style="width: 100px; height: 100px" :src="scope.row.fileUrl" :preview-src-list="scope.row.fileUrl"></el-image>
+            </div>
+          </a>
+        </template>
+      </el-table-column>
       <el-table-column prop="indate" label="关闭时间" width="200" sortable></el-table-column>
     </el-table>
 
@@ -192,6 +205,7 @@ export default {
     backToDetection() {
       this.$router.go(-1);
     },
+    //暂未用到的上传格式和大小限制
     beforeUpload(file) {
       const isJPG = file.type === "image/png";
       const isLt2M = file.size / 1024 / 1024 < 2;
@@ -263,7 +277,6 @@ export default {
     maintainConfirm() {
       if (this.$refs.upload.uploadFiles.length == 1) {
         this.$refs.upload.submit();
-        this.$refs.upload.clearFiles();
       } else {
         this.$message({
           message: "必须上传照片",
@@ -292,6 +305,9 @@ export default {
               message: "保养完成",
               type: "success"
             });
+            this.maintenanceFormVisible = false;
+            this.$refs.upload.clearFiles();
+            this.getList();
           } else {
             this.$message({
               message: res.msg,

ys_vue/src/views/mold/moldDetail.vue

@@ -206,7 +206,8 @@
                         </el-table-column>
                         <el-table-column prop="part3dFile.fileName" label="3D图档" width="200" sortable>
                             <template slot-scope="scope" v-if="scope.row.part3dFile != null">
-                                <a class="download" :href="scope.row.part3dFile.fileUrl" :download="scope.row.part3dFile.fileName">{{scope.row.part3dFile.fileName}}</a>
+                                <a class="download" :href="scope.row.part3dFile.fileUrl" target="_blank">{{scope.row.part3dFile.fileName}}</a> 
+                                <!--  :download="scope.row.part3dFile.fileName" -->
                             </template>
                         </el-table-column>
                         <el-table-column prop="part2dFile.fileName" label="2D图档" width="200" sortable>