Merge branch 'master' of https://gitee.com/longyears/szhd-safety-web

.env.development

@@ -2,6 +2,6 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = 'http://safety.115.langye.net/'
+#VUE_APP_BASE_API = 'http://safety.115.langye.net/'
 
-#VUE_APP_BASE_API = http://192.168.60.99:9001/
+VUE_APP_BASE_API = http://192.168.60.99:9001/

package.json

@@ -28,7 +28,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
-    "relation-graph": "^2.1.24",
+    "relation-graph": "^2.1.25",
     "view-design": "^4.7.0",
     "vue": "^2.6.13",
     "vue-matomo": "^4.2.0",

src/styles/sidebar.scss

@@ -90,7 +90,10 @@
           font-weight: bold;
         }
 
+.nest-menu .el-submenu > .el-submenu__title{
 
+  font-weight: normal !important;
+}
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
       min-width: $sideBarWidth !important;
@@ -141,7 +144,6 @@
       &>.el-submenu__title {
         padding: 0 !important;
 
-
         .svg-icon {
           margin-left: 20px;
         }

src/views/system/user.vue

@@ -24,6 +24,11 @@
           </el-table-column>
           <el-table-column prop="username" label="用户名">
           </el-table-column>
+          <el-table-column prop="dept" label="部门">
+            <template slot-scope="scope">
+             {{scope.row.department.name}}
+            </template>
+          </el-table-column>
           <el-table-column prop="address" label="角色">
             <template slot-scope="scope">
               <el-tag size="medium" v-for="(item,index) in scope.row.roles" style="margin-right: 10px;">{{ item.name }}