diff --git a/.env.development b/.env.development
index 5aef017..0a6098f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
NODE_ENV=development
-VUE_APP_API_BASE_URL=http://pbl.natapp1.cc/jeecg-boot
+VUE_APP_API_BASE_URL=http://rcproject.natapp1.cc/jeecg-boot
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/public/color.less b/public/color.less
index fb50e1b..1bcd9b0 100644
--- a/public/color.less
+++ b/public/color.less
@@ -3747,7 +3747,7 @@ mark {
.ant-checkbox-wrapper:hover .ant-checkbox-inner,
.ant-checkbox:hover .ant-checkbox-inner,
.ant-checkbox-input:focus + .ant-checkbox-inner {
- border-color: @primary-color;
+ border-color: #000;
}
.ant-checkbox-checked:after {
border-radius: 2px;
@@ -3771,7 +3771,7 @@ mark {
border-color: rgba(0, 0, 0, 0.25);
}
.ant-checkbox-checked .ant-checkbox-inner:after {
- border: 2px solid #fff;
+ border: 2px solid #000000;
border-top: 0;
border-left: 0;
}
diff --git a/src/views/data/dataIndexing.vue b/src/views/data/dataIndexing.vue
index 34413a1..cb2afa0 100644
--- a/src/views/data/dataIndexing.vue
+++ b/src/views/data/dataIndexing.vue
@@ -43,6 +43,9 @@
+
+ 添加
+
@@ -61,7 +64,13 @@
+ :pagination="false" :scroll="{ y: 'calc(100vh - 380px)' }" rowKey="id">
+
+ 编辑
+
+ 删除
+
+
@@ -70,6 +79,7 @@
\ No newline at end of file
diff --git a/src/views/securityAndBackup/backup.vue b/src/views/securityAndBackup/backup.vue
index 79d5789..a24993f 100644
--- a/src/views/securityAndBackup/backup.vue
+++ b/src/views/securityAndBackup/backup.vue
@@ -44,7 +44,7 @@
一键备份
- 同步日志
+ 同步日志
@@ -53,6 +53,7 @@
+
@@ -61,13 +62,14 @@ import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
import backupModal from './modules/backupModal'
-
+import backLog from './modules/backLog'
export default {
name: "backup",
mixins: [JeecgListMixin],
components: {
JEllipsis,
backupModal,
+ backLog,
VNodes: {
functional: true,
render: (h, ctx) => ctx.props.vnodes,
@@ -166,13 +168,13 @@ export default {
});
},
handleRun(sourceType) {
- postAction("/idcDataBackup/dmExportByUserName",{sourceType:sourceType}).then((res) => {
+ postAction("/idcDataBackup/dmExportBySourceType",{sourceType:sourceType}).then(res => {
if (res.success) {
this.$message.success(res.result);
} else {
this.$message.warning(res.message);
}
- });
+ })
},
handleStartStop(id,backupStatus) {
postAction("/idcDataBackup/edit",{id:id,backupStatus:backupStatus}).then((res) => {
@@ -198,9 +200,8 @@ export default {
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title = "编辑";
},
- handleAdd() {
- this.$refs.modalForm.add();
- this.$refs.modalForm.title = "新增";
+ showlog:function(id) {
+ this.$refs.backLog.open(id);
},
handleDistribute: function (id) {
var that = this;
diff --git a/src/views/securityAndBackup/modules/backLog.vue b/src/views/securityAndBackup/modules/backLog.vue
new file mode 100644
index 0000000..d665734
--- /dev/null
+++ b/src/views/securityAndBackup/modules/backLog.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file