+
+
+
+
-
+
-
- {{ systemName }}
+{{ systemName }}
+
-
-
-
+
m.menuUrl === path);
+ const currentMenu = this.menuList.find((m) => m.menuUrl === path);
let parentMenuId = currentMenu.parentMenuId;
const breadcrumb = [currentMenu.menuName];
while (parentMenuId !== 0) {
- const parentMenu = this.menuList.find(m => m.menuId === parentMenuId);
+ const parentMenu = this.menuList.find((m) => m.menuId === parentMenuId);
breadcrumb.unshift(parentMenu.menuName);
parentMenuId = parentMenu.parentMenuId;
}
diff --git a/src/pages/frame/store/settingModule.js b/src/pages/frame/store/settingModule.js
index 5faa8637709955c7c49a9df4d3ab2777fef62e4e..45577560f4680f0bec696fc2bd0cb785536f2a5e 100644
--- a/src/pages/frame/store/settingModule.js
+++ b/src/pages/frame/store/settingModule.js
@@ -12,7 +12,6 @@ const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || [];
export default {
namespaced: true,
state: {
- isMobile: false,
animates: globalConfig.animates.preset,
palettes: globalConfig.palettes,
pageMinHeight: 0,
@@ -36,7 +35,7 @@ export default {
if (menuData.length > 0 && !menuData[0].fullPath) {
formatFullPath(menuData);
}
- return menuData.map(item => {
+ return menuData.map((item) => {
const menuItem = { ...item };
delete menuItem.children;
return menuItem;
@@ -44,9 +43,6 @@ export default {
},
},
mutations: {
- setDevice(state, isMobile) {
- state.isMobile = isMobile;
- },
setTheme(state, theme) {
state.theme = theme;
},
@@ -92,7 +88,7 @@ export default {
},
setCustomTitle(state, { path, title }) {
if (title) {
- const obj = state.customTitles.find(item => item.path === path);
+ const obj = state.customTitles.find((item) => item.path === path);
if (obj) {
obj.title = title;
} else {
diff --git a/src/pages/frame/view/login/Login.vue b/src/pages/frame/view/login/Login.vue
index b7c1b93a34d7905caac7783e3cefc3acca8d9e46..8a106e8caf70637ec8e94d3b1b9f350f8519930b 100644
--- a/src/pages/frame/view/login/Login.vue
+++ b/src/pages/frame/view/login/Login.vue
@@ -89,11 +89,23 @@ export default {
checked: true,
logging: false,
form: this.$form.createForm(this),
+ back: null,
};
},
created() {
clearToken();
},
+
+ beforeRouteEnter(to, from, next) {
+ const {
+ query: { back },
+ } = to;
+ const { fullPath } = from;
+ next((vm) => {
+ if (back) vm.back = fullPath;
+ });
+ },
+
computed: {
applicationName() {
return this.$store.state.settingModule.systemName;
@@ -102,7 +114,7 @@ export default {
methods: {
onSubmit(e) {
e.preventDefault();
- this.form.validateFields(async err => {
+ this.form.validateFields(async (err) => {
if (!err) {
this.logging = true;
const userName = this.form.getFieldValue('userName');
@@ -113,7 +125,7 @@ export default {
setToken(token);
setUserId(userId);
await setUserInfoByRequest();
- this.$router.replace('/');
+ this.$router.replace(this.back ? this.back : '/');
} catch (error) {
// todo
}
diff --git a/src/pages/frame/view/template/PageTemplateView.vue b/src/pages/frame/view/template/PageTemplateView.vue
index 590b3906502cbe7a1165501e16c204b6c02b492a..d7bf44c61db432719c228c52a8256d275543d1b9 100644
--- a/src/pages/frame/view/template/PageTemplateView.vue
+++ b/src/pages/frame/view/template/PageTemplateView.vue
@@ -1,6 +1,6 @@
-
+
![]()
+
+
+
+
+
+
+
diff --git a/src/pages/xunjian/task_managment/center/index.vue b/src/pages/xunjian/task_managment/center/index.vue
index 7cd96688ddcd50aa18e98e9438fe756e0fca6c4a..d9cb0a30f7c21c5d22e7b5c396b4ba76c7f2ddcb 100644
--- a/src/pages/xunjian/task_managment/center/index.vue
+++ b/src/pages/xunjian/task_managment/center/index.vue
@@ -5,33 +5,63 @@
rowKey="jobId"
:addBtn="addBtn"
:selected.sync="selected"
+ ref="table"
+ :drawerWidth="800"
>
-
-
+
+
-
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
导出
-
-
+
+
+
+
+
+
+ 地点
+ {{ row.placeNum }}
+ 个
+
+
+ 单元
+ {{ row.unitNum }}
+ 个
+
+
+ 项目
+ {{ row.itemNum }}
+ 个
+
+
+ 异常
+ {{ row.abnormalNum }}
+ 个
+
+
+ 完成率
+
+ {{ row.unitNum ? (row.finishedNum / row.unitNum).toFixed(2) : 0 }}
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/xunjian/task_managment/center/view_detail.vue b/src/pages/xunjian/task_managment/center/view_detail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5458af9c3d44334873ae2a9e4e14f5339b5373a5
--- /dev/null
+++ b/src/pages/xunjian/task_managment/center/view_detail.vue
@@ -0,0 +1,32 @@
+
+
+ 备注：
+
+
+
+
+
+
+
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index c3d7d41b43c076377e36d90b5b2c8aa804c6f551..c1b72d4c595cf0fb7bd764e44df9403ffc4e1800 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1,6 +1,3 @@
-//enquire.js 纯 JavaScript 实现的 CSS 媒体查询库
-import enquireJs from "enquire.js";
-
export function isDef(v) {
return v !== undefined && v !== null;
}
@@ -18,19 +15,7 @@ export function remove(arr, item) {
}
export function isRegExp(v) {
- return _toString.call(v) === "[object RegExp]";
-}
-
-export function enquireScreen(call) {
- const handler = {
- match: function() {
- call && call(true);
- },
- unmatch: function() {
- call && call(false);
- },
- };
- enquireJs.register("only screen and (max-width: 767.99px)", handler);
+ return _toString.call(v) === '[object RegExp]';
}
const _toString = Object.prototype.toString;
diff --git a/src/utils/requestUtil.js b/src/utils/requestUtil.js
index 32065f45a66b551f8c1ac8c65233b4058734af59..689b41183b0f5c5b39c6604f0ef092e728744e40 100644
--- a/src/utils/requestUtil.js
+++ b/src/utils/requestUtil.js
@@ -18,7 +18,7 @@ axios.defaults.baseURL = '/api';
*/
function loadResponseInterceptor({ router }) {
axios.interceptors.request.use(
- function(config) {
+ function (config) {
// 在发送请求之前做些什么
config.headers = {
...config.headers,
@@ -27,7 +27,7 @@ function loadResponseInterceptor({ router }) {
};
return config;
},
- function(error) {
+ function (error) {
// 对请求错误做些什么
return Promise.reject(error);
},
@@ -35,7 +35,7 @@ function loadResponseInterceptor({ router }) {
// 添加响应拦截器
axios.interceptors.response.use(
- function(response) {
+ function (response) {
const { data } = response;
// 2xx 范围内的状态码都会触发该函数。
// 对响应数据做点什么
@@ -44,21 +44,21 @@ function loadResponseInterceptor({ router }) {
}
if (data.code === 'error.system.authc') {
- router.push('/login');
+ router.push({ path: '/login', query: { back: true } });
}
notification.error({
message: data.code,
- description: h => h('pre', data.message),
+ description: (h) => h('pre', data.message),
});
return Promise.reject(data.message);
},
- function(error) {
+ function (error) {
// 超出 2xx 范围的状态码都会触发该函数。
// 对响应错误做点什么
notification.error({
message: `${error.response.status} ${error.response.statusText}`,
- description: h => h('pre', error.message),
+ description: (h) => h('pre', error.message),
});
return Promise.reject(error);
},
{{ detailData.inspectionRemark }}
+
+