修改

ys_vue/src/http.js

@@ -57,11 +57,9 @@ export default {
      * @param exception 异常的回调函数
      */
     post (url, data, response, exception) {
-        var user = sessionStorage.getItem('user');
-        console.log(!user)
+        var user = sessionStorage.getItem('user') , token = "";
         if(user != null){
-            const name = JSON.parse(user).name
-            console.log(name)
+            token = JSON.parse(user).headImgurl
         }
         axios({
             method: 'post',
@@ -70,7 +68,8 @@ export default {
             timeout: TIME_OUT_MS,
             headers: {
                 //'Content-Type': 'application/json; charset=UTF-8'
-                'content-type': ' application/x-www-form-urlencoded; charset=UTF-8'
+                'Content-type': ' application/x-www-form-urlencoded; charset=UTF-8',
+                'token': token
             }
         }).then(
             (result) => {
@@ -93,6 +92,10 @@ export default {
      * @param exception 异常的回调函数
      */
     get (url, response, exception) {
+        var user = sessionStorage.getItem('user') , token = "";
+        if(user != null){
+            token = JSON.parse(user).headImgurl
+        }
         axios({
             method: 'get',
             url: handleUrl(url),
@@ -122,6 +125,10 @@ export default {
      * @param exception 异常的回调函数
      */
     uploadFile (url, data, response, exception) {
+        var user = sessionStorage.getItem('user') , token = "";
+        if(user != null){
+            token = JSON.parse(user).headImgurl
+        }
         axios({
             method: 'post',
             url: handleUrl(url),
@@ -151,6 +158,10 @@ export default {
      * @param exception 异常的回调函数
      */
     downloadFile (url, data, fileName, exception) {
+        var user = sessionStorage.getItem('user') , token = "";
+        if(user != null){
+            token = JSON.parse(user).headImgurl
+        }
         axios({
             method: 'post',
             url: handleUrl(url),

ys_vue/src/main.js

@@ -48,7 +48,7 @@ router.beforeEach((to, from, next) => {
     } else {
         for(var i in routes){
             if(user){
-                if(routes[i].name == "基础管理" && user.name != "管理员"){
+                if(routes[i].name == "基础管理" && user.username != "管理员"){
                     routes.splice(i, 1)
                 }
             }

ys_vue/src/port.js

@@ -8,7 +8,7 @@ export default {
         resetPwd: '/manage/user/passwordReset'
     },
     project: {
-        userList: '/role/list'
+        userList: '/user/list'
     },
     // 基础管理
     base: {

ys_vue/src/routes.js

@@ -33,48 +33,47 @@ let routes = [
         name: '',
         hidden: true
     },
-    //{ path: '/main', component: Main },
-    {
-        path: '/',
-        component: Home,
-        name: '导航一',
-        iconCls: 'el-icon-message',//图标样式class
-        children: [
-            { path: '/main', component: Main, name: '主页', hidden: true },
-            { path: '/table', component: Table, name: 'Table' },
-            { path: '/form', component: Form, name: 'Form' },
-            { path: '/user', component: user, name: '列表' },
-        ]
-    },
-    {
-        path: '/',
-        component: Home,
-        name: '导航二',
-        iconCls: 'fa fa-id-card-o',
-        children: [
-            { path: '/page4', component: Page4, name: '页面4' },
-            { path: '/page5', component: Page5, name: '页面5' }
-        ]
-    },
-    {
-        path: '/',
-        component: Home,
-        name: '',
-        iconCls: 'fa fa-address-card',
-        leaf: true,//只有一个节点
-        children: [
-            { path: '/page6', component: Page6, name: '导航三' }
-        ]
-    },
-    {
-        path: '/',
-        component: Home,
-        name: 'Charts',
-        iconCls: 'fa fa-bar-chart',
-        children: [
-            { path: '/echarts', component: echarts, name: 'echarts' }
-        ]
-    },
+    // {
+    //     path: '/',
+    //     component: Home,
+    //     name: '导航一',
+    //     iconCls: 'el-icon-message',//图标样式class
+    //     children: [
+    //         { path: '/main', component: Main, name: '主页', hidden: true },
+    //         { path: '/table', component: Table, name: 'Table' },
+    //         { path: '/form', component: Form, name: 'Form' },
+    //         { path: '/user', component: user, name: '列表' },
+    //     ]
+    // },
+    // {
+    //     path: '/',
+    //     component: Home,
+    //     name: '导航二',
+    //     iconCls: 'fa fa-id-card-o',
+    //     children: [
+    //         { path: '/page4', component: Page4, name: '页面4' },
+    //         { path: '/page5', component: Page5, name: '页面5' }
+    //     ]
+    // },
+    // {
+    //     path: '/',
+    //     component: Home,
+    //     name: '',
+    //     iconCls: 'fa fa-address-card',
+    //     leaf: true,//只有一个节点
+    //     children: [
+    //         { path: '/page6', component: Page6, name: '导航三' }
+    //     ]
+    // },
+    // {
+    //     path: '/',
+    //     component: Home,
+    //     name: 'Charts',
+    //     iconCls: 'fa fa-bar-chart',
+    //     children: [
+    //         { path: '/echarts', component: echarts, name: 'echarts' }
+    //     ]
+    // },
     // 地图概览
     {
         path: '/',

ys_vue/src/views/Home.vue

@@ -124,7 +124,7 @@
 			var user = sessionStorage.getItem('user');
 			if (user) {
 				user = JSON.parse(user);
-				this.sysUserName = user.name || '';
+				this.sysUserName = user.username || '';
             }
 		}
 	}

ys_vue/src/views/Login.vue

@@ -6,10 +6,10 @@
             </div>
             <h3 class="title">云塑网后台管理系统</h3>
             <el-form-item class="login-input" prop="account">
-                <el-input type="text" v-model="ruleForm.account" auto-complete="off" placeholder="账号" clearable prefix-icon="el-icon-user-solid"></el-input>
+                <el-input type="text" v-model="ruleForm.account" autocomplete="off" placeholder="账号" clearable prefix-icon="el-icon-user-solid"></el-input>
             </el-form-item>
             <el-form-item class="login-input" prop="password">
-                <el-input type="password" v-model="ruleForm.password" auto-complete="off" placeholder="密码" show-password prefix-icon="el-icon-lock"></el-input>
+                <el-input type="password" v-model="ruleForm.password" autocomplete="off" placeholder="密码" show-password prefix-icon="el-icon-lock"></el-input>
             </el-form-item>
             <!-- <el-checkbox v-model="checked" checked class="remember">记住密码</el-checkbox> -->
             <el-form-item class="login-button" style="width:100%;">

ys_vue/src/views/base/comp.vue

@@ -45,10 +45,10 @@
 		<el-dialog title="新增公司" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm" :inline="true" class="demo-form-inline">
 				<el-form-item label="公司名称" prop="companyName">
-					<el-input v-model="addForm.companyName" auto-complete="off"></el-input>
+					<el-input v-model="addForm.companyName" autocomplete="off"></el-input>
 				</el-form-item>
                 <el-form-item label="公司地址" prop="companyAddress">
-					<el-input v-model="addForm.companyAddress" auto-complete="off"></el-input>
+					<el-input v-model="addForm.companyAddress" autocomplete="off"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -61,10 +61,10 @@
 		<el-dialog title="编辑公司" :visible.sync="editFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="editForm" label-width="100px" :rules="formRules" ref="editForm" :inline="true" class="demo-form-inline">
 				<el-form-item label="公司名称" prop="companyName">
-					<el-input v-model="editForm.companyName" auto-complete="off"></el-input>
+					<el-input v-model="editForm.companyName" autocomplete="off"></el-input>
 				</el-form-item>
                 <el-form-item label="公司地址" prop="companyAddress">
-					<el-input v-model="editForm.companyAddress" auto-complete="off"></el-input>
+					<el-input v-model="editForm.companyAddress" autocomplete="off"></el-input>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">

ys_vue/src/views/base/factory.vue

@@ -45,10 +45,10 @@
 		<el-dialog title="新增工厂" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm" :inline="true" class="demo-form-inline">
 				<el-form-item label="工厂名称" prop="factoryName">
-					<el-input v-model="addForm.factoryName" auto-complete="off"></el-input>
+					<el-input v-model="addForm.factoryName" autocomplete="off"></el-input>
 				</el-form-item>
                 <el-form-item label="工厂地址" prop="factoryArea">
-					<el-input v-model="addForm.factoryArea" auto-complete="off" :change="changeFactoryArea('addContainer')"></el-input>
+					<el-input v-model="addForm.factoryArea" autocomplete="off" :change="changeFactoryArea('addContainer')"></el-input>
 				</el-form-item>
                 <div id="addContainer" class="formMap" v-if="addForm.factoryArea != ''"></div>
 			</el-form>
@@ -62,10 +62,10 @@
 		<el-dialog title="编辑工厂" :visible.sync="editFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="editForm" label-width="100px" :rules="formRules" ref="editForm" :inline="true" class="demo-form-inline">
 				<el-form-item label="工厂名称" prop="factoryName">
-					<el-input v-model="editForm.factoryName" auto-complete="off"></el-input>
+					<el-input v-model="editForm.factoryName" autocomplete="off"></el-input>
 				</el-form-item>
                 <el-form-item label="工厂地址" prop="factoryArea">
-					<el-input v-model="editForm.factoryArea" auto-complete="off" :change="changeFactoryArea('editContainer')"></el-input>
+					<el-input v-model="editForm.factoryArea" autocomplete="off" :change="changeFactoryArea('editContainer')"></el-input>
 				</el-form-item>
                 <div id="editContainer" class="formMap" v-if="editForm.factoryArea != ''"></div>
 			</el-form>

ys_vue/src/views/base/role.vue

@@ -60,7 +60,7 @@
 		<el-dialog title="新增角色" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm">
 				<el-form-item label="角色名称" prop="roleName">
-					<el-input v-model="addForm.roleName" auto-complete="off"></el-input>
+					<el-input v-model="addForm.roleName" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="权限配置">
                     <el-row>
@@ -88,7 +88,7 @@
 		<el-dialog title="编辑人员" :visible.sync="editFormVisible" :close-on-click-modal="false" customClass='customWidth'>
 			<el-form :model="editForm" label-width="100px" :rules="formRules" ref="editForm">
 				<el-form-item label="角色名称" prop="roleName">
-					<el-input v-model="editForm.roleName" auto-complete="off"></el-input>
+					<el-input v-model="editForm.roleName" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="权限配置">
                     <el-row>

ys_vue/src/views/detection/detection.vue

@@ -50,7 +50,7 @@
 		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" auto-complete="off"></el-input>
+					<el-input v-model="editForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="editForm.sex">
@@ -78,7 +78,7 @@
 		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
 			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" auto-complete="off"></el-input>
+					<el-input v-model="addForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="addForm.sex">

ys_vue/src/views/mold/moldFile.vue

@@ -50,7 +50,7 @@
 		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" auto-complete="off"></el-input>
+					<el-input v-model="editForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="editForm.sex">
@@ -78,7 +78,7 @@
 		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
 			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" auto-complete="off"></el-input>
+					<el-input v-model="addForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="addForm.sex">

ys_vue/src/views/mold/moldList.vue

@@ -50,7 +50,7 @@
 		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" auto-complete="off"></el-input>
+					<el-input v-model="editForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="editForm.sex">
@@ -78,7 +78,7 @@
 		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
 			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" auto-complete="off"></el-input>
+					<el-input v-model="addForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="addForm.sex">

ys_vue/src/views/nav1/Table.vue

@@ -50,7 +50,7 @@
 		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" auto-complete="off"></el-input>
+					<el-input v-model="editForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="editForm.sex">
@@ -78,7 +78,7 @@
 		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
 			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" auto-complete="off"></el-input>
+					<el-input v-model="addForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="addForm.sex">

ys_vue/src/views/project/competence.vue

@@ -50,7 +50,7 @@
 		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" auto-complete="off"></el-input>
+					<el-input v-model="editForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="editForm.sex">
@@ -78,7 +78,7 @@
 		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
 			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" auto-complete="off"></el-input>
+					<el-input v-model="addForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="addForm.sex">

ys_vue/src/views/project/project.vue

@@ -50,7 +50,7 @@
 		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" auto-complete="off"></el-input>
+					<el-input v-model="editForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="editForm.sex">
@@ -78,7 +78,7 @@
 		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
 			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" auto-complete="off"></el-input>
+					<el-input v-model="addForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="addForm.sex">

ys_vue/src/views/project/staff.vue

@@ -24,9 +24,6 @@
 				<el-form-item style="float:right;">
 					<el-button type="primary" @click="handleAdd">新增</el-button>
 				</el-form-item>
-                <el-form-item style="float:right;">
-					<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
-				</el-form-item>
 			</el-form>
 		</el-col>
 
@@ -57,30 +54,49 @@
                 :total="total"
                 style="float:right;">
             </el-pagination>
-			<!-- <el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="20" :total="total" style="float:right;">
-			</el-pagination> -->
 		</el-col>
 
         <!--新增界面-->
-		<el-dialog title="新增人员" :visible.sync="addFormVisible" :close-on-click-modal="false">
-			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" auto-complete="off"></el-input>
+		<el-dialog title="新增人员" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass='customWidth'>
+			<el-form :model="addForm" label-width="100px" :rules="addFormRules" ref="addForm" :inline="true" class="demo-form-inline">
+				<el-form-item label="姓名" prop="username">
+					<el-input v-model="addForm.username" autocomplete="off"></el-input>
 				</el-form-item>
-				<el-form-item label="性别">
-					<el-radio-group v-model="addForm.sex">
-						<el-radio class="radio" :label="1">男</el-radio>
-						<el-radio class="radio" :label="0">女</el-radio>
-					</el-radio-group>
+				<el-form-item label="账号" prop="account">
+					<el-input v-model="addForm.account" autocomplete="off"></el-input>
 				</el-form-item>
-				<el-form-item label="年龄">
-					<el-input-number v-model="addForm.age" :min="0" :max="200"></el-input-number>
+				<el-form-item label="手机号">
+					<el-input v-model="addForm.mobile" autocomplete="off"></el-input>
 				</el-form-item>
-				<el-form-item label="生日">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.birth"></el-date-picker>
+                <el-form-item label="类型" prop="teamName">
+					<el-select v-model="addForm.teamName" filterable placeholder="请选择">
+                        <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
 				</el-form-item>
-				<el-form-item label="地址">
-					<el-input type="textarea" v-model="addForm.addr"></el-input>
+                <el-form-item label="公司">
+					<el-select v-model="addForm.companyId" filterable placeholder="请选择">
+                        <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+				</el-form-item>
+				<el-form-item label="角色">
+					<el-select v-model="addForm.roleType" filterable placeholder="请选择">
+                        <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                        </el-option>
+                    </el-select>
 				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -93,7 +109,7 @@
 		<el-dialog title="编辑人员" :visible.sync="editFormVisible" :close-on-click-modal="false">
 			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
 				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" auto-complete="off"></el-input>
+					<el-input v-model="editForm.name" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="性别">
 					<el-radio-group v-model="editForm.sex">
@@ -121,12 +137,12 @@
 
 <script>
 	import util from '../../common/js/util'
-	//import NProgress from 'nprogress'
 	import { getUserListPage, removeUser, batchRemoveUser, editUser, addUser } from '../../api/api';
 
 	export default {
 		data() {
 			return {
+
                 options: [{
                     value: '选项1',
                     label: '黄金糕'