From ab4217e0e6b6b2e75ac30396fbc8bfd22e337f0d Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 6 Nov 2024 14:14:09 +0800
Subject: [PATCH] 11.6

---
 fuintAdmin/.env.development                   |  2 +-
 .../src/views/notificationList/index.vue      |  1 -
 fuintAdmin/src/views/shopowner.vue            |  5 -----
 .../src/layout/components/Navbar.vue          |  2 +-
 fuintAdmin_zt/src/views/Site/index.vue        | 15 +++++++++----
 .../src/views/homeComponents/manage.vue       | 22 +++++++++++--------
 .../src/main/resources/application.properties |  4 ++--
 7 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development
index 40429657e..89b6b1bdb 100644
--- a/fuintAdmin/.env.development
+++ b/fuintAdmin/.env.development
@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
+VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/'
 
 
 # http://192.168.0.121:8080/
diff --git a/fuintAdmin/src/views/notificationList/index.vue b/fuintAdmin/src/views/notificationList/index.vue
index 36ab9d4cb..8ba761965 100644
--- a/fuintAdmin/src/views/notificationList/index.vue
+++ b/fuintAdmin/src/views/notificationList/index.vue
@@ -5,7 +5,6 @@
       <span style="cursor: pointer" @click="goback()">当前位置：首页--通知公告</span>
     </div>
   <div class="hui_box">
-
     <div class="top_new">
       <el-form :model="queryParams" ref="queryForm" size="small" style="width: 100%" :inline="true" >
         <el-form-item label="" prop="deptName">
diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue
index 657d9154a..ee80cc4de 100644
--- a/fuintAdmin/src/views/shopowner.vue
+++ b/fuintAdmin/src/views/shopowner.vue
@@ -220,13 +220,8 @@
             {{ sjtjTitle }} <i
             class="el-icon-arrow-down el-icon--right"></i></div>
           <el-dropdown-menu slot="dropdown">
-            <!--            <el-dropdown-item command="近一周" index="1">近一周</el-dropdown-item>-->
-            <!--            <el-dropdown-item command="近一月" index="1">本月</el-dropdown-item>-->
-            <!--            <el-dropdown-item command="近一年" index="1">本季度</el-dropdown-item>-->
-            <!--            <el-dropdown-item command="近一年" index="1">本年</el-dropdown-item>-->
             <el-dropdown-item v-for="(item,index) in amountList" :key="index" :command="item">{{ item }}
             </el-dropdown-item>
-
           </el-dropdown-menu>
         </el-dropdown>
         <div class="h-anniu" :class="{'q-anniu' : countTimeShow == true}" @click="countTimeShow = true"> 自定义
diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
index 933d185a7..2a25e3e15 100644
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="navbar">
     <div style="display: flex;align-items: center" >
-      <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
+       <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
       <div class="title-logo">
 
         <div style="margin-left: 30px;">
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 7c6076463..0f6e40bef 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -695,10 +695,17 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="角色状态" prop="accountStatus">
-              <el-radio-group v-model="form.accountStatus" @change="$forceUpdate()">
-                <el-radio :key=1 :label=1 :value=1>启用</el-radio>
-                <el-radio :key=0 :label=0 :value=0>禁用</el-radio>
-              </el-radio-group>
+<!--              <el-radio-group v-model="form.accountStatus" @change="$forceUpdate()">-->
+<!--                <el-radio :key=1 :label=1 :value=1>启用</el-radio>-->
+<!--                <el-radio :key=0 :label=0 :value=0>禁用</el-radio>-->
+<!--              </el-radio-group>-->
+              <el-switch
+                v-model="form.accountStatus"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                active-value="1"
+                inactive-value="0">
+              </el-switch>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/fuintAdmin_zt/src/views/homeComponents/manage.vue b/fuintAdmin_zt/src/views/homeComponents/manage.vue
index e614b6ced..c3d230b58 100644
--- a/fuintAdmin_zt/src/views/homeComponents/manage.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/manage.vue
@@ -115,12 +115,9 @@
           </div>
         </div>
         <div class="hui-hang"></div>
-        <div class="h-tt" >活跃油站</div>
+<!--        <div class="h-tt" >活跃油站</div>-->
         <div class="d-s" >
-
-
-            <div id="ccc" style="width: 300px;height: 250px; "></div>
-
+            <div id="ccc" style="width: 300px;height: 300px; "></div>
           <div class="h-r-ba"></div>
           <div>
 
@@ -148,7 +145,7 @@
             </el-popover>
           </div>
         </div>
-        <div style="height: 90%;overflow:auto;">
+        <div style="height: 90%;overflow:auto;scrollbar-width: none">
           <div class="d-s" style="margin: 30px 0px" v-for="(item,index) in hardwareList" :key="index" >
             <!--          <div class="r-img">-->
             <!--            <img src="../../assets/images/pcin.png" style="width: 84px;height: 70px">-->
@@ -416,7 +413,7 @@ export default {
           {
             name: '',
             type: 'pie',
-            radius: ['50%', '80%'],
+            radius: ['40%', '70%'],
             labelLine: {
               show: false
             },
@@ -434,7 +431,14 @@ export default {
             data: dataList,
 
           }
-        ]
+        ],
+        grid: {
+          left: '3%',
+          right: '3%',
+          bottom: '3%',
+          top: '3%',
+          containLabel: true
+        }
       };
       const option1 = {
         color: [
@@ -748,7 +752,7 @@ export default {
   background: #fff;
   border: 1px solid #FFFFFF;
   height: 460px;
-  overflow: auto;
+  //overflow: auto;
   box-sizing: border-box;
   padding: 15px;
 }
diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties
index 27f4e4d47..2639080eb 100644
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application.properties
@@ -1,10 +1,10 @@
 # \u57FA\u672C\u914D\u7F6E
 server.port=8080
 env.profile=dev
-env.properties.path=D:/work/sw/fuintBackend/configure/
+#env.properties.path=C:/Users/qq244432/Desktop/project/oil-station/fuintBackend/configure/
 #env.properties.path=F:/work/oilSystem/fuintBackend/configure/
 #env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
-#env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure
+env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure
 #env.properties.path=D:/work/oilSystem/fuintBackend/configure/
 #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/