ming 3 tahun lalu
induk
melakukan
4802b8861c

+ 4 - 4
public/index.html

@@ -32,19 +32,19 @@
     </strong>
   </noscript>
     <div id="app">
-        <div class="first-loading-wrp">
-            <!-- <div class="loading-wrp">
+        <!-- <div class="first-loading-wrp">
+            <div class="loading-wrp">
                 <span class="dot dot-spin">
           <i></i>
           <i></i>
           <i></i>
           <i></i>
         </span>
-            </div> -->
+            </div>
             <h1>
                 <%= VUE_APP_TITLE %>
             </h1>
-        </div>
+        </div> -->
     </div>
     <!-- built files will be auto injected -->
     <script src="./static/config.js"></script>

+ 2 - 1
src/layout/index.vue

@@ -2,7 +2,7 @@
   <a-layout class="vab-layout-wrap">
     <!-- 顶部横向排版 start -->
     <div>
-      <a-layout-header class="vab-header">
+      <a-layout-header class="vab-header"  :style="`background:${$store.state.homeStyle}`">
         <a-row>
           <a-col :xs="10" :sm="10" :md="10" :lg="10" :xl="10">
             <vab-logo />
@@ -96,6 +96,7 @@ import VabContent from './vab-content'
 import { mapActions, mapGetters } from 'vuex'
 import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue'
 
+
 export default {
   components: {
     VabLogo,

+ 2 - 2
src/layout/vab-avatar/index.vue

@@ -47,7 +47,7 @@
       />
     </span>
 
-    <span><img src="../../assets/images/switch.png" alt="" width="15" /></span>
+    <!-- <span><img src="../../assets/images/switch.png" alt="" width="15" /></span> -->
   </div>
 </template>
 
@@ -154,7 +154,7 @@ export default {
     opacity: 0.7;
   }
   .bell {
-    margin: 0 20px 0 18px;
+    margin: 0 0px 0 18px;
     cursor: pointer;
   }
   .bell:hover {

+ 6 - 4
src/layout/vab-logo/index.vue

@@ -11,12 +11,13 @@
   </div> -->
 
   <div class="vab-logo">
-    <router-link to="/" class="logo-url">
-      <img src="../../assets/logo2.png" width="133" style="position: relative; top: -5px;"/>
+    <router-link to="/" class="logo-url" style="margin-right:20px;" v-if="store.state.homeLogo">
+      <img  :src="`${store.state.homeLogo}`"  style="position: relative; top: -6px;height:31px"/>
     </router-link>
-    <!-- <span class="anticon"></span> -->
+    <!-- <span class="anticon"></span> -->  
+    <!-- src="@/assets/logo2.png"  -->
 
-    <span style="font-size: 26px;margin-left:20px; color: #fff">永天智慧电力平台</span>
+    <span style="font-size: 26px; color: #fff">{{store.state.homeTitle}}</span>
   </div>
 </template>
 
@@ -36,6 +37,7 @@ export default {
   setup() {
     const store = useStore()
     return {
+      store,
       collapsed: false,
       logo: computed(() => store.getters['settings/logo']),
       title: computed(() => store.getters['settings/title']),

+ 9 - 4
src/main.js

@@ -49,14 +49,19 @@ app
 
 
 router.beforeEach((to) => {
-    console.log(to.meta.title)
-    store.commit('getAuthorities', to.meta.title)
-    console.log('store.state.authorities')
-    console.log(store.state.authorities)
+
+
 
     if (to.path != '/login') {
         store.commit("publicSiteList");
         store.commit('publicDeviceList')
+
+        console.log(to.meta.title)
+        store.commit('getAuthorities', to.meta.title)
+        console.log('store.state.authorities')
+        console.log(store.state.authorities)
+
+
     }
     // if (to.path == '/home') {
     //     if (window.location.host.indexOf('localhost') != -1) {

+ 4 - 0
src/store/index.js

@@ -29,7 +29,11 @@ export default createStore({
 
         authorities: [],
 
+
         timeProcessing: '',
+        homeStyle: '#016ddb',
+        homeLogo: '',
+        homeTitle: '永天智慧电力平台',
 
         Time_Data: [], //公共api请求参数->Time_Data
         timearr: [], //公共处理开始时间和结束时间中的时间段天数 值存储

+ 22 - 22
src/store/modules/routes.js

@@ -58,28 +58,28 @@ const actions = {
         }
         data[0].meta.affix = false
 
-        data.unshift({
-            path: "/home",
-            hidden: false,
-            redirect: "/index/index",
-            component: "Layout",
-            meta: {
-                title: "数据看板",
-                icon: "home",
-
-            },
-            children: [{
-                path: "/index/index",
-                hidden: false,
-                component: "@/views/index/index",
-                meta: {
-                    title: "数据看板",
-                    icon: "home",
-                    affix: true
-
-                }
-            }]
-        })
+        // data.unshift({
+        //     path: "/home",
+        //     hidden: false,
+        //     redirect: "/index/index",
+        //     component: "Layout",
+        //     meta: {
+        //         title: "数据看板",
+        //         icon: "home",
+
+        //     },
+        //     children: [{
+        //         path: "/index/index",
+        //         hidden: false,
+        //         component: "@/views/index/index",
+        //         meta: {
+        //             title: "数据看板",
+        //             icon: "home",
+        //             affix: true
+
+        //         }
+        //     }]
+        // })
 
         // data.push({
         //     path: "/tenantManage",

+ 16 - 8
src/views/login/index.vue

@@ -59,7 +59,8 @@
       <!-- 基于vue{{ dependencies['vue'] }}
       + ant-design-vue
       {{ dependencies['ant-design-vue'] }}开发 -->
-      上海永天科技股份有限公司
+      <!-- 上海永天科技股份有限公司 -->
+      {{loginFooter}}
     </div>
   </div>
 </template>
@@ -91,8 +92,9 @@ export default {
       dependencies: dependencies,
       devDependencies: devDependencies,
 
-      companyName: '',
-      backdropUrl: '',
+      companyName: '永天智慧电力平台',
+      backdropUrl: require('@/assets/login_images/login_background.png'),
+      loginFooter:'上海永天科技股份有限公司'
     }
   },
   computed: {
@@ -121,8 +123,9 @@ export default {
     }
 
     this.getLoginStyle()
-    this.companyName='永天智慧电力平台'
-    this.backdropUrl=require('@/assets/login_images/login_background.png')
+    // this.companyName='永天智慧电力平台'
+    // this.backdropUrl=require('@/assets/login_images/login_background.png')
+    // this.loginFooter='上海永天科技股份有限公司'
   },
   methods: {
 
@@ -130,12 +133,17 @@ export default {
     getLoginStyle() {
       api
         .getLoginStyle({
-          url:window.location.host.indexOf('localhost') != -1 ?'fivee.dianli.uskycloud.com':window.location.host
+          url:window.location.host.indexOf('localhost') != -1 ?'dianli.usky.cn:13201':window.location.host
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
-            this.backdropUrl = requset.data[0].loginBackUrl?requset.data[0].loginBackUrl:require('@/assets/login_images/login_background.png')
-            this.companyName = requset.data[0].loginTitle?requset.data[0].loginTitle:'永天智慧电力平台'
+
+            this.backdropUrl = requset.data[0].loginBackUrl
+            this.companyName = requset.data[0].loginTitle
+            this.loginFooter = requset.data[0].loginFooter
+            // this.backdropUrl = requset.data[0].loginBackUrl?requset.data[0].loginBackUrl:require('@/assets/login_images/login_background.png')
+            // this.companyName = requset.data[0].loginTitle?requset.data[0].loginTitle:'永天智慧电力平台'
+            // this.loginFooter = requset.data[0].loginFooter?requset.data[0].loginFooter:'上海永天科技股份有限公司'
           } else {
             alert(requset.msg)
           }

+ 14 - 5
src/views/middle.vue

@@ -50,7 +50,7 @@
       </el-row>
     </div>
 
-    <div class="middle-container-tips">上海永天科技股份有限公司</div>
+    <div class="middle-container-tips">{{middleFooter}}</div>
   </div>
 </template>
 <script>
@@ -82,6 +82,7 @@ export default defineComponent({
     const middleBackUrl=ref(require('@/assets/images/middle_background.png'))
     const middleLogo=ref(require('@/assets/logo2.png'))
     const middleTitle=ref('永天智慧电力平台')
+    const middleFooter=ref('永天电力')
     
 
     onMounted(() => {
@@ -121,9 +122,16 @@ export default defineComponent({
         .getMiddleConfig({}) .then((requset) => {
           if (requset.status === 'SUCCESS') {
             //有返回值用返回值配置,无返回值用默认配置
-            middleBackUrl.value = requset.data[0].middleBackUrl?requset.data[0].middleBackUrl:require('@/assets/images/middle_background.png')
-            middleLogo.value = requset.data[0].middleLogo?requset.data[0].middleLogo:require('@/assets/logo2.png')
-            middleTitle.value = requset.data[0].middleTitle?requset.data[0].middleTitle:'永天智慧电力平台'
+
+            // requset.data=[]
+            middleBackUrl.value = requset.data[0].middleBackUrl
+            middleLogo.value = requset.data[0].middleLogo
+            middleTitle.value = requset.data[0].middleTitle
+            middleFooter.value = requset.data[0].middleFooter
+            store.state.homeStyle=requset.data[0].homeStyle
+            store.state.homeLogo=requset.data[0].homeLogo
+            store.state.homeTitle=requset.data[0].middleTitle
+
           } else {
             alert(requset.msg)
           }
@@ -134,7 +142,8 @@ export default defineComponent({
       getMiddleConfig,
       middleBackUrl,
       middleLogo,
-      middleTitle
+      middleTitle,
+      middleFooter
     }
   },
 })