msb-public
/
dc3-web
mirror of https://gitee.com/pnoker/dc3-web.git
1
0
Code Issues Projects Releases Wiki Activity

优化

Browse Source
develop
pnoker 4 years ago
parent a2dec37d1b
commit d100fb29dc
9 changed files with 84 additions and 34 deletions
Show Stats Download Patch File Download Diff File

5
src/config/axios.js
Unescape View File

@ -5,7 +5,6 @@ import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import {failMessage} from '@/util/util'
import {getStore} from "@/util/store";
import {getTokenCookies} from '@/util/auth'
NProgress.configure({
showSpinner: false
@ -23,8 +22,8 @@ axios.defaults.validateStatus = function (status) {
axios.interceptors.request.use(config => {
NProgress.start();
config.headers['Content-Type'] = 'application/json';
config.headers['Auth-User'] = getStore({name: 'user'}) || '';
config.headers['Auth-Token'] = getTokenCookies() || '';
config.headers['X-Auth-User'] = getStore({name: 'user'}) || '';
config.headers['X-Auth-Token'] = getStore({name: 'token'}) || '';
return config;
}, error => {
console.error('Request interceptors:', error);

3
src/router/router.js
Unescape View File

@ -6,7 +6,6 @@ import NProgress from "nprogress";
import {checkTokenValid} from "@/api/user";
import store from "@/store/store";
import {getStore} from '@/util/store'
import {getTokenCookies} from "@/util/auth";
Vue.use(VueRouter);
@ -36,7 +35,7 @@ router.beforeEach((to, from, next) => {
if (meta.isAuth !== true || from.name === 'login') {
next();
} else {
const token = getTokenCookies(), user = getStore({name: 'user'});
const token = getStore({name: 'token'}), user = getStore({name: 'user'});
if ('' === token || undefined === token || '' === user || undefined === user) {
next({path: '/login'});
return;

11
src/store/modules/user.js
Unescape View File

@ -1,12 +1,11 @@
import md5 from 'js-md5';
import {getStore, removeStore, setStore} from '@/util/store'
import {getTokenCookies, removeTokenCookies, setTokenCookies} from '@/util/auth'
import {getStore, setStore} from '@/util/store'
import {cancelToken, generateSalt, generateToken} from '@/api/user'
const user = {
state: {
user: getStore({name: 'user'}) || '',
token: getTokenCookies() || '',
token: getStore({name: 'token'}) || '',
},
actions: {
GenerateSalt({commit}, name) {
@ -53,15 +52,15 @@ const user = {
},
REMOVE_USER: (state) => {
state.user = '';
removeStore({name: 'user'});
setStore({name: 'user'});
},
SET_TOKEN: (state, token) => {
state.token = token;
setTokenCookies(token);
setStore({name: 'token', content: state.token});
},
REMOVE_TOKEN: (state) => {
state.token = '';
removeTokenCookies();
setStore({name: 'token'});
}
}
};

36
src/views/device/Device.vue
Unescape View File

@ -101,13 +101,47 @@
trigger: 'click'
}
]
}, {
label: '数据存储类型',
prop: 'multi',
width: 100,
span: 8,
type: 'select',
value: false,
dicData: [
{
label: '单点数据',
value: false
}, {
label: '结构数据',
value: true
}
]
}, {
label: '状态',
prop: 'status',
width: 100,
span: 8,
disabled: true,
slot: true
display: false,
slot: true,
type: 'select',
value: 'OFFLINE',
dicData: [
{
label: '在线',
value: 'ONLINE'
}, {
label: '离线',
value: 'OFFLINE'
}, {
label: '维护',
value: 'MAINTAIN'
}, {
label: '故障',
value: 'FAULT'
}
]
}, {
label: '备注',
prop: 'description',

18
src/views/driver/DriverAttribute.vue
Unescape View File

@ -115,22 +115,28 @@
value: 'string',
dicData: [
{
label: '字符串',
label: '字符串(string)',
value: 'string'
}, {
label: '布尔量',
label: '布尔量(boolean)',
value: 'boolean'
}, {
label: '整数',
label: '字节(byte)',
value: 'byte'
}, {
label: '短整数(short)',
value: 'short'
}, {
label: '整数(int)',
value: 'int'
}, {
label: '长整数',
label: '长整数(long)',
value: 'long'
}, {
label: '浮点数',
label: '浮点数(float)',
value: 'float'
}, {
label: '双精度浮点数',
label: '双精度浮点数(double)',
value: 'double'
}
],

18
src/views/point/Point.vue
Unescape View File

@ -92,22 +92,28 @@
value: 'string',
dicData: [
{
label: '字符串',
label: '字符串(string)',
value: 'string'
}, {
label: '布尔量',
label: '布尔量(boolean)',
value: 'boolean'
}, {
label: '整数',
label: '字节(byte)',
value: 'byte'
}, {
label: '短整数(short)',
value: 'short'
}, {
label: '整数(int)',
value: 'int'
}, {
label: '长整数',
label: '长整数(long)',
value: 'long'
}, {
label: '浮点数',
label: '浮点数(float)',
value: 'float'
}, {
label: '双精度浮点数',
label: '双精度浮点数(double)',
value: 'double'
}
],

18
src/views/point/PointAttribute.vue
Unescape View File

@ -115,22 +115,28 @@
value: 'string',
dicData: [
{
label: '字符串',
label: '字符串(string)',
value: 'string'
}, {
label: '布尔量',
label: '布尔量(boolean)',
value: 'boolean'
}, {
label: '整数',
label: '字节(byte)',
value: 'byte'
}, {
label: '短整数(short)',
value: 'short'
}, {
label: '整数(int)',
value: 'int'
}, {
label: '长整数',
label: '长整数(long)',
value: 'long'
}, {
label: '浮点数',
label: '浮点数(float)',
value: 'float'
}, {
label: '双精度浮点数',
label: '双精度浮点数(double)',
value: 'double'
}
],

5
src/views/point/PointValue.vue
Unescape View File

@ -16,7 +16,7 @@
@current-change="currentChange"
>
<template slot="interval" slot-scope="scope">
{{scope.row.createTime-scope.row.originTime}}
{{scope.row.createTime-scope.row.originTime||""}}
</template>
</avue-crud>
</base-card>
@ -41,10 +41,11 @@
dateBtn: true,
menu: false,
addBtn: false,
editBtn: false,
delBtn: false,
editBtn: false,
height: 664,
align: 'center',
defaultExpandAll: true,
column: [
{
label: '所属设备',

4
src/views/profile/Profile.vue
Unescape View File

@ -72,7 +72,7 @@
value: true,
dicData: [
{
label: '公有',
label: '公有(web暂不支持,该模式请使用批量导入)',
value: true
}, {
label: '私有',
@ -168,7 +168,7 @@
},
driver() {
dictionaryApi.driverDictionary().then(res => {
this.findObject(this.listOption.column,'driverId').dicData = res.data;
this.findObject(this.listOption.column, 'driverId').dicData = res.data;
}).catch(() => {
});
},

Write Preview
Loading…
Cancel
Save