diff --git a/fuintAdmin/src/assets/images/shangchuan.png b/fuintAdmin/src/assets/images/shangchuan.png
new file mode 100644
index 000000000..1d142af50
Binary files /dev/null and b/fuintAdmin/src/assets/images/shangchuan.png differ
diff --git a/fuintAdmin/src/components/map/imgUpload.vue b/fuintAdmin/src/components/map/imgUpload.vue
index dcc7d30da..fa6412704 100644
--- a/fuintAdmin/src/components/map/imgUpload.vue
+++ b/fuintAdmin/src/components/map/imgUpload.vue
@@ -30,7 +30,11 @@
:src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto;height: 100%"
/>
-
+
+ 点击上传 本地文件
+
+
+
diff --git a/fuintAdmin/src/store/modules/user.js b/fuintAdmin/src/store/modules/user.js
index 64a65819b..354cc2477 100644
--- a/fuintAdmin/src/store/modules/user.js
+++ b/fuintAdmin/src/store/modules/user.js
@@ -59,13 +59,11 @@ const user = {
return
}
console.log("user_58",res.data)
-
// dutyRoleCode
Cookies.remove('DUTY_ROLE_CODE');
Cookies.set("DUTY_ROLE_CODE", res.data.dutyRoleCode);
Cookies.remove('IS_ZT_LOGIN');
Cookies.remove('IS_CA_LOGIN');
-
if (res.data.ownerId == "3") {
setToken(res.data.token)
commit('SET_TOKEN', res.data.token)
diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
index 3a800263f..881b6ce7d 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -119,11 +119,6 @@
type="text"
@click="handleRecharge(scope.row)"
>车队充值
-
-
-
-
-
diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue
index 452ef12ef..b9bc2c978 100644
--- a/fuintAdmin/src/views/handover/HandoverDetails.vue
+++ b/fuintAdmin/src/views/handover/HandoverDetails.vue
@@ -1,10 +1,11 @@
-
-
-
-
-
交班详情
+
+
+
@@ -53,37 +54,37 @@
-
-
-
-
-
-
- 已交班
- 未交班
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 交班数据
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -120,6 +121,10 @@ export default {
data() {
return {
+ tablist:[
+ "交接班",
+ "交班记录"
+ ],
openDetail:false,
dataForm:{},
dataList:[],
@@ -240,13 +245,22 @@ export default {
diff --git a/fuintAdmin_zt/src/store/modules/user.js b/fuintAdmin_zt/src/store/modules/user.js
index c0718d01f..ca9625960 100644
--- a/fuintAdmin_zt/src/store/modules/user.js
+++ b/fuintAdmin_zt/src/store/modules/user.js
@@ -52,21 +52,18 @@ const user = {
const password = userInfo.password
const captchaCode = userInfo.captchaCode
const uuid = userInfo.uuid
- return new Promise((resolve, reject) => {
+ return new Promise((resolve, reject) => {
login(username, password, captchaCode, uuid).then(res => {
if(res.data.token == null ){
this.$router.push({ path: '/login' });
return
}
-
console.log("user_58",res.data)
if (res.data.ownerId !== "3") {
setToken(res.data.token)
-
commit('SET_TOKEN', res.data.token)
// Cookies.remove('IS_BK_LOGIN');
sessionStorage.removeItem('IS_BK_LOGIN');
-
}else {
// Cookies.set("IS_BK_LOGIN", JSON.stringify(res.data));
sessionStorage.setItem("IS_BK_LOGIN", JSON.stringify(res.data));
@@ -92,6 +89,7 @@ const user = {
commit('SET_ROLES', res.data.roles)
commit('SET_PERMISSIONS', res.data.permissions)
} else {
+
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.accountName)
diff --git a/fuintAdmin_zt/src/views/member/manage.vue b/fuintAdmin_zt/src/views/member/manage.vue
new file mode 100644
index 000000000..d351dabb2
--- /dev/null
+++ b/fuintAdmin_zt/src/views/member/manage.vue
@@ -0,0 +1,11 @@
+
+
+ 会员管理
+
+
+
+