模板修改、bug修复

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202409031604",
+  "version": "1.0.202409051514",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",

src/views/dataCloudMap/components/headquarterEnterprise.vue

@@ -132,10 +132,22 @@ export default {
       selectZbCount().then(res=>{
         this.countData = res.data;
       })
+      this.pagination = {
+        current: 1,
+        size: 10
+      }
+      this.pagination = { ...this.pagination,...this.formInline };
       this.getList();
     },
     infoClose(){
       this.infoVisible = false;
+      this.formInline = {
+        qymc:"",
+        tyshxydm:"",
+        type:"",
+        projectSmallType:""
+      }
+      this.projectSmallType = "";
     },
     getList(){
       this.loading = true;

src/views/onlineDeclaration/declareDetailContent/index.vue

@@ -128,6 +128,7 @@
                     </span>
                     <div class="contain_main">
                       <div v-if="item.approvalByName && item.approvalStatus == 1">{{ item.approvalByName }}</div>
+                      <div v-if="item.approvalByName && item.approvalStatus == 2">{{ item.approvalByName }}</div>
                       <div v-show="item.approvalOpinions">
                         审核意见：{{ item.approvalOpinions }}
                       </div>
@@ -141,7 +142,7 @@
                         </div>
                         <div class="attach_right" v-if="item.approvalAttachment">
                           <div v-for="(attachment, index) in item.children" :key="index" class="attach_item">
-                            <a :href="VUE_APP_BASE_API + item.url" target="_blank">
+                            <a :href="VUE_APP_BASE_API + attachment" target="_blank">
                               <img src="../../../assets/images/uploadBgc.jpg" class="li_img" alt="" />
                               <span class="icon_name">{{
                                 attachment | dealURL
@@ -499,6 +500,7 @@ export default {
             item.children = item.approvalAttachment.split(",");
           }
           this.approvalInfoList.push(item);
+          console.log(this.approvalInfoList,"this.approvalInfoList");
           return item;
         });
         if (this.templateId == "1") {

src/views/project/projectInfo/components/projectProgress/index.vue

@@ -25,6 +25,7 @@
                 <div class="schedule-content">
                   <div class="card-content-left">
                     <div class="schedule-card-title" v-if="activity.approvalByName && activity.approvalStatus == 1">{{ activity.approvalByName }}</div>
+                    <div class="schedule-card-title" v-if="activity.approvalByName && activity.approvalStatus == 2">{{ activity.approvalByName }}</div>
                     <!-- <div class="schedule-card-title" v-if="false">提交项目材料</div> -->
                     <!-- <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 0">待初审</div>
                     <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 1">初审通过</div>

src/views/workbench/index.vue

@@ -252,7 +252,8 @@
                   <div class="appropriate-analyse-box">
                     <div class="box-header">
                       <span class="garden"></span>
-                      <span class="box-header-title">资金拨付情况分析</span>
+                      <!-- <span class="box-header-title">资金引导-拨付情况分析</span> -->
+                      <span class="box-header-title">资金引导</span>
                     </div>
                     <div class="capital-appropriate-analyse-box">
                       <echartDataFour></echartDataFour>