Strona główna Odkrywaj Pomoc
Zaloguj się
yuanMM
/
ele-usky-admin
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

'202206151406'

fanghuisheng 3 lat temu
rodzic
faecc1fb3a
commit
4c77870467
19 zmienionych plików z 243 dodań i 215 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 5 0
      README.md
  2. 10 0
      babel.config.js
  3. 0 1
      package.json
  4. BIN
      public/favicon.ico
  5. BIN
      public/favicon1.ico
  6. 17 11
      public/index.html
  7. 1 5
      src/App.vue
  8. BIN
      src/assets/login_images/uskyIcon.png
  9. 6 8
      src/layout/vab-avatar/index.vue
  10. 1 4
      src/main.js
  11. 50 29
      src/store/index.js
  12. 25 8
      src/store/modules/routes.js
  13. 1 22
      src/store/modules/user.js
  14. 5 11
      src/vab/plugins/permissions.js
  15. 28 9
      src/views/login/index.vue
  16. 18 36
      src/views/platManage/index.vue
  17. 53 33
      src/views/tenantManage/systemConfig/dialogComponent.vue
  18. 7 5
      src/views/tenantManage/tenantUnit/dialogComponent.vue
  19. 16 33
      src/views/tenantManage/tenantUnit/index.vue

+ 5 - 0
README.md
Wyświetl plik 

@@ -0,0 +1,5 @@
 
+删除依赖 
+
 
+imagemin-gifsicle 图片压缩包
 
+
 
+安装依赖

+ 10 - 0
babel.config.js
Wyświetl plik 

@@ -1,3 +1,13 @@
 
 module.exports = {
 
   presets: ['@vue/cli-plugin-babel/preset'],
 
 }
 
+// module.exports = {
 
+//   presets: [
 
+//     '@vue/app'
 
+//   ],
 
+//   env: {
 
+//     development: {
 
+//       plugins: ['dynamic-import-node']
 
+//     }
 
+//   }
 
+// }

+ 0 - 1
package.json
Wyświetl plik 

@@ -48,7 +48,6 @@
 
     "eslint-plugin-vue": "^7.5.0",
 
     "filemanager-webpack-plugin": "^3.1.0",
 
     "image-webpack-loader": "^8.1.0",
 
-    "imagemin-gifsicle": "^2.0.0",
 
     "less": "^4.1.1",
 
     "less-loader": "^7.3.0",
 
     "lint-staged": "^10.5.3",

BIN
public/favicon.ico
Wyświetl plik


BIN
public/favicon1.ico
Wyświetl plik


+ 17 - 11
public/index.html
Wyświetl plik 

@@ -5,24 +5,30 @@
 
     <meta charset="utf-8" />
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
 
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
 
+    <link rel="icon" href="<%= BASE_URL %>" />
 
     <title>
 
         <%= htmlWebpackPlugin.options.title %>
 
     </title>
 
-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=246349bf278f6225fa80156828d0f061"></script>
 
+    <script type="text/javascript"
 
+        src="https://webapi.amap.com/maps?v=1.4.15&key=246349bf278f6225fa80156828d0f061"></script>
 
 
-    <meta content="vab,vab官网,后台管理框架,vue后台管理框架,vue-admin-beautiful,vue-admin-beautiful-pro,vue-admin-beautiful官网,vue-admin-beautiful文档,vue-element-admin,vue-element-admin官网,vue-element-admin文档,vue-admin,vue-admin官网,vue-admin文档" name="keywords" />
 
-    <meta content="<%= VUE_APP_TITLE %>官网与文档基于vue-admin-beautiful-pro构建，简称vab（是一款超棒的vue+element中后台前端快速开发框架），QQ群972435319，作者：<%= VUE_APP_AUTHOR %>" name="description" />
 
+    <meta
 
+        content="vab,vab官网,后台管理框架,vue后台管理框架,vue-admin-beautiful,vue-admin-beautiful-pro,vue-admin-beautiful官网,vue-admin-beautiful文档,vue-element-admin,vue-element-admin官网,vue-element-admin文档,vue-admin,vue-admin官网,vue-admin文档"
 
+        name="keywords" />
 
+    <meta
 
+        content="<%= VUE_APP_TITLE %>官网与文档基于vue-admin-beautiful-pro构建，简称vab（是一款超棒的vue+element中后台前端快速开发框架），QQ群972435319，作者：<%= VUE_APP_AUTHOR %>"
 
+        name="description" />
 
     <meta content="<%= VUE_APP_AUTHOR %>" name="author" />
 
-    <link href="<%= BASE_URL %>static/css/loading.css" rel="stylesheet" />
 
+    <!-- <link href="<%= BASE_URL %>static/css/loading.css" rel="stylesheet" /> -->
 
     <script>
 
         var _hmt = _hmt || [];
 
-        (function() {
 
+        (function () {
 
             var hm = document.createElement("script");
 
             hm.src = "https://hm.baidu.com/hm.js?7174bade1219f9cc272e7978f9523fc8";
 
             var s = document.getElementsByTagName("script")[0];
 
             s.parentNode.insertBefore(hm, s);
 
         })();
 
+
 
     </script>
 
 
 
@@ -30,11 +36,11 @@
 
 
 <body>
 
     <noscript>
 
-    <strong>
 
-      We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
 
-        properly without JavaScript enabled. Please enable it to continue.
 
-    </strong>
 
-  </noscript>
 
+        <strong>
 
+            We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
 
+                properly without JavaScript enabled. Please enable it to continue.
 
+        </strong>
 
+    </noscript>
 
     <div id="app">
 
         <!-- <div class="first-loading-wrp">
 
             <div class="loading-wrp">

+ 1 - 5
src/App.vue
Wyświetl plik 

@@ -3,14 +3,12 @@
 
 </template>
 
 <script>
 
 import { defineComponent, watchEffect } from 'vue'
 
-// import {useRouter} from 'vue-router'
 
 
 import store from '@/store'
 
 
 export default defineComponent({
 
   setup() {
 
     let hasToken = store.getters['user/accessToken']
 
-    // let router = useRouter();
 
 
     watchEffect((fn, options) => {
 
       fn, options
 
@@ -19,8 +17,7 @@ export default defineComponent({
 
         //   path: '/login',
 
         // })
 
       } else {
 
-        console.log(2)
 
-
 
+        // console.log(2)
 
       }
 
     })
 
     return {
 
@@ -28,7 +25,6 @@ export default defineComponent({
 
     }
 
   },
 
 })
 
-
 
 </script>
 
 
 <style lang="less">

BIN
src/assets/login_images/uskyIcon.png
Wyświetl plik


+ 6 - 8
src/layout/vab-avatar/index.vue
Wyświetl plik 

@@ -12,14 +12,14 @@
 
       </a>
 
     </span>
 
 
-    <span class="bell">
 
+    <!-- <span class="bell">
 
       <img
 
         src="../../assets/images/bell.png"
 
         alt=""
 
         width="15"
 
         @click="goAlarmingPage"
 
       />
 
-    </span>
 
+    </span> -->
 
 
     <a-dropdown>
 
       <span class="ant-dropdown-link">
 
@@ -96,9 +96,7 @@ export default {
 
     }, 0)
 
   },
 
   methods: {
 
-
 
-     ...mapActions({
 
- 
+    ...mapActions({
 
       delAllVisitedRoutes: 'tagsBar/delAllVisitedRoutes',
 
 
       // toggleCollapse: 'settings/toggleCollapse',
 
@@ -119,7 +117,7 @@ export default {
 
       this.$router.push('/alarmManage')
 
     },
 
 
-     async closeAllTabs() {
 
+    async closeAllTabs() {
 
       await this.delAllVisitedRoutes()
 
       if (this.affixTabs.some((tag) => tag.path === this.toThisTag().path))
 
         return
 
@@ -133,8 +131,8 @@ export default {
 
         // this.$router.push(`/login?redirect=${fullPath}`)
 
 
         // this.$store.visitedRoutes=[]
 
-   
-        this.$store.state.homePageUrl=''
 
+
 
+        this.$store.state.homePageUrl = ''
 
 
         this.closeAllTabs()

+ 1 - 4
src/main.js
Wyświetl plik 

@@ -89,15 +89,12 @@ router.beforeEach((to) => {
 
 
         console.log(to.meta.title)
 
         store.commit('getAuthorities', to.meta.title)
 
-            // store.commit('getMiddleConfig')
 
+        store.commit('getMiddleConfig')
 
 
         // console.log('store.state.authorities')
 
         // console.log(store.state.authorities)
 
 
-
 
         // next()
 
-
 
-
 
     }
 
     // if (to.path == '/home') {
 
     //     if (window.location.host.indexOf('localhost') != -1) {

+ 50 - 29
src/store/index.js
Wyświetl plik 

@@ -12,6 +12,16 @@ files.keys().forEach((key) => {
 
     modules[key.replace(/(\.\/|\.js)/g, '')] = files(key).default
 
 })
 
 
+function getLabelIcon(labelIcon) {
 
+    var link =
 
+        document.querySelector("link[rel*='icon']") ||
 
+        document.createElement('link')
 
+    link.type = 'image/x-icon'
 
+    link.rel = 'shortcut icon'
 
+    link.href = labelIcon
 
+    document.getElementsByTagName('head')[0].appendChild(link)
 
+}
 
+
 
 Object.keys(modules).forEach((key) => {
 
     modules[key]['namespaced'] = true
 
 })
 
@@ -34,6 +44,7 @@ export default createStore({
 
         homeStyle: '#016ddb',
 
         homeLogo: '',
 
         homeTitle: '永天智慧电力平台',
 
+        labelIcon: require('@/assets/login_images/uskyIcon.png'),
 
 
         largeScreenUrl: '',
 
         middleStatus: 1,
 
@@ -104,19 +115,19 @@ export default createStore({
 
                             requset.data.map((val) => {
 
                                 // if (val.children.length > 0) {
 
                                 state.deviceList.push({
 
-                                        deviceCode: val.deviceCode,
 
-                                        deviceName: val.deviceName,
 
-                                        id: val.id,
 
-                                        children: val.children.length > 0 ?
 
-                                            val.children.map((val) => {
 
-                                                return {
 
-                                                    deviceCode: val.variableCoding,
 
-                                                    deviceName: val.variableName,
 
-                                                    id: val.id,
 
-                                                }
 
-                                            }) : val.children,
 
-                                    })
 
-                                    // }
 
+                                    deviceCode: val.deviceCode,
 
+                                    deviceName: val.deviceName,
 
+                                    id: val.id,
 
+                                    children: val.children.length > 0 ?
 
+                                        val.children.map((val) => {
 
+                                            return {
 
+                                                deviceCode: val.variableCoding,
 
+                                                deviceName: val.variableName,
 
+                                                id: val.id,
 
+                                            }
 
+                                        }) : val.children,
 
+                                })
 
+                                // }
 
                             })
 
                         } else {
 
                             ElMessage.error(requset.msg)
 
@@ -140,10 +151,10 @@ export default createStore({
 
                     if (requset.status === 'SUCCESS') {
 
                         state.authorities = []
 
                         var menuObj = requset.data;
 
-                        menuObj.forEach(function(item) {
 
-                                state.authorities.push(item.menuName)
 
-                            })
 
-                            // console.log(state.authorities)
 
+                        menuObj.forEach(function (item) {
 
+                            state.authorities.push(item.menuName)
 
+                        })
 
+                        // console.log(state.authorities)
 
                     } else {
 
                         ElMessage.error(requset.msg)
 
                     }
 
@@ -166,7 +177,10 @@ export default createStore({
 
                         state.largeScreenUrl = requset.data[0].largeScreenUrl
 
                         state.middleStatus = requset.data[0].middleStatus
 
                         state.homePageUrl = requset.data[0].homePageUrl
 
-                            // alert('中间页请求后' + state.middleStatus)
 
+                        state.labelIcon = requset.data[0].labelIcon
 
+
 
+                        getLabelIcon(state.labelIcon)
 
+
 
                     } else {
 
                         ElMessage.error(requset.msg)
 
                     }
 
@@ -174,8 +188,15 @@ export default createStore({
 
 
         },
 
 
-
 
-
 
+        /**
 
+         * @标签页图标配置
 
+         * @param {*} state 
+         * @param {*} val 
+         */
 
+        getLabelIcon(state) {
 
+            console.log(state.labelIcon)
 
+            getLabelIcon(state.labelIcon)
 
+        },
 
 
 
         /**
 
@@ -198,7 +219,7 @@ export default createStore({
 
                 var HH = time[i].getHours() < 10 ? '0' + time[i].getHours() : time[i].getHours()
 
                 var MM = time[i].getMinutes() < 10 ? '0' + time[i].getMinutes() : time[i].getMinutes()
 
                 var SS = time[i].getSeconds() < 10 ? '0' + time[i].getSeconds() : time[i].getSeconds()
 
-                    // console.log(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
 
+                // console.log(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
 
                 state.Time_Data.push(Y + '-' + M + '-' + D + ' ' + HH + ':' + MM + ':' + SS)
 
             }
 
         },
 
@@ -222,8 +243,8 @@ export default createStore({
 
                 k = k + 24 * 60 * 60 * 1000;
 
             }
 
             state.timearr = arrTime
 
-                // return arrTime;
 
-                // 时间格式处理
 
+            // return arrTime;
 
+            // 时间格式处理
 
             function datetimeparse(timestamp, format, prefix) {
 
                 if (typeof timestamp == "string") {
 
                     timestamp = Number(timestamp);
 
@@ -255,20 +276,20 @@ export default createStore({
 
                 let YYYY = dateobj.getFullYear();
 
                 let MM =
 
                     dateobj.getMonth() > 8 ?
 
-                    dateobj.getMonth() + 1 :
 
-                    "0" + (dateobj.getMonth() + 1);
 
+                        dateobj.getMonth() + 1 :
 
+                        "0" + (dateobj.getMonth() + 1);
 
                 let DD =
 
                     dateobj.getDate() > 9 ? dateobj.getDate() : "0" + dateobj.getDate();
 
                 let HH =
 
                     dateobj.getHours() > 9 ? dateobj.getHours() : "0" + dateobj.getHours();
 
                 let mm =
 
                     dateobj.getMinutes() > 9 ?
 
-                    dateobj.getMinutes() :
 
-                    "0" + dateobj.getMinutes();
 
+                        dateobj.getMinutes() :
 
+                        "0" + dateobj.getMinutes();
 
                 let ss =
 
                     dateobj.getSeconds() > 9 ?
 
-                    dateobj.getSeconds() :
 
-                    "0" + dateobj.getSeconds();
 
+                        dateobj.getSeconds() :
 
+                        "0" + dateobj.getSeconds();
 
                 let output = "";
 
                 let separator = "/";
 
                 if (format) {

+ 25 - 8
src/store/modules/routes.js
Wyświetl plik 

@@ -6,6 +6,7 @@ import { asyncRoutes, constantRoutes } from '@/router'
 
 import { getRouterList } from '@/api/router'
 
 import { convertRouter, filterRoutes } from '@/utils/routes'
 
 import { ElMessage } from 'element-plus'
 
+import { notification } from 'ant-design-vue'
 
 import store from '..'
 
 // import { Layout } from 'ant-design-vue'
 
 
@@ -47,18 +48,34 @@ const actions = {
 
         let { data } = await getRouterList();
 
 
         if (data.length == 0) {
 
-            store.state.auth = 0
 
             ElMessage.warning('此角色暂无分配权限，请先联系超级管理员分配权限 ! ')
 
         } else {
 
-            store.state.auth = 1
 
+            const hour = new Date().getHours()
 
+            const thisTime =
 
+                hour < 8 ?
 
+                    '早上好' :
 
+                    hour <= 11 ?
 
+                        '上午好' :
 
+                        hour <= 13 ?
 
+                            '中午好' :
 
+                            hour < 18 ?
 
+                                '下午好' :
 
+                                '晚上好'
 
+
 
+            notification.open({
 
+                // message: `欢迎登录${title}`,
 
+                message: `登录成功`,
 
+                description: `${thisTime}！`,
 
+            })
 
+            store.state.firstMiddleState = true
 
         }
 
         data[0].meta.affix = false
 
 
 
         //根据首页请求地址动态配置affix的标签项
 
         if (store.state.homePageUrl) {
 
-            data.forEach(function(item) {
 
-                item.children.forEach(function(aa) {
 
+            data.forEach(function (item) {
 
+                item.children.forEach(function (aa) {
 
                     if (aa.component == store.state.homePageUrl) {
 
                         aa.meta.affix = true
 
                     }
 
@@ -155,15 +172,15 @@ const actions = {
 
 
 
 
-        data.forEach(function(item) {
 
+        data.forEach(function (item) {
 
             if (item.children.length > 1) {
 
-                item.children.forEach(function(i) {
 
+                item.children.forEach(function (i) {
 
                     i.meta.icon = ''
 
                 })
 
             }
 
         })
 
-        console.log('data')
 
-        console.log(data)
 
+        // console.log('data')
 
+        // console.log(data)
 
 
         store.state.middleList = data

+ 1 - 22
src/store/modules/user.js
Wyświetl plik 

@@ -73,29 +73,8 @@ const actions = {
 
         const { data } = await login(userInfo)
 
         const accessToken = data
 
         if (accessToken) {
 
-            commit('setAccessToken', accessToken)
 
-            const hour = new Date().getHours()
 
-            const thisTime =
 
-                hour < 8 ?
 
-                '早上好' :
 
-                hour <= 11 ?
 
-                '上午好' :
 
-                hour <= 13 ?
 
-                '中午好' :
 
-                hour < 18 ?
 
-                '下午好' :
 
-                '晚上好'
 
-
 
-            title
 
-            if (store.state.auth == 1) {
 
-                notification.open({
 
-                    // message: `欢迎登录${title}`,
 
-                    message: `登录成功`,
 
-                    description: `${thisTime}！`,
 
-                })
 
-                store.state.firstMiddleState = true
 
 
-            }
 
+            commit('setAccessToken', accessToken)
 
 
         } else {
 
             message.error(`登录接口异常，未正确返回${tokenName}...`)

+ 5 - 11
src/vab/plugins/permissions.js
Wyświetl plik 

@@ -13,16 +13,13 @@ import {
 
     routesWhiteList,
 
 } from '@/config'
 
 
-router.beforeEach(async(to, from, next) => {
 
-
 
-
 
-
 
+router.beforeEach(async (to, from, next) => {
 
 
     let hasToken = store.getters['user/accessToken']
 
 
     if (!loginInterception) hasToken = true
 
-    console.log(localStorage.getItem('accessToken'))
 
-    console.log(localStorage.getItem('accessToken'))
 
+    // console.log(localStorage.getItem('accessToken'))
 
+    // console.log(localStorage.getItem('accessToken'))
 
     if (hasToken) {
 
 
         if (to.path === '/login') {
 
@@ -30,9 +27,6 @@ router.beforeEach(async(to, from, next) => {
 
             next({ path: '/' })
 
         } else {
 
 
-
 
-
 
-
 
             const hasRoles =
 
                 store.getters['acl/admin'] ||
 
                 store.getters['acl/role'].length > 0 ||
 
@@ -48,6 +42,7 @@ router.beforeEach(async(to, from, next) => {
 
             } else {
 
 
                 store.commit('getMiddleConfig')
 
+                store.commit('getLabelIcon')
 
 
                 try {
 
                     if (loginInterception) {
 
@@ -80,8 +75,6 @@ router.beforeEach(async(to, from, next) => {
 
                         var aa = (store.state.homePageUrl).slice(7)
 
                         var bb = aa.slice(0, -6)
 
 
-                        // alert(bb)
 
-
 
                         // 首页请求地址动态配置
 
                         if (store.state.homePageUrl) {
 
                             var pathUrl = bb
 
@@ -93,6 +86,7 @@ router.beforeEach(async(to, from, next) => {
 
 
                     }
 
 
+
 
                 } catch {
 
                     await store.dispatch('user/resetAll')
 
                     if (recordRoute)

+ 28 - 9
src/views/login/index.vue
Wyświetl plik 

@@ -17,7 +17,7 @@
 
           class="row-left-box"
 
           style="display: flex; justify-content: center; align-items: center"
 
         >
 
-          <div style="text-align:center">
 
+          <div style="text-align: center">
 
             <img :src="`${loginLogo}`" alt="" style="width: 193px" />
 
             <div class="login-container-title">{{ companyName }}</div>
 
             <div class="row-left-after"></div>
 
@@ -38,6 +38,7 @@
 
                   v-model:value="form.password"
 
                   type="password"
 
                   placeholder="请输入密码"
 
+                  autocomplete
 
                 >
 
                   <template v-slot:prefix>
 
                     <LockOutlined style="color: rgba(0, 0, 0, 0.25)" />
 
@@ -133,15 +134,11 @@ export default {
 
     this.form.password = '' //admin123
 
 
     const router = useRouter()
 
-    console.log(router)
 
     if (router.currentRoute.value.query.userName === 'admin') {
 
       this.handleSubmit()
 
     }
 
 
     this.getLoginStyle()
 
-    // this.companyName='永天智慧电力平台'
 
-    // this.backdropUrl=require('@/assets/login_images/login_background.png')
 
-    // this.loginFooter='上海永天科技股份有限公司'
 
   },
 
   methods: {
 
     //根据不同的域名，显示不同的title和背景图
 
@@ -155,10 +152,32 @@ export default {
 
         })
 
         .then((requset) => {
 
           if (requset.status === 'SUCCESS') {
 
-            this.backdropUrl = requset.data[0].loginBackUrl?requset.data[0].loginBackUrl:this.backdropUrl
 
-            this.companyName = requset.data[0].loginTitle?requset.data[0].loginTitle:this.companyName
 
-            this.loginFooter = requset.data[0].loginFooter?requset.data[0].loginFooter:this.loginFooter
 
-            this.loginLogo = requset.data[0].loginLogo?requset.data[0].loginLogo:this.loginLogo
 
+            this.backdropUrl =
 
+              requset.data[0] != undefined
 
+                ? requset.data[0].loginBackUrl
 
+                : this.backdropUrl
 
+
 
+            this.companyName =
 
+              requset.data[0] != undefined
 
+                ? requset.data[0].loginTitle
 
+                : this.companyName
 
+
 
+            this.loginFooter =
 
+              requset.data[0] != undefined
 
+                ? requset.data[0].loginFooter
 
+                : this.loginFooter
 
+
 
+            this.loginLogo =
 
+              requset.data[0] != undefined
 
+                ? requset.data[0].loginLogo
 
+                : this.loginLogo
 
+
 
+            this.$store.state.labelIcon =
 
+              requset.data[0] != undefined
 
+                ? requset.data[0].labelIcon
 
+                : this.$store.state.labelIcon
 
+
 
+            this.$store.commit('getLabelIcon')
 
           } else {
 
             alert(requset.msg)
 
           }

+ 18 - 36
src/views/platManage/index.vue
Wyświetl plik 

@@ -4,13 +4,9 @@
 
     <div class="filter-container mb-10">
 
       <div class="left">
 
         <div>
 
-          <a class="" style="margin-right: 30px">模板管理列表</a>
 
-          <el-button
 
-            icon="el-icon-plus"
 
-            type="success"
 
-            @click="addItem()"
 
-          >
 
-           添加模板
 
+          <a class="" style="margin-right: 30px">平台管理列表</a>
 
+          <el-button icon="el-icon-plus" type="success" @click="addItem()">
 
+            添加平台
 
           </el-button>
 
         </div>
 
       </div>
 
@@ -19,14 +15,13 @@
 
     <div class="filter-container mb-10">
 
       <div style="margin-top: 20px">
 
         <div class="filter-item">
 
-          模板名称：
 
+          平台名称：
 
           <el-input
 
             v-model="platformName"
 
             placeholder="请输入内容"
 
             style="width: 150px"
 
           ></el-input>
 
         </div>
 
-       
 
         <div class="filter-item planOutage">
 
           选择时间范围：
 
@@ -62,29 +57,16 @@
 
       :cell-style="cellStyle"
 
     >
 
       <el-table-column type="index" label="序号" width="50px"></el-table-column>
 
-      <el-table-column
 
-        prop="platformName"
 
-        label="模板名称"
 
-      ></el-table-column>
 
-      <el-table-column
 
-        prop="tenantCount"
 
-        label="在用租户数"
 
-      ></el-table-column>
 
-      <el-table-column
 
-        prop="createTime"
 
-        label="创建时间"
 
-      >
 
-
 
-      <template #default="scope">
 
-         <span>
 
-           {{scope.row.createTime}}
 
-         </span>
 
+      <el-table-column prop="platformName" label="平台名称"></el-table-column>
 
+      <el-table-column prop="tenantCount" label="在用租户数"></el-table-column>
 
+      <el-table-column prop="createTime" label="创建时间">
 
+        <template #default="scope">
 
+          <span>
 
+            {{ scope.row.createTime }}
 
+          </span>
 
         </template>
 
-      
       </el-table-column>
 
-     
 
-  
       <el-table-column fixed="right" label="操作" width="80">
 
         <template #default="scope">
 
           <el-button
 
@@ -172,8 +154,8 @@ export default defineComponent({
 
         systemName: '',
 
         email: '',
 
         address: '',
 
-        status:0,
 
-        domain:''
 
+        status: 0,
 
+        domain: '',
 
       }
 
       dialogTitle.value = '添加模板'
 
       showDialog.value = true
 
@@ -182,11 +164,11 @@ export default defineComponent({
 
     const editRow = (row) => {
 
       console.log(row)
 
       tableItem.value = {
 
-        id:row.id,
 
+        id: row.id,
 
         platformName: row.platformName,
 
         tenantCount: row.tenantCount,
 
-        tenantTerm: row.tenantTerm=='永久有效'?3:4,
 
-        value1:row.tenantTerm,
 
+        tenantTerm: row.tenantTerm == '永久有效' ? 3 : 4,
 
+        value1: row.tenantTerm,
 
         status: Number(row.status),
 
         geoPosition: row.geoPosition,
 
         createTime: Number(row.createTime),
 
@@ -194,8 +176,8 @@ export default defineComponent({
 
         systemName: Number(row.systemName),
 
         email: row.email,
 
         address: row.address,
 
-        remark:row.remark,
 
-        domain:row.domain
 
+        remark: row.remark,
 
+        domain: row.domain,
 
       }
 
       dialogTitle.value = '编辑'
 
       showDialog.value = true

+ 53 - 33
src/views/tenantManage/systemConfig/dialogComponent.vue
Wyświetl plik 

@@ -28,37 +28,60 @@
 
               <el-form-item label="主题样式:" prop="homeStyle">
 
                 <el-select v-model="form.homeStyle" placeholder="请选择">
 
                   <el-option label="#f22636" value="#f22636">
 
-                    <div class="homeStyleColor" style="background:#f22636"></div>
 
+                    <div
 
+                      class="homeStyleColor"
 
+                      style="background: #f22636"
 
+                    ></div>
 
                   </el-option>
 
                   <el-option label="#f75527" value="#f75527">
 
-                    <div class="homeStyleColor" style="background:#f75527"></div>
 
+                    <div
 
+                      class="homeStyleColor"
 
+                      style="background: #f75527"
 
+                    ></div>
 
                   </el-option>
 
                   <el-option label="#fdaa30" value="#fdaa30">
 
-                    <div class="homeStyleColor" style="background:#fdaa30"></div>
 
+                    <div
 
+                      class="homeStyleColor"
 
+                      style="background: #fdaa30"
 
+                    ></div>
 
                   </el-option>
 
                   <el-option label="#2bc1c5" value="#2bc1c5">
 
-                    <div class="homeStyleColor" style="background:#2bc1c5"></div>
 
+                    <div
 
+                      class="homeStyleColor"
 
+                      style="background: #2bc1c5"
 
+                    ></div>
 
                   </el-option>
 
                   <el-option label="#58c22d" value="#58c22d">
 
-                    <div class="homeStyleColor" style="background:#58c22d"></div>
 
+                    <div
 
+                      class="homeStyleColor"
 
+                      style="background: #58c22d"
 
+                    ></div>
 
                   </el-option>
 
                   <el-option label="#2292fc" value="#2292fc">
 
-                    <div class="homeStyleColor" style="background:#2292fc"></div>
 
+                    <div
 
+                      class="homeStyleColor"
 
+                      style="background: #2292fc"
 
+                    ></div>
 
                   </el-option>
 
                   <el-option label="#5159ea" value="#5159ea">
 
-                    <div class="homeStyleColor" style="background:#5159ea"></div>
 
+                    <div
 
+                      class="homeStyleColor"
 
+                      style="background: #5159ea"
 
+                    ></div>
 
                   </el-option>
 
                   <el-option label="#7537c1" value="#7537c1">
 
-                    <div class="homeStyleColor" style="background:#7537c1"></div>
 
+                    <div
 
+                      class="homeStyleColor"
 
+                      style="background: #7537c1"
 
+                    ></div>
 
                   </el-option>
 
                 </el-select>
 
               </el-form-item>
 
 
               <el-form-item label="大屏跳转地址:" prop="largeScreenUrl ">
 
-                <el-input v-model="form.largeScreenUrl "></el-input>
 
+                <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>
 
                 <el-upload
 
@@ -83,7 +106,11 @@
 
               <el-form-item label="首页请求地址:" prop="homePageUrl">
 
                 <!-- <el-input v-model="form.homePageUrl"></el-input> -->
 
 
-                <el-select v-model="form.homePageUrl" placeholder="请选择"   clearable>
 
+                <el-select
 
+                  v-model="form.homePageUrl"
 
+                  placeholder="请选择"
 
+                  clearable
 
+                >
 
                   <el-option
 
                     v-for="item in homeUrlList"
 
                     :key="item.value"
 
@@ -325,7 +352,6 @@ export default defineComponent({
 
     const value = ref(true)
 
     const accessToken = ref(store.state.user.accessToken)
 
 
-
 
     const upload = ref(null)
 
     const upload2 = ref(null)
 
     const upload22 = ref(null)
 
@@ -339,8 +365,7 @@ export default defineComponent({
 
 
     const dataSet = reactive({
 
       uploadUrl:
 
-        process.env.VUE_APP_BASE_URL +
 
-        '/patrolInspectionDevice/pictureUpload',
 
+        process.env.VUE_APP_BASE_URL + '/patrolInspectionDevice/pictureUpload',
 
       fileList: [],
 
     })
 
 
@@ -407,7 +432,7 @@ export default defineComponent({
 
             homePageUrl: form.value.homePageUrl,
 
             homeLayout: form.value.homeLayout,
 
             homeStyle: form.value.homeStyle,
 
-            largeScreenUrl :form.value.largeScreenUrl,
 
+            largeScreenUrl: form.value.largeScreenUrl,
 
           }
 
 
           if (props.configStatus) {
 
@@ -418,7 +443,7 @@ export default defineComponent({
 
                   message: '修改配置成功',
 
                   type: 'success',
 
                 })
 
-                 store.commit('getMiddleConfig')
 
+                store.commit('getMiddleConfig')
 
                 closeDialog()
 
               } else {
 
                 ElMessage.error(requset.msg)
 
@@ -432,7 +457,7 @@ export default defineComponent({
 
                   message: '新增配置成功',
 
                   type: 'success',
 
                 })
 
-                 store.commit('getMiddleConfig')
 
+                store.commit('getMiddleConfig')
 
                 closeDialog()
 
               } else {
 
                 ElMessage.error(requset.msg)
 
@@ -468,7 +493,7 @@ export default defineComponent({
 
                   type: 'success',
 
                 })
 
                 closeDialog()
 
-                 store.commit('getMiddleConfig')
 
+                store.commit('getMiddleConfig')
 
               } else {
 
                 ElMessage.error(requset.msg)
 
               }
 
@@ -481,7 +506,7 @@ export default defineComponent({
 
                   message: '新增配置成功',
 
                   type: 'success',
 
                 })
 
-                 store.commit('getMiddleConfig')
 
+                store.commit('getMiddleConfig')
 
                 closeDialog()
 
               } else {
 
                 ElMessage.error(requset.msg)
 
@@ -516,7 +541,7 @@ export default defineComponent({
 
                   message: '修改配置成功',
 
                   type: 'success',
 
                 })
 
-                 store.commit('getMiddleConfig')
 
+                store.commit('getMiddleConfig')
 
                 closeDialog()
 
               } else {
 
                 ElMessage.error(requset.msg)
 
@@ -530,7 +555,7 @@ export default defineComponent({
 
                   message: '新增配置成功',
 
                   type: 'success',
 
                 })
 
-                 store.commit('getMiddleConfig')
 
+                store.commit('getMiddleConfig')
 
                 closeDialog()
 
               } else {
 
                 ElMessage.error(requset.msg)
 
@@ -614,7 +639,6 @@ export default defineComponent({
 
       closeDialog,
 
       open,
 
 
-
 
       store,
 
       beginTime,
 
       showDialog,
 
@@ -759,21 +783,17 @@ export default defineComponent({
 
   width: 100px !important;
 
 }
 
 
-.homeStyleColor{
 
+.homeStyleColor {
 
   width: 100%;
 
-    height: 20px;
 
-    margin-top: 7px;
 
-    color:#fff;
 
-    // line-height:20px;
 
-    // padding-left:5px
 
-
 
-} 
-
 
+  height: 20px;
 
+  margin-top: 7px;
 
+  color: #fff;
 
+  // line-height:20px;
 
+  // padding-left:5px
 
+}
 
 </style>
 
 <style>
 
 .systemCard .el-dialog__body {
 
   padding-top: 10px !important;
 
 }
 
-
 
-
 
 </style>

+ 7 - 5
src/views/tenantManage/tenantUnit/dialogComponent.vue
Wyświetl plik 

@@ -24,7 +24,7 @@
 
 
           <el-form-item label="有效期限:" prop="tenantTerm">
 
             <el-radio-group v-model="form.tenantTerm">
 
-              <el-radio :label="3" value="3">2090-01-01</el-radio>
 
+              <el-radio :label="3" value="3">永久有效</el-radio>
 
               <el-radio :label="4" value="4">
 
                 <el-date-picker
 
                   :min-time="nowDate"
 
@@ -241,16 +241,18 @@ export default defineComponent({
 
       var map = new AMap.Map('mapF', {
 
         resizeEnable: true,
 
       })
 
-      
+
 
       //地图点标记回显
 
       if (props.dialogTitle != '新增') {
 
-        var newArray = form.value.geoPosition&&form.value.geoPosition.indexOf(',')!=-1?form.value.geoPosition.split(','):[0,0 ]
 
+        var newArray =
 
+          form.value.geoPosition && form.value.geoPosition.indexOf(',') != -1
 
+            ? form.value.geoPosition.split(',')
 
+            : [0, 0]
 
         marker = new AMap.Marker({
 
           position: new AMap.LngLat(newArray[0], newArray[1]), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
 
         })
 
         map.add([marker])
 
-      } 
-    
+      }
 
 
       //为地图注册click事件获取鼠标点击出的经纬度坐标
 
       map.on('click', function (e) {

+ 16 - 33
src/views/tenantManage/tenantUnit/index.vue
Wyświetl plik 

@@ -139,48 +139,33 @@
 
           </span>
 
         </template>
 
       </el-table-column>
 
-      <el-table-column
 
-        prop="domain"
 
-        label="域名"
 
-        min-width="200px"
 
-      >
 
-
 
-      <template #default="scope">
 
-          <a  target="_blank" :href='`http://${scope.row.domain}`'> 
-            {{ scope.row.domain}}
 
+      <el-table-column prop="domain" label="域名" min-width="200px">
 
+        <template #default="scope">
 
+          <a target="_blank" :href="`http://${scope.row.domain}`">
 
+            {{ scope.row.domain }}
 
           </a>
 
         </template>
 
-
 
-      
-      
       </el-table-column>
 
-      <el-table-column
 
-        prop="tenantTerm"
 
-        label="到期时间"
 
-        min-width="110px"
 
-      >
 
-       <template #default="scope">
 
+      <el-table-column prop="tenantTerm" label="到期时间" min-width="110px">
 
+        <template #default="scope">
 
           <span>
 
-            {{ scope.row.tenantTerm === '永久有效' ? '2090-01-01' : scope.row.tenantTerm }}
 
+            {{ scope.row.tenantTerm }}
 
           </span>
 
         </template>
 
-      
       </el-table-column>
 
       <!-- <el-table-column
 
         prop="geoPosition"
 
         label="地理位置"
 
         min-width="160px"
 
       ></el-table-column> -->
 
-     
 
       <el-table-column
 
         prop="platformName"
 
         label="系统平台"
 
         min-width="140px"
 
       ></el-table-column>
 
-      
 
-       <el-table-column prop="status" label="状态" width="">
 
+      <el-table-column prop="status" label="状态" width="">
 
         <template #default="scope">
 
           <span
 
             :style="{
 
@@ -191,7 +176,7 @@
 
           </span>
 
         </template>
 
       </el-table-column>
 
-      
+
 
       <el-table-column fixed="right" label="操作" width="80">
 
         <template #default="scope">
 
           <el-button
 
@@ -202,7 +187,6 @@
 
           >
 
             编辑
 
           </el-button>
 
-          
         </template>
 
       </el-table-column>
 
     </el-table>
 
@@ -281,8 +265,8 @@ export default defineComponent({
 
         systemName: '',
 
         email: '',
 
         address: '',
 
-        status:0,
 
-        domain:''
 
+        status: 0,
 
+        domain: '',
 
       }
 
       dialogTitle.value = '新增'
 
       showDialog.value = true
 
@@ -291,11 +275,11 @@ export default defineComponent({
 
     const editRow = (row) => {
 
       console.log(row)
 
       tableItem.value = {
 
-        id:row.id,
 
+        id: row.id,
 
         tenantName: row.tenantName,
 
         tenantManager: row.tenantManager,
 
-        tenantTerm: row.tenantTerm=='永久有效'?3:4,
 
-        value1:row.tenantTerm,
 
+        tenantTerm: row.tenantTerm == '永久有效' ? 3 : 4,
 
+        value1: row.tenantTerm,
 
         status: Number(row.status),
 
         geoPosition: row.geoPosition,
 
         tenantType: Number(row.tenantType),
 
@@ -303,8 +287,8 @@ export default defineComponent({
 
         systemName: Number(row.systemName),
 
         email: row.email,
 
         address: row.address,
 
-        remark:row.remark,
 
-        domain:row.domain
 
+        remark: row.remark,
 
+        domain: row.domain,
 
       }
 
       dialogTitle.value = '编辑'
 
       showDialog.value = true
 
@@ -336,7 +320,6 @@ export default defineComponent({
 
       })
 
     }
 
 
- 
     //是否删除  ---- 否
 
     const cancelEvent = () => {
 
       console.log('cancel!')