From feed480e29ffa97db05861c085cbd2aad2bb2558 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 13 七月 2023 15:11:05 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 1
Source/UBCS-WEB/src/views/docking/data.vue | 183 +++++++++++++++
Source/UBCS-WEB/src/views/docking/loge.vue | 190 +++++++++++++++
Source/UBCS-WEB/src/api/docking/data.js | 13 +
Source/UBCS-WEB/src/api/docking/task.js | 21 +
Source/UBCS-WEB/src/components/file/main.vue | 2
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 1
Source/UBCS-WEB/src/api/docking/loge.js | 13 +
Source/UBCS-WEB/src/views/docking/task.vue | 237 +++++++++++++++++++
9 files changed, 660 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/docking/data.js b/Source/UBCS-WEB/src/api/docking/data.js
new file mode 100644
index 0000000..5d1cf4e
--- /dev/null
+++ b/Source/UBCS-WEB/src/api/docking/data.js
@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getList = (page, size, params) => {
+ return request({
+ url: '/api/ubcs-code/dockingManagement/gridDockingData',
+ method: 'get',
+ params: {
+ ...params,
+ page,
+ size
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/api/docking/loge.js b/Source/UBCS-WEB/src/api/docking/loge.js
new file mode 100644
index 0000000..3b758e6
--- /dev/null
+++ b/Source/UBCS-WEB/src/api/docking/loge.js
@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getList = (page, size, params) => {
+ return request({
+ url: '/api/ubcs-code/dockingManagement/gridLoge',
+ method: 'get',
+ params: {
+ ...params,
+ page,
+ size
+ }
+ })
+}
diff --git a/Source/UBCS-WEB/src/api/docking/task.js b/Source/UBCS-WEB/src/api/docking/task.js
new file mode 100644
index 0000000..f398361
--- /dev/null
+++ b/Source/UBCS-WEB/src/api/docking/task.js
@@ -0,0 +1,21 @@
+import request from '@/router/axios';
+
+export const getList = (page, size, params) => {
+ return request({
+ url: '/api/ubcs-code/dockingManagement/gridDockingTask',
+ method: 'get',
+ params: {
+ ...params,
+ page,
+ size
+ }
+ })
+}
+
+export const sendData = (oid) => {
+ return request({
+ url: '/api/ubcs-code/dockingManagement/sendData',
+ method: 'post',
+ data: oid
+ })
+}
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 44f196f..44b5166 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -384,7 +384,7 @@
download(data)
}else{
if (this.selectionList.length === 0) {
- this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");x
+ this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
return;
}
data.append('fileOids',this.oids)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index e518e8d..2c79a93 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -74,6 +74,7 @@
border: true,
index: true,
selection: true,
+ reserveSelection:true,
dialogClickModal: false,
highlightCurrentRow: true,
column: []
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index cfef5d5..49c1779 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -75,6 +75,7 @@
border: true,
index: true,
selection: true,
+ reserveSelection:true,
dialogClickModal: false,
highlightCurrentRow: true,
rowKey:'oid',
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
new file mode 100644
index 0000000..1f442e8
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -0,0 +1,183 @@
+<template>
+ <!--绯荤粺闆嗘垚鐨勭郴缁熶俊鎭〉闈�-->
+ <basic-container>
+ <avue-crud :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ ref="crud"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import {getList} from "@/api/docking/data";
+import {validatenull} from "@/util/validate";
+import {mapGetters} from "vuex";
+import website from "@/config/website";
+
+export default {
+name: "data",
+ data(){
+ return {
+ loading: false,
+ query: {},
+ selectionList: [],
+ page: {
+ pageSize: 20,
+ currentPage: 1,
+ total: 0
+ },
+ data:[],
+ option: {
+ calcHeight: 30,
+ tip: false,
+ searchShow: false,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: false,
+ dialogClickModal: false,
+ menu:false,
+ column: [
+ {
+ label: "鏁版嵁缂栫爜",
+ prop: "id",
+ search: true,
+ sortable:true,
+ width:150
+ },
+ {
+ label: "鍥惧彿",
+ prop: "uniquecode",
+ search: true,
+ sortable:true
+ },
+ {
+ label: '鍒嗙被id',
+ prop: 'classifyid',
+ search: true,
+ sortable:true,
+ width: 250
+ },
+ {
+ label: '鍒嗙被鍚嶇О',
+ prop: 'classifyname',
+ search: true,
+ sortable:true
+ },
+ {
+ label: '涓氬姟绫诲瀷oid',
+ prop: 'btmoid',
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '涓氬姟绫诲瀷id',
+ prop: 'btmid',
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '鎺ㄩ�佺被鍨�',
+ prop: 'sendtype',
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '鏄惁鍒嗚В浠诲姟',
+ prop: 'sendflag',
+ search: true,
+ sortable:true,
+ width: 150,
+ html:true,
+ align:'center',
+ type:'select',
+ dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
+ props: {
+ label: "value",
+ value: "key"
+ },
+ formatter : function (row, column) {
+ return row.sendflag == 'true' || row.sendflag == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
+ }
+ }
+ ]
+ }
+ }
+ },
+ computed:{
+ ...mapGetters([ "permission"]),
+ permissionList() {
+ return {
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: false
+ };
+ }
+ },
+ methods: {
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page);
+ },
+ onLoad(page, params={}) {
+ this.loading = true;
+ var query={}
+ if (this.query) {
+ for (var key in this.query) {
+ query['conditionMap["' + key + '"]'] = this.query[key];
+ }
+ }
+ getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ }).catch(error=>{
+ this.$message.error(error);
+ this.loading = false;
+ });
+ }
+ }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
new file mode 100644
index 0000000..f4c2b24
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -0,0 +1,190 @@
+<template>
+ <!--绯荤粺闆嗘垚鐨勭郴缁熸棩蹇楅〉闈�-->
+ <basic-container>
+ <avue-crud :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ ref="crud"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import {getList} from "@/api/docking/loge";
+import {validatenull} from "@/util/validate";
+import {mapGetters} from "vuex";
+
+export default {
+ name: "loge",
+ data(){
+ return {
+ loading: false,
+ query: {},
+ selectionList: [],
+ page: {
+ pageSize: 20,
+ currentPage: 1,
+ total: 0
+ },
+ data:[],
+ option: {
+ calcHeight: 30,
+ tip: false,
+ searchShow: false,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: false,
+ dialogClickModal: false,
+ menu:false,
+ column: [
+ {
+ label: "鏁版嵁缂栫爜",
+ prop: "id",
+ search: true,
+ sortable:true,
+ width:150
+ },
+ {
+ label: "鍥惧彿",
+ prop: "uniquecode",
+ search: true,
+ sortable:true,
+ width:150
+ },
+ {
+ label: '鍒嗙被id',
+ prop: 'classifyid',
+ search: true,
+ sortable:true,
+ width: 250
+ },
+ {
+ label: '鍒嗙被鍚嶇О',
+ prop: 'classifyname',
+ search: true,
+ sortable:true,
+ overHidden: true
+ },
+ {
+ label: '绯荤粺缂栧彿',
+ prop: 'systemcode',
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '绯荤粺鍚嶇О',
+ prop: 'systemname',
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '鏄惁鎺ㄩ�佹垚鍔�',
+ prop: 'interfacestatus',
+ search: true,
+ sortable:true,
+ width: 120,
+ html:true,
+ align:'center',
+ type:'select',
+ dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
+ props: {
+ label: "value",
+ value: "key"
+ },
+ formatter : function (row, column) {
+ return row.interfacestatus == 'true' || row.interfacestatus == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
+ }
+ },
+ {
+ label: '杩斿洖msg',
+ prop: 'msg',
+ overHidden: true
+ },
+ {
+ label: '璁板綍鏃堕棿',
+ prop: 'createTime',
+ sortable:true,
+ width: 160
+ }
+ ]
+ }
+ }
+ },
+ computed:{
+ ...mapGetters([ "permission"]),
+ permissionList() {
+ return {
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: false
+ };
+ }
+ },
+ methods: {
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page);
+ },
+ onLoad(page, params={}) {
+ this.loading = true;
+ var query={}
+ if (this.query) {
+ for (var key in this.query) {
+ query['conditionMap["' + key + '"]'] = this.query[key];
+ }
+ }
+ getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ }).catch(error=>{
+ this.$message.error(error);
+ this.loading = false;
+ });
+ }
+ }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
new file mode 100644
index 0000000..48efd1d
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -0,0 +1,237 @@
+<template>
+ <!--绯荤粺闆嗘垚鐨勭郴缁熶换鍔￠〉闈�-->
+ <basic-container>
+ <avue-crud :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ ref="crud"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button type="primary"
+ size="small"
+ plain
+ icon="el-icon-refresh-right"
+ @click="handleSend">鎵嬪姩鎺ㄩ��
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import {getList,sendData} from "@/api/docking/task";
+import {validatenull} from "@/util/validate";
+import {mapGetters} from "vuex";
+import {remove} from "@/api/code/codeSynonym";
+
+export default {
+ name: "task",
+ data(){
+ return {
+ loading: false,
+ query: {},
+ selectionList: [],
+ page: {
+ pageSize: 20,
+ currentPage: 1,
+ total: 0
+ },
+ data:[],
+ option: {
+ calcHeight: 30,
+ tip: false,
+ searchShow: false,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ menu:false,
+ column: [
+ {
+ label: "鏁版嵁缂栫爜",
+ prop: "id",
+ search: true,
+ sortable:true,
+ width:150
+ },
+ {
+ label: "鍥惧彿",
+ prop: "uniquecode",
+ search: true,
+ sortable:true,
+ width:150
+ },
+ {
+ label: '鍒嗙被id',
+ prop: 'classifyid',
+ search: true,
+ sortable:true,
+ width: 250
+ },
+ {
+ label: '鍒嗙被鍚嶇О',
+ prop: 'classifyname',
+ search: true,
+ sortable:true
+ },
+ {
+ label: '绯荤粺缂栧彿',
+ prop: 'systemcode',
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '绯荤粺鍚嶇О',
+ prop: 'systemname',
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '鏁版嵁鎯呭喌',
+ prop: 'sendtype',
+ sortable:true,
+ width: 100
+ },
+ {
+ label: '鏄惁鎺ㄩ�佹垚鍔�',
+ prop: 'sendflag',
+ search: true,
+ sortable:true,
+ width: 120,
+ html:true,
+ align:'center',
+ type:'select',
+ dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
+ props: {
+ label: "value",
+ value: "key"
+ },
+ formatter : function (row, column) {
+ return row.sendflag == 'true' || row.sendflag == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
+ }
+ },
+ {
+ label: '浠诲姟鍒涘缓鏃堕棿',
+ prop: 'createTime',
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '鏈�鍚庢帹閫佹椂闂�',
+ prop: 'lastModifyTime',
+ sortable:true,
+ width: 150
+ }
+ ]
+ }
+ }
+ },
+ computed:{
+ ...mapGetters([ "permission"]),
+ permissionList() {
+ return {
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: false
+ };
+ },
+ oids() {
+ let oids = [];
+ this.selectionList.forEach(ele => {
+ oids.push(ele.oid);
+ });
+ return oids.join(",");
+ }
+ },
+ methods: {
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ var query = {}
+ if (this.query) {
+ for (var key in this.query) {
+ query['conditionMap["' + key + '"]'] = this.query[key];
+ }
+ }
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.params, query, this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ }).catch(error => {
+ this.$message.error(error);
+ this.loading = false;
+ });
+ },
+ handleSend() {
+ let data = new FormData();
+ if (this.selectionList.length === 0) {
+ this.$message.warning("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return;
+ }
+ data.append('oid', this.oids)
+ this.$confirm("鏄惁鎺ㄩ�佹暟鎹�?", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ return sendData(data)
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
+ }).catch(error => {
+ this.$message.error(error);
+ });
+ }
+ }
+
+}
+</script>
+
+<style scoped>
+
+</style>
--
Gitblit v1.9.3