From 4315612563badc6caf252e008a3c9772a2b86331 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 5 Aug 2024 13:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=9A=E5=8F=91=E5=B1=95?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=95=B0=E6=8D=AE=E4=B8=BA-=E7=9A=84?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0=E3=80=81=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1logo=E3=80=81=E6=94=BF?=
 =?UTF-8?q?=E5=8A=A1=E7=AB=AF=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=94=99=E5=88=AB?=
 =?UTF-8?q?=E5=AD=97=E6=9B=B4=E6=8D=A2=E3=80=81=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E3=80=81=E4=BF=9D=E7=95=99=E4=B8=80=E4=BD=8D=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=B0=8F=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 package.json                                  |   2 +-
 src/assets/styles/public.scss                 | 157 ++++++++++++++++--
 src/views/ServiceAndDevelopment/index.vue     |   2 +-
 src/views/abnormalRemind/index.vue            |   7 +
 src/views/home/index.vue                      |   5 +-
 src/views/onlineDeclaration/records/index.vue |   1 +
 src/views/tool/build/index.vue                |  67 ++++----
 src/views/warningReminder/index.vue           |  24 ++-
 .../components/daibanrenwu/index.vue          |   4 +-
 .../components/promoteTable/index.vue         |  10 +-
 .../components/statisticsAnalyse/index.vue    |   6 +-
 .../components/statisticsNew/index.vue        |   8 +-
 .../components/zhinengtixing/index.vue        |   8 +-
 src/views/workbench/index.vue                 |  14 +-
 15 files changed, 242 insertions(+), 75 deletions(-)

diff --git a/.env.development b/.env.development
index b2cda0a..c6cec0b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.118:9040'
+VUE_APP_BASE_API = 'http://192.168.0.109:9040'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
 
diff --git a/package.json b/package.json
index 6aaaff8..c02b8e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202408021554",
+  "version": "1.0.202408051113",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 3aaca27..5d6abda 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -1496,7 +1496,7 @@
 
         .main-right {
           padding: 10px 20px;
-
+          height: 100%;
           .right-header {
             display: flex;
             justify-content: space-between;
@@ -1533,7 +1533,8 @@
           }
 
           .right-main {
-            height: 121px;
+            // height: 121px;
+            height: calc(100% - 55px);
             overflow-y: scroll;
             .main-items {
               display: flex;
@@ -3692,13 +3693,6 @@
           font-weight: 500;
           font-size: 14px;
         }
-        .red {
-          color: #FD5F5F;
-        }
-        .green {
-          color: #4EB997;
-        }
-
         th {
           font-weight: bold;
           font-size: 14px;
@@ -3993,6 +3987,149 @@
   }
 }
 
+// 政务端工作台智能提醒弹框
+.zhinengtixing-dialog {
+  .el-dialog__body {
+    padding: 20px;
+  }
+
+  .el-dialog__header {
+    border-bottom: 1px solid #F0F0F0;
+
+    .el-dialog__title {
+      font-family: PingFang-SC-Heavy;
+      font-weight: 800;
+      font-size: 16px;
+      color: #000000;
+    }
+  }
+
+  .serviceIndustry-box {
+    .radio_btn {
+      margin: 10px 0;
+    }
+
+    .serviceIndustry-form {
+
+      .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;
+      }
+    }
+
+    section {
+      .el-table::before {
+        height: 100%;
+        width: 1px;
+      }
+      .el-table {
+        border-left: none;
+        .project-trace-table-number {
+          font-family: PingFang-SC-Medium;
+          font-weight: 500;
+          font-size: 14px;
+          color: #134EE6;
+          font-style: normal;
+          text-decoration-line: underline;
+          text-transform: none;
+          cursor: pointer;
+        }
+        .project-trace-table-type {
+          font-weight: 500;
+          font-size: 14px;
+        }
+        .red {
+          color: #FD5F5F;
+        }
+        .green {
+          color: #4EB997;
+        }
+
+        th {
+          font-weight: bold;
+          font-size: 14px;
+          color: #000;
+          text-align: center;
+        }
+
+        td {
+          font-weight: 500;
+          font-size: 14px;
+          color: #666666;
+        }
+
+        .evenNumber-row-childred {
+          background-color: #E8F3FC;
+        }
+
+        .evenNumber-row {
+          background-color: #F6F9FD;
+        }
+      }
+      .dataMap-work-table {
+        .workDialog-btns {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          .project-trace-table-number {
+            margin-right: 5px;
+          }
+        }
+        td {
+          border-bottom: 1px solid #D9D9D9;
+        }
+      }
+
+      .my-pagination-container {
+        margin-top: 10px;
+
+        .el-pagination.is-background .el-pager li:not(.is-disabled).active {
+
+          background-color: #1890FF;
+          /*进行修改选中项背景和字体 */
+
+          color: #fff;
+        }
+
+        .el-pagination {
+
+          .btn-prev,
+          .btn-next {
+            padding: 0px 20px;
+          }
+        }
+      }
+    }
+  }
+}
+
 #echarts {
   width: 100%;
   height: calc(100% - 110px);
@@ -4154,7 +4291,7 @@
         font-family: AlibabaPuHuiTiR;
         padding: 0;
         font-size: 14px;
-        color: #1890FF;
+        // color: #1890FF;
         font-style: normal;
         text-decoration-line: underline;
         text-transform: none;
diff --git a/src/views/ServiceAndDevelopment/index.vue b/src/views/ServiceAndDevelopment/index.vue
index 1ff1ccb..bc416aa 100644
--- a/src/views/ServiceAndDevelopment/index.vue
+++ b/src/views/ServiceAndDevelopment/index.vue
@@ -59,7 +59,7 @@
                 <el-table-column prop="shuzhi" label="操作" align="center">
                     <template slot-scope="scope">
                         <!-- <div class="yewufazhanbox-charu" @click="charu(scope.row)">插入</div> -->
-                        <el-button type="text"class="yewufazhanbox-charu" @click="charu(scope.row)" :disabled="btnDisable">插入</el-button>
+                        <el-button type="text" class="yewufazhanbox-charu" @click="charu(scope.row)" :disabled="btnDisable || scope.row.count == '-'">插入</el-button>
                     </template>
                 </el-table-column>
             </el-table>
diff --git a/src/views/abnormalRemind/index.vue b/src/views/abnormalRemind/index.vue
index 52cf8f2..0dba480 100644
--- a/src/views/abnormalRemind/index.vue
+++ b/src/views/abnormalRemind/index.vue
@@ -19,6 +19,12 @@
         <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
           <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="待办任务标题" align="center" prop="enterpriseDirectory" />
+          <el-table-column label="申报时间" align="center" prop="createTime">
+            <template slot-scope="scope">
+              <!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> -->
+              <span>{{ scope.row.createTime }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="审核状态" align="center" prop="cylx">
             <template slot-scope="scope">
               <span v-if="scope.row.status == 5" class="approval_status5">评审通过</span>
@@ -66,6 +72,7 @@ export default {
       pagination: {
         current:1,
         size:10,
+        orderChange:0,
       },
       loading:false,
       formInline: {
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ff085c4..06509e9 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -173,7 +173,7 @@
                 <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
                   <div>{{ item.enterpriseDirectory}}</div>
                   <!-- <div>{{ item.enterpriseName }}</div> -->
-                  <div>{{ (item.status == 0 ? "待填报" : item.status == 8 ? "初审不通过" : item.status == 10 ? "初审退回修改" : item.status == 7 ? "复审不通过" : item.status == 9 ? "终审不通过" : item.status == 5 ? "终审通过" : "") }}</div>
+                  <div>{{ (item.status == 0 ? "待填报" : item.status == 8 ? "初审不通过" : item.status == 10 ? "初审退回修改" : item.status == 7 ? "复审不通过" : item.status == 9 ? "终审不通过" : item.status == 5 ? "终审通过" : item.status == 1 ? "初审中" : item.status == 2 ? "复审中" : item.status == 3 ? "终审中" : item.status == 6 ? "已填报" : "") }}</div>
                   <!-- <div>审批【知识产权】材料</div> -->
                   <div @click="MoreRecords(item.status)" class="last_child_item" :class="item.status == 0 ? 'tab-red' : item.status == 10 ? 'tab-red' : 'last_child_item'">{{ item.status == 0 ? "去填报" : item.status == 10 ? "去修改" : "去查看"}}</div>
                 </div>
@@ -216,7 +216,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         creditCode: this.$store.state.user.name,
-        statusStr: [0, 5, 7, 8, 9, 10],
+        orderChange:1,
+        // statusStr: [0, 5, 7, 8, 9, 10],
       },
       // 是否显示弹出层
       open: false,
diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue
index 0a79021..9b668c0 100644
--- a/src/views/onlineDeclaration/records/index.vue
+++ b/src/views/onlineDeclaration/records/index.vue
@@ -403,6 +403,7 @@ export default {
         statusChange: "",
         pageNum: 1,
         pageSize: 10,
+        orderChange:1,
       },
       enterpriseId: '',
       templateDataList: [],
diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue
index 75f1b24..dab3ca7 100644
--- a/src/views/tool/build/index.vue
+++ b/src/views/tool/build/index.vue
@@ -2,9 +2,9 @@
   <div class="container">
     <div class="left-board">
       <div class="logo-wrapper">
-        <div class="logo">
+        <!-- <div class="logo">
           <img :src="logo" alt="logo"> Form Generator
-        </div>
+        </div> -->
       </div>
       <el-scrollbar class="left-scrollbar">
         <div class="components-list">
@@ -137,7 +137,7 @@
     <input id="copyNode" type="hidden">
 
     <!-- 新增模板 -->
-    <el-dialog title="创建新模板" :visible.sync="createTemplate" width="680px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="修改模板" :visible.sync="createTemplate" width="680px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="dialogForm" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -441,7 +441,7 @@ export default {
       })
     },
     open(){
-      this.createTemplate = true;
+      this.createTemplate = false;
     },
     getDataList(){
       getAllList({dictType:"project_categories"}).then(res=>{
@@ -491,6 +491,34 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          // 级别，责任单位，模板使用有效期开始时间，模板使用有效期结束时间，模板名称
+          const { level, responsibilityUnit, useStart, useEnd, templateName } = this.dialogForm;
+          if(this.dialogForm.id) {
+            templateInfoChange({...this.dialogForm, templateJson: JSON.stringify(this.formData)}).then(res=>{
+              if(res.code == 200) {
+                // this.$router.push({
+                //   name: 'Template',
+                //   params: {code:800},
+                // })
+                this.$emit("successCode",800)
+                this.reset()
+                this.drawingList = []
+              }
+            })
+          } else if(level && responsibilityUnit && useStart && useEnd && templateName) {
+            templateInfo({level, responsibilityUnit, templateName, useStart, useEnd, projectBigType:this.projectBigType, projectMiddleType:this.projectMiddleType, projectSmallType:this.projectSmallType,templateJson: JSON.stringify(this.formData)}).then(res=>{
+              if(res.code == 200) {
+                // this.$router.push({
+                //   name: 'Template',
+                //   params: {code:200},
+                // })
+                this.$emit("successCode",200)
+                this.reset()
+                this.drawingList = []
+              }
+            })
+            
+          }
           this.createTemplate = false;
         }
       });
@@ -596,36 +624,7 @@ export default {
     },
     showJson() {
       this.AssembleFormData()
-      // 级别，责任单位，模板使用有效期开始时间，模板使用有效期结束时间，模板名称
-      const { level, responsibilityUnit, useStart, useEnd, templateName } = this.dialogForm;
-      if(this.dialogForm.id) {
-        templateInfoChange({...this.dialogForm, templateJson: JSON.stringify(this.formData)}).then(res=>{
-          if(res.code == 200) {
-            // this.$router.push({
-            //   name: 'Template',
-            //   params: {code:800},
-            // })
-            this.$emit("successCode",800)
-            this.reset()
-            this.drawingList = []
-          }
-        })
-      } else if(level && responsibilityUnit && useStart && useEnd && templateName) {
-        templateInfo({level, responsibilityUnit, templateName, useStart, useEnd, projectBigType:this.projectBigType, projectMiddleType:this.projectMiddleType, projectSmallType:this.projectSmallType,templateJson: JSON.stringify(this.formData)}).then(res=>{
-          if(res.code == 200) {
-            // this.$router.push({
-            //   name: 'Template',
-            //   params: {code:200},
-            // })
-            this.$emit("successCode",200)
-            this.reset()
-            this.drawingList = []
-          }
-        })
-        
-      } else {
-        this.createTemplate = true;
-      }
+      this.createTemplate = true;
     },
     download() {
       this.dialogVisible = true
diff --git a/src/views/warningReminder/index.vue b/src/views/warningReminder/index.vue
index caeea2f..25987e5 100644
--- a/src/views/warningReminder/index.vue
+++ b/src/views/warningReminder/index.vue
@@ -27,7 +27,7 @@
           </el-table-column>
           <el-table-column label="操作" prop="userId" class-name="table-operation" width="120">
             <template slot-scope="scope">
-              <span class="look-info" @click="goInfo(scope.row)">查看详情</span>
+              <span class="look-info" @click="putMemo(scope.row)">查看详情</span>
             </template>
           </el-table-column>
         </el-table>
@@ -41,6 +41,16 @@
         ></my-pagination>
       </section>
     </div>
+    <el-dialog title="详情" :visible.sync="open" width="400px" append-to-body :close-on-click-modal="false">
+      <div class="team-main">
+        <div>提醒时间:</div>
+        <div>{{ info.alertTime }}</div>
+      </div>
+      <div class="team-main">
+        <div>提醒内容:</div>
+        <div>{{ info.alertContent  }}</div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -64,6 +74,9 @@ export default {
       },
       tableData:[],
       tabHeader: undefined,
+      // 是否显示弹出层
+      open: false,
+      info:{},
     }
   },
   mounted() {
@@ -79,6 +92,15 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    putMemo(item){
+      if(item.isRead == 1) {
+        changeIsRead({id:item.id}).then(res=>{
+          this.getList();
+        })
+      }
+      this.open = true;
+      this.info = item;
+    },
     // 列表获取
     getList(){
       this.loading = true;
diff --git a/src/views/workbench/components/daibanrenwu/index.vue b/src/views/workbench/components/daibanrenwu/index.vue
index 77aa106..6d2bd30 100644
--- a/src/views/workbench/components/daibanrenwu/index.vue
+++ b/src/views/workbench/components/daibanrenwu/index.vue
@@ -23,6 +23,7 @@
         </el-col>
       </el-form>
       <section>
+        <!-- height="485px" -->
         <el-table 
           v-loading="loading" 
           class="dataMap-work-table" 
@@ -30,7 +31,6 @@
           border
           :row-class-name="tableRowClassName" 
           :header-cell-style="{background:'#D1D9E6'}"
-          height="550px"
         >  <!-- :max-height="tabHeader" -->
           <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="待办任务标题" prop="enterpriseDirectory" align="center"/>
@@ -98,7 +98,7 @@ export default {
       this.loading = true;
       approvalList(this.pagination).then(res=>{
         this.tableData = res.rows
-        this.total = res.rows.total;
+        this.total = res.total;
         this.loading = false;
       })
     },
diff --git a/src/views/workbench/components/promoteTable/index.vue b/src/views/workbench/components/promoteTable/index.vue
index 67d4059..920878e 100644
--- a/src/views/workbench/components/promoteTable/index.vue
+++ b/src/views/workbench/components/promoteTable/index.vue
@@ -5,7 +5,7 @@
       <div class="item-left">平台类项目名称</div>
       <div class="item-identical">
         <img class="img-one" src="@/assets/images/homeOne.png" alt="">
-        <span class="item-headerline">入住企业数量：</span>
+        <span class="item-headerline">入驻企业数量：</span>
         <span class="item-number">768
           <span class="item-unit">家</span>
         </span>
@@ -27,7 +27,7 @@
       <div class="item-left">平台类项目名称</div>
       <div class="item-identical">
         <img class="img-one" src="@/assets/images/homeOne.png" alt="">
-        <span class="item-headerline">入住企业数量：</span>
+        <span class="item-headerline">入驻企业数量：</span>
         <span class="item-number">768
           <span class="item-unit">家</span>
         </span>
@@ -49,7 +49,7 @@
       <div class="item-left">平台类项目名称</div>
       <div class="item-identical">
         <img class="img-one" src="@/assets/images/homeOne.png" alt="">
-        <span class="item-headerline">入住企业数量：</span>
+        <span class="item-headerline">入驻企业数量：</span>
         <span class="item-number">768
           <span class="item-unit">家</span>
         </span>
@@ -71,7 +71,7 @@
       <div class="item-left">平台类项目名称</div>
       <div class="item-identical">
         <img class="img-one" src="@/assets/images/homeOne.png" alt="">
-        <span class="item-headerline">入住企业数量：</span>
+        <span class="item-headerline">入驻企业数量：</span>
         <span class="item-number">768
           <span class="item-unit">家</span>
         </span>
@@ -93,7 +93,7 @@
       <div class="item-left">平台类项目名称</div>
       <div class="item-identical">
         <img class="img-one" src="@/assets/images/homeOne.png" alt="">
-        <span class="item-headerline">入住企业数量：</span>
+        <span class="item-headerline">入驻企业数量：</span>
         <span class="item-number">768
           <span class="item-unit">家</span>
         </span>
diff --git a/src/views/workbench/components/statisticsAnalyse/index.vue b/src/views/workbench/components/statisticsAnalyse/index.vue
index 0f6f352..bc12b51 100644
--- a/src/views/workbench/components/statisticsAnalyse/index.vue
+++ b/src/views/workbench/components/statisticsAnalyse/index.vue
@@ -7,8 +7,8 @@ export default {
   data() {
     let colors = ['#FFA329','#00AEFF']
     let datas = [
-      { value: 500, name: '外资实缴资本', label:{color:"#FFA329"}},
-      { value: 1000, name: '内资实缴资本', label:{color:"#00AEFF"}},
+      { value: 500, percent: "66", name: '外资实缴资本', label:{color:"#FFA329"}},
+      { value: 1000, percent: "25", name: '内资实缴资本', label:{color:"#00AEFF"}},
     ];
     // 公用调整
     let itemStyle = {
@@ -80,7 +80,7 @@ export default {
               // position: "outside",
               padding: [10, -30],
               formatter: (params) => {
-                return "{a|" +params.value+"}{b|" + "家}\n{c|" + params.value + "}{d|" + "%}";
+                return "{a|" +params.value+"}{b|" + "家}\n{c|" + params.percent.toFixed(1) + "}{d|" + "%}";
               },
               rich: {
                 a: {
diff --git a/src/views/workbench/components/statisticsNew/index.vue b/src/views/workbench/components/statisticsNew/index.vue
index 0cefdc8..0b9e149 100644
--- a/src/views/workbench/components/statisticsNew/index.vue
+++ b/src/views/workbench/components/statisticsNew/index.vue
@@ -7,9 +7,9 @@ export default {
   data() {
     let colors = ['#FFA329','#00AEFF','#5CBC69']
     let datas = [
-      { value: 500, name: '5G互联网领域', label:{color:"#FFA329"}},
-      { value: 400, name: '制造业领域', label:{color:"#00AEFF"}},
-      { value: 300, name: '现代物流领域', label:{color:"#5CBC69"}},
+      { value: 500, percent: "41", name: '5G互联网领域', label:{color:"#FFA329"}},
+      { value: 400, percent: "34", name: '制造业领域', label:{color:"#00AEFF"}},
+      { value: 300, percent: "25", name: '现代物流领域', label:{color:"#5CBC69"}},
     ];
     // 公用调整
     let itemStyle = {
@@ -81,7 +81,7 @@ export default {
               // position: "outside",
               padding: [10, -30],
               formatter: (params) => {
-                return "{a|" +params.value+"}{b|" + "家}\n{c|" + params.value + "}{d|" + "%}";
+                return "{a|" +params.value+"}{b|" + "家}\n{c|" + params.percent.toFixed(1) + "}{d|" + "%}";
               },
               rich: {
                 a: {
diff --git a/src/views/workbench/components/zhinengtixing/index.vue b/src/views/workbench/components/zhinengtixing/index.vue
index ec545ad..7c31fa8 100644
--- a/src/views/workbench/components/zhinengtixing/index.vue
+++ b/src/views/workbench/components/zhinengtixing/index.vue
@@ -5,7 +5,7 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     @close="infoClose"
-    custom-class="serviceIndustry-dialog"
+    custom-class="zhinengtixing-dialog"
     append-to-body
   >
     <div class="serviceIndustry-box">
@@ -23,6 +23,7 @@
         </el-col>
       </el-form>
       <section>
+        <!-- height="485px" -->
         <el-table 
           v-loading="loading" 
           class="dataMap-work-table" 
@@ -30,7 +31,6 @@
           border
           :row-class-name="tableRowClassName" 
           :header-cell-style="{background:'#D1D9E6'}"
-          height="550px"
         >  <!-- :max-height="tabHeader" -->
           <el-table-column label="序号" type="index" align="center" width="50"/>
           <el-table-column label="提醒内容" prop="alertContent" align="center"/>
@@ -97,7 +97,7 @@ export default {
       chiefAll(this.pagination).then(res=>{
         this.loading = false;
         this.total = res.data.total;
-        this.tableData = res.data.chiefAll
+        this.tableData = res.data.records
       })
       // servicesList(this.pagination).then(res=>{
       //   this.loading = false;
@@ -151,7 +151,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep .serviceIndustry-dialog {
+::v-deep .zhinengtixing-dialog {
   margin-top: 10vh !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 8c8234a..ded7743 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -24,7 +24,7 @@
     </header>
     <main class="home-main">
       <el-row class="main-row">
-        <el-col :span="14" class="work-main-left service-left">
+        <el-col :span="12" class="work-main-left service-left">
           <!-- <div class="main-left">
             <div class="left-header">
               <div class="left-header-title">【服务业数据概览】</div>
@@ -56,9 +56,9 @@
           <echartData :activeIndex="activeIndex" ref="echartData"/>
         </el-col>
         
-        <el-col :span="10">
-          <el-row type="flex" class="main-two-row">
-            <el-col :span="24" class="work-main-left" style="height: 64%;">
+        <!-- <el-col :span="10">
+          <el-row type="flex" class="main-two-row"> -->
+            <el-col :span="6" class="work-main-left">
               <div class="main-left">
                 <div class="left-header">
                   <div class="left-header-titleS">
@@ -117,7 +117,7 @@
                 </div>
               </div>
             </el-col>
-            <el-col :span="24" style="height: 34%;">
+            <el-col :span="6">
               <div class="work-main-right">
                 <div class="main-right">
                   <div class="right-header">
@@ -141,8 +141,8 @@
                 </div>
               </div>
             </el-col>
-          </el-row>
-        </el-col>
+          <!-- </el-row>
+        </el-col> -->
       </el-row>
       <el-row class="main-row-two">
         <div class="analyse-header">