Merge branch 'master' of http://39.105.126.192:3000/DR3_web/ioc-admin-ui

package.json

@@ -19,10 +19,22 @@
     "@vue/cli-plugin-vuex": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
     "babel-plugin-component": "^1.1.1",
+<<<<<<< HEAD
     "sass": "^1.32.7",
     "sass-loader": "^12.0.0",
     "less-loader": "^11.1.0",
     "svg-sprite-loader": "^6.0.11",
+=======
+<<<<<<< HEAD
+    "sass": "^1.32.7",
+    "sass-loader": "^12.0.0",
+=======
+    "less-loader": "^11.1.0",
+    "sass": "^1.32.7",
+    "sass-loader": "^12.0.0",
+    "svg-sprite-loader": "^6.0.11",
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
     "vue-template-compiler": "^2.6.14"
   }
 }

src/components/home/MainFrame.vue

@@ -1,6 +1,17 @@
 <template>
   <div class="mainFrame">
     <el-container>
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+      <el-header>Header</el-header>
+      <el-container>
+        <el-aside >Aside</el-aside>
+        <el-container>
+          <el-main>
+            <router-view />
+=======
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
       <el-header>
         <navbar></navbar>
       </el-header>
@@ -11,6 +22,10 @@
         <el-container>
           <el-main>
             <test></test>
+<<<<<<< HEAD
+=======
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
           </el-main>
         </el-container>
       </el-container>
@@ -19,6 +34,7 @@
 </template>
 
 <script>
+<<<<<<< HEAD
 import navbar from '@/layout/Navbar'
 import sidebar from '@/layout/Sidebar'
 import userManagement from '@/views/userManagement/index'
@@ -32,10 +48,56 @@ export default {
 </script>
 
 <style lang="less" scoped>
+=======
+<<<<<<< HEAD
+export default {
+  data() {
+    return {}
+=======
+import navbar from '@/layout/Navbar'
+import sidebar from '@/layout/Sidebar'
+import userManagement from '@/views/userManagement/index'
+import permissionManagement from '@/views/permissionManagement/index'
+import test from '@/views/systemManagement/index'
+export default {
+  components: { navbar, sidebar,userManagement,permissionManagement,test },
+  methods: {
+    toggleSideBar() {
+
+    },
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+  }
+}
+</script>
+
+<<<<<<< HEAD
+<style scoped>
+=======
+<style lang="less" scoped>
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
 .mainFrame {
   width: 100%;
   height: 100%;
 }
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+.el-container {
+  height: 100%;
+}
+.el-header {
+  background-color: #B3C0D1;
+  color: #333;
+  height: 60px;
+}
+
+.el-aside {
+  background-color: #D3DCE6;
+  color: #333;
+  height: 100%;
+=======
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
 
 .el-container {
   height: 100%;
@@ -60,6 +122,10 @@ export default {
   color: rgba(16, 16, 16, 1);
   font-size: 14px;
   text-align: center;
+<<<<<<< HEAD
+=======
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
 }
 
 .el-main {
@@ -67,4 +133,11 @@ export default {
   color: #333;
   height: 100%;
 }
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+
+=======
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
 </style>

src/main.js

@@ -9,8 +9,15 @@ import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import locale from 'element-ui/lib/locale/lang/zh-CN'
 
+<<<<<<< HEAD
 import '@/icons'
 
+=======
+<<<<<<< HEAD
+=======
+import '@/icons'
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
 Vue.use(ElementUI, { locale });
 
 new Vue({

src/views/HomeView.vue

@@ -10,7 +10,15 @@ import MainFrame from "@/components/home/MainFrame.vue";
 export default {
   name: 'HomeView',
   components: {
+<<<<<<< HEAD
     MainFrame
+=======
+<<<<<<< HEAD
+    MainFrame
+=======
+    MainFrame,
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
   }
 }
 </script>

vue.config.js

@@ -1,8 +1,17 @@
 const { defineConfig } = require('@vue/cli-service')
 module.exports = defineConfig({
+<<<<<<< HEAD
 
   transpileDependencies: true
 })
+=======
+<<<<<<< HEAD
+  transpileDependencies: true
+})
+=======
+  transpileDependencies: true,
+})
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860
 
 const path = require('path')
 module.exports = {
@@ -27,3 +36,8 @@ module.exports = {
           .loader('file-loader')
   }
 }
+<<<<<<< HEAD
+=======
+
+>>>>>>> 6d4aae2 (用户管理、组织管理、权限管理更新)
+>>>>>>> af4e4aeb3d79f496002276d9d2650a78a030e860