+
@@ -73,7 +75,7 @@
-
-
-
-
+
+
+
@@ -93,7 +95,7 @@
-
+
@@ -115,10 +117,10 @@
-
-
-
-
+
+
+
@@ -138,16 +140,17 @@
-
-
-
-
-
+
+ + {{ item.meta.title }}
+
@@ -159,7 +162,7 @@
{{ pmenu.meta.title }}
-
-
-
-
+
+
+
@@ -189,135 +192,138 @@
diff --git a/src/views/system/application/index.vue b/src/views/system/application/index.vue
index f30463a..9540b99 100644
--- a/src/views/system/application/index.vue
+++ b/src/views/system/application/index.vue
@@ -106,12 +106,12 @@ export default {
}
.click-tab {
- color: #409eff;
- border-bottom: 2px solid #409eff;
+ color: var(--el-color-primary);
+ border-bottom: 2px solid var(--el-color-primary);
}
.tab-box:hover {
- color: #409eff;
+ color: var(--el-color-primary);
}
.tab-info-box-hid {
diff --git a/src/views/system/application/installedApplist.vue b/src/views/system/application/installedApplist.vue
index a3b9bd5..d543942 100644
--- a/src/views/system/application/installedApplist.vue
+++ b/src/views/system/application/installedApplist.vue
@@ -1,5 +1,5 @@
-
+
@@ -7,9 +7,9 @@
![]()
![]()
@@ -22,7 +22,7 @@
- {{ scope.row.app }}
+ {{ scope.row.app }}
@@ -32,7 +32,7 @@
-
@@ -64,134 +64,134 @@ import { ElMessageBox } from 'element-plus';
export default {
components: { popInfo },
- data() {
- return {
- data: [],
- loading:false,
- popShow: false,
- info: {},
- }
- },
- mounted() {
- this.loaddata();
- },
- methods: {
- installPlugin(o) {
- this.info = o;
- this.popShow = true;
- },
- closePlugin(refresh = false){
- this.info = {};
- this.popShow = false;
- if (refresh===true) {
- this.loaddata();
-
- // // 重新加载菜单
- // this.$api.system.index.get().then((response) => {
- // this.$tool.data.set('menu', response.data.menu);
- // });
- // this.$router.x_getMenu();
+ data() {
+ return {
+ data: [],
+ loading: false,
+ popShow: false,
+ info: {},
}
},
- loaddata(){
- this.loading = true;
- this.$http.get('admin/application/installedApplist').then((res) => {
- this.loading = false;
- if (res.code == 200) {
- this.data = res.data;
+ mounted() {
+ this.loaddata();
+ },
+ methods: {
+ installPlugin(o) {
+ this.info = o;
+ this.popShow = true;
+ },
+ closePlugin(refresh = false) {
+ this.info = {};
+ this.popShow = false;
+ if (refresh === true) {
+ this.loaddata();
+
+ // // 重新加载菜单
+ // this.$api.system.index.get().then((response) => {
+ // this.$tool.data.set('menu', response.data.menu);
+ // });
+ // this.$router.x_getMenu();
}
- });
- },
- upgrade(o){
- return ElMessageBox.confirm('正在将应用<'+ o.name + '>升级到'+o.upgradeversion, '此操作不可逆, 如已二次开发请谨慎操作', {
- type: 'info',
- closeOnClickModal: false,
- confirmButtonText: '确认操作',
- }).then(() => {
- o.changeStatusloading = true;
- return this.$http.post('admin/application/upgrade', {app:o.app, upgradeversion:o.upgradeversion}).then((res) => {
- o.changeStatusloading = false;
+ },
+ loaddata() {
+ this.loading = true;
+ this.$http.get('admin/application/installedApplist').then((res) => {
+ this.loading = false;
+ if (res.code == 200) {
+ this.data = res.data;
+ }
+ });
+ },
+ upgrade(o) {
+ return ElMessageBox.confirm('正在将应用<' + o.name + '>升级到' + o.upgradeversion, '此操作不可逆, 如已二次开发请谨慎操作', {
+ type: 'info',
+ closeOnClickModal: false,
+ confirmButtonText: '确认操作',
+ }).then(() => {
+ o.changeStatusloading = true;
+ return this.$http.post('admin/application/upgrade', { app: o.app, upgradeversion: o.upgradeversion }).then((res) => {
+ o.changeStatusloading = false;
- // 请先确认身份
- if (res.code == 205) {
- this.$message.warning(res.message || "请前往在线升级频道登录X-PHP后进行升级");
- if (res.url) {
- this.$router.replace({
- path: res.url
- })
+ // 请先确认身份
+ if (res.code == 205) {
+ this.$message.warning(res.message || "请前往在线升级频道登录X-PHP后进行升级");
+ if (res.url) {
+ this.$router.replace({
+ path: res.url
+ })
+ }
+ return false;
}
+
+ if (res.code == 200) {
+ this.loaddata();
+ this.$message.success(res.message || "操作成功")
+ return true;
+ }
+ this.$alert(res.message, "提示", { type: 'error' });
return false;
- }
+ });
+ }).catch(() => { })
+ },
+ changeStatus(o) {
+ return ElMessageBox.confirm((o.status ? '关闭应用会导致相关调用失效' : '打开应用(' + o.name + ')') + ', 确认执行?', '正在' + (o.status ? '关闭' : '打开') + '应用', {
+ type: 'error',
+ closeOnClickModal: false,
+ confirmButtonText: '确认操作',
+ }).then(() => {
+ o.changeStatusloading = true;
+ return this.$http.post('admin/application/status', { app: o.app, status: o.status ? 0 : 1 }).then((res) => {
+ o.changeStatusloading = false;
+ if (res.code == 200) {
+ this.$message.success(res.message || "操作成功")
+ return true;
+ }
+ this.$alert(res.message, "提示", { type: 'error' });
+ return false;
+ });
+ }).catch(() => { })
+ },
+ uninstall(item, index) {
- if (res.code == 200) {
- this.loaddata();
- this.$message.success(res.message || "操作成功")
- return true;
- }
- this.$alert(res.message, "提示", {type: 'error'});
- return false;
- });
- }).catch(() => {})
+ ElMessageBox.confirm('当前操作不可逆,可能会造成无法访问或数据清空.', '正在卸载应用', {
+ type: 'error',
+ closeOnClickModal: false,
+ confirmButtonText: '确认卸载',
+ }).then(() => {
+ this.$http.post('admin/application/uninstall', { app: item.app }).then((res) => {
+ if (res.code == 200) {
+
+ this.data.splice(index, 1)
+ // // 重新加载菜单
+ // this.$api.system.index.get().then((response) => {
+ // this.$tool.data.set('menu', response.data.menu);
+ // });
+ // this.$router.x_getMenu();
+
+ this.$message.success(res.message || "操作成功")
+ return true;
+ }
+ this.$alert(res.message, "提示", { type: 'error' });
+ });
+
+ }).catch(() => { })
+
+ },
},
- changeStatus(o){
- return ElMessageBox.confirm((o.status?'关闭应用会导致相关调用失效':'打开应用('+ o.name +')') + ', 确认执行?', '正在'+ (o.status?'关闭':'打开') + '应用', {
- type: 'error',
- closeOnClickModal: false,
- confirmButtonText: '确认操作',
- }).then(() => {
- o.changeStatusloading = true;
- return this.$http.post('admin/application/status', {app:o.app, status:o.status?0:1}).then((res) => {
- o.changeStatusloading = false;
- if (res.code == 200) {
- this.$message.success(res.message || "操作成功")
- return true;
- }
- this.$alert(res.message, "提示", {type: 'error'});
- return false;
- });
- }).catch(() => {})
- },
- uninstall(item, index) {
-
- ElMessageBox.confirm('当前操作不可逆,可能会造成无法访问或数据清空.', '正在卸载应用', {
- type: 'error',
- closeOnClickModal: false,
- confirmButtonText: '确认卸载',
- }).then(() => {
- this.$http.post('admin/application/uninstall', {app:item.app}).then((res) => {
- if (res.code == 200) {
-
- this.data.splice(index, 1)
- // // 重新加载菜单
- // this.$api.system.index.get().then((response) => {
- // this.$tool.data.set('menu', response.data.menu);
- // });
- // this.$router.x_getMenu();
-
- this.$message.success(res.message || "操作成功")
- return true;
- }
- this.$alert(res.message, "提示", {type: 'error'});
- });
-
- }).catch(() => {})
-
- },
- },
}
+}
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index f6d0492..f40eda1 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -61,10 +61,7 @@ export default {
typeList: [],
date: [],
data: [],
- search: {
- keyword: this.$route.query.keyword || '',
- type: this.$route.query.type || ''
- },
+ search: {},
api: '',
current: '',
config: {},
@@ -119,9 +116,15 @@ export default {
this.column = data.column || 'column';
},
getType() {
- this.$http.get('log/admin/types', { type: this.search.type }, { cacheparameters: true }).then((res) => {
+ this.$http.get('log/admin/types', { type: this.$route.query.type }, { cacheparameters: true }).then((res) => {
if (res.code == 200) {
Object.assign(this.$data, res.data);
+ // 替换search值
+ for (const key in this.search) {
+ if (Object.prototype.hasOwnProperty.call(this.$route.query, key)) {
+ this.search[key] = this.$route.query[key];
+ }
+ }
}
});
},
@@ -132,8 +135,10 @@ export default {
}
this.$refs.table.reload(this.search)
- var url = this.changeURLArg(window.location.href, 'type', this.current)
- url = this.changeURLArg(url, 'keyword', this.search.keyword)
+ let url = window.location.href;
+ for (const [key, value] of Object.entries(this.search)) {
+ url = this.changeURLArg(url, key, value)
+ }
history.replaceState(Object.assign({}, window.history.state, { url: url }), 'null', url);
},
upsearch() {
diff --git a/src/views/system/stat/index.vue b/src/views/system/stat/index.vue
index e5e16ce..a285f92 100644
--- a/src/views/system/stat/index.vue
+++ b/src/views/system/stat/index.vue
@@ -1,32 +1,32 @@
-
+
-
+
-
+
-
- {{ scope.row.name }}
+ {{ scope.row.name }}
- {{ scope.row.description }}
+ {{ scope.row.description }}
-
+
+
-
-
+
-
-
+
+
@@ -35,98 +35,147 @@
-
+
diff --git a/src/views/system/upgrade/index.vue b/src/views/system/upgrade/index.vue
index 8f39beb..5aee67d 100644
--- a/src/views/system/upgrade/index.vue
+++ b/src/views/system/upgrade/index.vue
@@ -415,7 +415,7 @@ $linkColor: #3b6ff1;
border-radius: 50%;
overflow: hidden;
line-height: 40px;
- background: #2362fb;
+ background: var(--el-color-primary);
font-size: 12px;
color: #fff;
text-align: center;
diff --git a/src/views/table/1/index.vue b/src/views/table/1/index.vue
index 7dd7d49..337a231 100644
--- a/src/views/table/1/index.vue
+++ b/src/views/table/1/index.vue
@@ -83,7 +83,6 @@ export default {
tableurl: this.$route.meta.tableurl,
groupFilterText: '',
tabskey: '',
- tabsdefaultvalue: ''
}
},
mounted() {
@@ -97,8 +96,12 @@ export default {
awaitvar.then((res) => {
if (res.code == 200) {
Object.assign(this.$data, res.data);
- if (res.data.tabsdefaultvalue && res.data.tabskey) {
- this.search[res.data.tabskey] = res.data.tabsdefaultvalue
+
+ // 替换search值
+ for (const key in this.search) {
+ if (Object.prototype.hasOwnProperty.call(this.$route.query, key)) {
+ this.search[key] = this.$route.query[key];
+ }
}
}
@@ -207,10 +210,11 @@ export default {
}
@@ -226,7 +230,8 @@ export default {
.container {
border: 1px solid var(--el-border-color-light);
border-radius: 4px;
- background-color: var(--el-fill-color-blank);;
+ background-color: var(--el-fill-color-blank);
+ ;
overflow: hidden;
}
diff --git a/src/views/table/2/index.vue b/src/views/table/2/index.vue
index 60ce28a..76dfdcb 100644
--- a/src/views/table/2/index.vue
+++ b/src/views/table/2/index.vue
@@ -18,10 +18,11 @@
-
+
-
@@ -62,6 +63,8 @@ export default {
},
isselection: true,
tableexpand: false,
+ tableexpandtype: '',
+ defaultExpandAll: true,
tableexpandfield: 'content',
selection: [],
column: [],
@@ -84,7 +87,6 @@ export default {
tableurl: this.$route.meta.tableurl,
groupFilterText: '',
tabskey: '',
- tabsdefaultvalue: ''
}
},
mounted() {
@@ -99,11 +101,18 @@ export default {
awaitvar.then((res) => {
if (res.code == 200) {
Object.assign(this.$data, res.data);
- if (res.data.tabsdefaultvalue && res.data.tabskey) {
- this.search[res.data.tabskey] = res.data.tabsdefaultvalue
+
+
+ // 替换search值
+ for (const key in this.search) {
+ if (Object.prototype.hasOwnProperty.call(this.$route.query, key)) {
+ this.search[key] = this.$route.query[key];
+ }
}
+
+
// 子组件加载完毕后调用回调函数，并传递数据
- this.$emit('child-loaded', Object.assign({}, this.$data.aside, { search: this.$data.search }));
+ this.$emit('child-loaded', Object.assign({}, this.$data.aside, { search: this.search }));
}
});
}
@@ -218,6 +227,11 @@ export default {
\ No newline at end of file
+}
+
\ No newline at end of file
diff --git a/src/views/table/3/index.vue b/src/views/table/3/index.vue
index c5ffbf2..0b2af92 100644
--- a/src/views/table/3/index.vue
+++ b/src/views/table/3/index.vue
@@ -1,7 +1,7 @@