Home Explore Help
Sign In
crazycat
/
IDCOL
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

no message

XAWDJ0277HWXPT2\Administrator 5 years ago
parent
9c7f01b157
commit
33b7446b67
24 changed files with 1054 additions and 23 deletions
Unified View Show Diff Stats
  1. 1 0
      web/css/chunk-2ab76162.c3c6a124.css
  2. 0 1
      web/css/chunk-6a010b72.4211d6bc.css
  3. 1 1
      web/index.html
  4. 0 2
      web/js/app.7eb0f506.js
  5. 0 1
      web/js/app.7eb0f506.js.map
  6. 2 0
      web/js/app.fead92e7.js
  7. 1 0
      web/js/app.fead92e7.js.map
  8. 2 0
      web/js/chunk-2ab76162.5ae66d64.js
  9. 1 0
      web/js/chunk-2ab76162.5ae66d64.js.map
  10. 0 2
      web/js/chunk-691e64ee.1ff22d28.js
  11. 0 1
      web/js/chunk-691e64ee.1ff22d28.js.map
  12. 2 0
      web/js/chunk-691e64ee.473afeb2.js
  13. 1 0
      web/js/chunk-691e64ee.473afeb2.js.map
  14. 0 2
      web/js/chunk-6a010b72.2cd7d577.js
  15. 0 1
      web/js/chunk-6a010b72.2cd7d577.js.map
  16. 2 2
      web/js/chunk-7ef40bfa.16e72cb6.js
  17. 1 0
      web/js/chunk-7ef40bfa.0b78d39b.js.map
  18. 0 1
      web/js/chunk-7ef40bfa.16e72cb6.js.map
  19. 1 1
      webConfig/public/index.html
  20. 2 2
      webConfig/src/components/header.vue
  21. 4 4
      webConfig/src/router.js
  22. 1 1
      webConfig/src/views/dashboard.vue
  23. 0 1
      webConfig/src/views/projectManagement.vue
  24. 1032 0
      webConfig/src/views/userManagement.vue

File diff suppressed because it is too large
+ 1 - 0
web/css/chunk-2ab76162.c3c6a124.css


File diff suppressed because it is too large
+ 0 - 1
web/css/chunk-6a010b72.4211d6bc.css


File diff suppressed because it is too large
+ 1 - 1
web/index.html


File diff suppressed because it is too large
+ 0 - 2
web/js/app.7eb0f506.js


File diff suppressed because it is too large
+ 0 - 1
web/js/app.7eb0f506.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/app.fead92e7.js


File diff suppressed because it is too large
+ 1 - 0
web/js/app.fead92e7.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-2ab76162.5ae66d64.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-2ab76162.5ae66d64.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-691e64ee.1ff22d28.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-691e64ee.1ff22d28.js.map


File diff suppressed because it is too large
+ 2 - 0
web/js/chunk-691e64ee.473afeb2.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-691e64ee.473afeb2.js.map


File diff suppressed because it is too large
+ 0 - 2
web/js/chunk-6a010b72.2cd7d577.js


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-6a010b72.2cd7d577.js.map


File diff suppressed because it is too large
+ 2 - 2
web/js/chunk-7ef40bfa.16e72cb6.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-7ef40bfa.0b78d39b.js.map


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-7ef40bfa.16e72cb6.js.map


+ 1 - 1
webConfig/public/index.html
View File 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="<%= BASE_URL %>bitbug_favicon.ico">
 
     <link rel="icon" href="<%= BASE_URL %>bitbug_favicon.ico">
 
-    <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_1849275_53j289mb29y.css">
 
+    <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_1849275_m6mub5ets3e.css">
 
     <title>IDCOL</title>
 
     <title>IDCOL</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>

+ 2 - 2
webConfig/src/components/header.vue
View File 

@@ -23,8 +23,8 @@
 
                         </div>
 
                         </div>
 
                         <div class="nav_ul">
 
                         <div class="nav_ul">
 
                             <div class="nav_title"><span class="span">Set Up</span></div>
 
                             <div class="nav_title"><span class="span">Set Up</span></div>
 
-                            <div class="nav_li" @click="linkToFun('/userRights')" :class="{'select':routerStr == '/userRights'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">User rights</span></div>
 
-                            <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">User Management</span></div>
 
+                            <div class="nav_li" @click="linkToFun('/userManagement')" :class="{'select':routerStr == '/userManagement'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">User Management</span></div>
 
+                            <!-- <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">User Management</span></div> -->
 
                             <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">Operation Log</span></div>
 
                             <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">Operation Log</span></div>
 
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>

+ 4 - 4
webConfig/src/router.js
View File 

@@ -8,7 +8,7 @@ Vue.use(VueRouter)
 
 const dashboard = () => import('./views/dashboard.vue');
 
 const dashboard = () => import('./views/dashboard.vue');
 
 const projectManagement = () => import('./views/projectManagement.vue');
 
 const projectManagement = () => import('./views/projectManagement.vue');
 
 const GIS = () => import('./views/GISMap.vue');
 
 const GIS = () => import('./views/GISMap.vue');
 
-const userRights = () => import('./views/userRights.vue');
 
+const userManagement = () => import('./views/userManagement.vue');
 
 
 
 const routes = [
 
 const routes = [
 
     {
 
     {
 
@@ -31,9 +31,9 @@ const routes = [
 
         component: GIS
 
         component: GIS
 
     },
 
     },
 
     {
 
     {
 
-        path: '/userRights',
 
-        name: 'userRights',
 
-        component: userRights
 
+        path: '/userManagement',
 
+        name: 'userManagement',
 
+        component: userManagement
 
     },
 
     },
 
 ]
 
 ]

+ 1 - 1
webConfig/src/views/dashboard.vue
View File 

@@ -215,7 +215,7 @@
 
                             height="calc(100% - 3.5rem)"
 
                             height="calc(100% - 3.5rem)"
 
                             :data="faultInformationList">
 
                             :data="faultInformationList">
 
                             <el-table-column
 
                             <el-table-column
 
-                                label="NO"
 
+                                label="Num"
 
                                 prop="webIndex"
 
                                 prop="webIndex"
 
                                 align="center"
 
                                 align="center"
 
                                 header-align="center"
 
                                 header-align="center"

+ 0 - 1
webConfig/src/views/projectManagement.vue
View File 

@@ -1055,7 +1055,6 @@
 
 
 
                 loading:{
 
                 loading:{
 
                     deviceList:false,
 
                     deviceList:false,
 
-                    faultInformationList:false,
 
                 }
 
                 }
 
             }
 
             }
 
         },
 
         },

File diff suppressed because it is too large
+ 1032 - 0
webConfig/src/views/userManagement.vue