From f939ea9726f6d1184e71de982da4f1aa848f5162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Tue, 18 Feb 2025 10:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20current=20=20size?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                   |   2 +-
 .env.production                    |   4 +-
 package.json                       |   2 +-
 src/views/abnormalRemind/index.vue | 181 +++++----
 src/views/home/index.vue           | 577 +++++++++++++++++++++--------
 src/views/homeTwo/index.vue        | 554 +++++++++++++++++++--------
 6 files changed, 956 insertions(+), 364 deletions(-)

diff --git a/.env.development b/.env.development
index 845714c..c3ebfc6 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.122:9040'
+VUE_APP_BASE_API = 'http://192.168.0.123:9040'
 # 测试环境数据库
 # VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # 脱敏三方测试用数据库
diff --git a/.env.production b/.env.production
index 4401bfc..97bf221 100644
--- a/.env.production
+++ b/.env.production
@@ -7,9 +7,9 @@ ENV = 'production'
 # 金鸡湖现代服务业品牌管理系统/生产环境
 # VUE_APP_BASE_API = '/prod-api'
 # 测试环境数据库
-VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # 脱敏三方测试用数据库
 # VUE_APP_BASE_API = 'http://39.101.188.84:9031'
 # VUE_APP_BASE_API = 'http://192.114.0.197/api'
 # 正式环境数据库
-# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
+VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
diff --git a/package.json b/package.json
index 5138d71..e04ed57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202502171515",
+  "version": "1.0.202502181028",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/views/abnormalRemind/index.vue b/src/views/abnormalRemind/index.vue
index 0fa221b..5f34ff8 100644
--- a/src/views/abnormalRemind/index.vue
+++ b/src/views/abnormalRemind/index.vue
@@ -3,83 +3,140 @@
   <div class="L-public-main" id="L-size-main">
     <div class="L-main">
       <header id="L-header">
-        <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" ref="queryFrom">
+        <el-form
+          :inline="true"
+          :model="formInline"
+          size="small"
+          class="demo-form-inline"
+          ref="queryFrom"
+        >
           <el-col :span="24">
             <el-form-item label="待办任务标题：" prop="enterpriseDirectory">
-              <el-input v-model.trim="formInline.enterpriseDirectory" placeholder="请输入内容"></el-input>
+              <el-input
+                v-model.trim="formInline.enterpriseDirectory"
+                placeholder="请输入内容"
+              ></el-input>
             </el-form-item>
             <el-form-item>
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+              <el-button size="mini" @click="resetQuery('queryFrom')"
+                >重置</el-button
+              >
+              <el-button
+                size="mini"
+                type="primary"
+                @click="handleQuery('queryFrom')"
+                >查询</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
       </header>
       <section>
-        <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
-          <el-table-column label="序号" type="index" align="center" width="50"/>
-          <el-table-column label="待办任务标题" align="center" prop="enterpriseDirectory" />
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          :row-class-name="tableRowClassName"
+          :height="tabHeader"
+          :max-height="tabHeader"
+        >
+          <el-table-column
+            label="序号"
+            type="index"
+            align="center"
+            width="50"
+          />
+          <el-table-column
+            label="待办任务标题"
+            align="center"
+            prop="enterpriseDirectory"
+          />
           <el-table-column label="审核状态" align="center" prop="cylx">
             <template slot-scope="scope">
-              <span v-if="scope.row.status == 5" class="approval_status5">评审通过</span>
+              <span v-if="scope.row.status == 5" class="approval_status5"
+                >评审通过</span
+              >
               <!-- <span v-if="scope.row.status == 4" class="approval_status3">市级评定中</span> -->
-              <span v-if="scope.row.status == 3" class="approval_status3">终审中</span>
-              <span v-if="scope.row.status == 2" class="approval_status1">复审中</span>
-              <span v-if="scope.row.status == 1" class="approval_status1">初审中</span>
-              <span v-if="scope.row.status == 0" class="approval_status0">待填报</span>
-              <span v-if="scope.row.status == 8" class="approval_status8">初审不通过</span>
-              <span v-if="scope.row.status == 7" class="approval_status9">复审不通过</span>
+              <span v-if="scope.row.status == 3" class="approval_status3"
+                >终审中</span
+              >
+              <span v-if="scope.row.status == 2" class="approval_status1"
+                >复审中</span
+              >
+              <span v-if="scope.row.status == 1" class="approval_status1"
+                >初审中</span
+              >
+              <span v-if="scope.row.status == 0" class="approval_status0"
+                >待填报</span
+              >
+              <span v-if="scope.row.status == 8" class="approval_status8"
+                >初审不通过</span
+              >
+              <span v-if="scope.row.status == 7" class="approval_status9"
+                >复审不通过</span
+              >
               <!-- <span v-if="scope.row.status == 6" class="approval_status9">专家评审-拒绝</span> -->
-              <span v-if="scope.row.status == 6" class="approval_status5">已填报</span>
-              <span v-if="scope.row.status == 9" class="approval_status9">终审不通过</span>
-              <span v-if="scope.row.status == 10" class="approval_status9">初审驳回</span>
+              <span v-if="scope.row.status == 6" class="approval_status5"
+                >已填报</span
+              >
+              <span v-if="scope.row.status == 9" class="approval_status9"
+                >终审不通过</span
+              >
+              <span v-if="scope.row.status == 10" class="approval_status9"
+                >初审驳回</span
+              >
             </template>
           </el-table-column>
-          <el-table-column label="操作" prop="userId" align="center" class-name="table-operation" width="120">
+          <el-table-column
+            label="操作"
+            prop="userId"
+            align="center"
+            class-name="table-operation"
+            width="120"
+          >
             <template slot-scope="scope">
               <span class="look-info" @click="goInfo(scope.row)">去查看</span>
             </template>
           </el-table-column>
         </el-table>
-        <my-pagination 
+        <my-pagination
           id="L-pagination"
           :total="total"
           :page="pagination.pageNum"
           :limit="pagination.pageSize"
           @pagination="getPagination"
-          :current-page.sync="pagination.pageNum" 
+          :current-page.sync="pagination.pageNum"
         ></my-pagination>
       </section>
     </div>
   </div>
 </template>
 <script>
-import myPagination from "@/views/components/Pagination/index.vue"
-import { listRecords } from "@/api/onlineDeclartion/records"
+import myPagination from "@/views/components/Pagination/index.vue";
+import { listRecords } from "@/api/onlineDeclartion/records";
 export default {
-  components:{myPagination},
+  components: { myPagination },
   data() {
     return {
       userType: this.$store.state.user.userType,
       deptId: this.$store.state.user.deptId,
-      total:0,
+      total: 0,
       pagination: {
-        pageNum:1,
-        pageSize:10,
-        orderChange:1,
+        current: 1,
+        size: 10,
+        orderChange: 1,
       },
-      loading:false,
+      loading: false,
       formInline: {
-        enterpriseDirectory: '',
+        enterpriseDirectory: "",
         type: null,
       },
-      tableData:[],
+      tableData: [],
       tabHeader: undefined,
-    }
+    };
   },
   mounted() {
     this.cancalDebounce();
-    window.addEventListener('resize', this.cancalDebounce);
+    window.addEventListener("resize", this.cancalDebounce);
     // if(this.$route.params.enterpriseName) {
     //   this.formInline.enterpriseName = this.$route.params.enterpriseName;
     //   this.pagination = { ...this.pagination,...this.formInline };
@@ -87,17 +144,17 @@ export default {
     this.getList();
   },
   destroyed() {
-    window.removeEventListener('resize', this.cancalDebounce);
+    window.removeEventListener("resize", this.cancalDebounce);
   },
-  methods:{
+  methods: {
     // 列表获取
-    getList(){
+    getList() {
       this.loading = true;
-      listRecords(this.pagination).then(res=>{
+      listRecords(this.pagination).then((res) => {
         this.loading = false;
         this.total = res.total;
-        this.tableData = res.rows;
-      })
+        this.tableData = res.data.records;
+      });
     },
     // 获取页码
     getPagination(pages) {
@@ -109,45 +166,45 @@ export default {
     handleQuery() {
       this.pagination = {
         pageNum: 1,
-        pageSize: 10
-      }
-      this.pagination = { ...this.pagination,...this.formInline };
+        pageSize: 10,
+      };
+      this.pagination = { ...this.pagination, ...this.formInline };
       this.getList();
     },
     // 重置
-    resetQuery(formName){
+    resetQuery(formName) {
       this.$refs[formName].resetFields();
       this.pagination = {
         pageNum: 1,
-        pageSize: 10
-      }
+        pageSize: 10,
+      };
       this.getList();
     },
     // 修改table背景色
-    tableRowClassName({row, rowIndex}){
+    tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {
-        return 'evenNumber-row';
+        return "evenNumber-row";
       }
-      return '';
+      return "";
     },
     // 查看详情
-    goInfo(row){
+    goInfo(row) {
       this.$router.push({
-        name: 'Online',
-      })
+        name: "Online",
+      });
     },
     // 屏幕尺寸变化
-    cancalDebounce(){
-      const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
-      const header = document.getElementById('L-header'); // 通过元素的 ID 获取元素
-      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+    cancalDebounce() {
+      const element = document.getElementById("L-size-main"); // 通过元素的 ID 获取元素
+      const header = document.getElementById("L-header"); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById("L-pagination"); // 通过元素的 ID 获取元素
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
       this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
-    }
+    },
   },
-}
+};
 </script>
 <style scoped lang="scss">
 .approval_status5 {
@@ -157,7 +214,7 @@ export default {
 }
 .approval_status5::after {
   position: absolute;
-  content: '';
+  content: "";
   width: 7px;
   height: 7px;
   border-radius: 50%;
@@ -173,7 +230,7 @@ export default {
 }
 .approval_status3::after {
   position: absolute;
-  content: '';
+  content: "";
   width: 7px;
   height: 7px;
   border-radius: 50%;
@@ -189,7 +246,7 @@ export default {
 }
 .approval_status1::after {
   position: absolute;
-  content: '';
+  content: "";
   width: 7px;
   height: 7px;
   border-radius: 50%;
@@ -205,7 +262,7 @@ export default {
 }
 .approval_status0::after {
   position: absolute;
-  content: '';
+  content: "";
   width: 7px;
   height: 7px;
   border-radius: 50%;
@@ -221,7 +278,7 @@ export default {
 }
 .approval_status8::after {
   position: absolute;
-  content: '';
+  content: "";
   width: 7px;
   height: 7px;
   border-radius: 50%;
@@ -237,7 +294,7 @@ export default {
 }
 .approval_status9::after {
   position: absolute;
-  content: '';
+  content: "";
   width: 7px;
   height: 7px;
   border-radius: 50%;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1853b59..5b90e6f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -16,27 +16,52 @@
               <div class="left-echart">
                 <echart></echart>
               </div>
-              <div class="right-tables" :style="{height : tabOneHeader + 'px'}" v-if="tableData.length > 0">
-                <div class="table-items" v-for="item in tableData" :key="item.id">
-                  <div class="project-name" @click="goProjectInfoLeft(item)">【{{item.projectName}}】</div>
+              <div
+                class="right-tables"
+                :style="{ height: tabOneHeader + 'px' }"
+                v-if="tableData.length > 0"
+              >
+                <div
+                  class="table-items"
+                  v-for="item in tableData"
+                  :key="item.id"
+                >
+                  <div class="project-name" @click="goProjectInfoLeft(item)">
+                    【{{ item.projectName }}】
+                  </div>
                   <div class="project-type">
                     <span class="left-title">项目类别：</span>
                     <div class="project-type-box" v-if="item.projectBigType">
-                      <dict-tag class="right-value" :options="dict.type.project_categories" :value="item.projectBigType"/>
+                      <dict-tag
+                        class="right-value"
+                        :options="dict.type.project_categories"
+                        :value="item.projectBigType"
+                      />
                     </div>
                     <span class="right-value" v-else>其他</span>
                   </div>
                   <div class="declare-time">
                     <span class="left-title">拨付时间：</span>
-                    <span class="right-number">{{ item.appropriationTime ? formatDate(item.appropriationTime,2) : ''  }}</span>
+                    <span class="right-number">{{
+                      item.appropriationTime
+                        ? formatDate(item.appropriationTime, 2)
+                        : ""
+                    }}</span>
                   </div>
                   <div class="appropriate">
-                    <span class="left-title">拨付金额<span class="left-unit">(元)</span>:</span>
-                    <span class="right-number">{{item.fundAmount}}</span>
+                    <span class="left-title"
+                      >拨付金额<span class="left-unit">(元)</span>:</span
+                    >
+                    <span class="right-number">{{ item.fundAmount }}</span>
                   </div>
                 </div>
               </div>
-              <el-empty class="right-tables-Two" :style="{height : tabOneHeader + 'px'}" :image-size="160" v-else></el-empty>
+              <el-empty
+                class="right-tables-Two"
+                :style="{ height: tabOneHeader + 'px' }"
+                :image-size="160"
+                v-else
+              ></el-empty>
             </div>
           </el-col>
           <el-col :span="12" class="enterprise-honor">
@@ -44,15 +69,31 @@
               <span class="garden"></span>
               <span class="box-header-title">企业荣誉资质（5个）</span>
             </div>
-            <div class="two-tables" :style="{height : tabOneHeader + 'px'}" v-if="enterpriseHonor.length > 0">
-              <div class="table-items" v-for="item in enterpriseHonor" :key="item.id">
+            <div
+              class="two-tables"
+              :style="{ height: tabOneHeader + 'px' }"
+              v-if="enterpriseHonor.length > 0"
+            >
+              <div
+                class="table-items"
+                v-for="item in enterpriseHonor"
+                :key="item.id"
+              >
                 <div class="promoteProject-top">
-                  <span class="span-one" @click="goProjectInfo(item)"><dict-tag :options="dict.type.project_small_type" :value="item.projectSmallType"/></span>
+                  <span class="span-one" @click="goProjectInfo(item)"
+                    ><dict-tag
+                      :options="dict.type.project_small_type"
+                      :value="item.projectSmallType"
+                  /></span>
                 </div>
                 <div class="promoteProject-bottom">
                   <div class="promoteProject-bottom-left">
                     项目类别：
-                    <span class="span-two"><dict-tag :options="dict.type.project_categories" :value="item.projectBigType"/></span>
+                    <span class="span-two"
+                      ><dict-tag
+                        :options="dict.type.project_categories"
+                        :value="item.projectBigType"
+                    /></span>
                   </div>
                   <div class="promoteProject-bottom-right">
                     申报时间：
@@ -61,7 +102,11 @@
                 </div>
               </div>
             </div>
-            <el-empty :style="{height : tabOneHeader + 'px'}" :image-size="160" v-else></el-empty>
+            <el-empty
+              :style="{ height: tabOneHeader + 'px' }"
+              :image-size="160"
+              v-else
+            ></el-empty>
           </el-col>
         </el-row>
         <el-row class="home-enterprise-bottom">
@@ -71,23 +116,56 @@
               <span class="box-header-title">往年专项资金申报（10个）</span>
             </div>
             <section>
-              <el-table v-loading="loadingTab" class="dataMap-two-table" :data="tableData" :height="tableTwoHeight" border :header-cell-style="{background:'#E8F3FC'}">
-                <el-table-column label="项目类别" prop="projectType" align="center">
+              <el-table
+                v-loading="loadingTab"
+                class="dataMap-two-table"
+                :data="tableData"
+                :height="tableTwoHeight"
+                border
+                :header-cell-style="{ background: '#E8F3FC' }"
+              >
+                <el-table-column
+                  label="项目类别"
+                  prop="projectType"
+                  align="center"
+                >
                   <template slot-scope="scope">
                     <div v-if="scope.row.projectBigType">
-                      <dict-tag :options="dict.type.project_categories" :value="scope.row.projectBigType"/>
+                      <dict-tag
+                        :options="dict.type.project_categories"
+                        :value="scope.row.projectBigType"
+                      />
                     </div>
                     <span v-else>其他</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="项目名称" prop="projectName" align="center">
+                <el-table-column
+                  label="项目名称"
+                  prop="projectName"
+                  align="center"
+                >
                   <template slot-scope="scope">
-                    <div class="project-trace-table" @click="goProjectInfoLeft(scope.row)">{{ scope.row.projectName }}</div>
+                    <div
+                      class="project-trace-table"
+                      @click="goProjectInfoLeft(scope.row)"
+                    >
+                      {{ scope.row.projectName }}
+                    </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="专项资金拨付时间" prop="time" align="center">
+                <el-table-column
+                  label="专项资金拨付时间"
+                  prop="time"
+                  align="center"
+                >
                   <template slot-scope="scope">
-                    <div class="project-trace-table-number">{{ scope.row.appropriationTime ? formatDate(scope.row.appropriationTime,2) : ''  }}</div>
+                    <div class="project-trace-table-number">
+                      {{
+                        scope.row.appropriationTime
+                          ? formatDate(scope.row.appropriationTime, 2)
+                          : ""
+                      }}
+                    </div>
                   </template>
                 </el-table-column>
               </el-table>
@@ -98,97 +176,217 @@
               <span class="garden"></span>
               <span class="box-header-title">关联项目进展（3个）</span>
             </div>
-            <div class="promoteProject-box-wai-box" :style="{height:tableTwoHeight + 'px'}" v-if="tableTwoData.length > 0">
-              <div class="promoteProject-box-div" v-for="(item,index) in tableTwoData" :key="index">
+            <div
+              class="promoteProject-box-wai-box"
+              :style="{ height: tableTwoHeight + 'px' }"
+              v-if="tableTwoData.length > 0"
+            >
+              <div
+                class="promoteProject-box-div"
+                v-for="(item, index) in tableTwoData"
+                :key="index"
+              >
                 <div class="promoteProject-top">
-                  <span class="span-one" @click="goProjectInfo(item)">【<dict-tag :options="dict.type.project_small_type" :value="item.projectSmallType"/>】</span>
+                  <span class="span-one" @click="goProjectInfo(item)"
+                    >【<dict-tag
+                      :options="dict.type.project_small_type"
+                      :value="item.projectSmallType"
+                    />】</span
+                  >
                 </div>
                 <div class="promoteProject-bottom">
                   <div class="promoteProject-bottom-left">
                     项目类别：
-                    <span class="span-two"><dict-tag :options="dict.type.project_categories" :value="item.projectBigType"/></span>
+                    <span class="span-two"
+                      ><dict-tag
+                        :options="dict.type.project_categories"
+                        :value="item.projectBigType"
+                    /></span>
                   </div>
                   <div class="promoteProject-bottom-right">
                     申报时间：
                     <span class="span-three">{{ formatYear(item) }}</span>
                   </div>
                 </div>
-                <div class="promoteProject-position" :class="(item.status == 0 || item.status == 1 || item.status == 2 || item.status == 3) ? 'orange' : (item.status == 6) ? 'green' : (item.status == 7 || item.status == 8 || item.status == 9 || item.status == 10) ? 'red' : ''">
-                  {{item.status == 0 ? '待填报' : item.status == 1 ? '初审中' : item.status == 2 ? '复审中' : item.status == 3 ? '终审中' : item.status == 6 ? '已填报' : item.status == 7 ? '复审不通过' : item.status == 8 ? '初审不通过' : item.status == 9 ? '终审不通过' : item.status == 10 ? '初审驳回' : ''}}
+                <div
+                  class="promoteProject-position"
+                  :class="
+                    item.status == 0 ||
+                    item.status == 1 ||
+                    item.status == 2 ||
+                    item.status == 3
+                      ? 'orange'
+                      : item.status == 6
+                      ? 'green'
+                      : item.status == 7 ||
+                        item.status == 8 ||
+                        item.status == 9 ||
+                        item.status == 10
+                      ? 'red'
+                      : ''
+                  "
+                >
+                  {{
+                    item.status == 0
+                      ? "待填报"
+                      : item.status == 1
+                      ? "初审中"
+                      : item.status == 2
+                      ? "复审中"
+                      : item.status == 3
+                      ? "终审中"
+                      : item.status == 6
+                      ? "已填报"
+                      : item.status == 7
+                      ? "复审不通过"
+                      : item.status == 8
+                      ? "初审不通过"
+                      : item.status == 9
+                      ? "终审不通过"
+                      : item.status == 10
+                      ? "初审驳回"
+                      : ""
+                  }}
                 </div>
               </div>
             </div>
-            <el-empty :style="{height : tableTwoHeight + 'px'}" :image-size="160" v-else></el-empty>
+            <el-empty
+              :style="{ height: tableTwoHeight + 'px' }"
+              :image-size="160"
+              v-else
+            ></el-empty>
           </el-col>
         </el-row>
       </el-col>
       <el-col :span="8" class="home-main-right">
         <el-row type="flex" class="main-two-row">
-          <el-col :span="24" class="work-main-left" style="height: 49.5%;">
+          <el-col :span="24" class="work-main-left" style="height: 49.5%">
             <div class="main-left">
               <div class="left-header">
                 <div class="left-header-titleS">
                   <span class="dataCloudMap-birght"></span>
                   <div class="left-header-title">智能提醒</div>
                 </div>
-                <el-button @click="enterjump" type="text" v-if="remindList.length > 0">>> 更多记录</el-button>
+                <el-button
+                  @click="enterjump"
+                  type="text"
+                  v-if="remindList.length > 0"
+                  >>> 更多记录</el-button
+                >
               </div>
               <div class="left-main" v-if="remindList.length > 0">
-                <el-card shadow="never" v-for="(item,index) in remindList" :key="index" :class="item.isRead == 1 ? 'el-card-border' : ''">
+                <el-card
+                  shadow="never"
+                  v-for="(item, index) in remindList"
+                  :key="index"
+                  :class="item.isRead == 1 ? 'el-card-border' : ''"
+                >
                   <div class="warn-main">
                     <div class="warn-main-left" v-if="item.alertManner == 2">
-                      <div class="warn-main-img"><img src="@/assets/images/warn-green.png" alt=""></div>
+                      <div class="warn-main-img">
+                        <img src="@/assets/images/warn-green.png" alt="" />
+                      </div>
                       <div class="warn-main-content">
-                        <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后填报结束】</div>
-                        <div class="content-middle">{{ item.alertContent }}</div>
+                        <div class="content-title">
+                          【{{ item.declarationName }}】【预计{{
+                            item.daysAdvance
+                          }}天后填报结束】
+                        </div>
+                        <div class="content-middle">
+                          {{ item.alertContent }}
+                        </div>
                         <!-- <div class="content-time">{{ item.alertTime }}</div> -->
                         <div class="tixing-duanxin">
                           <div class="content-time">{{ item.alertTime }}</div>
-                          <div class="content-time content-time-two">已发送短信</div>
+                          <div class="content-time content-time-two">
+                            已发送短信
+                          </div>
                         </div>
                       </div>
                     </div>
-                    <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2">
-                      <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+                    <div
+                      class="warn-main-left"
+                      v-else-if="
+                        item.alertManner == 1 &&
+                        item.qymc &&
+                        item.alertRecipients == 2
+                      "
+                    >
+                      <div class="warn-main-img">
+                        <img src="@/assets/images/warn-orange.png" alt="" />
+                      </div>
                       <div class="warn-main-content">
-                        <div class="content-title" style="display: flex;">【{{ item.qymc }}】<dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
-                        <div class="content-middle">{{ item.alertContent }}</div>
+                        <div class="content-title" style="display: flex">
+                          【{{ item.qymc }}】<dict-tag
+                            :options="dict.type.project_small_type"
+                            :value="item.declarationName"
+                          />
+                        </div>
+                        <div class="content-middle">
+                          {{ item.alertContent }}
+                        </div>
                         <!-- <div class="content-time">{{ item.alertTime }}</div> -->
                         <div class="tixing-duanxin">
                           <div class="content-time">{{ item.alertTime }}</div>
-                          <div class="content-time content-time-two">已发送短信</div>
+                          <div class="content-time content-time-two">
+                            已发送短信
+                          </div>
                         </div>
                       </div>
                     </div>
-                    <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
-                      <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+                    <div
+                      class="warn-main-left"
+                      v-else-if="item.alertManner == 1 && item.projectId"
+                    >
+                      <div class="warn-main-img">
+                        <img src="@/assets/images/warn-orange.png" alt="" />
+                      </div>
                       <div class="warn-main-content">
-                        <div class="content-title">【{{ item.declarationName }}】</div>
-                        <div class="content-middle">{{ item.alertContent }}</div>
+                        <div class="content-title">
+                          【{{ item.declarationName }}】
+                        </div>
+                        <div class="content-middle">
+                          {{ item.alertContent }}
+                        </div>
                         <!-- <div class="content-time">{{ item.alertTime }}</div> -->
                         <div class="tixing-duanxin">
                           <div class="content-time">{{ item.alertTime }}</div>
-                          <div class="content-time content-time-two">已发送短信</div>
+                          <div class="content-time content-time-two">
+                            已发送短信
+                          </div>
                         </div>
                       </div>
                     </div>
-                    <div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId">
-                      <div class="warn-main-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
+                    <div
+                      class="warn-main-left different-left"
+                      v-else-if="item.alertManner == 1 && !item.projectId"
+                    >
+                      <div class="warn-main-img">
+                        <img src="@/assets/images/warn-blue.png" alt="" />
+                      </div>
                       <div class="warn-main-content">
                         <div class="content-title">{{ item.alertContent }}</div>
                         <!-- <div class="content-time">{{ item.alertTime }}</div> -->
                         <div class="tixing-duanxin">
                           <div class="content-time">{{ item.alertTime }}</div>
-                          <div class="content-time content-time-two">已发送短信</div>
+                          <div class="content-time content-time-two">
+                            已发送短信
+                          </div>
                         </div>
                       </div>
                     </div>
                     <div class="warn-main-right">
-                      <div class="warn-main-right-chakan" @click="putMemo(item)">
+                      <div
+                        class="warn-main-right-chakan"
+                        @click="putMemo(item)"
+                      >
                         查看
                       </div>
-                      <div class="warn-main-right-status" :class="item.isRead == 1 ? 'status-unread' : ''">
-                        {{ item.isRead == 1 ? '未读' : '已读' }}
+                      <div
+                        class="warn-main-right-status"
+                        :class="item.isRead == 1 ? 'status-unread' : ''"
+                      >
+                        {{ item.isRead == 1 ? "未读" : "已读" }}
                       </div>
                     </div>
                   </div>
@@ -200,25 +398,86 @@
               </div> -->
             </div>
           </el-col>
-          <el-col :span="24" class="work-main-right" style="height: 49.5%;">
+          <el-col :span="24" class="work-main-right" style="height: 49.5%">
             <div class="main-right" id="task-box">
               <div class="right-header" id="task-header">
                 <div class="right-header-box">
                   <span class="dataCloudMap-birght"></span>
                   <div class="right-header-title">待办任务</div>
                 </div>
-                <el-button @click="enterjumpTask" type="text" v-if="backlogArray.length > 0">>> 更多记录</el-button>
+                <el-button
+                  @click="enterjumpTask"
+                  type="text"
+                  v-if="backlogArray.length > 0"
+                  >>> 更多记录</el-button
+                >
               </div>
-              <div class="right-main" :style="{height: tabHeader+'px'}" v-if="backlogArray.length > 0" v-loading="loading">
-                <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
-                  <div>{{ item.enterpriseDirectory}}</div>
+              <div
+                class="right-main"
+                :style="{ height: tabHeader + 'px' }"
+                v-if="backlogArray.length > 0"
+                v-loading="loading"
+              >
+                <div
+                  class="main-items"
+                  v-for="(item, index) in backlogArray"
+                  :key="index"
+                  :class="index % 2 == 0 ? '' : 'main-item'"
+                >
+                  <div>{{ item.enterpriseDirectory }}</div>
                   <!-- <div>{{ item.enterpriseName }}</div> -->
-                  <div>{{ (item.status == 0 ? "待填报" : item.status == 8 ? "初审不通过" : item.status == 10 ? "初审退回修改" : item.status == 7 ? "复审不通过" : item.status == 9 ? "终审不通过" : item.status == 5 ? "终审通过" : item.status == 1 ? "初审中" : item.status == 2 ? "复审中" : item.status == 3 ? "终审中" : item.status == 6 ? "已填报" : "") }}</div>
+                  <div>
+                    {{
+                      item.status == 0
+                        ? "待填报"
+                        : item.status == 8
+                        ? "初审不通过"
+                        : item.status == 10
+                        ? "初审退回修改"
+                        : item.status == 7
+                        ? "复审不通过"
+                        : item.status == 9
+                        ? "终审不通过"
+                        : item.status == 5
+                        ? "终审通过"
+                        : item.status == 1
+                        ? "初审中"
+                        : item.status == 2
+                        ? "复审中"
+                        : item.status == 3
+                        ? "终审中"
+                        : item.status == 6
+                        ? "已填报"
+                        : ""
+                    }}
+                  </div>
                   <!-- <div>审批【知识产权】材料</div> -->
-                  <div @click="MoreRecords(item.status)" class="last_child_item" :class="item.status == 0 ? 'tab-red' : item.status == 10 ? 'tab-red' : 'last_child_item'">{{ item.status == 0 ? "去填报" : item.status == 10 ? "去修改" : "去查看"}}</div>
+                  <div
+                    @click="MoreRecords(item.status)"
+                    class="last_child_item"
+                    :class="
+                      item.status == 0
+                        ? 'tab-red'
+                        : item.status == 10
+                        ? 'tab-red'
+                        : 'last_child_item'
+                    "
+                  >
+                    {{
+                      item.status == 0
+                        ? "去填报"
+                        : item.status == 10
+                        ? "去修改"
+                        : "去查看"
+                    }}
+                  </div>
                 </div>
               </div>
-              <el-empty :style="{height: tabHeader+'px'}" :image-size="160" v-else></el-empty>
+              <el-empty
+                :style="{ height: tabHeader + 'px' }"
+                :image-size="160"
+                v-else
+              ></el-empty>
               <!-- <div class="right-main" v-else>
                 <el-divider content-position="center">暂无</el-divider>
               </div> -->
@@ -227,61 +486,71 @@
         </el-row>
       </el-col>
     </el-row>
-    <el-dialog title="详情" :visible.sync="open" width="400px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      title="详情"
+      :visible.sync="open"
+      width="400px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <div class="team-main">
         <div>提醒时间:</div>
         <div>{{ info.alertTime }}</div>
       </div>
       <div class="team-main">
         <div>提醒内容:</div>
-        <div>{{ info.alertContent  }}</div>
+        <div>{{ info.alertContent }}</div>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import { listRecords } from "@/api/onlineDeclartion/records"
-import { chiefAll, enterpriseAll, changeIsRead } from "@/api/jin_ji_hu/intelligentReminder"
-import { usualFund, enterpriseProject } from "@/api/jin_ji_hu/zijinbiao"
-import echart from "./components/echartsPage"
+import { listRecords } from "@/api/onlineDeclartion/records";
+import {
+  chiefAll,
+  enterpriseAll,
+  changeIsRead,
+} from "@/api/jin_ji_hu/intelligentReminder";
+import { usualFund, enterpriseProject } from "@/api/jin_ji_hu/zijinbiao";
+import echart from "./components/echartsPage";
 export default {
   dicts: ["project_small_type", "project_categories"],
-  components:{
-    echart
+  components: {
+    echart,
   },
   data() {
     // 项目类别展示大类；  项目名称展示小类
     return {
       // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
       // userType: this.$store.state.user.userType,
-      backlogArray:[],
+      backlogArray: [],
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        current: 1,
+        size: 10,
         creditCode: this.$store.state.user.name,
-        orderChange:1,
+        orderChange: 1,
         // statusStr: [0, 5, 7, 8, 9, 10],
       },
       // 是否显示弹出层
       open: false,
       fileList: [],
       uploadList: [],
-      loading:false,
-      loadingTab:false,
+      loading: false,
+      loadingTab: false,
       remindList: [],
-      info:{},
+      info: {},
       tabHeader: 200,
       tabOneHeader: 200,
-      tableTwoHeight:null,
-      tableData:[],
-      tableTwoData:[],
-      enterpriseHonor:[],
-    }
+      tableTwoHeight: null,
+      tableData: [],
+      tableTwoData: [],
+      enterpriseHonor: [],
+    };
   },
-  mounted(){
+  mounted() {
     this.getListTwo();
     this.cancalDebounce();
-    window.addEventListener('resize', this.cancalDebounce);
+    window.addEventListener("resize", this.cancalDebounce);
     this.entRemind();
     // 往年资金拨付比例
     this.getUsualFund();
@@ -291,148 +560,150 @@ export default {
     this.getEnterpriseProjectTwo();
   },
   beforeDestroy() {
-    window.removeEventListener('resize', this.cancalDebounce);
+    window.removeEventListener("resize", this.cancalDebounce);
   },
-  methods:{
+  methods: {
     // 企业荣誉资质
-    getEnterpriseProjectOne(){
-      enterpriseProject({type:1}).then(res=>{
+    getEnterpriseProjectOne() {
+      enterpriseProject({ type: 1 }).then((res) => {
         this.enterpriseHonor = res.data;
-      })
+      });
     },
     // 关联项目进展
-    getEnterpriseProjectTwo(){
-      enterpriseProject({type:2}).then(res=>{
+    getEnterpriseProjectTwo() {
+      enterpriseProject({ type: 2 }).then((res) => {
         this.tableTwoData = res.data;
-      })
+      });
     },
     // 往年资金拨付比例
-    getUsualFund(){
-      usualFund().then(res=>{
-        this.tableData = res.data
-      })
+    getUsualFund() {
+      usualFund().then((res) => {
+        this.tableData = res.data;
+      });
     },
     // 待填报
-    getListTwo(){
+    getListTwo() {
       this.loading = true;
-      listRecords(this.queryParams).then(response => {
-        this.backlogArray = response.rows
+      listRecords(this.queryParams).then((response) => {
+        this.backlogArray = response.data.records;
+
         this.loading = false;
       });
     },
     // 企业端智能提醒
-    entRemind(){
-      enterpriseAll({current:1,size:20}).then(res=>{
+    entRemind() {
+      enterpriseAll({ current: 1, size: 20 }).then((res) => {
         this.remindList = res.data.records;
-      })
+      });
     },
     // 企业荣誉资质/关联项目进展跳转
-    goProjectInfo(item){
+    goProjectInfo(item) {
       this.$router.push({
-        name: 'projectInfo',
-        query: { userId: Number(item.id) }
-      })
+        name: "projectInfo",
+        query: { userId: Number(item.id) },
+      });
     },
     // 往年专项资金申报
-    goProjectInfoLeft(item){
+    goProjectInfoLeft(item) {
       // console.log(item,"item");
-      if(item.projectName == "区级总部" || item.projectName == "市级服务业领军") {
-        if(item.projectId) {
+      if (
+        item.projectName == "区级总部" ||
+        item.projectName == "市级服务业领军"
+      ) {
+        if (item.projectId) {
           this.$router.push({
-            name: 'projectInfo',
-            query: { userId: Number(item.projectId) }
-          })
+            name: "projectInfo",
+            query: { userId: Number(item.projectId) },
+          });
         }
       }
     },
     // 智能提醒跳转
-    enterjump(){
+    enterjump() {
       this.$router.push({
-        name: 'WarningReminder',
-      })
+        name: "WarningReminder",
+      });
     },
     // 智能提醒去查看并修改状态
-    putMemo(item){
-      if(item.isRead == 1) {
-        changeIsRead({id:item.id}).then(res=>{
+    putMemo(item) {
+      if (item.isRead == 1) {
+        changeIsRead({ id: item.id }).then((res) => {
           this.entRemind();
-        })
+        });
       }
-      if(item.projectId) {
+      if (item.projectId) {
         this.$router.push({
-          name: 'projectInfo',
-          query: { userId: Number(item.projectId) }
-        })
-      } else if(item.alertRecipients == 1 && item.alertManner == 2) {
+          name: "projectInfo",
+          query: { userId: Number(item.projectId) },
+        });
+      } else if (item.alertRecipients == 1 && item.alertManner == 2) {
         this.$router.push({
-          name: 'Online',
-          params: { statusChange: "0" }
-        })
-      } else if(item.alertManner == 1) {
+          name: "Online",
+          params: { statusChange: "0" },
+        });
+      } else if (item.alertManner == 1) {
         this.open = true;
         this.info = item;
       }
     },
     // 更多记录待办任务
-    enterjumpTask(){
+    enterjumpTask() {
       this.$router.push({
-        name: 'AbnormalRemind',
-      })
+        name: "AbnormalRemind",
+      });
     },
     // 更多记录
-    MoreRecords(status){
-      if(status == 0 || status == 10) {
+    MoreRecords(status) {
+      if (status == 0 || status == 10) {
         this.$router.push({
-          name: 'Online',
-          params: { statusChange: "0" }
-        })
+          name: "Online",
+          params: { statusChange: "0" },
+        });
       } else {
         this.$router.push({
-          name: 'Online',
-          params: { statusChange: "1" }
-        })
+          name: "Online",
+          params: { statusChange: "1" },
+        });
       }
     },
-    formatYear(time){
-      if(time.fileJson) {
-        return this.parseTime(time.createTime, '{y}-{m}-{d}')
+    formatYear(time) {
+      if (time.fileJson) {
+        return this.parseTime(time.createTime, "{y}-{m}-{d}");
       } else {
-        return time.projectYear
+        return time.projectYear;
       }
     },
-    formatDate(dateString,id) {
+    formatDate(dateString, id) {
       const year = dateString.slice(0, 4);
       const month = dateString.slice(4, 6);
       const day = dateString.slice(6, 8);
-      if(id == 1) {
+      if (id == 1) {
         return `${year}年${month}月${day}日`;
       } else {
         return `${year}-${month}-${day}`;
       }
     },
     // 屏幕尺寸变化
-    cancalDebounce(){
-      const element = document.getElementById('task-box'); // 通过元素的 ID 获取元素
-      const header = document.getElementById('task-header'); // 通过元素的 ID 获取元素
+    cancalDebounce() {
+      const element = document.getElementById("task-box"); // 通过元素的 ID 获取元素
+      const header = document.getElementById("task-header"); // 通过元素的 ID 获取元素
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       this.tabHeader = elementHeight - headerHeight - 30;
 
-      const oneTable = document.getElementById('one-table'); // 通过元素的 ID 获取元素
-      const oneHeader = document.getElementById('one-table-header'); // 通过元素的 ID 获取元素
+      const oneTable = document.getElementById("one-table"); // 通过元素的 ID 获取元素
+      const oneHeader = document.getElementById("one-table-header"); // 通过元素的 ID 获取元素
       const oneTableHeight = oneTable.offsetHeight;
       const oneHeaderHeight = oneHeader.offsetHeight;
       this.tabOneHeader = oneTableHeight - oneHeaderHeight - 45;
 
-      const twoTable = document.getElementById('table-two'); // 通过元素的 ID 获取元素
-      const twoHeader = document.getElementById('table-two-title'); // 通过元素的 ID 获取元素
+      const twoTable = document.getElementById("table-two"); // 通过元素的 ID 获取元素
+      const twoHeader = document.getElementById("table-two-title"); // 通过元素的 ID 获取元素
       const twoTableHeight = twoTable.offsetHeight;
       const twoHeaderHeight = twoHeader.offsetHeight;
       this.tableTwoHeight = twoTableHeight - twoHeaderHeight - 45;
-    }
+    },
   },
-}
+};
 </script>
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/homeTwo/index.vue b/src/views/homeTwo/index.vue
index 3610f42..a7018d7 100644
--- a/src/views/homeTwo/index.vue
+++ b/src/views/homeTwo/index.vue
@@ -7,20 +7,41 @@
           <div class="enterprise-header-title">专项资金、荣誉、投资等统计</div>
         </div>
         <el-row class="home-enterprise-top">
-          <el-col :span="12" class="enterprise-honor" id="one-table" style="margin-right: 10px;">
+          <el-col
+            :span="12"
+            class="enterprise-honor"
+            id="one-table"
+            style="margin-right: 10px"
+          >
             <div class="box-header" id="one-table-header">
               <span class="garden"></span>
               <span class="box-header-title">企业荣誉资质</span>
             </div>
-            <div class="two-tables" :style="{height : tabOneHeader + 'px'}" v-if="enterpriseHonor.length > 0">
-              <div class="table-items" v-for="item in enterpriseHonor" :key="item.id">
+            <div
+              class="two-tables"
+              :style="{ height: tabOneHeader + 'px' }"
+              v-if="enterpriseHonor.length > 0"
+            >
+              <div
+                class="table-items"
+                v-for="item in enterpriseHonor"
+                :key="item.id"
+              >
                 <div class="promoteProject-top">
-                  <span class="span-one" @click="goProjectInfo(item)"><dict-tag :options="dict.type.project_small_type" :value="item.projectSmallType"/></span>
+                  <span class="span-one" @click="goProjectInfo(item)"
+                    ><dict-tag
+                      :options="dict.type.project_small_type"
+                      :value="item.projectSmallType"
+                  /></span>
                 </div>
                 <div class="promoteProject-bottom">
                   <div class="promoteProject-bottom-left">
                     项目类别：
-                    <span class="span-two"><dict-tag :options="dict.type.project_categories" :value="item.projectBigType"/></span>
+                    <span class="span-two"
+                      ><dict-tag
+                        :options="dict.type.project_categories"
+                        :value="item.projectBigType"
+                    /></span>
                   </div>
                   <div class="promoteProject-bottom-right">
                     申报时间：
@@ -29,34 +50,96 @@
                 </div>
               </div>
             </div>
-            <el-empty :style="{height : tabOneHeader + 'px'}" :image-size="160" v-else></el-empty>
+            <el-empty
+              :style="{ height: tabOneHeader + 'px' }"
+              :image-size="160"
+              v-else
+            ></el-empty>
           </el-col>
           <el-col :span="12" class="relevancy-project">
             <div class="box-header">
               <span class="garden"></span>
               <span class="box-header-title">关联项目进展</span>
             </div>
-            <div class="promoteProject-box-wai-box" :style="{height:tableTwoHeight + 'px'}" v-if="tableTwoData.length > 0">
-              <div class="promoteProject-box-div" v-for="(item,index) in tableTwoData" :key="index">
+            <div
+              class="promoteProject-box-wai-box"
+              :style="{ height: tableTwoHeight + 'px' }"
+              v-if="tableTwoData.length > 0"
+            >
+              <div
+                class="promoteProject-box-div"
+                v-for="(item, index) in tableTwoData"
+                :key="index"
+              >
                 <div class="promoteProject-top">
-                  <span class="span-one" @click="goProjectInfo(item)">【<dict-tag :options="dict.type.project_small_type" :value="item.projectSmallType"/>】</span>
+                  <span class="span-one" @click="goProjectInfo(item)"
+                    >【<dict-tag
+                      :options="dict.type.project_small_type"
+                      :value="item.projectSmallType"
+                    />】</span
+                  >
                 </div>
                 <div class="promoteProject-bottom">
                   <div class="promoteProject-bottom-left">
                     项目类别：
-                    <span class="span-two"><dict-tag :options="dict.type.project_categories" :value="item.projectBigType"/></span>
+                    <span class="span-two"
+                      ><dict-tag
+                        :options="dict.type.project_categories"
+                        :value="item.projectBigType"
+                    /></span>
                   </div>
                   <div class="promoteProject-bottom-right">
                     申报时间：
                     <span class="span-three">{{ formatYear(item) }}</span>
                   </div>
                 </div>
-                <div class="promoteProject-position" :class="(item.status == 0 || item.status == 1 || item.status == 2 || item.status == 3) ? 'orange' : (item.status == 6) ? 'green' : (item.status == 7 || item.status == 8 || item.status == 9 || item.status == 10) ? 'red' : ''">
-                  {{item.status == 0 ? '待填报' : item.status == 1 ? '初审中' : item.status == 2 ? '复审中' : item.status == 3 ? '终审中' : item.status == 6 ? '已填报' : item.status == 7 ? '复审不通过' : item.status == 8 ? '初审不通过' : item.status == 9 ? '终审不通过' : item.status == 10 ? '初审驳回' : ''}}
+                <div
+                  class="promoteProject-position"
+                  :class="
+                    item.status == 0 ||
+                    item.status == 1 ||
+                    item.status == 2 ||
+                    item.status == 3
+                      ? 'orange'
+                      : item.status == 6
+                      ? 'green'
+                      : item.status == 7 ||
+                        item.status == 8 ||
+                        item.status == 9 ||
+                        item.status == 10
+                      ? 'red'
+                      : ''
+                  "
+                >
+                  {{
+                    item.status == 0
+                      ? "待填报"
+                      : item.status == 1
+                      ? "初审中"
+                      : item.status == 2
+                      ? "复审中"
+                      : item.status == 3
+                      ? "终审中"
+                      : item.status == 6
+                      ? "已填报"
+                      : item.status == 7
+                      ? "复审不通过"
+                      : item.status == 8
+                      ? "初审不通过"
+                      : item.status == 9
+                      ? "终审不通过"
+                      : item.status == 10
+                      ? "初审驳回"
+                      : ""
+                  }}
                 </div>
               </div>
             </div>
-            <el-empty :style="{height : tableTwoHeight + 'px'}" :image-size="160" v-else></el-empty>
+            <el-empty
+              :style="{ height: tableTwoHeight + 'px' }"
+              :image-size="160"
+              v-else
+            ></el-empty>
           </el-col>
         </el-row>
         <el-row class="home-enterprise-bottom">
@@ -66,28 +149,75 @@
               <span class="box-header-title">往年专项资金拨付情况</span>
             </div>
             <section>
-              <el-table v-loading="loadingTab" class="dataMap-two-table" :data="tableData" :height="tableTwoHeight" border :header-cell-style="{background:'#E8F3FC'}">
-                <el-table-column label="项目名称" prop="projectName" align="center">
+              <el-table
+                v-loading="loadingTab"
+                class="dataMap-two-table"
+                :data="tableData"
+                :height="tableTwoHeight"
+                border
+                :header-cell-style="{ background: '#E8F3FC' }"
+              >
+                <el-table-column
+                  label="项目名称"
+                  prop="projectName"
+                  align="center"
+                >
                   <template slot-scope="scope">
-                    <div class="project-trace-table" :class="(scope.row.projectName == '区级总部' || scope.row.projectName == '市级服务业领军') ? '' : 'project-trace-table-gray'" @click="goProjectInfoLeft(scope.row)">{{ scope.row.projectName }}</div>
+                    <div
+                      class="project-trace-table"
+                      :class="
+                        scope.row.projectName == '区级总部' ||
+                        scope.row.projectName == '市级服务业领军'
+                          ? ''
+                          : 'project-trace-table-gray'
+                      "
+                      @click="goProjectInfoLeft(scope.row)"
+                    >
+                      {{ scope.row.projectName }}
+                    </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="项目类别" prop="projectType" align="center">
+                <el-table-column
+                  label="项目类别"
+                  prop="projectType"
+                  align="center"
+                >
                   <template slot-scope="scope">
                     <div v-if="scope.row.projectBigType">
-                      <dict-tag :options="dict.type.project_categories" :value="scope.row.projectBigType"/>
+                      <dict-tag
+                        :options="dict.type.project_categories"
+                        :value="scope.row.projectBigType"
+                      />
                     </div>
                     <span v-else>其他</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="拨付金额(万元)" prop="fundAmount" align="center" />
-                <el-table-column label="专项资金拨付时间" prop="time" align="center">
+                <el-table-column
+                  label="拨付金额(万元)"
+                  prop="fundAmount"
+                  align="center"
+                />
+                <el-table-column
+                  label="专项资金拨付时间"
+                  prop="time"
+                  align="center"
+                >
                   <template slot-scope="scope">
-                    <div class="project-trace-table-number">{{ scope.row.appropriationTime ? formatDate(scope.row.appropriationTime,2) : ''  }}</div>
+                    <div class="project-trace-table-number">
+                      {{
+                        scope.row.appropriationTime
+                          ? formatDate(scope.row.appropriationTime, 2)
+                          : ""
+                      }}
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="企业名称" prop="qymc" align="center" />
-                <el-table-column label="专项类型" prop="specialType" align="center" />
+                <el-table-column
+                  label="专项类型"
+                  prop="specialType"
+                  align="center"
+                />
                 <el-table-column label="摘要" prop="summary" align="center" />
               </el-table>
             </section>
@@ -96,71 +226,133 @@
       </el-col>
       <el-col :span="8" class="home-main-right">
         <el-row type="flex" class="main-two-row">
-          <el-col :span="24" class="work-main-left" style="height: 49.5%;">
+          <el-col :span="24" class="work-main-left" style="height: 49.5%">
             <div class="main-left">
               <div class="left-header">
                 <div class="left-header-titleS">
                   <span class="dataCloudMap-birght"></span>
                   <div class="left-header-title">智能提醒</div>
                 </div>
-                <el-button @click="enterjump" type="text" v-if="remindList.length > 0">>> 更多记录</el-button>
+                <el-button
+                  @click="enterjump"
+                  type="text"
+                  v-if="remindList.length > 0"
+                  >>> 更多记录</el-button
+                >
               </div>
               <div class="left-main" v-if="remindList.length > 0">
-                <el-card shadow="never" v-for="(item,index) in remindList" :key="index" :class="item.isRead == 1 ? 'el-card-border' : ''">
+                <el-card
+                  shadow="never"
+                  v-for="(item, index) in remindList"
+                  :key="index"
+                  :class="item.isRead == 1 ? 'el-card-border' : ''"
+                >
                   <div class="warn-main">
                     <div class="warn-main-left" v-if="item.alertManner == 2">
-                      <div class="warn-main-img"><img src="@/assets/images/warn-green.png" alt=""></div>
+                      <div class="warn-main-img">
+                        <img src="@/assets/images/warn-green.png" alt="" />
+                      </div>
                       <div class="warn-main-content">
-                        <div class="content-title">【{{ item.declarationName }}】【预计{{ item.daysAdvance }}天后填报结束】</div>
-                        <div class="content-middle">{{ item.alertContent }}</div>
+                        <div class="content-title">
+                          【{{ item.declarationName }}】【预计{{
+                            item.daysAdvance
+                          }}天后填报结束】
+                        </div>
+                        <div class="content-middle">
+                          {{ item.alertContent }}
+                        </div>
                         <!-- <div class="content-time">{{ item.alertTime }}</div> -->
                         <div class="tixing-duanxin">
                           <div class="content-time">{{ item.alertTime }}</div>
-                          <div class="content-time content-time-two">已发送短信</div>
+                          <div class="content-time content-time-two">
+                            已发送短信
+                          </div>
                         </div>
                       </div>
                     </div>
-                    <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2">
-                      <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+                    <div
+                      class="warn-main-left"
+                      v-else-if="
+                        item.alertManner == 1 &&
+                        item.qymc &&
+                        item.alertRecipients == 2
+                      "
+                    >
+                      <div class="warn-main-img">
+                        <img src="@/assets/images/warn-orange.png" alt="" />
+                      </div>
                       <div class="warn-main-content">
-                        <div class="content-title" style="display: flex;">【{{ item.qymc }}】<dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
-                        <div class="content-middle">{{ item.alertContent }}</div>
+                        <div class="content-title" style="display: flex">
+                          【{{ item.qymc }}】<dict-tag
+                            :options="dict.type.project_small_type"
+                            :value="item.declarationName"
+                          />
+                        </div>
+                        <div class="content-middle">
+                          {{ item.alertContent }}
+                        </div>
                         <!-- <div class="content-time">{{ item.alertTime }}</div> -->
                         <div class="tixing-duanxin">
                           <div class="content-time">{{ item.alertTime }}</div>
-                          <div class="content-time content-time-two">已发送短信</div>
+                          <div class="content-time content-time-two">
+                            已发送短信
+                          </div>
                         </div>
                       </div>
                     </div>
-                    <div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
-                      <div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
+                    <div
+                      class="warn-main-left"
+                      v-else-if="item.alertManner == 1 && item.projectId"
+                    >
+                      <div class="warn-main-img">
+                        <img src="@/assets/images/warn-orange.png" alt="" />
+                      </div>
                       <div class="warn-main-content">
-                        <div class="content-title">【{{ item.declarationName }}】</div>
-                        <div class="content-middle">{{ item.alertContent }}</div>
+                        <div class="content-title">
+                          【{{ item.declarationName }}】
+                        </div>
+                        <div class="content-middle">
+                          {{ item.alertContent }}
+                        </div>
                         <!-- <div class="content-time">{{ item.alertTime }}</div> -->
                         <div class="tixing-duanxin">
                           <div class="content-time">{{ item.alertTime }}</div>
-                          <div class="content-time content-time-two">已发送短信</div>
+                          <div class="content-time content-time-two">
+                            已发送短信
+                          </div>
                         </div>
                       </div>
                     </div>
-                    <div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId">
-                      <div class="warn-main-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
+                    <div
+                      class="warn-main-left different-left"
+                      v-else-if="item.alertManner == 1 && !item.projectId"
+                    >
+                      <div class="warn-main-img">
+                        <img src="@/assets/images/warn-blue.png" alt="" />
+                      </div>
                       <div class="warn-main-content">
                         <div class="content-title">{{ item.alertContent }}</div>
                         <!-- <div class="content-time">{{ item.alertTime }}</div> -->
                         <div class="tixing-duanxin">
                           <div class="content-time">{{ item.alertTime }}</div>
-                          <div class="content-time content-time-two">已发送短信</div>
+                          <div class="content-time content-time-two">
+                            已发送短信
+                          </div>
                         </div>
                       </div>
                     </div>
                     <div class="warn-main-right">
-                      <div class="warn-main-right-chakan" @click="putMemo(item)">
+                      <div
+                        class="warn-main-right-chakan"
+                        @click="putMemo(item)"
+                      >
                         查看
                       </div>
-                      <div class="warn-main-right-status" :class="item.isRead == 1 ? 'status-unread' : ''">
-                        {{ item.isRead == 1 ? '未读' : '已读' }}
+                      <div
+                        class="warn-main-right-status"
+                        :class="item.isRead == 1 ? 'status-unread' : ''"
+                      >
+                        {{ item.isRead == 1 ? "未读" : "已读" }}
                       </div>
                     </div>
                   </div>
@@ -172,25 +364,86 @@
               </div> -->
             </div>
           </el-col>
-          <el-col :span="24" class="work-main-right" style="height: 49.5%;">
+          <el-col :span="24" class="work-main-right" style="height: 49.5%">
             <div class="main-right" id="task-box">
               <div class="right-header" id="task-header">
                 <div class="right-header-box">
                   <span class="dataCloudMap-birght"></span>
                   <div class="right-header-title">待办任务</div>
                 </div>
-                <el-button @click="enterjumpTask" type="text" v-if="backlogArray.length > 0">>> 更多记录</el-button>
+                <el-button
+                  @click="enterjumpTask"
+                  type="text"
+                  v-if="backlogArray.length > 0"
+                  >>> 更多记录</el-button
+                >
               </div>
-              <div class="right-main" :style="{height: tabHeader+'px'}" v-if="backlogArray.length > 0" v-loading="loading">
-                <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
-                  <div>{{ item.enterpriseDirectory}}</div>
+              <div
+                class="right-main"
+                :style="{ height: tabHeader + 'px' }"
+                v-if="backlogArray.length > 0"
+                v-loading="loading"
+              >
+                <div
+                  class="main-items"
+                  v-for="(item, index) in backlogArray"
+                  :key="index"
+                  :class="index % 2 == 0 ? '' : 'main-item'"
+                >
+                  <div>{{ item.enterpriseDirectory }}</div>
                   <!-- <div>{{ item.enterpriseName }}</div> -->
-                  <div>{{ (item.status == 0 ? "待填报" : item.status == 8 ? "初审不通过" : item.status == 10 ? "初审退回修改" : item.status == 7 ? "复审不通过" : item.status == 9 ? "终审不通过" : item.status == 5 ? "终审通过" : item.status == 1 ? "初审中" : item.status == 2 ? "复审中" : item.status == 3 ? "终审中" : item.status == 6 ? "已填报" : "") }}</div>
+                  <div>
+                    {{
+                      item.status == 0
+                        ? "待填报"
+                        : item.status == 8
+                        ? "初审不通过"
+                        : item.status == 10
+                        ? "初审退回修改"
+                        : item.status == 7
+                        ? "复审不通过"
+                        : item.status == 9
+                        ? "终审不通过"
+                        : item.status == 5
+                        ? "终审通过"
+                        : item.status == 1
+                        ? "初审中"
+                        : item.status == 2
+                        ? "复审中"
+                        : item.status == 3
+                        ? "终审中"
+                        : item.status == 6
+                        ? "已填报"
+                        : ""
+                    }}
+                  </div>
                   <!-- <div>审批【知识产权】材料</div> -->
-                  <div @click="MoreRecords(item.status)" class="last_child_item" :class="item.status == 0 ? 'tab-red' : item.status == 10 ? 'tab-red' : 'last_child_item'">{{ item.status == 0 ? "去填报" : item.status == 10 ? "去修改" : "去查看"}}</div>
+                  <div
+                    @click="MoreRecords(item.status)"
+                    class="last_child_item"
+                    :class="
+                      item.status == 0
+                        ? 'tab-red'
+                        : item.status == 10
+                        ? 'tab-red'
+                        : 'last_child_item'
+                    "
+                  >
+                    {{
+                      item.status == 0
+                        ? "去填报"
+                        : item.status == 10
+                        ? "去修改"
+                        : "去查看"
+                    }}
+                  </div>
                 </div>
               </div>
-              <el-empty :style="{height: tabHeader+'px'}" :image-size="160" v-else></el-empty>
+              <el-empty
+                :style="{ height: tabHeader + 'px' }"
+                :image-size="160"
+                v-else
+              ></el-empty>
               <!-- <div class="right-main" v-else>
                 <el-divider content-position="center">暂无</el-divider>
               </div> -->
@@ -199,22 +452,32 @@
         </el-row>
       </el-col>
     </el-row>
-    <el-dialog title="详情" :visible.sync="open" width="400px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      title="详情"
+      :visible.sync="open"
+      width="400px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <div class="team-main">
         <div>提醒时间:</div>
         <div>{{ info.alertTime }}</div>
       </div>
       <div class="team-main">
         <div>提醒内容:</div>
-        <div>{{ info.alertContent  }}</div>
+        <div>{{ info.alertContent }}</div>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import { listRecords } from "@/api/onlineDeclartion/records"
-import { chiefAll, enterpriseAll, changeIsRead } from "@/api/jin_ji_hu/intelligentReminder"
-import { usualFund, enterpriseProject } from "@/api/jin_ji_hu/zijinbiao"
+import { listRecords } from "@/api/onlineDeclartion/records";
+import {
+  chiefAll,
+  enterpriseAll,
+  changeIsRead,
+} from "@/api/jin_ji_hu/intelligentReminder";
+import { usualFund, enterpriseProject } from "@/api/jin_ji_hu/zijinbiao";
 export default {
   dicts: ["project_small_type", "project_categories"],
   data() {
@@ -222,34 +485,34 @@ export default {
     return {
       // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
       // userType: this.$store.state.user.userType,
-      backlogArray:[],
+      backlogArray: [],
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        current: 1,
+        size: 10,
         creditCode: this.$store.state.user.name,
-        orderChange:1,
+        orderChange: 1,
         // statusStr: [0, 5, 7, 8, 9, 10],
       },
       // 是否显示弹出层
       open: false,
       fileList: [],
       uploadList: [],
-      loading:false,
-      loadingTab:false,
+      loading: false,
+      loadingTab: false,
       remindList: [],
-      info:{},
+      info: {},
       tabHeader: 200,
       tabOneHeader: 200,
-      tableTwoHeight:null,
-      tableData:[],
-      tableTwoData:[],
-      enterpriseHonor:[],
-    }
+      tableTwoHeight: null,
+      tableData: [],
+      tableTwoData: [],
+      enterpriseHonor: [],
+    };
   },
-  mounted(){
+  mounted() {
     this.getListTwo();
     this.cancalDebounce();
-    window.addEventListener('resize', this.cancalDebounce);
+    window.addEventListener("resize", this.cancalDebounce);
     this.entRemind();
     // 往年资金拨付比例
     this.getUsualFund();
@@ -259,148 +522,149 @@ export default {
     this.getEnterpriseProjectTwo();
   },
   beforeDestroy() {
-    window.removeEventListener('resize', this.cancalDebounce);
+    window.removeEventListener("resize", this.cancalDebounce);
   },
-  methods:{
+  methods: {
     // 企业荣誉资质
-    getEnterpriseProjectOne(){
-      enterpriseProject({type:1}).then(res=>{
+    getEnterpriseProjectOne() {
+      enterpriseProject({ type: 1 }).then((res) => {
         this.enterpriseHonor = res.data;
-      })
+      });
     },
     // 关联项目进展
-    getEnterpriseProjectTwo(){
-      enterpriseProject({type:2}).then(res=>{
+    getEnterpriseProjectTwo() {
+      enterpriseProject({ type: 2 }).then((res) => {
         this.tableTwoData = res.data;
-      })
+      });
     },
     // 往年资金拨付比例
-    getUsualFund(){
-      usualFund().then(res=>{
-        this.tableData = res.data
-      })
+    getUsualFund() {
+      usualFund().then((res) => {
+        this.tableData = res.data;
+      });
     },
     // 待填报
-    getListTwo(){
+    getListTwo() {
       this.loading = true;
-      listRecords(this.queryParams).then(response => {
-        this.backlogArray = response.rows
+      listRecords(this.queryParams).then((response) => {
+        this.backlogArray = response.data.records;
         this.loading = false;
       });
     },
     // 企业端智能提醒
-    entRemind(){
-      enterpriseAll({current:1,size:20}).then(res=>{
+    entRemind() {
+      enterpriseAll({ current: 1, size: 20 }).then((res) => {
         this.remindList = res.data.records;
-      })
+      });
     },
     // 企业荣誉资质/关联项目进展跳转
-    goProjectInfo(item){
+    goProjectInfo(item) {
       this.$router.push({
-        name: 'projectInfo',
-        query: { userId: Number(item.id) }
-      })
+        name: "projectInfo",
+        query: { userId: Number(item.id) },
+      });
     },
     // 往年专项资金申报
-    goProjectInfoLeft(item){
+    goProjectInfoLeft(item) {
       // console.log(item,"item");
-      if(item.projectName == "区级总部" || item.projectName == "市级服务业领军") {
-        if(item.projectId) {
+      if (
+        item.projectName == "区级总部" ||
+        item.projectName == "市级服务业领军"
+      ) {
+        if (item.projectId) {
           this.$router.push({
-            name: 'projectInfo',
-            query: { userId: Number(item.projectId) }
-          })
+            name: "projectInfo",
+            query: { userId: Number(item.projectId) },
+          });
         }
       }
     },
     // 智能提醒跳转
-    enterjump(){
+    enterjump() {
       this.$router.push({
-        name: 'WarningReminder',
-      })
+        name: "WarningReminder",
+      });
     },
     // 智能提醒去查看并修改状态
-    putMemo(item){
-      if(item.isRead == 1) {
-        changeIsRead({id:item.id}).then(res=>{
+    putMemo(item) {
+      if (item.isRead == 1) {
+        changeIsRead({ id: item.id }).then((res) => {
           this.entRemind();
-        })
+        });
       }
-      if(item.projectId) {
+      if (item.projectId) {
         this.$router.push({
-          name: 'projectInfo',
-          query: { userId: Number(item.projectId) }
-        })
-      } else if(item.alertRecipients == 1 && item.alertManner == 2) {
+          name: "projectInfo",
+          query: { userId: Number(item.projectId) },
+        });
+      } else if (item.alertRecipients == 1 && item.alertManner == 2) {
         this.$router.push({
-          name: 'Online',
-          params: { statusChange: "0" }
-        })
-      } else if(item.alertManner == 1) {
+          name: "Online",
+          params: { statusChange: "0" },
+        });
+      } else if (item.alertManner == 1) {
         this.open = true;
         this.info = item;
       }
     },
     // 更多记录待办任务
-    enterjumpTask(){
+    enterjumpTask() {
       this.$router.push({
-        name: 'AbnormalRemind',
-      })
+        name: "AbnormalRemind",
+      });
     },
     // 更多记录
-    MoreRecords(status){
-      if(status == 0 || status == 10) {
+    MoreRecords(status) {
+      if (status == 0 || status == 10) {
         this.$router.push({
-          name: 'Online',
-          params: { statusChange: "0" }
-        })
+          name: "Online",
+          params: { statusChange: "0" },
+        });
       } else {
         this.$router.push({
-          name: 'Online',
-          params: { statusChange: "1" }
-        })
+          name: "Online",
+          params: { statusChange: "1" },
+        });
       }
     },
-    formatYear(time){
-      if(time.fileJson) {
-        return this.parseTime(time.createTime, '{y}-{m}-{d}')
+    formatYear(time) {
+      if (time.fileJson) {
+        return this.parseTime(time.createTime, "{y}-{m}-{d}");
       } else {
-        return time.projectYear
+        return time.projectYear;
       }
     },
-    formatDate(dateString,id) {
+    formatDate(dateString, id) {
       const year = dateString.slice(0, 4);
       const month = dateString.slice(4, 6);
       const day = dateString.slice(6, 8);
-      if(id == 1) {
+      if (id == 1) {
         return `${year}年${month}月${day}日`;
       } else {
         return `${year}-${month}-${day}`;
       }
     },
     // 屏幕尺寸变化
-    cancalDebounce(){
-      const element = document.getElementById('task-box'); // 通过元素的 ID 获取元素
-      const header = document.getElementById('task-header'); // 通过元素的 ID 获取元素
+    cancalDebounce() {
+      const element = document.getElementById("task-box"); // 通过元素的 ID 获取元素
+      const header = document.getElementById("task-header"); // 通过元素的 ID 获取元素
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       this.tabHeader = elementHeight - headerHeight - 30;
 
-      const oneTable = document.getElementById('one-table'); // 通过元素的 ID 获取元素
-      const oneHeader = document.getElementById('one-table-header'); // 通过元素的 ID 获取元素
+      const oneTable = document.getElementById("one-table"); // 通过元素的 ID 获取元素
+      const oneHeader = document.getElementById("one-table-header"); // 通过元素的 ID 获取元素
       const oneTableHeight = oneTable.offsetHeight;
       const oneHeaderHeight = oneHeader.offsetHeight;
       this.tabOneHeader = oneTableHeight - oneHeaderHeight - 45;
 
-      const twoTable = document.getElementById('table-two'); // 通过元素的 ID 获取元素
-      const twoHeader = document.getElementById('table-two-title'); // 通过元素的 ID 获取元素
+      const twoTable = document.getElementById("table-two"); // 通过元素的 ID 获取元素
+      const twoHeader = document.getElementById("table-two-title"); // 通过元素的 ID 获取元素
       const twoTableHeight = twoTable.offsetHeight;
       const twoHeaderHeight = twoHeader.offsetHeight;
       this.tableTwoHeight = twoTableHeight - twoHeaderHeight - 45;
-    }
+    },
   },
-}
+};
 </script>
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>