diff --git a/back/public/index.html b/back/public/index.html
index 4869501d..1d32cc9d 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -1,8 +1,8 @@
@@ -43,8 +43,9 @@
diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue
index c4bd61be..3a6cafa8 100644
--- a/back/src/views/modules/sys/log-operation.vue
+++ b/back/src/views/modules/sys/log-operation.vue
@@ -1,40 +1,169 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('query') }}
- {{ $t('export') }}
+ 重置
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 复制
+
+
+
+
{{ `${scope.row.requestTime}ms` }}
-
+
- {{ $t('logOperation.status0') }}
- {{ $t('logOperation.status1') }}
+ {{
+ $t('logOperation.status0')
+ }}
+ {{
+ $t('logOperation.status1')
+ }}
-
-
-
+
+ @current-change="pageCurrentChangeHandle"
+ >
@@ -61,9 +191,98 @@ export default {
exportURL: '/sys/log/operation/export'
},
dataForm: {
- status: ''
+ status: '',
+ creatorName: '',
+ startDate: '',
+ endDate: '',
+ operation: ''
+ },
+ value1: ''
+ }
+ },
+ watch: {
+ value1 (val) {
+ val[0] = this.handleTime(val[0], 'yyyy-MM-dd HH:mm:ss')
+ this.dataForm.startDate = val[0]
+ val[1] = this.handleTime(val[1], 'yyyy-MM-dd HH:mm:ss')
+ this.dataForm.endDate = val[1]
+ }
+ },
+ methods: {
+ // 复制方法
+ copyFunction (row) {
+ var data = row.resultData
+ var oInput = document.createElement('input')
+ oInput.value = data
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ oInput.className = 'oInput'
+ oInput.style.display = 'none'
+ this.$message({
+ type: 'success',
+ message: this.$t('复制成功')
+ })
+ },
+ // 重置按钮
+ resetFunction () {
+ const params = {
+ status: '',
+ creatorName: '',
+ startDate: '',
+ endDate: '',
+ operation: '',
+ operationType: 'all'
}
+ this.value1 = '' // 格式化日期
+ this.operationType = '' // 操作类型转化
+ this.page = 1
+ this.limit = 10
+ this.dataForm = params
+ this.getDataList() // 重置完调用查询方法
+ },
+ // 序号
+ rowClassName ({ row, rowIndex }) {
+ row.xh = rowIndex + 1 + (this.page - 1) * this.limit
+ },
+ // 定义格式化函数:
+ handleTime (time, format) {
+ if (time == null || time == undefined || time == '') {
+ return ''
+ }
+ var t = new Date(time)
+ var tf = function (i) {
+ return (i < 10 ? '0' : '') + i
+ }
+ return format.replace(/yyyy|MM|dd|HH|mm|ss/g, function (a) {
+ switch (a) {
+ case 'yyyy':
+ return tf(t.getFullYear())
+ break
+ case 'MM':
+ return tf(t.getMonth() + 1)
+ break
+ case 'mm':
+ return tf(t.getMinutes())
+ break
+ case 'dd':
+ return tf(t.getDate())
+ break
+ case 'HH':
+ return tf(t.getHours())
+ break
+ case 'ss':
+ return tf(t.getSeconds())
+ break
+ }
+ })
}
}
}
+
diff --git a/front/public/index.html b/front/public/index.html
index cacc03dd..e408d9d5 100644
--- a/front/public/index.html
+++ b/front/public/index.html
@@ -1,8 +1,8 @@
@@ -49,7 +49,7 @@
window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';
window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/';
- window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin';
+ window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin';
window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
// 穿透版本
// window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797';
@@ -126,4 +126,4 @@