From 415d3759a79817aaeb103ed587df3de885ef3832 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123456 <zxx19900626>
Date: 星期五, 15 四月 2022 17:36:21 +0800
Subject: [PATCH] 细节
---
src/libs/store.js | 52 +++---------
src/pages/login.vue | 1
src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue | 87 +++++++++++----------
src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue | 16 +--
src/store/modules/user.js | 4
src/router/router.js | 1
src/libs/axios.js | 3
src/router/index.js | 11 ++
src/api/jiuyeAndChuangye.js | 6 +
9 files changed, 88 insertions(+), 93 deletions(-)
diff --git a/src/api/jiuyeAndChuangye.js b/src/api/jiuyeAndChuangye.js
new file mode 100644
index 0000000..1682ad2
--- /dev/null
+++ b/src/api/jiuyeAndChuangye.js
@@ -0,0 +1,6 @@
+import { getRequest, postRequest} from "../libs/axios";
+
+//2.鏌ヨ鍔冲姩灏变笟琛ㄦ牸鏁版嵁鎺ュ彛
+export const getLabourTable = (params) => {
+ return postRequest('/ybg/webservice/app/employment/getLabourTable.do',params)
+}
diff --git a/src/libs/axios.js b/src/libs/axios.js
index c5747d3..e911bac 100644
--- a/src/libs/axios.js
+++ b/src/libs/axios.js
@@ -10,7 +10,7 @@
axios.interceptors.request.use(config => {
let token = store.getters.token
if(token) {
- config.headers['Authorization'] = token
+ config.headers['token'] = token
}
return config
},error => {
@@ -18,6 +18,7 @@
})
axios.interceptors.response.use(config => {
+ console.log(config,'config---config')
const status = Number(config.status)
const message = config.data.error
if( status !== 200) {
diff --git a/src/libs/store.js b/src/libs/store.js
index 19399a8..6adcdb8 100644
--- a/src/libs/store.js
+++ b/src/libs/store.js
@@ -1,50 +1,26 @@
-// 瀛樺偍鏁版嵁
-
-
/**
- * 瀛樺偍 localStorage
- * params => {key,type} 閿� 绫诲瀷 sessionStorage localStorage
- * obj => object 瀵硅薄
+ * 瀛樺偍localStorage
*/
-export const setStore = (params, obj) => {
- const { key, type } = params;
- if (typeof obj === 'object') {
- obj = JSON.stringify(obj);
- }
- if (type) {
- window.sessionStorage.setItem(key, obj);
- } else {
- window.localStorage.setItem(key, obj);
- }
+export const setStore = (name, content) => {
+ if (!name) return;
+ if (typeof content !== 'string') {
+ content = JSON.stringify(content);
+ }
+ window.localStorage.setItem(name, content);
}
-
/**
- * 鑾峰彇 localStorage
- * params => {key,type} 閿� 绫诲瀷 sessionStorage localStorage
- * 杩斿洖缁撴灉 object
+ * 鑾峰彇localStorage
*/
-
-export const getStore = (params) => {
- try {
- const { key, type } = params;
- let result;
- if (type) {
- result = window.sessionStorage.getItem(key);
- } else {
- result = window.localStorage.getItem(key);
- }
- return JSON.parse(result)
- } catch (e) {
- console.log(e)
- return undefined
- }
+export const getStore = name => {
+ if (!name) return;
+ return window.localStorage.getItem(name);
}
/**
* 鍒犻櫎localStorage
*/
-export const removeStore = key => {
- window.localStorage.removeItem(key)
- window.sessionStorage.removeItem(key)
+export const removeStore = name => {
+ if (!name) return;
+ window.localStorage.removeItem(name);
}
diff --git a/src/pages/login.vue b/src/pages/login.vue
index a7d2d1f..0e88b64 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -50,6 +50,7 @@
import {login} from "@/api/index";
export default {
+ name: "login",
data() {
return {
loginForm: {
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue
index e22a85d..9da8042 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/workStatistics.vue
@@ -11,83 +11,84 @@
border
style="width: 100%">
<el-table-column
+ :formatter="dataTypeFormatter"
align="center"
- prop="date"
+ prop="dataType"
label="鎸囨爣鍚嶇О"
fixed="left">
</el-table-column>
<el-table-column
- prop="name"
+ prop="yearFinish"
align="center"
label="鍘诲勾瀹屾垚">
</el-table-column>
<el-table-column
- prop="address"
+ prop="january"
align="center"
label="1鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="february"
align="center"
label="2鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="march"
align="center"
label="3鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="april"
align="center"
label="4鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="may"
align="center"
label="5鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="june"
align="center"
label="6鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="july"
align="center"
label="7鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="august"
align="center"
label="8鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="september"
align="center"
label="9鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="october"
align="center"
label="10鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="november"
align="center"
label="11鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="december"
align="center"
label="12鏈�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="plan"
align="center"
label="鐪佸巺璁″垝">
</el-table-column>
<el-table-column
- prop="address"
+ prop="finish"
align="center"
label="褰撳墠瀹屾垚鐜�">
</el-table-column>
@@ -99,41 +100,45 @@
<script>
import nowSize from "../../../../libs/nowSize";
+ import { getLabourTable } from '@/api/jiuyeAndChuangye'
export default {
name: "workStatistics",
data() {
return {
- tableData: [{
- date: '鍩庨晣鏂板灏变笟浜烘暟',
- name: '122',
- address: '32111'
- }, {
- date: '鍩庨晣澶变笟浜哄憳瀹炵幇鍐嶅氨涓氫汉鏁�',
- name: '233',
- address: '34222'
- }, {
- date: '鍐滄潙鍔冲姩鍔涘悜闈炲啘浜т笟杞Щ浜烘暟',
- name: '23222',
- address: '3112222'
- }, {
- date: '鍏朵腑锛氬姵鍔¤緭鍑�',
- name: '34221',
- address: '122222'
- }, {
- date: '寮�灞曡ˉ璐存�ц亴涓氭妧鑳藉煿璁汉鏁�',
- name: '2333',
- address: '1232233'
- }, {
- date: '鍩庨晣鐧昏澶变笟鐜�',
- name: '222',
- address: '2222'
- }]
+ tableData: []
}
},
mounted() {
+ this.getLabourTable()
this.laogongJiuyeEcharts()
},
methods: {
+ getLabourTable() {
+ getLabourTable().then(res => {
+ console.log('res----',res)
+ if(res.code == 1000) {
+ this.tableData = res.list
+ }
+ })
+ },
+ dataTypeFormatter(row,column) {
+ let name = row.dataType
+ if(name == 1) {
+ return '鍩庨晣鏂板灏变笟浜烘暟'
+ }else if(name == 2) {
+ return '鍩庨晣澶变笟浜哄憳瀹炵幇鍐嶅氨涓氫汉鏁�'
+ }else if(name == 3) {
+ return '鍩庨晣灏变笟鍥伴毦浜哄憳瀹炵幇鍐嶅氨涓氫汉鏁�'
+ }else if(name == 4) {
+ return '鍐滄潙鍔冲姩鍔涘悜闈炲啘浜т笟杞Щ浜烘暟'
+ }else if(name == 5) {
+ return '鍔冲姟杈撳嚭'
+ }else if(name == 6) {
+ return '寮�灞曡ˉ璐存�ц亴涓氭妧鑳藉煿璁璡t\t浜烘暟'
+ }else if(name == 7) {
+ return '鍩庨晣鐧昏澶变笟鐜�'
+ }
+ },
laogongJiuyeEcharts() {
let myEchart = this.$echarts.init(document.getElementById('laogongJiuyeEcharts'))
let option = {
diff --git a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
index 287730f..55b3d2a 100644
--- a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
+++ b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
@@ -392,17 +392,13 @@
// content:''
//}
}
- .el-checkbox__input.is-checked .el-checkbox__inner::after{
- width:20px;
- height:20px;
- background:url('../../../../assets/images/personnelTalents/Yes@2x.png')no-repeat center;
-
+ .el-checkbox__inner::after{
+ border: 0.01953125rem /* 5/256 */ solid #FFF;
+ height: 0.08203125rem /* 21/256 */;
+ width: 0.0625rem /* 16/256 */;
+ border-left: 0;
+ border-top: 0;
}
- .el-checkbox__input.is-checked .el-checkbox__inner::after{
- -webkit-transform: rotate(45deg) scaleY(1);
- transform: rotate(45deg) scaleY(1);
- }
-
}
</style>
<style lang="scss" scoped>
diff --git a/src/router/index.js b/src/router/index.js
index 116e667..6a92bc4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,7 @@
import Vue from 'vue'
import Router from 'vue-router'
import { routers } from './router'
+import store from "../store";
import { getStore, setStore, removeStore } from '../libs/store'
// 閲嶅鐐瑰嚮鐩稿悓璺敱鎷︽埅鎶ョ孩閿欒
const originalPush = Router.prototype.push;
@@ -35,7 +36,13 @@
export const router = new Router(RouterConfig);
// 鎷︽埅鍣ㄥ鐞�
-/*router.beforeEach((to, from, next) => {
+router.beforeEach((to, from, next) => {
+ const token = store.getters.token
+ if(to.name !== 'login' && !token) {
+ next({name: 'login'})
+ }else {
+ next()
+ }
// if (to.path == '/login') {
// removeStore('userinfo');
// }
@@ -80,4 +87,4 @@
// });
}
// NProgress.done();
-});*/
+});
diff --git a/src/router/router.js b/src/router/router.js
index f1f5f39..8cb015b 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -228,6 +228,7 @@
};
const login = {
path: "/login",
+ name:'login',
component: () => import("@/pages/login.vue"),
meta: {
title: `鍚庡彴鐧婚檰`
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6d53c1a..342d66f 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -6,11 +6,13 @@
const user = {
state: {
- token: getStore('token') || {}
+ token: getStore('token') || ''
},
mutations: {
SET_TOKEN: (state, token) => {
state.token = token
+ console.log(token,'token----set')
+ setStore('token',state.token)
}
},
actions: {
--
Gitblit v1.9.1