ming 3 years ago
parent
commit
84e895632c

+ 9 - 0
src/api/publicList.js

@@ -25,4 +25,13 @@ export function getAuthorities(params) {
     })
 }
 
+// 中间页的背景图 公司名称获取 logo (和主页的)
+export function getMiddleConfig(params) {
+    return request({
+        url: '/sysTenantConfig/getMiddleConfig',
+        method: 'GET',
+        params
+    })
+}
+
 // 设备下拉

+ 23 - 27
src/layout/vab-avatar/index.vue

@@ -5,10 +5,11 @@
       <!-- 天气预留位置 -->
     </span>
 
-    <span class="goPanelBlock">
-      <a  @click="goPanel" target="_blank">
-        <img src="/static/svgIcons/home.svg" alt="" width="12">
-        大屏</a>
+    <span class="goPanelBlock" v-if="$store.state.largeScreenUrl">
+      <a @click="goPanel" target="_blank">
+        <img src="/static/svgIcons/home.svg" alt="" width="12" />
+        大屏
+      </a>
     </span>
 
     <span class="bell">
@@ -36,21 +37,21 @@
           "
         /> -->
 
-        <span style="margin-right:10px;display:inline-block">欢迎您,{{ username }}</span>
-        
+        <span style="margin-right: 10px; display: inline-block">
+          欢迎您,{{ username }}
+        </span>
+
         <DownOutlined />
       </span>
 
       <template v-slot:overlay>
         <a-menu>
-           <a-menu-item @click="goPerCenter">个人中心</a-menu-item>
+          <a-menu-item @click="goPerCenter">个人中心</a-menu-item>
           <a-menu-item @click="logout">退出登录</a-menu-item>
         </a-menu>
       </template>
     </a-dropdown>
 
-    
-
     <!-- <span><img src="../../assets/images/switch.png" alt="" width="15" /></span> -->
   </div>
 </template>
@@ -94,22 +95,17 @@ export default {
     }, 0)
   },
   methods: {
-
-    goPerCenter(){
+    goPerCenter() {
       this.$router.push('/perCenter/index')
-
     },
 
-    goPanel(){
-      
+    goPanel() {
       if (window.location.host.indexOf('localhost') != -1) {
-
-     
-            window.open("http://localhost:8080/#/home");
-            
-        } else {
-            window.open("http://101.133.214.75:13201/");
-        }
+        window.open('http://localhost:8080/#/home')
+      } else {
+        var aa = this.$store.state.largeScreenUrl
+        window.open(aa)
+      }
     },
     goAlarmingPage() {
       this.$router.push('/alarmManage/index')
@@ -149,9 +145,9 @@ export default {
     display: inline-block;
     font-size: 14px;
     color: #fff;
-    img{
-      position:relative;
-      top:-1px;
+    img {
+      position: relative;
+      top: -1px;
     }
   }
   .goPanelBlock a:hover {
@@ -160,9 +156,9 @@ export default {
   .bell {
     margin: 0 18px 0 18px;
     cursor: pointer;
-    img{
-      position:relative;
-      top:-1px
+    img {
+      position: relative;
+      top: -1px;
     }
   }
   .bell:hover {

+ 1 - 0
src/main.js

@@ -58,6 +58,7 @@ router.beforeEach((to) => {
 
         console.log(to.meta.title)
         store.commit('getAuthorities', to.meta.title)
+        store.commit('getMiddleConfig')
         console.log('store.state.authorities')
         console.log(store.state.authorities)
 

+ 25 - 0
src/store/index.js

@@ -34,6 +34,8 @@ export default createStore({
         homeStyle: '#016ddb',
         homeLogo: '',
         homeTitle: '永天智慧电力平台',
+        largeScreenUrl: '',
+        middle_status: 1,
 
         Time_Data: [], //公共api请求参数->Time_Data
         timearr: [], //公共处理开始时间和结束时间中的时间段天数 值存储
@@ -146,6 +148,29 @@ export default createStore({
 
         },
 
+        /**
+         * @中间页主体页面配置
+         * @param {*} state 
+         */
+        async getMiddleConfig(state) {
+            await api
+                .getMiddleConfig()
+                .then((requset) => {
+                    if (requset.status === 'SUCCESS') {
+
+                        state.homeStyle = requset.data[0].homeStyle
+                        state.homeLogo = requset.data[0].homeLogo
+                        state.homeTitle = requset.data[0].middleTitle
+                        state.largeScreenUrl = requset.data[0].largeScreenUrl
+                        state.middle_status = requset.data[0].middle_status
+                    } else {
+                        ElMessage.error(requset.msg)
+                    }
+                })
+
+        },
+
+
 
 
 

+ 1 - 3
src/views/middle.vue

@@ -128,9 +128,7 @@ export default defineComponent({
             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)

+ 14 - 0
src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -54,6 +54,10 @@
                 </el-select>
               </el-form-item>
 
+              <el-form-item label="大屏跳转地址:" prop="largeScreenUrl ">
+                <el-input v-model="form.largeScreenUrl "></el-input>
+              </el-form-item>
+
              
               <el-form-item label="主页logo:" prop="homeLogo">
                 <el-input v-model="form.homeLogo"></el-input>
@@ -403,6 +407,7 @@ export default defineComponent({
             homePageUrl: form.value.homePageUrl,
             homeLayout: form.value.homeLayout,
             homeStyle: form.value.homeStyle,
+            largeScreenUrl :form.value.largeScreenUrl,
           }
 
           if (props.configStatus) {
@@ -413,6 +418,7 @@ export default defineComponent({
                   message: '修改配置成功',
                   type: 'success',
                 })
+                 store.commit('getMiddleConfig')
                 closeDialog()
               } else {
                 ElMessage.error(requset.msg)
@@ -426,6 +432,7 @@ export default defineComponent({
                   message: '新增配置成功',
                   type: 'success',
                 })
+                 store.commit('getMiddleConfig')
                 closeDialog()
               } else {
                 ElMessage.error(requset.msg)
@@ -461,6 +468,7 @@ export default defineComponent({
                   type: 'success',
                 })
                 closeDialog()
+                 store.commit('getMiddleConfig')
               } else {
                 ElMessage.error(requset.msg)
               }
@@ -473,6 +481,7 @@ export default defineComponent({
                   message: '新增配置成功',
                   type: 'success',
                 })
+                 store.commit('getMiddleConfig')
                 closeDialog()
               } else {
                 ElMessage.error(requset.msg)
@@ -507,6 +516,7 @@ export default defineComponent({
                   message: '修改配置成功',
                   type: 'success',
                 })
+                 store.commit('getMiddleConfig')
                 closeDialog()
               } else {
                 ElMessage.error(requset.msg)
@@ -520,6 +530,7 @@ export default defineComponent({
                   message: '新增配置成功',
                   type: 'success',
                 })
+                 store.commit('getMiddleConfig')
                 closeDialog()
               } else {
                 ElMessage.error(requset.msg)
@@ -658,6 +669,9 @@ export default defineComponent({
         homeLayout: [
           { required: false, message: '请选则主页导航布局', trigger: 'blur' },
         ],
+        largeScreenUrl: [
+          { required: false, message: '请输入大屏地址', trigger: 'blur' },
+        ],
 
         loginTitle: [
           { required: false, message: '请输入登录页标题', trigger: 'blur' },