Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

package-lock.json

@@ -18,6 +18,7 @@
         "tippy.js": "^6.3.7",
         "vue": "^2.5.2",
         "vue-router": "^3.0.1",
+        "vue2-org-tree": "^1.3.6",
         "vuex": "^3.6.2"
       },
       "devDependencies": {
@@ -37,6 +38,7 @@
         "file-loader": "^1.1.4",
         "friendly-errors-webpack-plugin": "^1.6.1",
         "html-webpack-plugin": "^2.30.1",
+        "less-loader": "^5.0.0",
         "node-notifier": "^5.1.2",
         "optimize-css-assets-webpack-plugin": "^3.2.0",
         "ora": "^1.2.0",
@@ -2546,6 +2548,19 @@
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "dev": true
     },
+    "node_modules/copy-anything": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz",
+      "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "is-what": "^3.14.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
     "node_modules/copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -6004,6 +6019,20 @@
       "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
       "dev": true
     },
+    "node_modules/image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "image-size": "bin/image-size.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -6639,6 +6668,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-what": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz",
+      "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -6791,6 +6827,105 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/less": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz",
+      "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "copy-anything": "^2.0.1",
+        "tslib": "^1.10.0"
+      },
+      "bin": {
+        "lessc": "bin/lessc"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "optionalDependencies": {
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "make-dir": "^2.1.0",
+        "mime": "^1.4.1",
+        "native-request": "^1.0.5",
+        "source-map": "~0.6.0"
+      }
+    },
+    "node_modules/less-loader": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz",
+      "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "loader-utils": "^1.1.0",
+        "pify": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 4.8.0"
+      },
+      "peerDependencies": {
+        "less": "^2.3.1 || ^3.0.0",
+        "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0"
+      }
+    },
+    "node_modules/less-loader/node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/less-loader/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/less/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -7454,6 +7589,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/native-request": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.1.0.tgz",
+      "integrity": "sha512-uZ5rQaeRn15XmpgE0xoPL8YWqcX90VtCFglYwAgkvKM5e8fog+vePLAhHxuuv/gRkrQxIeh5U3q9sMNUrENqWw==",
+      "dev": true,
+      "optional": true,
+      "peer": true
+    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -13170,6 +13313,13 @@
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
       "dev": true
     },
+    "node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -13817,6 +13967,14 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "node_modules/vue2-org-tree": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/vue2-org-tree/-/vue2-org-tree-1.3.6.tgz",
+      "integrity": "sha512-ExkQWmHcS3s1tjPDdaruE2p4JnfwOTc4MBqqMY7rsSM9pgzD53t6hbjyNOq9csnyugzREdCnX5V/ZHQMREDYZQ==",
+      "peerDependencies": {
+        "vue": "^2.5.4"
+      }
+    },
     "node_modules/vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",

package.json

@@ -20,6 +20,7 @@
     "tippy.js": "^6.3.7",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
+    "vue2-org-tree": "^1.3.6",
     "vuex": "^3.6.2"
   },
   "devDependencies": {
@@ -39,6 +40,7 @@
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
+    "less-loader": "^5.0.0",
     "node-notifier": "^5.1.2",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",

src/components/Login.vue

@@ -33,7 +33,7 @@
                         </div>
                     </div>
                     <div class="loginbtn-box">
-                        <el-button @click="Login()" class="loginbtn" v-loading.fullscreen.lock="fullscreenLoading" round>登 录</el-button>
+                        <el-button @keyup.enter.native="Login()" @click="Login()" class="loginbtn" v-loading.fullscreen.lock="fullscreenLoading" round>登 录</el-button>
                     </div>
                 </div>
                 <div></div>
@@ -72,6 +72,13 @@ export default {
         },
         //登录
         Login() {
+            if(this.usernum==""||this.password==""){
+                this.$message({
+                    message: "请填写账号密码！",
+                    type: 'warning'
+                });
+                return false;
+            }
             this.fullscreenLoading=true;
             var url="/api/login"
             var that=this
@@ -85,7 +92,7 @@ export default {
             }).then(function(res){
                 console.log(res)
                 if(res.data.code==200){
-                    localStorage.setItem('token', res.data.data.token);
+                    localStorage.setItem('userinif', JSON.stringify(res.data.data));
                     that.fullscreenLoading=false;
                     that.$router.push('/home/index')
                 }else{
@@ -100,6 +107,16 @@ export default {
     },
     mounted() {
         document.querySelector(".login-all").style.height = window.innerHeight + "px";
+        let that = this
+        document.onkeydown = function (e) {
+            e = window.event || e
+            console.log(e.code)
+            //保证是在登录页面发出的enter事件
+            if (e.code === 'Enter' || e.code === 'enter'|| e.code === 'NumpadEnter') {
+                //调用登录函数
+                that.Login();
+            }
+        }
     }
 }
 </script>

src/components/child/Controltree.vue

@@ -0,0 +1,545 @@
+<template>
+    <div class="controltree-box">
+        <div class="controltree-w">
+            <div class="controltree-ul" >
+                <div class="controltree-li" v-for="(item,index) in treeData" :key="index">
+                    {{item.label}}
+                    <div v-if="item.children" class="second-ul">
+                        <div class="second-ul-haed">
+                            <div>版块步骤</div>
+                            <div>管控时间</div>
+                            <div>完成时间</div>
+                        </div>
+                        <div v-if="item.panduan=='wu'">
+                            <div v-for="(seconditem,index) in item.children" :key="index"   class="li-steps-li">
+                                <div :style="filter_color(seconditem.state)">{{seconditem.label}}</div>
+                                <div>{{seconditem.date}}</div>
+                                <div>{{seconditem.enddate}}</div>
+                            </div>
+                        </div>
+                        <div v-if="item.panduan=='you'">
+                            <div v-for="(seconditem,index) in item.children" :key="index" class="second-li">
+                                <span>{{seconditem.label}}</span>
+                                <div class="li-steps-ul">
+                                    <div class="zanwu" v-if="!seconditem.children">暂无事件</div>
+                                    <div v-for="(stepsitem,index) in seconditem.children" :key="index"   class="li-steps-li">
+                                        <div :style="filter_color(stepsitem.state)">{{stepsitem.label}}</div>
+                                        <div>{{stepsitem.date}}</div>
+                                        <div>{{stepsitem.enddate}}</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            treeData: [{
+                    id: 1,
+                    label: "团组出行",
+                },
+                {
+                    id: 2,
+                    label: "确认出团",
+                },
+                {
+                    id: 3,
+                    label: "经费预算",
+                    panduan:"you",
+                    children:[
+                        {
+                            id:15,
+                            label: "未开始"
+                        },
+                        {
+                            id:16,
+                            label: "进行中"
+                        },
+                        {
+                            id:17,
+                            label: "已完成"
+                        }
+                    ]
+                },
+                {
+                    id: 4,
+                    label: " 市场部人员报价对接/反馈",
+                    panduan:"you",
+                    children:[
+                        {
+                            id:18,
+                            label: "未开始"
+                        },
+                        {
+                            id:19,
+                            label: "进行中"
+                        },
+                        {
+                            id:20,
+                            label: "已完成",
+                            children:[
+                                {
+                                    id:21,
+                                    label: "录入最终总经费预算及上传明细单",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'2023-02-10'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    id: 5,
+                    label: "报批流程"
+                },
+                {
+                    id: 6,
+                    label: "护照/签证",
+                    panduan:"wu",
+                    children:[
+                        {
+                            id:22,
+                            label: "签证费用录入",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:23,
+                            label: "归还护照",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:2
+                        },
+                        {
+                            id:24,
+                            label: "出签＋取护照",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:3
+                        },
+                        {
+                            id:25,
+                            label: "送签",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:3
+                        },
+                        {
+                            id:26,
+                            label: "填资料",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:27,
+                            label: "取护照资料",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:28,
+                            label: "收集资料",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        }
+                    ]
+                },
+                {
+                    id: 7,
+                    label: "各版块操作",
+                    panduan:"you",
+                    children:[
+                        {
+                            id:29,
+                            label: "机票",
+                            children:[
+                                {
+                                    id:42,
+                                    label: "询价并导入黑屏代码",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'2023-02-10',
+                                    state:1
+                                },
+                                {
+                                    id:43,
+                                    label: "机票已占位",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'2023-02-10',
+                                    state:1
+                                },
+                                {
+                                    id:44,
+                                    label: "已出票",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'2023-02-10',
+                                    state:2
+                                },
+                                {
+                                    id:45,
+                                    label: "机票费用录入",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'',
+                                    state:3
+                                }
+                            ]
+                        },
+                        {
+                            id:30,
+                            label: "酒店",
+                            children:[
+                                {
+                                    id:46,
+                                    label: "酒店费用录入",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'2023-02-10'
+                                }
+                            ]
+                        },
+                        {
+                            id:31,
+                            label: "OP",
+                            children:[
+                                {
+                                    id:47,
+                                    label: "OP费用录入",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'2023-02-10'
+                                }
+                            ]
+                        },
+                        {
+                            id:32,
+                            label: "商邀",
+                            children:[
+                                {
+                                    id:48,
+                                    label: "报批/商邀费用录入",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'2023-02-10'
+                                }
+                            ]
+                        },
+                        {
+                            id:33,
+                            label: "其他",
+                            children:[
+                                {
+                                    id:49,
+                                    label: "增减款项录入",
+                                    date:"2023-01-12 ~ 2023-02-10",
+                                    enddate:'2023-02-10'
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    id: 8,
+                    label: "费用审批",
+                    panduan:"wu",
+                    children:[
+                        {
+                            id:34,
+                            label: "机票费用审批",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:35,
+                            label: "酒店费用审批",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:36,
+                            label: "OP费用审批",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:37,
+                            label: "商邀费用审批",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:38,
+                            label: "增减款项审批",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        }
+                    ]
+                },
+                {
+                    id: 9,
+                    label: "付款给供应商",
+                    panduan:"wu",
+                    children:[
+                        {
+                            id:39,
+                            label: "OP费用付款",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:40,
+                            label: "商邀费用付款",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        },
+                        {
+                            id:41,
+                            label: "增减款项付款",
+                            date:"2023-01-12 ~ 2023-02-10",
+                            enddate:'2023-02-10',
+                            state:1
+                        }
+                    ]
+                },
+                {
+                    id: 10,
+                    label: "开行前会"
+                },
+                {
+                    id: 11,
+                    label: "送机"
+                },
+                {
+                    id: 12,
+                    label: "数据/附件归档"
+                },
+                {
+                    id: 13,
+                    label: "接机"
+                },
+                {
+                    id: 14,
+                    label: "客户意见表"
+                }
+            ]
+        }
+    },
+    created(){
+       
+    },
+    methods:{
+        filter_color(val){
+            if(val==1){
+                return "color:green"
+            }
+            if(val==3){
+                return "color:red"
+            }
+            if(val==2){
+                return "color:#8f8383"
+            }
+        }
+    },
+    filters:{
+        
+    }
+}
+</script>
+<style>
+    ul li{
+        list-style: none;
+    }
+    .controltree-box{
+        background-color: #fff;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 10px;
+        display: flex;
+        justify-content: center;
+        padding: 100px 0;
+    }
+    .controltree-ul{
+        display: flex;
+        flex-direction: column;
+    }
+    .controltree-w{
+        display: inline-block;
+        margin: 0 auto;
+
+    }
+    .controltree-li{
+        display: inline-block;
+        padding: 10px 20px;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 5px;
+        text-align: center;
+        position: relative;
+    }
+    .controltree-li:not(:last-child){
+        margin-bottom: 200px;
+    }
+    .controltree-li:not(:last-child)::after{
+        content: "";
+        display: inline-block;
+        width: 1px;
+        height: 195px;
+        position: absolute;
+        left: 50%;
+        top: 44px;
+        background-color: #F1B72C;
+    }
+    .controltree-li:nth-child(2n) .second-ul::before{
+        content: "";
+        display: inline-block;
+        width: 75px;
+        height: 1px;
+        position: absolute;
+        left: -75px;
+        top: 25px;
+        background-color: #F1B72C;
+    }
+    .controltree-li:nth-child(2n+1) .second-ul::before{
+        content: "";
+        display: inline-block;
+        width: 75px;
+        height: 1px;
+        position: absolute;
+        right: -75px;
+        top: 25px;
+        background-color: #1E5DA5;
+    }
+    .second-ul{
+        width: 480px;
+        position: absolute;
+        top: -5px;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 5px;
+        padding: 5px;
+    }
+    .second-li{
+        text-align: left;
+        position: relative;
+        margin-bottom: 10px;
+    }
+    .controltree-li:nth-child(2n+1) .second-ul{
+        flex-direction: row-reverse;
+        color: #1E5DA5;
+    }
+    .controltree-li:nth-child(2n+1) .second-ul .second-ul-haed{
+        background-color: #1E5DA5;
+    }
+    .controltree-li:nth-child(2n) .second-ul .second-ul-haed{
+        background-color: #F1B72C;
+    }
+    .second-ul-haed{
+        display: flex;
+        justify-content: space-between;
+        color: #fff;
+    }
+    .second-ul-haed>div{
+        padding: 10px 0;
+    }
+    .second-ul-haed>div:nth-child(1){
+        width: 30%;
+    }
+    .second-ul-haed>div:nth-child(2){
+        border-left: 1px solid #fff;
+        border-right:1px solid #fff ;
+        width: 50%;
+    }
+    .second-ul-haed>div:nth-child(3){
+        width: 20%;
+    }
+    /*.controltree-li:nth-child(2n+1) .second-ul .second-li::after{
+        content: "";
+        display: inline-block;
+        width: 24px;
+        height: 2px;
+        position: absolute;
+        left: 21px;
+        top: 10px;
+        background-color: #1E5DA5;
+    }*/
+    .controltree-li:nth-child(2n) .second-ul{
+        left: 300px;
+        color: #F1B72C;
+    }
+    .controltree-li:nth-child(2n+1) .second-ul{
+        right: 300px;
+        color: #1E5DA5;
+    }
+    .controltree-li:nth-child(2n){
+        background-color: #F1B72C;
+        color: #fff;
+    }
+    .controltree-li:nth-child(2n+1){
+        background-color: #1E5DA5;
+        color: #fff;
+    }
+    /*.controltree-li:nth-child(2n) .second-ul .second-li::after{
+        content: "";
+        display: inline-block;
+        width: 24px;
+        height: 2px;
+        position: absolute;
+        right: 21px;
+        top: 10px;
+        background-color: #F1B72C;
+    }*/
+    .second-li span{
+        display: inline-block;
+        width: 30%;
+        color: #555;
+        font-size: 17px;
+        font-weight: 600;
+        margin-bottom: 5px;
+    }
+    .li-steps-li{
+        display: flex;
+        align-items: center;
+        color: #8f8383;
+    }
+    .li-steps-li>div{
+        font-size: 13px;
+        padding: 5px 0;
+        text-align: center;
+        height: 100%;
+    }
+    .li-steps-li{
+        border: 1px solid #f7f7f7;
+    }
+    .li-steps-li:not(:first-child){
+        border-top: none;
+    }
+    .li-steps-li>div:not(:first-child){
+        border-left:1px solid #f7f7f7 ;
+    }
+    .li-steps-li>div:nth-child(1){
+        width: 30%;
+    }
+    .li-steps-li>div:nth-child(2){
+        width: 50%;
+    }
+    .li-steps-li>div:nth-child(3){
+        width: 20%;
+    }
+    .zanwu{
+        font-size: 12px;
+        color: #8f8383;
+        width: 30%;
+        text-align: center;
+        padding: 5px;
+    }
+</style>

src/components/child/index.vue

@@ -21,7 +21,7 @@
                     <el-table-column
                         prop="num"
                         label="序 号"
-                        width="60">
+                        width="55">
                         <template slot-scope="scope">
                             {{(currentPage - 1) * pageSize + scope.$index + 1}}
                         </template>
@@ -225,31 +225,33 @@ export default {
             this.currentPage = val;
         },
         Inquireclick(){
-            console.log(this.tableData)
             var newarr=[];
             if(this.input==""){
                 newarr=this.tableData;
             }else{
                 for(var i=0;i<this.tableData.length;i++){
-                    if(this.tableData[i].number.includes(this.input)){
+                    if(this.tableData[i].number.indexOf(this.input)!=-1){
                         newarr.push(this.tableData[i]);
                     }
-                    else if(this.tableData[i].cnName.includes(this.input)){
+                    else if(this.tableData[i].cnName.indexOf(this.input)!=-1){
                         newarr.push(this.tableData[i]);
                     }
-                    else if(this.tableData[i].companyName.includes(this.input)){
+                    else if(this.tableData[i].jobName.indexOf(this.input)!=-1){
                         newarr.push(this.tableData[i]);
                     }
-                    else if(this.tableData[i].ext.includes(this.input)){
+                    else if(this.tableData[i].companyName.indexOf(this.input)!=-1){
                         newarr.push(this.tableData[i]);
                     }
-                    else if(this.tableData[i].phone.includes(this.input)){
+                    else if(this.tableData[i].ext.indexOf(this.input)!=-1){
                         newarr.push(this.tableData[i]);
                     }
-                    else if(this.tableData[i].urgentPhone.includes(this.input)){
+                    else if(this.tableData[i].phone.indexOf(this.input)!=-1){
                         newarr.push(this.tableData[i]);
                     }
-                    else if(this.tableData[i].email.includes(this.input)){
+                    else if(this.tableData[i].urgentPhone.indexOf(this.input)!=-1){
+                        newarr.push(this.tableData[i]);
+                    }
+                    else if(this.tableData[i].email.indexOf(this.input)!=-1){
                         newarr.push(this.tableData[i]);
                     }
                 }
@@ -260,23 +262,68 @@ export default {
             var url="/api/System/GetUserList"
             var that=this
             this.$axios({
-                method: 'GET',
+                method: 'post',
                 url:url,
                 headers:{
                     Authorization:'Bearer '+this.token
+                },
+                data:{
+                    portType: 1,
                 }
             }).then(function(res){
                 console.log(res)
                 if(res.data.code==200){
                     that.tableData=res.data.data
+                    that.tableData.forEach(item=>{
+                        if(item.cnName==null){
+                            item.cnName = ''
+                        } 
+                        if(item.companyId==null){
+                            item.companyId = ''
+                        } 
+                        if(item.companyName==null){
+                            item.companyName = ''
+                        } 
+                        if(item.depId==null){
+                            item.depId = ''
+                        } 
+                        if(item.depName==null){
+                            item.depName = ''
+                        } 
+                        if(item.email==null){
+                            item.email = ''
+                        } 
+                        if(item.ext==null){
+                            item.ext = ''
+                        } 
+                        if(item.id==null){
+                            item.id = ''
+                        } 
+                        if(item.jobName==null){
+                            item.jobName = ''
+                        } 
+                        if(item.jobPostId==null){
+                            item.jobPostId = ''
+                        } 
+                        if(item.number==null){
+                            item.number = ''
+                        } 
+                        if(item.phone==null){
+                            item.phone = ''
+                        } 
+                        if(item.urgentPhone==null){
+                            item.urgentPhone = ''
+                        }
+                    })
                     that.tableDatas=that.tableData;
-                    console.log(that.tableData)
+                    console.log(that.tableDatas)
                 }
             })
         }
     },
     mounted(){
-        this.token=localStorage.getItem('token');
+        this.token=JSON.parse(localStorage.getItem('userinif')).token;
+        console.log(this.token)
         this.Getemployees();
     }
 }

src/components/home.vue

@@ -26,8 +26,8 @@
                   <img src="../assets/avatar.jpg" alt="" />
                 </div>
                 <div v-if="panduan" class="avatar-text">
-                  <div class="avatar-name">姓名: 王洪 部门: 信息部</div>
-                  <div class="avatar-division">职位: 后端开发</div>
+                  <div class="avatar-name">姓名: {{userinif.userInfo.cnName}} 部门: {{userinif.userInfo.depName}}</div>
+                  <div class="avatar-division">职位: {{userinif.userInfo.jobName}}</div>
                 </div>
               </div>
             </div>
@@ -159,8 +159,8 @@
                   <img src="../assets/avatar.jpg" alt="" />
                 </div>
                 <div class="avatar-text">
-                  <div class="avatar-name">姓名: 王洪 部门: 信息部</div>
-                  <div class="avatar-division">职位: 后端开发</div>
+                  <div class="avatar-name">姓名:{{userinif.userInfo.cnName}} 部门: {{userinif.userInfo.depName}}</div>
+                  <div class="avatar-division">职位: {{userinif.userInfo.jobName}}</div>
                 </div>
               </div>
             </div>
@@ -188,6 +188,7 @@
           username:"雷怡",
           indexs:"1",
           pdinstrument: true,
+          userinif:'',
         };
       },
       methods: {
@@ -267,6 +268,8 @@
         this.ifIndexValue();
       },
       created() {
+        this.userinif=JSON.parse(localStorage.getItem('userinif'));
+        console.log(this.userinif)
         console.log(this.$route);
       },
     };
@@ -377,7 +380,7 @@
       z-index: 2;
       right: 20px;
       top: -300px;
-      width: 260px;
+      width: 310px;
       border-radius: 5px;
       overflow: hidden;
       box-shadow: 0 0 5px #0005;

src/main.js

@@ -9,7 +9,7 @@ import './assets/icon/iconfont.css'
 import store from './store/index.js';
 
 import axios from 'axios';
- 
+
 Vue.prototype.$axios=axios;
 
 Vue.config.productionTip = false

src/router/index.js

@@ -12,6 +12,7 @@ import financeindex from '@/components/child/financeindex'
 import Globalindex from '@/components/child/Globalindex'
 import Generalindex from '@/components/child/Generalindex'
 import AuthorityJob from '@/components/child/AuthorityJob'
+import Controltree from '@/components/child/Controltree'
 
 Vue.use(Router)
 
@@ -66,6 +67,11 @@ export default new Router({
           path: '/home/AuthorityJob',
           name: 'AuthorityJob',
           component: AuthorityJob
+        },
+        {
+          path: '/home/Controltree',
+          name: 'Controltree',
+          component: Controltree
         }
       ]
     },