xgwangman 4 ani în urmă
părinte
comite
2c0f9c2ba6

+ 1 - 10
babel.config.js

@@ -1,12 +1,3 @@
 module.exports = {
-  presets: ["@vue/cli-plugin-babel/preset"],
-  plugins: [
-    [
-      "component",
-      {
-        libraryName: "element-ui",
-        styleLibraryName: "theme-chalk"
-      }
-    ]
-  ]
+  presets: ["@vue/cli-plugin-babel/preset"]
 };

+ 0 - 2
package.json

@@ -23,8 +23,6 @@
     "@vue/cli-service": "~4.5.0",
     "@vue/eslint-config-prettier": "^6.0.0",
     "babel-eslint": "^10.1.0",
-    "babel-plugin-component": "^1.1.1",
-    "babel-plugin-import": "^1.13.0",
     "eslint": "^6.7.2",
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-vue": "^6.2.2",

+ 11 - 14
public/index.html

@@ -26,7 +26,7 @@
   <link rel="stylesheet" type="text/css" href="https://cdn-ali2.jianyu360.com/pccss/public-nav-1200.css?v=1412" />
   <link rel="stylesheet" type="text/css" href="https://cdn-ali2.jianyu360.com/pccss/index.css?v=1412" />
   <link href="https://cdn-ali2.jianyu360.com/css/pc.css?v=1412" rel="stylesheet">
-  <script src="/js/jquery-3.2.1.min.js?v=1412"></script>
+  <script src="https://cdn-ali2.jianyu360.com/js/jquery-3.2.1.min.js?v=1412"></script>
   <!--[if lt IE 9]><script src="{{Msg "seo" "cdn"}}/js/jquery.js?v={{Msg "seo" "version"}}"><![endif]-->
   <script src="https://cdn-ali2.jianyu360.com/js/jquery.cookie.js"></script>
   <script src="https://cdn-ali2.jianyu360.com/js/bootstrap.min.js"></script>
@@ -222,11 +222,11 @@
       haslogin("10")
 
       var href = window.location.pathname;
-
-      if (href == "/jyxspc/courser-details" || href == "/jyxspc/buy-courser" || href == "/jyxspc/pay-courser" ||
-        href == "/jyxspc/pay-succ" ||
-        href == "/jyxspc/my-courser" ||
-        href == "/jyxspc/my-courser") {
+      console.log(href)
+      // if (href == "/entpc/myEnt" || href == "/entpc/bus" || href == "/jyxspc/pay-courser" ||
+      //   href == "/jyxspc/pay-succ" ||
+      //   href == "/jyxspc/my-courser" ||
+      //   href == "/jyxspc/my-courser") {
         $(".public-nav").css({
           "background": "#fff"
         });
@@ -235,16 +235,13 @@
         $(".jynav li").mouseenter(function () {
           $(this).find('a').css('color', '#2CB7CA!important')
         })
-      }
-      if (href == "/jyxspc/") {
-        console.log(111)
+      // }
+      // if (href == "/entpc/myEnt") {
         $(".public-nav").css({
-          "background": "#2274D5"
+          "background": "#fff"
         });
-        $(".public-nav .jynav li a").css("color", "#fff")
-      }
-
-      console.log()
+        $(".public-nav .jynav li a").css("color", "#1d1d1d")
+      // }
 
       $("#bidLogin").on("show.bs.modal", function () {
         $("#freetext").html(

+ 5 - 3
src/App.vue

@@ -22,8 +22,10 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #1d1d1d;
-  margin-top: 77px;
-  background: #f5f5fa;
-  min-height: calc(100vh - 260px);
+  padding-top: 77px;
+  padding-bottom: 20px;
+  background: #F5F5FB;
+  // min-height: calc(100vh - 260px);
+  min-height: 700px;
 }
 </style>

+ 51 - 0
src/assets/css/element.css

@@ -0,0 +1,51 @@
+/* element公共样式 */
+.el-tabs__header {
+    border-top: 1px solid #e0e0e0;
+    box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.05);
+}
+
+.el-tabs__header .el-tabs__nav-wrap, .el-tabs__header .el-tabs__nav-wrap .el-tabs__nav {
+    display: flex;
+    flex-direction: initial;
+    justify-content: center;
+}
+
+.el-tabs__nav-wrap::after {
+    background: none;
+}
+
+.el-tabs__header .el-tabs__nav-wrap .el-tabs__nav .el-tabs__active-bar {
+    width: 216px;
+    background: #2CB7CA;
+    padding: 0 92px 0 92px;
+    text-align: center;
+}
+
+.el-tabs__header .el-tabs__nav-wrap .el-tabs__item {
+    width: 216px;
+    height: 48px;
+    line-height: 48px;
+    font-size: 14px;
+    color: #686868;
+}
+
+.el-tabs__header .el-tabs__nav-wrap .el-tabs__item.is-active {
+    color: #1d1d1d;
+}
+
+.el-tabs__header .el-tabs__nav-wrap .el-tabs__item:hover {
+    color: #1d1d1d;
+}
+
+.el-tabs__content {
+    width: 1080px;
+    min-height: 500px;
+    margin: 0 auto;
+    background: #FFFFFF;
+    box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08);
+    border-radius: 5px;
+    margin-top: 20px;
+}
+.el-drawer {
+    box-shadow: -8px 0px 8px rgba(0, 0, 0, 0.05);
+}

+ 5 - 1
src/main.js

@@ -2,7 +2,11 @@ import Vue from "vue";
 import App from "./App.vue";
 import router from "./router";
 import store from "./store";
-import "./plugins/element.js";
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+import './assets/css/element.css';
+
+Vue.use(ElementUI);
 
 Vue.config.productionTip = false;
 

+ 0 - 8
src/plugins/element.js

@@ -1,8 +0,0 @@
-import Vue from "vue";
-import {
-    Button,
-    Switch
-} from "element-ui";
-
-Vue.use(Button)
-.use(Switch);

+ 13 - 2
src/views/bus/busMage.vue

@@ -1,10 +1,21 @@
 <template>
-    <div>商机管理</div>
+    <div class="bus_mage">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="商机" name="first">商机</el-tab-pane>
+            <el-tab-pane label="公告" name="second">公告</el-tab-pane>
+            <el-tab-pane label="报告" name="third">报告</el-tab-pane>
+            <el-tab-pane label="数据导出" name="forth">数据导出</el-tab-pane>
+        </el-tabs>
+    </div>
 </template>
 
 <script>
 export default {
-    
+    data() {
+        return {
+            activeName: 'first'
+        }
+    }
 }
 </script>
 

+ 17 - 0
src/views/ent/author.vue

@@ -0,0 +1,17 @@
+<template>
+    <div class="business">商机</div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    
+</style>

+ 63 - 0
src/views/ent/depart.vue

@@ -0,0 +1,63 @@
+<<template>
+    <div class="depart">
+        <el-button @click="handler" type="primary" style="margin-left: 16px;">
+        点我打开
+        </el-button>
+
+        <el-drawer
+            title="我是标题"
+            :visible.sync="drawer"
+            :modal="false"
+            :show-close="false"
+        >
+            <span>我来啦!</span><br/>
+        </el-drawer>
+
+        <el-button type="text" @click="dialogVisible = true">点击打开 Dialog</el-button>
+
+        <el-dialog
+        title="提示"
+        :visible.sync="dialogVisible"
+        width="30%"
+        :before-close="handleClose">
+        <span>这是一段信息</span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { entinfo } from '@/api/api';
+export default {
+    data() {
+        return {
+            drawer: false,
+            dialogVisible: false
+        }
+    },
+    created() {
+        entinfo().then(res => {
+            
+        })
+    },
+    methods: {
+        handler() {
+            this.drawer = true
+        },
+        handleClose(done) {
+            this.$confirm('确认关闭?')
+            .then(_ => {
+                done();
+            })
+            .catch(_ => {});
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+    
+</style>

+ 33 - 7
src/views/ent/myEnt.vue

@@ -1,18 +1,44 @@
 <template>
-    <div>我的企业</div>
+    <div class="my_ent">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="部门管理" name="first">
+                <v-depart></v-depart>
+            </el-tab-pane>
+            <el-tab-pane label="人员管理" name="second">
+                <v-person></v-person>
+            </el-tab-pane>
+            <el-tab-pane label="权限管理" name="third">
+                <v-author></v-author>
+            </el-tab-pane>
+        </el-tabs>
+    </div>
 </template>
 
 <script>
-import { entinfo } from '@/api/api'
+import vDepart from './depart.vue';
+import vPerson from './personal.vue';
+import vAuthor from './author.vue';
 export default {
-    created() {
-        entinfo().then(res => {
-            
-        })
+    components: {
+        vDepart,
+        vPerson,
+        vAuthor
+    },
+    data() {
+        return {
+            activeName: 'first'
+        }
+    },
+    methods: {
+        handleClick(tab, event) {
+            this.activeName = tab.name
+        }
     }
 }
 </script>
 
 <style lang="scss" scoped>
-
+.my_ent {
+    padding-bottom: 20px;
+}
 </style>

+ 24 - 0
src/views/ent/personal.vue

@@ -0,0 +1,24 @@
+<template>
+    <div class="personal">人员管理</div>
+</template>
+
+<script>
+import { entinfo } from '@/api/api';
+export default {
+    name: '',
+    data() {
+        return {
+            
+        }
+    },
+    created() {
+        entinfo().then(res => {
+            
+        })
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+    
+</style>