From 16f0fcafcd97026feaa483dceef4fd866b712dc1 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 5 Aug 2024 16:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=BF=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=87=E5=AD=97=E5=8F=8A=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84placeholder=E4=BB=A5=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=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/assets/styles/public.scss                  | 18 +++++++++++++++---
 src/views/abnormalRemind/index.vue             |  2 +-
 .../components/brandPublicity/index.vue        |  4 ++--
 src/views/workbench/index.vue                  |  3 ++-
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index c02b8e1..bb2bdbd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202408051113",
+  "version": "1.0.202408051543",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 5d6abda..dc4c641 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -1252,6 +1252,7 @@
 // 政务端工作台
 .workbench-box {
   height: 100%;
+  width: 100%;
   overflow-y: scroll;
 
   header {
@@ -1317,16 +1318,23 @@
 
   // 工作台
   .home-main {
+    width: 100%;
     padding: 10px;
     // height: calc(100% - 32vh);
     // height: auto;
     // overflow-y: auto;
-    display: grid;
-    grid-template-columns: 1fr;
-    grid-row-gap: 10px;
+    // display: grid;
+    // grid-template-columns: 1fr;
+    // grid-row-gap: 10px;
+    display: flex;
+    flex-direction: column;
     .main-row {
       // height: 100%;
+      // flex: 1;
+      margin-bottom: 10px;
       height: 580px;
+      // width: 100%;
+      box-sizing: border-box;
       display: flex;
       background-color: #f6f7f9;
 
@@ -1602,6 +1610,8 @@
 
     // 招商信息分析
     .main-row-two {
+      flex: 1;
+      margin-bottom: 10px;
       height: 400px;
       background-color: #fff;
       padding: 10px 20px;
@@ -1706,6 +1716,8 @@
       }
     }
     .main-row-three {
+      flex: 1;
+      // margin-bottom: 10px;
       // height: 1200px;
       background-color: #fff;
       padding: 10px 20px;
diff --git a/src/views/abnormalRemind/index.vue b/src/views/abnormalRemind/index.vue
index 88660cd..12d212e 100644
--- a/src/views/abnormalRemind/index.vue
+++ b/src/views/abnormalRemind/index.vue
@@ -66,7 +66,7 @@ export default {
       pagination: {
         current:1,
         size:10,
-        orderChange:0,
+        orderChange:1,
       },
       loading:false,
       formInline: {
diff --git a/src/views/workbench/components/brandPublicity/index.vue b/src/views/workbench/components/brandPublicity/index.vue
index ae5ebb4..2ed73fe 100644
--- a/src/views/workbench/components/brandPublicity/index.vue
+++ b/src/views/workbench/components/brandPublicity/index.vue
@@ -33,11 +33,11 @@ export default {
           time:"2023-02-11",
         },{
           projectName:"产业活动名称",
-          enterprice:"国家级",
+          enterprice:"省级",
           time:"2023-02-11",
         },{
           projectName:"产业活动名称",
-          enterprice:"国家级",
+          enterprice:"省级",
           time:"2023-02-11",
         },
       ]
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index d12d014..0dd2226 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -8,8 +8,9 @@
           </div>
         </div>
         <div class="workbench-btn">
+          <!-- :placeholder="checked == 0 ? '请输入企业名称' : checked == 1 ? '请输入项目名称' : checked == 2 ? '请输入荣誉名称' : ''"  -->
           <el-autocomplete 
-            :placeholder="checked == 0 ? '请输入企业名称' : checked == 1 ? '请输入项目名称' : checked == 2 ? '请输入荣誉名称' : ''" 
+            placeholder="请输入企业名称" 
             ref="autocomplete"
             v-model="search" 
             :fetch-suggestions="querySearch"