合并版本

.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

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;
 }

src/views/data/dataIndexing.vue

@@ -43,6 +43,9 @@
               <a-input placeholder="请输入搜索关键词" v-model="queryParam.massKey"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="8">
+            <a-button type="primary" @click="handleAdd" icon="plus" style="margin-left: 8px;left: 10px">添加</a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -61,7 +64,13 @@
         <!-- 表格区域 -->
         <div style="height:calc(100vh - 316px);background: #e6e9f1;overflow:hidden;padding: 15px;">
           <a-table size="middle" bordered :columns="columns" :data-source="dataSource" :loading="loading"
-            :pagination="false" :scroll="{ y: 'calc(100vh - 380px)' }" rowKey="id"></a-table>
+            :pagination="false" :scroll="{ y: 'calc(100vh - 380px)' }" rowKey="id">
+            <span slot="action" slot-scope="text, record">
+              <a @click="handleEdit(record)">编辑</a>
+              <a-divider type="vertical" />
+              <a @click="Delete(record, $event)">删除</a>
+            </span>
+          </a-table>
         </div>
         <div class="linese"></div>
       </a-col>
@@ -70,6 +79,7 @@
 </template>
 <script>
 import { metaDataTypeTree, tableIndexes } from '@/api/metaData'
+import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
 export default {
   name: "metadata",
   components: {
@@ -119,6 +129,13 @@ export default {
           title: '列在索引中的位置',
           align: "center",
           dataIndex: 'columnPosition',
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          width: 260,
+          scopedSlots: { customRender: 'action' },
         }
       ]
     }
@@ -139,6 +156,23 @@ export default {
     this.getMetaDataTypeTree()
   },
   methods: {
+    Delete(item) {
+      var that = this
+      that.$confirm({
+        title: '确认删除',
+        content: '是否删除选中索引?',
+        onOk: function () {
+          postAction("/tableIndex/dropIndex?schemaMass="+this.tableParams.schemaMass+"&tableName="+this.tableParams.tableName+"&indexName="+item.indexName+"&columns="+item.columnName+"&indexTypeCode="+item.indexType,{}).then(res => {
+            if (res.success) {
+              that.$message.success(res.message);
+              this.getTableIndexList();
+            } else {
+              that.$message.warning(res.message);
+            }
+          })
+        },
+      })
+    },
     getMetaDataTypeTree() {
       metaDataTypeTree(this.queryParam).then(res => {
         if (res.code == 200) {

src/views/fileManage/recycling.vue

@@ -217,4 +217,7 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+  /deep/ .ant-checkbox-checked{
+    background: #40a9ff !important;
+}
 </style>

src/views/securityAndBackup/backup.vue

@@ -44,7 +44,7 @@
           <a-divider type="vertical" />
           <a @click="handleRun(record.sourceType)">一键备份</a>
           <a-divider type="vertical" />
-          <a @click="handleRun(record.sourceType)">同步日志</a>
+          <a @click="showlog(record.id)">同步日志</a>
         </span>
       </a-table>
     </div>
@@ -53,6 +53,7 @@
 
     <!-- 表单区域 -->
     <backupModal ref="modalForm" @ok="modalFormOk"></backupModal>
+    <backLog ref="backLog" @ok="modalFormOk"></backLog>
   </a-card>
 </template>
 
@@ -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() {
+    showlog:function(id) {
-      this.$refs.modalForm.add();
+      this.$refs.backLog.open(id);
-      this.$refs.modalForm.title = "新增";
     },
     handleDistribute: function (id) {
       var that = this;

src/views/securityAndBackup/modules/backLog.vue

@@ -0,0 +1,116 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    @cancel="close"
+    :footer="null"
+    :ok-button-props="{ style: { display: 'none' } }">
+
+    <a-spin :spinning="confirmLoading">
+      <a-table 
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :pagination="ipagination"
+        :columns="columns"
+        :dataSource="dataSource"
+        @change="handleTableChange">
+<!--        :locale="myLocale"-->
+
+        <!-- 字符串超长截取省略号显示-->
+      </a-table>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import moment from "moment"
+import { getAction, deleteAction, putAction, postAction } from '@/api/manage'
+  export default {
+    name: "backlog",
+    components: {
+    },
+    data () {
+      return {
+        title:"操作",
+        buttonStyle: 'solid',
+        visible: false,
+        confirmLoading: false,
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'id',
+            width:60,
+            align:"id",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title: '表名',
+            align:"tableName",
+            dataIndex: 'tableName',
+          },
+          {
+            title: '数据条数',
+            align:"rowCount",
+            dataIndex: 'rowCount'
+          },
+        ],
+        syncTaskId:"",
+        queryParam: {
+          pageNum :1,
+          pageSize:20
+        },
+        dataSource:[],
+        ipagination:{}
+      }
+    },
+    created () {
+      
+    },
+    methods: {
+      open (record) {
+        this.visible =true;
+        this.syncTaskId = record;
+        this.getlist();
+      },
+      close () {
+        this.$emit('ok');
+        this.visible = false;
+      },
+      getlist(){
+        getAction('/dataManager/getExportLog?syncTaskId='+this.syncTaskId).then((res) => {
+            if (res.success) {
+                this.dataSource = res.result;
+                if(res.result.total)
+                {
+                  this.ipagination.total = res.result.total;
+                }
+            } else {
+                this.$message.warning(res.message);
+            }
+        });
+      },
+      handleTableChange(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        //TODO 筛选
+        if (Object.keys(sorter).length > 0) {
+          this.isorter.column = sorter.field;
+          this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+        }
+        this.ipagination = pagination;
+        this.getlist();
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.disabled{
+  pointer-events: none;
+}
+</style>