From b96d4552696a34aeb130a38e084d0f82ae7ce726 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 29 Jul 2024 10:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=99=BB=E5=BD=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=AD=A3=E5=BC=8F=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/App.vue                                   |  34 +-
 src/assets/styles/public.scss                 | 405 ++++++++++--------
 src/main.js                                   |  15 +
 src/permission.js                             |   2 +-
 .../dataCloudMap/components/echartData.vue    |   8 +-
 src/views/dataCloudMap/index.vue              | 367 ++++++++--------
 .../onlineDeclaration/template/index.vue      |  10 +-
 src/views/workbench/index.vue                 |  85 ++--
 9 files changed, 517 insertions(+), 411 deletions(-)

diff --git a/package.json b/package.json
index e4dac7f..8641d9b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202407261413",
+  "version": "1.0.202407290914",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/App.vue b/src/App.vue
index bd2dd56..ad6f99e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,30 +1,30 @@
 <template>
-  <ScaleBox>
+  <!-- <ScaleBox> -->
     <div id="app">
       <router-view />
     </div>
-  </ScaleBox>
+  <!-- </ScaleBox> -->
 </template>
 
 <script>
 import autofit from "autofit.js";
-import ScaleBox from "@/components/scaleBox";
+// import ScaleBox from "@/components/scaleBox";
 export default {
   name: "App",
-  components:{ScaleBox},
-  // mounted() {
-  //   autofit.init({
-  //     dh: 919,
-  //     dw: 1920,
-  //     el: "#app",
-  //     resize: true,
-  //     // ignore:[
-  //     //   {
-  //     //     el:".ignoreElement",
-  //     //   }
-  //     // ],
-  //   });
-  // },
+  // components:{ ScaleBox },
+  mounted() {
+    autofit.init({
+      dh: 919,
+      dw: 1920,
+      el: "#app",
+      resize: true,
+      // ignore:[
+      //   {
+      //     el:".ignoreElement",
+      //   }
+      // ],
+    });
+  },
   metaInfo() {
     return {
       title:
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 54ff900..99e42cf 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -1098,13 +1098,13 @@
     // overflow-y: scroll;
     .main-row {
       // height: 100%;
-      height: 540px;
+      height: 580px;
       display: flex;
       background-color: #f6f7f9;
       .work-main-left {
         background-color: #fff;
         border-radius: 10px;
-        margin-right: 10px;
+        margin-right: 20px;
         height: 100%;
         .main-left {
           padding: 10px 20px;
@@ -1113,13 +1113,35 @@
             // display: flex;
             // justify-content: space-between;
             // align-items: center;
-            padding: 5px 0 10px;
-            margin-bottom: 15px;
-            .left-header-title {
-              // font-family: PingFang-SC, PingFang-SC;
-              font-weight: bold;
+            // padding: 5px 0 10px;
+            margin-bottom: 10px;
+            display: flex;
+            // align-items: center;
+            align-items: flex-end;
+            justify-content: space-between;
+            .left-header-titleS {
+              display: flex;
+              align-items: center;
+              .dataCloudMap-birght {
+                width:  6px;
+                height: 18px;
+                background: #0086FF;
+                box-shadow: 3px 0 3px 0px #0086FF;
+                border-radius: 5px 5px 5px 5px;
+              }
+              .left-header-title {
+                font-family: AlibabaPuHuiTiB;
+                margin: 0 10px;
+                font-weight: bold;
+                font-size: 18px;
+                color: #333333;
+              }
+            }
+            .el-button {
+              font-family: PingFang-SC-Medium;
+              font-weight: 500;
               font-size: 14px;
-              color: #333333;
+              color: #0086FF;
             }
           }
           .left-main {
@@ -1208,6 +1230,9 @@
           }
         }
       }
+      .service-left {
+        padding: 10px 20px;
+      }
       .work-main-right {
         background-color: #fff;
         border-radius: 10px;
@@ -1219,17 +1244,29 @@
             justify-content: space-between;
             align-items: center;
             margin-bottom: 15px;
-            .right-header-title {
-              // font-family: PingFang-SC, PingFang-SC;
-              font-weight: bold;
-              font-size: 14px;
-              color: #333333;
+            .right-header-box {
+              display: flex;
+              align-items: center;
+              .dataCloudMap-birght {
+                width:  6px;
+                height: 18px;
+                background: #0086FF;
+                box-shadow: 3px 0 3px 0px #0086FF;
+                border-radius: 5px 5px 5px 5px;
+              }
+              .right-header-title {
+                font-family: AlibabaPuHuiTiB;
+                margin: 0 10px;
+                font-weight: bold;
+                font-size: 18px;
+                color: #333333;
+              }
             }
             .el-button {
-              // font-family: PingFang-SC, PingFang-SC;
+              font-family: PingFang-SC-Medium;
               font-weight: 500;
               font-size: 14px;
-              color: #134EE6;
+              color: #0086FF;
             }
           }
           .right-main {
@@ -1290,6 +1327,9 @@
       // align-content: space-between;
       justify-content: space-between;
     }
+    // 招商信息分析
+    .main-row-two {
+    }
   }
   // 企业端首页
   .home-index-main {
@@ -1352,156 +1392,6 @@
         background-color: #fff;
         border-radius: 10px;
         padding: 10px 20px;
-        .echart-title {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          .echart-left-title {
-            display: grid;
-            grid-template-columns: auto auto; /* 自动列宽 */
-            align-items: end; /* 垂直对齐方式：底部对齐 */
-            margin-top: -10px;
-            .L-title-left {
-              display: flex;
-              align-items: center;
-              .dataCloudMap-birght {
-                width:  6px;
-                height: 18px;
-                background: #0086FF;
-                box-shadow: 3px 0 3px 0px #0086FF;
-                border-radius: 5px 5px 5px 5px;
-              }
-              .dataCloudMap-title {
-                font-family: AlibabaPuHuiTiB;
-                font-size: 18px;
-                color: #333333;
-                margin: 0 10px;
-              }
-            }
-            .dataCloudMap-data {
-              font-family: AlibabaPuHuiTiR;
-              font-size: 14px;
-              color: #999999;
-              line-height: 22px;
-              // line-height: 31px;
-              // margin-top: 5px;
-            }
-          }
-          .rightBigNav {
-            padding: 2px;
-            box-sizing: border-box;
-            height: 33px;
-            // background: #fff;
-            .right-nav {
-              display: flex;
-              height: 100%;
-              font-size: 14px;
-              .tabStyle {
-                height: 100%;
-                background: #F6F9FD;
-                padding: 0 20px;
-                border-radius: 2px;
-                display: flex;
-                align-items: center;
-                cursor: pointer;
-                user-select: none;
-                color: #7a8599;
-                margin-right: 10px;
-                border-radius: 5px;
-
-                .change-grey-birght {
-                  width: 8px;
-                  height: 8px;
-                  background: #C7DAEE;
-                  border-radius: 50%;
-                  margin-right: 5px;
-                }
-                .change-blue-birght {
-                  background: #0086FF;
-                }
-                
-                .change-grey-text {
-                  color: #94A9C0;
-                  font-size: 14px;
-                  font-weight: 500;
-                }
-                .change-blue-text {
-                  color: #0086FF;
-                  font-weight: bold;
-                }
-              }
-              .change-blue {
-                background: #E8F3FC;
-                color: #fff;
-              }
-            }
-          }
-        }
-        .components-box {
-          height: 100%;
-        }
-        .echarts-data-box {
-          display: grid;
-          grid-template-columns: 1fr 1fr 1fr;
-          margin: 15px 0 12px;
-          .E-box-item {
-            display: flex;
-            .img-box {
-              width: 50px;
-              height: 50px;
-              border-radius: 50%;
-              margin-right: 10px;
-              background-size: contain; /* 图片大小适应容器 */
-              background-position: center; /* 图片居中 */
-              background-repeat: no-repeat; /* 不重复显示背景图 */
-            }
-            .img-box-one {
-              background-image: url("../images/mapIconOne.png");
-            }
-            .img-box-two {
-              background-image: url("../images/mapIconTwo.png");
-            }
-            .img-box-three {
-              background-image: url("../images/mapIconThree.png");
-            }
-            .data-box {
-              display: flex;
-              justify-content: space-between;
-              flex-direction: column;
-              .box-number {
-                display: flex;
-                align-items: flex-end;
-                .number-yuan {
-                  font-family: DINCondensed, DINCondensed;
-                  font-weight: bold;
-                  font-size: 36px;
-                  line-height: 30px;
-                  margin-right: 5px;
-                  color: #333333;
-                }
-                .yuan-unit {
-                  font-family: PingFang-SC, PingFang-SC;
-                  font-weight: bold;
-                  font-size: 12px;
-                  line-height: 18px;
-                  color: #666666;
-                }
-              }
-              .box-bottom {
-                font-family: PingFang-SC-Medium;
-                font-weight: 500;
-                font-size: 12px;
-                color: #666666;
-              }
-            }
-          }
-        }
-        #echarts {
-          width: 100%;
-          height: calc(100% - 110px);
-          // height: 30vh;
-          // height: 370px;
-        }
       }
       // 行业纵深情况
       .dataCloudMap-left-bottom {
@@ -1615,8 +1505,9 @@
         height: 42%;
         background-color: #fff;
         border-radius: 10px;
-        // padding: 10px 20px 15px;
-        padding: 1vh 20px 1.5vh;
+        padding: 10px 20px 15px;
+        // padding: 1vh 20px 1.5vh;
+        // padding: 1rem 2rem 1rem;
         display: flex;
         flex-direction: column;
         // justify-content: space-between;
@@ -1651,7 +1542,15 @@
             line-height: 22px;
           }
         }
+        .dataCloudMap-enterprise-bottom {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          // justify-content: space-between;
+          align-content: space-between;
+        }
         .dataCloudMap-enterprise {
+          flex: 1;
           margin-top: 15px;
           // margin-top: 2vh;
           display: grid;
@@ -1661,6 +1560,11 @@
           .el-card {
             background-color: #fff;
             border: none;
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            // justify-content: space-between;
+            align-content: space-between;
             .el-card__header {
               border-bottom: none;
               padding: 10px 15px 3px;
@@ -1674,12 +1578,20 @@
               }
             }
             .el-card__body {
-              padding: 7px 20px 10px 20px;
+              padding: 7px 20px 20px 20px;
+              flex: 1;
               // padding: 0.7vh 1vw 1.2vh 1vw;
+              // display: flex;
+              // flex-direction: column;
+              // justify-content: space-between;
+              // align-content: space-between;
+              display: grid;
+              grid-template-columns: 1fr;
+              grid-row-gap: 10px;
             }
             .card-items {
               // margin-bottom: 0.5vw;
-              margin-bottom: 10px;
+              // margin-bottom: 10px;
               padding: 7px 10px;
               // padding: 0.7vh 10px;
               background-color: #F6F9FD;
@@ -1752,7 +1664,7 @@
           }
         }
         .dataCloudMap-statistics {
-          margin-top: 12px;
+          margin-top: 15px;
           // margin-top: 1.5vh;
           display: grid;
           grid-template-columns: 1fr 1fr 1fr 1fr;
@@ -1917,6 +1829,7 @@
         .honor-data {
           margin-top: 15px;
           // margin-top: 2vh;
+          flex: 1;
           display: grid;
           grid-template-columns: 1fr 1fr 1fr;
           grid-gap: 15px;
@@ -2332,4 +2245,156 @@
       }
     }
   }
+}
+
+// 服务业数据概览
+.echart-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .echart-left-title {
+    display: grid;
+    grid-template-columns: auto auto; /* 自动列宽 */
+    align-items: end; /* 垂直对齐方式：底部对齐 */
+    margin-top: -10px;
+    .L-title-left {
+      display: flex;
+      align-items: center;
+      .dataCloudMap-birght {
+        width:  6px;
+        height: 18px;
+        background: #0086FF;
+        box-shadow: 3px 0 3px 0px #0086FF;
+        border-radius: 5px 5px 5px 5px;
+      }
+      .dataCloudMap-title {
+        font-family: AlibabaPuHuiTiB;
+        font-size: 18px;
+        color: #333333;
+        margin: 0 10px;
+      }
+    }
+    .dataCloudMap-data {
+      font-family: AlibabaPuHuiTiR;
+      font-size: 14px;
+      color: #999999;
+      line-height: 22px;
+      // line-height: 31px;
+      // margin-top: 5px;
+    }
+  }
+  .rightBigNav {
+    padding: 2px;
+    box-sizing: border-box;
+    height: 33px;
+    // background: #fff;
+    .right-nav {
+      display: flex;
+      height: 100%;
+      font-size: 14px;
+      .tabStyle {
+        height: 100%;
+        background: #F6F9FD;
+        padding: 0 20px;
+        border-radius: 2px;
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+        user-select: none;
+        color: #7a8599;
+        margin-right: 10px;
+        border-radius: 5px;
+
+        .change-grey-birght {
+          width: 8px;
+          height: 8px;
+          background: #C7DAEE;
+          border-radius: 50%;
+          margin-right: 5px;
+        }
+        .change-blue-birght {
+          background: #0086FF;
+        }
+        
+        .change-grey-text {
+          color: #94A9C0;
+          font-size: 14px;
+          font-weight: 500;
+        }
+        .change-blue-text {
+          color: #0086FF;
+          font-weight: bold;
+        }
+      }
+      .change-blue {
+        background: #E8F3FC;
+        color: #fff;
+      }
+    }
+  }
+}
+.components-box {
+  height: 100%;
+}
+.echarts-data-box {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  margin: 15px 0 12px;
+  .E-box-item {
+    display: flex;
+    .img-box {
+      width: 50px;
+      height: 50px;
+      border-radius: 50%;
+      margin-right: 10px;
+      background-size: contain; /* 图片大小适应容器 */
+      background-position: center; /* 图片居中 */
+      background-repeat: no-repeat; /* 不重复显示背景图 */
+    }
+    .img-box-one {
+      background-image: url("../images/mapIconOne.png");
+    }
+    .img-box-two {
+      background-image: url("../images/mapIconTwo.png");
+    }
+    .img-box-three {
+      background-image: url("../images/mapIconThree.png");
+    }
+    .data-box {
+      display: flex;
+      justify-content: space-between;
+      flex-direction: column;
+      .box-number {
+        display: flex;
+        align-items: flex-end;
+        .number-yuan {
+          font-family: DINCondensed, DINCondensed;
+          font-weight: bold;
+          font-size: 36px;
+          line-height: 30px;
+          margin-right: 5px;
+          color: #333333;
+        }
+        .yuan-unit {
+          font-family: PingFang-SC, PingFang-SC;
+          font-weight: bold;
+          font-size: 12px;
+          line-height: 18px;
+          color: #666666;
+        }
+      }
+      .box-bottom {
+        font-family: PingFang-SC-Medium;
+        font-weight: 500;
+        font-size: 12px;
+        color: #666666;
+      }
+    }
+  }
+}
+#echarts {
+  width: 100%;
+  height: calc(100% - 110px);
+  // height: 30vh;
+  // height: 370px;
 }
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 329caac..40fb7d7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -81,7 +81,22 @@ if (!localVersion || version !== localVersion) {
   localStorage.clear()		// 清除缓存
   localStorage.setItem('projectVersion', version)
 }
+// var docEl = document.documentElement;
+// function setRemUnit () {
+//   var rem = docEl.clientWidth / 19.2; // 可根据不同电脑分辨率进行手动修改（如1920*1080 为19.2
+//   docEl.style.fontSize = rem + 'px'
+//   console.log(docEl);
+//   console.log(rem + 'px');
+// }
 
+// setRemUnit()
+
+// window.addEventListener('resize', setRemUnit)
+// window.addEventListener('pageshow', function (e) {
+//   if (e.persisted) {
+//     setRemUnit()
+//   }
+// })
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
diff --git a/src/permission.js b/src/permission.js
index af00b4f..877aeb7 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -64,7 +64,7 @@ router.beforeEach((to, from, next) => {
           // var modifiedUrl = url.replace(/(\?appid&clienttoken=)[^&#]+/, '');
           // // console.log(modifiedUrl,'modifiedUrl');
           // window.location.href = modifiedUrl;
-          window.location.href = "http://114.216.202.175:8008/ecobrainportal/index.html";
+          window.location.href = "https://qytt.sipac.gov.cn/ecobrainportal/index.html";
           next({ path: "/" });
         });
         // store.dispatch("LogOut").then(() => {
diff --git a/src/views/dataCloudMap/components/echartData.vue b/src/views/dataCloudMap/components/echartData.vue
index fb48ff7..76f8ca7 100644
--- a/src/views/dataCloudMap/components/echartData.vue
+++ b/src/views/dataCloudMap/components/echartData.vue
@@ -181,15 +181,21 @@ export default {
     }
   },
   mounted(){
-    
     this.$nextTick(()=>{
       this.initEchart();
     })
     setTimeout(()=>{
       this.getService(1);
     },200)
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    cancalDebounce(){
+      window.onresize = this.myChart.resize();
+    },
     initEchart(){
       var chartDom = document.getElementById("echarts");
       this.myChart = echarts.init(chartDom);
diff --git a/src/views/dataCloudMap/index.vue b/src/views/dataCloudMap/index.vue
index 5d691f3..1789fa3 100644
--- a/src/views/dataCloudMap/index.vue
+++ b/src/views/dataCloudMap/index.vue
@@ -93,213 +93,215 @@
             </div>
             <span class="dataCloudMap-data">【统计数据截至：{{ time }}】</span>
           </div>
-          <div class="dataCloudMap-enterprise">
-            <!-- 第一个卡片 -->
-            <el-card shadow="always">
-              <div slot="header" class="clearfix">
-                <span>生产性服务业</span>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img"></div>
-                  <div class="card-type">规上企业数量:</div>
-                </div>
-                <div class="card-item-right">
-                  <div class="card-number" @click="enterInfo('生产性服务业企业')">768</div>
-                  <div class="card-unit">家</div>
-                </div>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img card-img-two"></div>
-                  <div class="card-type">规上企业营收:</div>
-                </div>
-                <div class="card-item-right">
-                  <div class="card-number number-two">1913</div>
-                  <div class="card-unit unit-two">亿</div>
-                </div>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img card-img-three"></div>
-                  <div class="card-type">全口径增加值:</div>
-                </div>
-                <div class="card-item-right">
-                  <div class="card-number number-three">132</div>
-                  <div class="card-unit unit-two">亿</div>
-                </div>
-              </div>
-            </el-card>
-            <!-- 第二个卡片 -->
-            <el-card shadow="always">
-              <div slot="header" class="clearfix">
-                <span>生活性服务业</span>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img"></div>
-                  <div class="card-type">规上企业数量:</div>
-                </div>
-                <div class="card-item-right">
-                  <div class="card-number" @click="enterInfo('生活性服务业企业')">768</div>
-                  <div class="card-unit">家</div>
-                </div>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img card-img-two"></div>
-                  <div class="card-type">规上企业营收:</div>
+          <div class="dataCloudMap-enterprise-bottom">
+            <div class="dataCloudMap-enterprise">
+              <!-- 第一个卡片 -->
+              <el-card shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>生产性服务业</span>
                 </div>
-                <div class="card-item-right">
-                  <div class="card-number number-two">1913</div>
-                  <div class="card-unit unit-two">亿</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img"></div>
+                    <div class="card-type">规上企业数量:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number" @click="enterInfo('生产性服务业企业')">768</div>
+                    <div class="card-unit">家</div>
+                  </div>
                 </div>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img card-img-three"></div>
-                  <div class="card-type">全口径增加值:</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-two"></div>
+                    <div class="card-type">规上企业营收:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-two">1913</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
                 </div>
-                <div class="card-item-right">
-                  <div class="card-number number-three">132</div>
-                  <div class="card-unit unit-two">亿</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-three"></div>
+                    <div class="card-type">全口径增加值:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-three">132</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
                 </div>
-              </div>
-            </el-card>
-            <!-- 第三个卡片 -->
-            <el-card shadow="always">
-              <div slot="header" class="clearfix">
-                <span>新兴服务业</span>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img"></div>
-                  <div class="card-type">规上企业数量:</div>
+              </el-card>
+              <!-- 第二个卡片 -->
+              <el-card shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>生活性服务业</span>
                 </div>
-                <div class="card-item-right">
-                  <div class="card-number" @click="enterInfo('新兴服务业企业')">768</div>
-                  <div class="card-unit">家</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img"></div>
+                    <div class="card-type">规上企业数量:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number" @click="enterInfo('生活性服务业企业')">768</div>
+                    <div class="card-unit">家</div>
+                  </div>
                 </div>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img card-img-two"></div>
-                  <div class="card-type">规上企业营收:</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-two"></div>
+                    <div class="card-type">规上企业营收:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-two">1913</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
                 </div>
-                <div class="card-item-right">
-                  <div class="card-number number-two">1913</div>
-                  <div class="card-unit unit-two">亿</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-three"></div>
+                    <div class="card-type">全口径增加值:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-three">132</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
                 </div>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img card-img-three"></div>
-                  <div class="card-type">全口径增加值:</div>
+              </el-card>
+              <!-- 第三个卡片 -->
+              <el-card shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>新兴服务业</span>
                 </div>
-                <div class="card-item-right">
-                  <div class="card-number number-three">132</div>
-                  <div class="card-unit unit-two">亿</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img"></div>
+                    <div class="card-type">规上企业数量:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number" @click="enterInfo('新兴服务业企业')">768</div>
+                    <div class="card-unit">家</div>
+                  </div>
                 </div>
-              </div>
-            </el-card>
-            <!-- 第四个卡片 -->
-            <el-card shadow="always">
-              <div slot="header" class="clearfix">
-                <span>限上批零住餐</span>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img"></div>
-                  <div class="card-type">规上企业数量:</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-two"></div>
+                    <div class="card-type">规上企业营收:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-two">1913</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
                 </div>
-                <div class="card-item-right">
-                  <div class="card-number" @click="enterInfo('限上批零住餐企业')">768</div>
-                  <div class="card-unit">家</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-three"></div>
+                    <div class="card-type">全口径增加值:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-three">132</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
                 </div>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img card-img-two"></div>
-                  <div class="card-type">规上企业营收:</div>
+              </el-card>
+              <!-- 第四个卡片 -->
+              <el-card shadow="always">
+                <div slot="header" class="clearfix">
+                  <span>限上批零住餐</span>
                 </div>
-                <div class="card-item-right">
-                  <div class="card-number number-two">1913</div>
-                  <div class="card-unit unit-two">亿</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img"></div>
+                    <div class="card-type">规上企业数量:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number" @click="enterInfo('限上批零住餐企业')">768</div>
+                    <div class="card-unit">家</div>
+                  </div>
                 </div>
-              </div>
-              <div class="card-items">
-                <div class="card-item-left">
-                  <div class="card-img card-img-three"></div>
-                  <div class="card-type">全口径增加值:</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-two"></div>
+                    <div class="card-type">规上企业营收:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-two">1913</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
                 </div>
-                <div class="card-item-right">
-                  <div class="card-number number-three">132</div>
-                  <div class="card-unit unit-two">亿</div>
+                <div class="card-items">
+                  <div class="card-item-left">
+                    <div class="card-img card-img-three"></div>
+                    <div class="card-type">全口径增加值:</div>
+                  </div>
+                  <div class="card-item-right">
+                    <div class="card-number number-three">132</div>
+                    <div class="card-unit unit-two">亿</div>
+                  </div>
                 </div>
-              </div>
-            </el-card>
-          </div>
-          <div class="dataCloudMap-statistics">
-            <div class="statistics-title">
-              总部企业
+              </el-card>
             </div>
-            <div class="statistics-items">
-              <div class="statistics-item">
-                <div class="statistics-item-img"></div>
-                <div class="statistics-item-type">企业数量:</div>
-                <div class="statistics-item-right">
-                  <div class="statistics-item-number" @click="headqEnterpriseBtn">365</div>
-                  <div class="statistics-item-unit">
-                    <span>家</span>
+            <div class="dataCloudMap-statistics">
+              <div class="statistics-title">
+                总部企业
+              </div>
+              <div class="statistics-items">
+                <div class="statistics-item">
+                  <div class="statistics-item-img"></div>
+                  <div class="statistics-item-type">企业数量:</div>
+                  <div class="statistics-item-right">
+                    <div class="statistics-item-number" @click="headqEnterpriseBtn">365</div>
+                    <div class="statistics-item-unit">
+                      <span>家</span>
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div class="statistics-items">
-              <div class="statistics-item">
-                <div class="statistics-item-img item-img-two"></div>
-                <div class="statistics-item-type">税收贡献:</div>
-                <div class="statistics-item-right">
-                  <div class="statistics-item-number number-two">1913</div>
-                  <div class="statistics-item-unit unit-two">
-                    <span>亿</span>
-                    <el-popover
-                      placement="top"
-                      width="207"
-                      trigger="click"
-                    >
-                      <div class="popover-Tooltip">增值税+企业所得税-免抵调库</div>
-                      <img slot="reference" src="@/assets/images/Mapi.png" alt="">
-                    </el-popover>
+              <div class="statistics-items">
+                <div class="statistics-item">
+                  <div class="statistics-item-img item-img-two"></div>
+                  <div class="statistics-item-type">税收贡献:</div>
+                  <div class="statistics-item-right">
+                    <div class="statistics-item-number number-two">1913</div>
+                    <div class="statistics-item-unit unit-two">
+                      <span>亿</span>
+                      <el-popover
+                        placement="top"
+                        width="207"
+                        trigger="click"
+                      >
+                        <div class="popover-Tooltip">增值税+企业所得税-免抵调库</div>
+                        <img slot="reference" src="@/assets/images/Mapi.png" alt="">
+                      </el-popover>
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div class="statistics-items statistics-items-none">
-              <div class="statistics-item">
-                <div class="statistics-item-img item-img-three"></div>
-                <div class="statistics-item-type">经营数据:</div>
-                <div class="statistics-item-right">
-                  <div class="statistics-item-number number-three">132</div>
-                  <div class="statistics-item-unit unit-two">
-                    <span>亿</span>
-                    <el-popover
-                      placement="top"
-                      width="170"
-                      trigger="click"
-                    >
-                    <div class="popover-Tooltip">
-                      <div>制造业总部提供产值</div>
-                      <div>服务业总部提供营收</div>
-                      <div>建筑业总部提供产值</div>
-                      <div>贸易类总部提供销售额</div>
+              <div class="statistics-items statistics-items-none">
+                <div class="statistics-item">
+                  <div class="statistics-item-img item-img-three"></div>
+                  <div class="statistics-item-type">经营数据:</div>
+                  <div class="statistics-item-right">
+                    <div class="statistics-item-number number-three">132</div>
+                    <div class="statistics-item-unit unit-two">
+                      <span>亿</span>
+                      <el-popover
+                        placement="top"
+                        width="170"
+                        trigger="click"
+                      >
+                      <div class="popover-Tooltip">
+                        <div>制造业总部提供产值</div>
+                        <div>服务业总部提供营收</div>
+                        <div>建筑业总部提供产值</div>
+                        <div>贸易类总部提供销售额</div>
+                      </div>
+                        <img slot="reference" src="@/assets/images/Mapi.png" alt="">
+                      </el-popover>
                     </div>
-                      <img slot="reference" src="@/assets/images/Mapi.png" alt="">
-                    </el-popover>
                   </div>
                 </div>
               </div>
-            </div>
+          </div>
           </div>
         </div>
 
@@ -413,13 +415,9 @@ export default {
       options1: [
         {
           name: "按年",
-          // url: require("../../assets/images/bg1.png"),
-          // url1: require("../../assets/images/bg2.png"),
         },
         {
           name: "按季度",
-          // url: require("../../assets/images/tb1.png"),
-          // url1: require("../../assets/images/tb2.png"),
         },
       ],
       loadingOne: false,
@@ -446,7 +444,6 @@ export default {
     this.getIndustryDepthList();
     // this.init()
     this.time = this.getNowFormatDate();
-    console.log(this.time);
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
diff --git a/src/views/onlineDeclaration/template/index.vue b/src/views/onlineDeclaration/template/index.vue
index f66daf4..70ade6e 100644
--- a/src/views/onlineDeclaration/template/index.vue
+++ b/src/views/onlineDeclaration/template/index.vue
@@ -246,12 +246,12 @@ export default {
     /** 查看流程图 */
     handleProcessView(row) {
       this.designerData.title = "流程设计 - " + row.templateName;
-      this.designerData.modelId = row.id;
+      this.designerData.modelId = "";
       this.designerOpen = true;
-      this.designerData.form = {
-        processName: row.templateName,
-        processKey: row.id + ''
-      }
+      // this.designerData.form = {
+      //   processName: row.templateName,
+      //   processKey: row.id + ''
+      // }
       // if (row.modelId) {
       //   this.designerData.loading = true;
       //   getBpmnXml(row.modelId).then(response => {
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 3f0f11a..fee35db 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -24,46 +24,48 @@
     </header>
     <main class="home-main">
       <el-row class="main-row">
-        <el-col :span="16" class="work-main-left">
-          <div class="main-left">
+        <el-col :span="14" class="work-main-left service-left">
+          <!-- <div class="main-left">
             <div class="left-header">
               <div class="left-header-title">【服务业数据概览】</div>
             </div>
-          </div>
-          <!-- <div class="dataCloudMap-left-top">
-            <div class="echart-title">
-              <div class="echart-left-title">
-                <div class="L-title-left">
-                  <span class="dataCloudMap-birght"></span>
-                  <span class="dataCloudMap-title">服务业发展总览</span>
-                </div>
-                <span class="dataCloudMap-data">【统计数据截至：2024-01】</span>
+          </div> -->
+          <div class="echart-title">
+            <div class="echart-left-title">
+              <div class="L-title-left">
+                <span class="dataCloudMap-birght"></span>
+                <span class="dataCloudMap-title">服务业发展总览</span>
               </div>
-              <div class="rightBigNav">
-                <div class="right-nav">
-                  <div
-                    class="tabStyle"
-                    v-for="(item, index) in options1"
-                    :key="index"
-                    @click="active(index + 1)"
-                    :class="activeIndex == index + 1 ? 'change-blue' : ''"
-                  >
-                    <div class="change-grey-birght" :class="activeIndex == index + 1 ? 'change-blue-birght' : ''"></div>
-                    <span class="change-grey-text" :class="activeIndex == index + 1 ? 'change-blue-text' : ''">{{ item.name }}</span>
-                  </div>
+              <span class="dataCloudMap-data">【统计数据截至：2024-01】</span>
+            </div>
+            <div class="rightBigNav">
+              <div class="right-nav">
+                <div
+                  class="tabStyle"
+                  v-for="(item, index) in options1"
+                  :key="index"
+                  @click="active(index + 1)"
+                  :class="activeIndex == index + 1 ? 'change-blue' : ''"
+                >
+                  <div class="change-grey-birght" :class="activeIndex == index + 1 ? 'change-blue-birght' : ''"></div>
+                  <span class="change-grey-text" :class="activeIndex == index + 1 ? 'change-blue-text' : ''">{{ item.name }}</span>
                 </div>
               </div>
             </div>
-            <echartData :activeIndex="activeIndex" ref="echartData"/>
-          </div> -->
+          </div>
+          <echartData :activeIndex="activeIndex" ref="echartData"/>
         </el-col>
         
-        <el-col :span="8">
+        <el-col :span="10">
           <el-row type="flex" class="main-two-row">
-            <el-col :span="24" class="work-main-left" style="height: 69%;">
+            <el-col :span="24" class="work-main-left" style="height: 63%;">
               <div class="main-left">
                 <div class="left-header">
-                  <div class="left-header-title">【智能提醒】</div>
+                  <div class="left-header-titleS">
+                    <span class="dataCloudMap-birght"></span>
+                    <div class="left-header-title">智能提醒</div>
+                  </div>
+                  <el-button @click="MoreRecords('all')" type="text" v-if="remindList.length > 0">>> 更多记录</el-button>
                 </div>
                 <div class="left-main">
                   <el-card shadow="never" v-for="(item,index) in remindList" :key="index" :class="item.isRead == 1 ? 'el-card-border' : ''">
@@ -112,11 +114,14 @@
                 </div>
               </div>
             </el-col>
-            <el-col :span="24" style="height: 29%;">
+            <el-col :span="24" style="height: 34%;">
               <div class="work-main-right">
                 <div class="main-right">
                   <div class="right-header">
-                    <div class="right-header-title">【待办提醒】</div>
+                    <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">
@@ -136,6 +141,9 @@
           </el-row>
         </el-col>
       </el-row>
+      <el-row class="main-row-two">
+
+      </el-row>
     </main>
     <el-dialog title="详情" :visible.sync="open" width="400px" append-to-body :close-on-click-modal="false">
       <div class="team-main">
@@ -155,10 +163,12 @@ import { approvalList, uploadFile } from "@/api/onlineDeclartion/pendingReview"
 import { selectAll, workSearch } from "@/api/jin_ji_hu/home"
 import { chiefAll, changeIsRead } from "@/api/jin_ji_hu/intelligentReminder"
 import homeIndex from "@/views/home/index.vue"
+import echartData from '@/views/dataCloudMap/components/echartData.vue'
 export default {
   dicts: ["project_small_type"],
   components:{
-    homeIndex
+    homeIndex,
+    echartData
   },
   data() {
     return {
@@ -186,6 +196,15 @@ export default {
       loading:false,
       remindList: [],
       info:{},
+      activeIndex:1,
+      options1: [
+        {
+          name: "按年",
+        },
+        {
+          name: "按季度",
+        },
+      ],
     }
   },
   mounted(){
@@ -195,6 +214,10 @@ export default {
     }
   },
   methods:{
+    active(e) {
+      this.activeIndex = e;
+      this.$refs.echartData.getService(e);
+    },
     // 待审批
     getList(){
       this.loading = true;