From 9cc629e7963f022bdcee081227cad80f060c451a Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Thu, 1 Aug 2024 13:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E6=9C=8D=E5=8A=A1=E4=B8=9A=E5=8F=91?=
 =?UTF-8?q?=E5=B1=95=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/api/jin_ji_hu/ServiceDevelopment/index.js |  19 +
 src/assets/styles/font.css                    |   4 +
 src/assets/styles/font/ArialMT.otf            | Bin 0 -> 27384 bytes
 src/assets/styles/public.scss                 | 389 +++++++++++++++++-
 src/views/ServiceAndDevelopment/index.vue     | 314 ++++++--------
 src/views/components/myEditor/index.vue       |  21 +-
 .../home/components/echartsPage/index.vue     | 148 +++++++
 src/views/home/index.vue                      | 203 ++++++++-
 src/views/policyDocument/index.vue            |   2 +-
 .../components/promoteProject/index.vue       |   2 +-
 11 files changed, 871 insertions(+), 233 deletions(-)
 create mode 100644 src/api/jin_ji_hu/ServiceDevelopment/index.js
 create mode 100644 src/assets/styles/font/ArialMT.otf
 create mode 100644 src/views/home/components/echartsPage/index.vue

diff --git a/package.json b/package.json
index d79edd6..c139ea9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202407310924",
+  "version": "1.0.202408010854",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/api/jin_ji_hu/ServiceDevelopment/index.js b/src/api/jin_ji_hu/ServiceDevelopment/index.js
new file mode 100644
index 0000000..905664d
--- /dev/null
+++ b/src/api/jin_ji_hu/ServiceDevelopment/index.js
@@ -0,0 +1,19 @@
+import request from "@/utils/request"
+
+// 查询模板指标自定义选择
+export function templateMetrics(params) {
+  return request({
+    url: "/jjh/templateMetrics/templateMetrics",
+    method: "get",
+    params
+  })
+}
+
+// 新增服务业发展报告
+export function templateMetricsAdd(data){
+  return request({
+    url: "/jjh/templateMetrics",
+    method: "post",
+    data
+  })
+}
\ No newline at end of file
diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css
index c99a132..43f6371 100644
--- a/src/assets/styles/font.css
+++ b/src/assets/styles/font.css
@@ -41,4 +41,8 @@
 @font-face {
   font-family: "ArialB";
   src: url("./font/Arial-BoldMT.otf");
+}
+@font-face {
+  font-family: "ArialM";
+  src: url("./font/ArialMT.otf");
 }
\ No newline at end of file
diff --git a/src/assets/styles/font/ArialMT.otf b/src/assets/styles/font/ArialMT.otf
new file mode 100644
index 0000000000000000000000000000000000000000..343e2b3f9c0ffc0268dcddc25c89d8ffe45c19e1
GIT binary patch
literal 27384
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
IzyI(50GYd67XSbN

literal 0
HcmV?d00001

diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 2228289..4d19a4f 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -1,5 +1,15 @@
 @import "@/assets/styles/utils.scss";
 
+
+// 富文本编译器样式
+.el-form-item__content {
+  .w-e-text-container {
+    .w-e-text-placeholder {
+      top: 10px;
+    }
+  }
+}
+
 // 面包屑样式
 .my-L-breadcrumb {
   // height: 55px;
@@ -1839,6 +1849,15 @@
                   color: #fff;
                   font-family: AlibabaPuHuiTiM;
                 }
+                .orange {
+                  background-color: #ff8929;
+                }
+                .green {
+                  background-color: #5cbc69;
+                }
+                .red {
+                  background-color: #ff6349;
+                }
                 .promoteProject-top {
                   .span-one {
                     font-family: AlibabaPuHuiTiM;
@@ -2199,9 +2218,257 @@
     .home-main-left {
       background-color: #fff;
       border-radius: 10px;
-      // margin-right: 20px;
       margin-right: 10px;
+      padding: 10px 20px;
       height: 100%;
+      display: flex;
+      flex-direction: column;
+      .enterprise-header {
+        display: flex;
+        align-items: center;
+        margin-bottom: 10px;
+        .dataCloudMap-birght {
+          width:  6px;
+          height: 18px;
+          background: #0086FF;
+          box-shadow: 3px 0 3px 0px #0086FF;
+          border-radius: 5px 5px 5px 5px;
+        }
+        .enterprise-header-title {
+          font-family: AlibabaPuHuiTiB;
+          margin: 0 10px;
+          font-weight: bold;
+          font-size: 18px;
+          color: #333333;
+        }
+      }
+      .home-enterprise-top,.home-enterprise-bottom {
+        // flex: 1;
+        margin-bottom: 10px;
+        height: 50%;
+        height: calc((100% - 45px) / 2);
+        display: flex;
+        .capital-proportion,.capital-declare {
+          margin-right: 10px;
+        }
+        .capital-proportion,.enterprise-honor,.capital-declare,.relevancy-project {
+          width: 100%;
+          background-color: #F5F8FA;
+          height: 100%;
+          padding: 20px 20px 10px;
+          border-radius: 10px;
+          display: flex;
+          flex-direction: column;
+          .box-header {
+            display: flex;
+            align-items: center;
+            .garden {
+              width: 10px;
+              height: 10px;
+              border-radius: 50%;
+              background-color: #0086FF;
+              margin-right: 10px;
+            }
+            .box-header-title {
+              font-family: AlibabaPuHuiTiB;
+              font-size: 16px;
+              color: #383838;
+            }
+          }
+          // 往年资金拨付完成比例
+          .capital-echart-table {
+            flex: 1;
+            margin-top: 10px;
+            display: flex;
+            .left-echart {
+              flex: 1;
+              // width: 45%;
+              height: 100%;
+              #echartsHome {
+                height: 100%;
+                width: 100%;
+              }
+            }
+            .right-tables {
+              flex: 1;
+              // width: 50%;
+              overflow-y: scroll;
+              display: grid;
+              grid-template-columns: 1fr;
+              row-gap: 10px;
+              .table-items {
+                padding: 15px 15px;
+                text-align: left;
+                background-color: #fff;
+                display: grid;
+                grid-template-columns: 1fr;
+                row-gap: 10px;
+                .project-name {
+                  font-family: AlibabaPuHuiTiM;
+                  font-size: 16px;
+                  color: #1890FF;
+                  font-style: normal;
+                  text-decoration-line: underline;
+                  text-transform: none;
+                }
+                .project-type,.declare-time,.appropriate {
+                  display: flex;
+                  align-items: center;
+                  font-size: 16px;
+                  color: #666666;
+                  // flex-wrap: nowrap;
+                  .left-title {
+                    // flex: 1;
+                    margin-right: 5px;
+                    font-family: AlibabaPuHuiTiR;
+                    .left-unit {
+                      font-size: 12px;
+                    }
+                  }
+                  .right-value {
+                    font-family: AlibabaPuHuiTiM;
+                    width: 65%;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                    word-break: break-all;
+                    white-space: nowrap;
+                  }
+                  .right-number {
+                    font-family: ArialB;
+                  }
+                }
+              }
+            }
+          }
+          // 企业荣誉资质
+          .two-tables {
+            flex: 1;
+            display: grid;
+            grid-template-columns: 1fr;
+            row-gap: 10px;
+            margin-top: 10px;
+            .table-items {
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+              padding: 10px 20px;
+              background-color: #fff;
+              overflow-y: scroll;
+              .two-left {
+                font-family: AlibabaPuHuiTiM;
+                font-size: 16px;
+                color: #1890FF;
+              }
+              .two-right {
+                display: flex;
+                align-items: center;
+                font-size: 14px;
+                color: #666666;
+                .right-left {
+                  font-family: AlibabaPuHuiTiR;
+                }
+                .right-span {
+                  font-family: AlibabaPuHuiTiM;
+                }
+              }
+            }
+          }
+          // 往年专项资金申报
+          section {
+            margin-top: 10px;
+            .el-table {
+              th {
+                font-family: AlibabaPuHuiTiM;
+                font-size: 14px;
+                color: #333333;
+              }
+              td {
+                font-family: AlibabaPuHuiTiR;
+                font-size: 14px;
+                color: #666666;
+              }
+              .project-trace-table-number {
+                font-family: ArialM;
+                font-size: 14px;
+                color: #666666;
+              }
+              .project-trace-table {
+                font-family: AlibabaPuHuiTiR;
+                font-size: 14px;
+                color: #1890FF;
+              }
+            }
+          }
+          // 关联项目进展
+          .promoteProject-box-wai-box {
+            margin-top: 10px;
+            overflow-y: auto;
+            display: grid;
+            grid-template-columns: 1fr;
+            row-gap: 15px;
+            .promoteProject-box-div {
+              background: #FFFFFF;
+              padding: 14px;
+              position: relative;
+              .promoteProject-position {
+                position: absolute;
+                top: 0;
+                right: 0;
+                padding: 5px 0;
+                width: 20%;
+                border-radius: 0px 0px 0px 20px;
+                background-color: #ff8929;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #fff;
+                font-family: AlibabaPuHuiTiM;
+              }
+              .orange {
+                background-color: #ff8929;
+              }
+              .green {
+                background-color: #5cbc69;
+              }
+              .red {
+                background-color: #ff6349;
+              }
+              .promoteProject-top {
+                .span-one {
+                  font-family: AlibabaPuHuiTiM;
+                  font-size: 16px;
+                  color: #1890FF;
+                  font-style: normal;
+                  text-decoration-line: underline;
+                  text-transform: none;
+                }
+              }
+              .promoteProject-bottom {
+                margin-top: 16px;
+                display: flex;
+                justify-content: space-between;
+                width: 85%;
+                .promoteProject-bottom-left {
+                  font-family: AlibabaPuHuiTiR;
+                  font-size: 14px;
+                  color: #666666;
+                  .span-two {
+                    font-family: AlibabaPuHuiTiM;
+                  }
+                }
+                .promoteProject-bottom-right {
+                  font-family: AlibabaPuHuiTiR;
+                  font-size: 14px;
+                  color: #666666;
+                  .span-three {
+                    font-family:  ArialB;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     }
     .home-main-right {
       height: 100%;
@@ -2337,6 +2604,9 @@
           border-radius: 10px;
           margin-right: 10px;
           padding: 10px 20px;
+          .main-right {
+            height: 100%;
+          }
           .right-header {
             display: flex;
             justify-content: space-between;
@@ -2368,6 +2638,7 @@
             }
           }
           .right-main {
+            overflow-y: scroll;
             .main-items {
               display: flex;
               align-items: center;
@@ -3678,28 +3949,47 @@
   .yewufazhanbox-right {
     background: #fff;
     border-radius: 10px;
-    padding: 20px;
+    padding: 10px 20px;
 
-    .yewufazhan-title {
-      padding-left: 15px;
-      position: relative;
-      font-family: AlibabaPuHuiTiB;
-      font-size: 16px;
-      color: #383838;
-      text-align: left;
-      font-weight: 600;
+    .yewufazhanbox-header-box {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
       margin-bottom: 20px;
+      .yewufazhan-title {
+        padding-left: 15px;
+        position: relative;
+        font-family: AlibabaPuHuiTiB;
+        font-size: 16px;
+        color: #383838;
+        text-align: left;
+        font-weight: 600;
+  
+        &:before {
+          content: '';
+          position: absolute;
+          left: 0px;
+          top: 50%;
+          transform: translate(0, -50%);
+          width: 9px;
+          height: 9px;
+          background-color: #0086FF;
+          border-radius: 50%;
+        }
+      }
+      .el-button--default:hover {
+        background-color: oklab(0.65 -0.06 -0.18);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
 
-      &:before {
-        content: '';
-        position: absolute;
-        left: 0px;
-        top: 50%;
-        transform: translate(0, -50%);
-        width: 9px;
-        height: 9px;
-        background-color: #0086FF;
-        border-radius: 50%;
+      .el-button--default {
+        border-color: #1890FF;
+        font-family: PingFang-SC;
+        font-size: 14px;
+        font-weight: bold;
+        color: #0086FF;
+        padding: 10px 100px;
       }
     }
 
@@ -3719,6 +4009,38 @@
 
     .dialog-from-item {
       text-align: right;
+
+      .el-button--primary.is-active,
+      .el-button--primary:active {
+        background: oklab(0.7 -0.3 -0.4);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+
+      .el-button--primary {
+        background: #1890FF;
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+
+      .el-button--primary:focus,
+      .el-button--primary:hover {
+        background: oklab(0.7 -0.3 -0.4);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+
+      .el-button--default:hover,
+      .el-button--primary:hover {
+        background-color: oklab(0.65 -0.06 -0.18);
+        border-color: #1890FF;
+        color: #FFFEFE;
+      }
+
+      .el-button--default {
+        border-color: #1890FF;
+        color: #000000;
+      }
     }
   }
 
@@ -3726,9 +4048,32 @@
     width: 25%;
     position: relative;
 
+    .yewufazhan-title-right {
+      padding-left: 15px;
+      position: relative;
+      font-family: AlibabaPuHuiTiB;
+      font-size: 16px;
+      color: #383838;
+      text-align: left;
+      font-weight: 600;
+      line-height: 40px;
+
+      &:before {
+        content: '';
+        position: absolute;
+        left: 0px;
+        top: 50%;
+        transform: translate(0, -50%);
+        width: 9px;
+        height: 9px;
+        background-color: #0086FF;
+        border-radius: 50%;
+      }
+    }
+
     .yewufazhanbox-right-from {
       position: absolute;
-      top: 13px;
+      top: 10px;
       right: 20px;
 
       span {
@@ -3747,8 +4092,8 @@
       height: 95%;
       overflow: auto;
       .yewufazhanbox-charu {
-        cursor:pointer;
         font-family: AlibabaPuHuiTiR;
+        padding: 0;
         font-size: 14px;
         color: #1890FF;
         font-style: normal;
diff --git a/src/views/ServiceAndDevelopment/index.vue b/src/views/ServiceAndDevelopment/index.vue
index e2ae59d..d6791db 100644
--- a/src/views/ServiceAndDevelopment/index.vue
+++ b/src/views/ServiceAndDevelopment/index.vue
@@ -1,27 +1,30 @@
 <template>
     <div class="L-public-main yewufazhan-box">
-        <div class="yewufazhanbox-left">
-            <div class="yewufazhan-title">文本编辑器</div>
+        <div class="yewufazhanbox-left" v-loading="loading">
+            <div class="yewufazhanbox-header-box">
+                <div class="yewufazhan-title">文本编辑器</div>
+                <el-button @click="footbtn('一键生成')">一键生成</el-button>
+            </div>
             <el-form :model="addFrom" size="small" ref="importFrom" :rules="rules" class="newArticle">
                 <el-row :gutter="20">
                     <el-col>
-                        <el-form-item class="yewufazhanbox-input" prop="name">
-                            <el-input v-model.trim="addFrom.name" placeholder="请输入报告模板标题"></el-input>
+                        <el-form-item class="yewufazhanbox-input" prop="title">
+                            <el-input v-model.trim="addFrom.title" placeholder="请输入报告模板标题"></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
                 <el-row :gutter="20">
                     <el-col>
-                        <el-form-item class="yewufazhanbox-input" prop="enterUnit">
-                            <el-input v-model.trim="addFrom.enterUnit" placeholder="副标题"></el-input>
+                        <el-form-item class="yewufazhanbox-input" prop="subheading">
+                            <el-input v-model.trim="addFrom.subheading" placeholder="副标题"></el-input>
                         </el-form-item>
                     </el-col>
 
                 </el-row>
                 <el-row>
                     <el-col :span="24">
-                        <el-form-item prop="enterContent">
-                            <myEditor :height="200" v-model="addFrom.enterContent"></myEditor>
+                        <el-form-item prop="content">
+                            <myEditor height="480px" ref="myEditor" v-model="addFrom.content" @onFocus="onFocus" @onBlur="onBlur"></myEditor>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -32,30 +35,31 @@
                     <el-form-item class="dialog-from-item">
                         <el-button @click="footbtn('预览')">预览</el-button>
                         <el-button type="primary" @click="footbtn('保存')">保存</el-button>
-                        <el-button type="primary" @click="footbtn('一键生成')">一键生成</el-button>
+                        
                         <el-button type="primary" @click="footbtn('导出')">导出</el-button>
                     </el-form-item>
                 </el-form>
             </div>
         </div>
         <div class="yewufazhanbox-right">
-            <div class="yewufazhan-title">文本编辑器</div>
+            <div class="yewufazhan-title-right">模板指标自定义选择</div>
             <div class="yewufazhanbox-right-from">
                 <span>年份：</span>
-                <el-date-picker v-model="nianfenvalue3" type="year" placeholder="选择年">
+                <el-date-picker v-model="nianfenvalue3" value-format="yyyy" format="yyyy" @change="timeChange" type="year" placeholder="选择年">
                 </el-date-picker>
             </div>
             <div class="yewufazhanbox-right-table">
                 <el-table :data="tableData" border header-align="center" stripe>
-                <el-table-column prop="shuju" label="数据项" width="180" align="center">
+                <el-table-column prop="dataName" label="数据项" width="180" align="center">
                 </el-table-column>
-                <el-table-column prop="nianfen" label="统计年份" align="center">
+                <el-table-column prop="years" label="统计年份" align="center">
                 </el-table-column>
-                <el-table-column prop="shuzhi" label="数值" align="center">
+                <el-table-column prop="count" label="数值" align="center">
                 </el-table-column>
                 <el-table-column prop="shuzhi" label="操作" align="center">
                     <template slot-scope="scope">
-                        <div class="yewufazhanbox-charu" @click="charu(scope.row)">插入</div>
+                        <!-- <div class="yewufazhanbox-charu" @click="charu(scope.row)">插入</div> -->
+                        <el-button type="text"class="yewufazhanbox-charu" @click="charu(scope.row)" :disabled="btnDisable">插入</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -63,12 +67,37 @@
        
 
         </div>
+        <el-dialog
+            title="查看详情" 
+            :visible.sync="infoVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            @close="infoClose"
+            custom-class="info-dialog"
+            append-to-body
+            >
+            <div class="info-content">
+                <div class="info-title">{{ infoFrom.title }}</div>
+                <div class="info-content-top">
+                <div>发布人：{{ infoFrom.createBy }}</div>
+                <div>发布时间：{{ infoFrom.enterTime }}</div>
+                </div>
+                <div v-html="infoFrom.content" class="info-content-content"></div>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-form size="small">
+                <el-form-item class="dialog-from-item">
+                    <el-button size="mini" @click="infoClose">关闭</el-button>
+                </el-form-item>
+                </el-form>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
 import myEditor from "@/views/components/myEditor/index.vue"
-
+import { templateMetrics, templateMetricsAdd } from "@/api/jin_ji_hu/ServiceDevelopment/index"
 export default {
     name: '',
     components: { myEditor },
@@ -76,217 +105,104 @@ export default {
         return {
             nianfenvalue3: "",
             addFrom: {
-                name: "",
-                joinProject: "",
-                enterUnit: "",
-                policyLevel: "",
+                title: "",
+                subheading: "",
+                content: "",
+            },
+            infoFrom :{
+                title: "",
+                content: "",
+                createBy: "",
+                enterTime: "",
             },
             rules: {
-                name: [
-                    { required: true, message: '请填写政策文件名称', trigger: 'blur' }
+                title: [
+                    { required: true, message: '请输入报告模板标题', trigger: 'blur' }
                 ],
                 // joinProject:[
                 //   { required: true, message: '请填写政策等级', trigger: 'blur' }
                 // ],
-                enterUnit: [
-                    { required: true, message: '请填写发文单位', trigger: 'blur' }
-                ],
-                policyLevel: [
-                    { required: true, message: '请选择政策等级', trigger: 'change' }
+                subheading: [
+                    { required: true, message: '请输入副标题', trigger: 'blur' }
                 ],
-                enterTime: [
-                    { required: true, message: '请选择发文时间', trigger: 'change' }
+                content: [
+                    { required: true, message: '请输入内容', trigger: 'blur' }
                 ],
             },
-            tableData: [
-                {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                }, {
-                    shuju: "服务业企业总数 ",
-                    nianfen: "2023",
-                    shuzhi: "524"
-                },
-            ]
+            tableData: [],
+            btnDisable:true,
+            loading:false,
+            title : '苏州工业园区服务业发展情况',
+            subheading: "2023年4月",
+            content: "<p>一、总体实力显著增强</p><p>产业规模高速增长，综合贡献明显提升。</p><p>近年来,园区服务业保持持续增长态势,截至目前,园区服务业规上企业总计 677 家。2021年,园区实现服务业增加值 1674.4亿元，占GDP 比重达 50.3%。2022年全年，实现服务业增加值1753.18亿元，占 GDP 比重49.9%。2023年1-3月，实现服务业增加值 405.95亿元，同比增加4.2%。7大服务业核算行业(①多式联运和运输代理业、②装卸报运和仓储业、③互联网和相关服务、软件信息服务业、④租赁和商务服务业、(5居民服务、修理和其他服务业、⑥文化、体育和娱乐业、⑦科学研究和技术服务业)2022年全年营股1311.71亿元，增速达22%:2023年1-3月实现营收 348.34亿元，同比增速 35%。根据苏州市新兴服务业行业分类(含金融服务、信息服务、物流服务、科技服务、商务中介服务、设计服务、人力资源服务、检验栓测认证、低碳绿色服务、现代商贸、文化消费、旅游康养等 12个类别)，2022年国区新兴服务业营收达 1488.57 亿元，较上年增长 24%。</p><p>二、产业结构持续优化</p><p>产业结构还步优化，生产性服务占主导。经过多年发展，园区服务业产业结构逐渐多样化，生产性服务业与生活性服务业基本形成7:3的格局。2022年，生产性服务业增加值达到1199.5亿元，占服务业增加值比重达68.筑。截至目前，园区生产性服务业规上企业总计 655家(含部分工业企业)。自 2019年苏州市开展全市生产恒服务业综合译价以来，园区已连续两年考评优秀。37家国区企业入选苏州市生产性服务业领军企业，占全市51%，位全市第一，并成为苏州首个实现生产性服务业9大重点领域(信息技术服务、研发设计、金融服务、检验检测认证、知识产权服务、节能环保服务、人力资源服务、现代供应蛙管理、商务服务)全度盖的区域。推动先进制造业和现代服务业深度融合发展，2022年初，园区获评江苏省两业融合深度融合试点地区。</p><p>城市活力不断提升，生活性服务显潜能。完成环金鸡湖商圈城市活力提升规划并正式发布，引导环金鸡湖商圈核心商业体差异定位、错位发展，金鸡湖景区获评第一批省级现代服务业高质量发展集聚示范区。积极引入北京及上海周边外溢资源，推动园区载体与国内优质品牌对接，加快发展“首店经济”(首店经济是指一个区域利用特有的资源优势，吸引国内外品牌在区域首次开设门店，目前国区大力推动“中国首店”“苏州首店”落户园区)。通过开展“云购金鸡湖”等活动，持续打造金鸡湖系列 IP，宣传园区特色消费场景，在后疫情时代不断激发生活性服务业发展能。</p>",
+            infoVisible:false,
         }
     },
     created() { },
-    mounted() { },
+    mounted() { 
+        let date = new Date();
+        let year = date.getFullYear();
+        this.nianfenvalue3 = year + ''
+        this.getList();
+    },
     methods: {
         // 插入
         charu(item){
-            console.log(item);
-            this.addFrom.enterContent = item.shuzhi
+            // console.log(item);
+            this.$refs.myEditor.interposition(item.count)
+            // 在选区插入文本 : editor.insertText('xxx')  editor.dangerouslyInsertHtml(`<h1>标题</h1><p>文本 <b>加粗</b></p>`)
         },
         // 底部按钮
-
         footbtn(type) {
             if (type == '预览') {
 
             }
             if (type == '保存') {
-
+                console.log(this.addFrom.content);
+                
+                // templateMetricsAdd().then(res=>{
+                //     console.log(res);
+                // })
             }
             if (type == '一键生成') {
-
+                this.loading = true;
+                setTimeout(()=>{
+                    this.addFrom.title = this.title;
+                    this.addFrom.subheading = this.subheading;
+                    this.addFrom.content = this.content;
+                    this.loading = false;
+                },2000)
             }
             if (type == '导出') {
 
             }
-        }
+        },
+        // 查询模板指标自定义选择
+        getList(){
+            templateMetrics({year:this.nianfenvalue3}).then(res=>{
+                this.tableData = res.data;
+            })
+        },
+        // 选择年份变化
+        timeChange(time){
+            this.getList()
+        },
+        onFocus(){
+            this.btnDisable = false;
+        },
+        onBlur(){
+            this.btnDisable = true;
+        },
+        // 关闭详情
+        infoClose(){
+            this.infoFrom = {
+                title: "",
+                content: "",
+                createBy: "",
+                enterTime: "",
+            }
+            this.infoVisible = false;
+        },
     },
     computed: {}
 }
diff --git a/src/views/components/myEditor/index.vue b/src/views/components/myEditor/index.vue
index ffc9677..799b040 100644
--- a/src/views/components/myEditor/index.vue
+++ b/src/views/components/myEditor/index.vue
@@ -8,13 +8,15 @@
       :mode="mode"
     />
     <Editor
-      style="height: 500px; overflow-y: hidden;"
+      :style="{height: height, overflowY: 'hidden'}"
       v-loading="Loading"
       v-model="html"
       :defaultConfig="editorConfig"
       :mode="mode"
       @onCreated="onCreated"
       @onChange="onChange"
+      @onFocus="onFocus"
+      @onBlur="onBlur"
     />
   </div>
 </template>
@@ -37,8 +39,10 @@ export default {
           'emotion',
         ],
       },
+      number: 0,
       editorConfig: { 
         placeholder: '请输入内容...',
+        autoFocus:false,                        // 配置编辑器默认是否 focus ，默认为 true
         MENU_CONF: {
           uploadImage:{
             // 上传图片配置
@@ -74,6 +78,10 @@ export default {
       type: String,
       default: "",
     },
+    height: {
+      type: String,
+      default: '500px'
+    }
   },
   watch: {
     value: {
@@ -85,6 +93,7 @@ export default {
   },
   methods:{
     onCreated(editor) {
+      // 
       this.editor = Object.seal(editor) // 一定要用 Object.seal() ，否则会报错
       this.$nextTick(()=>{
         const toolbar = DomEditor.getToolbar(editor)
@@ -98,6 +107,16 @@ export default {
       this.$emit('input',html);
       // console.log('content', editor.children)
     },
+    onFocus(editor){
+      this.$emit('onFocus');
+    },
+    // 光标处插入数据
+    interposition(value){
+      this.editor.dangerouslyInsertHtml(`<span style="color: rgb(255, 255, 255); background-color: rgb(66, 144, 247);">${value}</span>`)
+    },
+    onBlur(){
+      this.$emit('onBlur');
+    },
     destroy() {
       const editor = this.editor
       if (editor == null) return
diff --git a/src/views/home/components/echartsPage/index.vue b/src/views/home/components/echartsPage/index.vue
new file mode 100644
index 0000000..ea7fb2c
--- /dev/null
+++ b/src/views/home/components/echartsPage/index.vue
@@ -0,0 +1,148 @@
+<template>
+  <div id="echartsHome" ref="myChartHome"></div>
+</template>
+<script>
+import * as echarts from "echarts";
+export default {
+  data() {
+    let colors = ['#5CBC69','#FF8929']
+    let datas = [
+      { value: 5, name: '已完成', label:{color:"#5CBC69"}},
+      { value: 95, name: '未完成', label:{color:"#FF8929"}},
+    ];
+    // 公用调整
+    let itemStyle = {
+      // normal: {
+      borderRadius: 4,
+      borderColor: "#F5F8FA",
+      borderWidth: 4,
+      color: function (params) {
+        return colors[params.dataIndex];
+      },
+      // },
+    };
+    return {
+      myChartHome: false,
+      option: {
+        color:colors,
+        legend: {
+          bottom: '10%',
+          right: '20%',
+          orient: 'horizontal',
+          data: datas,
+          icon: 'square',
+          itemWith: 14,
+          itemHeight: 14,
+          itemGap: 13,
+          // padding: [5, 10, 5, 0],
+          formatter(name) {
+            // debugger;
+            // const item = datas.filter((item) => item.name === name)[0];
+            return `{name|${name}}`;
+          },
+          textStyle: {
+            rich: {
+              name: {
+                color: '#666666',
+                fontSize: 14,
+                width: 100,
+                fontFamily: "AlibabaPuHuiTiR",
+              },
+            },
+          },
+        },
+        series: [
+          {
+            // 数据
+            type: "pie",
+            zlevel: 3,
+            radius: ["40%", "55%"],
+            center: ["45%", "40%"],
+            itemStyle: itemStyle,
+            emphasis: {
+              scale: true,
+              label: {
+                show: true
+              },
+            },
+            label: {
+              show: true,
+            },
+            data: datas,
+            label: {
+              // show: true,
+              // position: "outside",
+              padding: [10, -20],
+              formatter: (params) => {
+                return "{a|" +params.value+"}{b|" + "%}";
+              },
+              rich: {
+                a: {
+                  fontFamily: "DINCondensed",
+                  fontWeight: 'bold',
+                  fontSize: 18,
+                  padding: [-15, 0, 0, 0],
+                },
+                b: {
+                  fontFamily: "AlibabaPuHuiTiR",
+                  fontSize: 12,
+                  fontWeight: 500,
+                  padding: [-15, 0, 0, 0],
+                },
+              },
+            },
+            labelLine: {
+              show: true,
+              length: 15,
+              length2: 20,
+            },
+          },
+          {
+            name: "阴影圈",
+            type: "pie",
+            radius: ["0%", "35%"],
+            center: ["45%", "40%"],
+            hoverAnimation: false,
+            tooltip: {
+              show: false,
+            },
+            itemStyle: {
+              color: "rgba(0, 174, 255, 0.1)",
+              borderWidth:1,
+              borderColor: "rgba(0, 174, 255, 0.6)",
+            },
+            zlevel: 4,
+            labelLine: {
+              show: false,
+            },
+            data: [100],
+          }
+        ],
+      }
+    }
+  },
+  mounted(){
+    this.$nextTick(()=>{
+      this.initEchart();
+    })
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
+  methods:{
+    cancalDebounce(){
+      console.log("走了吗");
+      window.onresize = this.myChartHome.resize();
+    },
+    initEchart(){
+      var chartDom = document.getElementById("echartsHome");
+      this.myChartHome = echarts.init(chartDom);
+      this.myChartHome.setOption(this.option)
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 737670e..92ab743 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,12 +1,107 @@
 <template>
   <div class="home-box">
     <el-row type="flex" class="main-row">
-      <el-col :span="14" class="home-main-left">
-        
+      <el-col :span="16" class="home-main-left">
+        <div class="enterprise-header">
+          <span class="dataCloudMap-birght"></span>
+          <div class="enterprise-header-title">专项资金、荣誉、投资等统计</div>
+        </div>
+        <el-row class="home-enterprise-top">
+          <el-col :span="12" class="capital-proportion" id="one-table">
+            <div class="box-header" id="one-table-header">
+              <span class="garden"></span>
+              <span class="box-header-title">往年资金拨付完成比例（5%）</span>
+            </div>
+            <div class="capital-echart-table" id="echart-wai-box">
+              <div class="left-echart">
+                <echart></echart>
+              </div>
+              <div class="right-tables" :style="{height : tabOneHeader + 'px'}">
+                <div class="table-items" v-for="item in 5">
+                  <div class="project-name">【项目名称】</div>
+                  <div class="project-type">
+                    <span class="left-title">项目类别：</span>
+                    <span class="right-value">自主品牌先进技术研究院</span>
+                  </div>
+                  <div class="declare-time">
+                    <span class="left-title">申报时间：</span>
+                    <span class="right-number">2023-04-01</span>
+                  </div>
+                  <div class="appropriate">
+                    <span class="left-title">拨付金额<span class="left-unit">(亿元)</span>:</span>
+                    <span class="right-number">50</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="12" class="enterprise-honor">
+            <div class="box-header">
+              <span class="garden"></span>
+              <span class="box-header-title">企业荣誉资质（5个）</span>
+            </div>
+            <div class="two-tables" :style="{height : tabOneHeader + 'px'}">
+              <div class="table-items" v-for="item in 5">
+                <div class="two-left">xxxxx项目</div>
+                <div class="two-right">
+                  <span class="right-left">项目类别：</span>
+                  <span class="right-span">自主品牌先进技术研究院</span>
+                </div>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row class="home-enterprise-bottom">
+          <el-col :span="12" class="capital-declare" id="table-two">
+            <div class="box-header" id="table-two-title">
+              <span class="garden"></span>
+              <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-column label="项目名称" prop="projectName" align="center">
+                  <template slot-scope="scope">
+                    <div class="project-trace-table">{{ scope.row.projectName }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="专项资金申报时间" prop="time" align="center">
+                  <template slot-scope="scope">
+                    <div class="project-trace-table-number">{{ scope.row.time }}</div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </section>
+          </el-col>
+          <el-col :span="12" class="relevancy-project">
+            <div class="box-header">
+              <span class="garden"></span>
+              <span class="box-header-title">关联项目进展（3个）</span>
+            </div>
+            <div class="promoteProject-box-wai-box" :style="{height:tableTwoHeight + 'px'}">
+              <div class="promoteProject-box-div" v-for="(item,index) in tableTwoData" :key="index">
+                <div class="promoteProject-top">
+                  <span class="span-one">【{{ item.projectName }}】</span>
+                </div>
+                <div class="promoteProject-bottom">
+                  <div class="promoteProject-bottom-left">
+                    所属企业：
+                    <span class="span-two">{{ item.enterprice }}</span>
+                  </div>
+                  <div class="promoteProject-bottom-right">
+                    申报时间：
+                    <span class="span-three">{{ item.time }}</span>
+                  </div>
+                </div>
+                <div class="promoteProject-position" :class="item.type == 1 ? 'orange' : item.type == 2 ? 'green' : item.type == 3 ? 'red' : ''">{{item.type == 1 ? '复审中' : item.type == 2 ? '评审通过' : item.type == 3 ? '复审不通过' : ''}}</div>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
       </el-col>
-      <el-col :span="10" class="home-main-right">
+      <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: 64%;">
+          <el-col :span="24" class="work-main-left" style="height: 64.5%;">
             <div class="main-left">
               <div class="left-header">
                 <div class="left-header-titleS">
@@ -65,16 +160,16 @@
               </div>
             </div>
           </el-col>
-          <el-col :span="24" class="work-main-right" style="height: 34%;">
-            <div class="main-right">
-              <div class="right-header">
+          <el-col :span="24" class="work-main-right" style="height: 34.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="MoreRecords('all')" type="text" v-if="backlogArray.length > 0">>> 更多记录</el-button>
               </div>
-              <div class="right-main" v-if="backlogArray.length > 0" v-loading="loading">
+              <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> -->
@@ -106,8 +201,12 @@
 <script>
 import { listRecords } from "@/api/onlineDeclartion/records"
 import { chiefAll, enterpriseAll, changeIsRead } from "@/api/jin_ji_hu/intelligentReminder"
+import echart from "./components/echartsPage"
 export default {
   dicts: ["project_small_type"],
+  components:{
+    echart
+  },
   data() {
     return {
       // 判断登陆用户是何身份⌈ 01 ： 企业  02 ： 政务 ⌋
@@ -124,14 +223,81 @@ export default {
       fileList: [],
       uploadList: [],
       loading:false,
+      loadingTab:false,
       remindList: [],
       info:{},
+      tabHeader: 200,
+      tabOneHeader: 200,
+      tableTwoHeight:null,
+      tableData:[
+        {
+          projectType:"省级总部",
+          projectName:"xxx项目",
+          time:"2024-04-01"
+        },{
+          projectType:"市级总部",
+          projectName:"xxx项目",
+          time:"2024-04-01"
+        },{
+          projectType:"区级总部",
+          projectName:"xxx项目",
+          time:"2024-04-01"
+        },{
+          projectType:"省级服务业领军",
+          projectName:"xxx项目",
+          time:"2024-04-01"
+        },{
+          projectType:"两业融合试点单位",
+          projectName:"xxx项目",
+          time:"2024-04-01"
+        },{
+          projectType:"市级工业设计中心",
+          projectName:"xxx项目",
+          time:"2024-04-01"
+        },{
+          projectType:"两业融合试点单位",
+          projectName:"xxx项目",
+          time:"2024-04-01"
+        },{
+          projectType:"市级工业设计中心",
+          projectName:"xxx项目",
+          time:"2024-04-01"
+        },
+      ],
+      tableTwoData:[
+        {
+          projectName:"项目名称",
+          enterprice:"苏州众汇聚合信息科技有限公司",
+          time:"2024-04-01",
+          type:1,
+        },{
+          projectName:"项目名称",
+          enterprice:"苏州众汇聚合信息科技有限公司",
+          time:"2024-04-01",
+          type:2,
+        },{
+          projectName:"项目名称",
+          enterprice:"苏州众汇聚合信息科技有限公司",
+          time:"2024-04-01",
+          type:3,
+        },{
+          projectName:"项目名称",
+          enterprice:"苏州众汇聚合信息科技有限公司",
+          time:"2024-04-01",
+          type:3,
+        },
+      ]
     }
   },
   mounted(){
     this.getListTwo();
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
     // this.entRemind();
   },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   methods:{
     // 待填报
     getListTwo(){
@@ -190,6 +356,27 @@ export default {
         }
       }
     },
+    // 屏幕尺寸变化
+    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 oneTableHeight = oneTable.offsetHeight;
+      const oneHeaderHeight = oneHeader.offsetHeight;
+      this.tabOneHeader = oneTableHeight - oneHeaderHeight - 30;
+
+      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 - 50;
+      console.log(this.tabOneHeader);
+    }
   },
 }
 </script>
diff --git a/src/views/policyDocument/index.vue b/src/views/policyDocument/index.vue
index 5ef13ed..7deff9e 100644
--- a/src/views/policyDocument/index.vue
+++ b/src/views/policyDocument/index.vue
@@ -143,7 +143,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="发文内容：" class="importFormItem" prop="enterContent">
-              <myEditor v-if="openEditor" :height="200" v-model="addFrom.enterContent"></myEditor>
+              <myEditor v-if="openEditor" height="500px" v-model="addFrom.enterContent"></myEditor>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/workbench/components/promoteProject/index.vue b/src/views/workbench/components/promoteProject/index.vue
index 4f90b6c..7436d90 100644
--- a/src/views/workbench/components/promoteProject/index.vue
+++ b/src/views/workbench/components/promoteProject/index.vue
@@ -15,7 +15,7 @@
           <span class="span-three">{{ item.time }}</span>
         </div>
       </div>
-      <div class="promoteProject-position">复审中</div>
+      <div class="promoteProject-position" :class="item.type == 1 ? 'orange' : item.type == 2 ? 'green' : item.type == 3 ? 'red' : ''">{{item.type == 1 ? '复审中' : item.type == 2 ? '评审通过' : item.type == 3 ? '复审不通过' : ''}}</div>
     </div>
   </div>
 </template>