Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -67,6 +67,7 @@ import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import com.jero.modules.system.util.PDFUtils;
 import com.jero.modules.system.util.StringUtils;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl;
@@ -3882,6 +3883,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     @Override
     public void exportExcel(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String cut = (String) map.get("cut");
         //String flag = "file"为带文件导出标识
         String flag = (String) map.get("flag");
@@ -3997,6 +3999,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     boolean b = CosBootUtil.doesObjectExist(url);
                                     if(b){
                                         InputStream download = CosBootUtil.download(url);
+                                        if(url.endsWith(".pdf") || url.endsWith(".PDF")){
+                                            String currentTime = sdf.format(new Date());
+                                            String waterContent = loginUser.getUsername() + " " + currentTime;
+                                            File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent);
+                                            download = new FileInputStream(newFile.getPath());
+                                        }
                                         copyFile(download, fileNowPath + File.separator + ossFile.getFileName());
                                     }
                                 }
@@ -4026,6 +4034,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             IOUtils.closeQuietly(os);
             File file = new File(uploadpath + "/tempZip");
             FileUtil.deleteContents(file);
+            File fileTemp = new File(uploadpath + "/tempZip.zip");
+            FileUtil.deleteContents(fileTemp);
         }
     }
 

jero-web/src/views/processCenter/components/projectInformation.vue

@@ -13,7 +13,10 @@
               @click="urlClick(queryForm[item.value])"
               v-if="item.type == 1"
         >{{queryForm[item.value]}}</span>
-
+        <span class="text-field-right text-field-right-url"
+              @click="standardClick(queryForm)"
+              v-else-if="item.type == '4'" :title="queryForm[item.value]"
+        >{{queryForm[item.value]}}</span>
         <span class="text-field-right" v-else :title="queryForm[item.value]"
         >{{queryForm[item.value]}}</span>
       </div>
@@ -25,6 +28,7 @@
    1打开新页面
    2显示文件
    3点击事件处理\需要传点击事件
+   4标注号的跳转
 -->
 <script>
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
@@ -80,6 +84,15 @@
         if (val) {
           window.open(val)
         }
+      },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.standId
+          }
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }

jero-web/src/views/processCenter/processForm/taskListProcess/index.vue

@@ -102,7 +102,8 @@
           {},
           {
             title: this.$t('standard'),
-            value: 'serialNumber'
+            value: 'serialNumber',
+            type:'4',
           },
           {
             title: this.$t('title'),

jero-web/src/views/projectManagement/components/TaskList.vue

@@ -14,7 +14,7 @@
           </a-col>
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
-              <div class="title-text" style="width: 64px" :title="$t('areaOfResponsibility')">
+              <div class="title-text"  :title="$t('areaOfResponsibility')">
                 <span>{{$t('areaOfResponsibility')}}</span>
               </div>
               <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
@@ -23,7 +23,50 @@
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
             </div>
           </a-col>
-          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text"  :title="$t('CertificationProgress')">
+                <span>{{$t('CertificationProgress')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.certificationProgress"
+                                 :placeholder="$t('PleaseSelect')+$t('CertificationProgress')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'certification_progress'"/>
+            </div>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('CurrentStatus')">
+                <span>{{$t('CurrentStatus')}}</span>
+              </div>
+              <a-select
+                class="box-input"
+                v-model="queryParam.projectStatusAssess"
+                :placeholder="$t('PleaseSelect')+$t('CurrentStatus')">
+                <a-select-option :value="'1'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('red') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'2'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('yellow') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'3'">
+                             <span style="display: inline-block;width: 100%">
+                                    {{ $t('green') }}
+                             </span>
+                </a-select-option>
+                <a-select-option :value="'4'">
+                               <span style="display: inline-block;width: 100%">
+                                     {{ $t('blue') }}
+                                </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+          <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
@@ -53,10 +96,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
-<!--        @click="standardClick(result)"-->
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
           <div class="content">
-            <a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}</a>
+            <a class="box-content-a" @click="standardClick(result)" :title="result.serialNumber">{{result.serialNumber}}</a>
             <a class="box-content-buttom" :title="result.title">{{result.title}}</a>
           </div>
         </div>
@@ -420,7 +462,7 @@
         let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',
           query: {
-            id:row.id
+            id:row.standId
           }
         })
         window.open(newUrl.href, '_blank')
@@ -440,14 +482,14 @@
   }
 
   .title-text {
-    width: 32px;
+    width: 64px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
     font-size: 14px;
     margin-right: 16px;
     margin-top: 3px;
-    text-align: left;
+    text-align: right;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -455,7 +497,7 @@
 
   .box-input {
     display: inline-block;
-    width: 70%;
+    width: calc(100% - 64px);
     height: 38px;
     margin-top: 2px;
   }

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -226,9 +226,9 @@
                  {{text}}
               </span>
         </span>
-        <!--        @click="standardClick(record)"-->
+
         <span slot="standard" slot-scope="text,record" :title="text">
-              <a class="textName">
+              <a class="textName" @click="standardClick(record)">
                  {{text}}
               </a>
         </span>
@@ -2014,7 +2014,7 @@
         let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',
           query: {
-            id: row.id
+            id: row.standId
           }
         })
         window.open(newUrl.href, '_blank')