From 77b00428891493e9ead0672623ce39b9b6461e13 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 22 十月 2024 21:53:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue | 157 +++
Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue | 138 +++
Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue | 2
Source/plt-web/plt-web-ui/src/views/system/log/index.vue | 170 ++++
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 42
Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue | 35
Source/plt-web/plt-web-ui/src/api/UI/formDefine/api.js | 1173 ++++++++++++++------------------
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 28
Source/plt-web/plt-web-ui/src/views/system/log/basicConf.vue | 138 +++
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 41
/dev/null | 16
Source/plt-web/plt-web-ui/src/views/system/user/index.vue | 4
Source/plt-web/plt-web-ui/src/api/system/log/logBasic.js | 57 +
Source/plt-web/plt-web-ui/src/api/system/fileManager/index.vue | 155 ++++
14 files changed, 1,395 insertions(+), 761 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/api/UI/formDefine/api.js b/Source/plt-web/plt-web-ui/src/api/UI/formDefine/api.js
index 5a093b9..5d6e885 100644
--- a/Source/plt-web/plt-web-ui/src/api/UI/formDefine/api.js
+++ b/Source/plt-web/plt-web-ui/src/api/UI/formDefine/api.js
@@ -58,7 +58,7 @@
}
// 瀵煎嚭
-export function exportExcel (params) {
+export function exportExcel(params) {
return request({
url: '/api/portalVIController/exportExcel',
method: 'post',
@@ -77,688 +77,533 @@
})
}
-const obj ={
- "id": "",// 淇敼鏃跺�欏繀浼�
- "prm": {
- "formQtName": "", // 琛ㄥ崟鍚嶇О瀵瑰簲涓嬮潰瑙嗗浘鍚嶇О
- "prmItemList": [
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "0",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "anticollaboration",
- "itemFieldWidth": "",
- "itemFieldWidthList": [],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "",
- "itemInObj": "",
- "itemIsEditable": "1",
- "itemIsHidden": "0",
- "itemIsHttpSave": "0",
- "itemIsNavigatorExpand": "",
- "itemIsRequired": "0",
- "itemIsShowFolder": "",
- "itemKeyFieldList": [],
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "鍙嶅崗浣滄爣璇�",
- "itemOR": "",
- "itemOutFieldList": [],
- "itemOutFields": "",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [],
- "itemSelectoutFieldList": [],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "text",
- "itemTypeText": "鍗曡鏂囨湰妗�",
- "itemValue": "N",
- "itemValueList": []
- },
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "0",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "holistic",
- "itemFieldWidth": "",
- "itemFieldWidthList": [],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "",
- "itemInObj": "",
- "itemIsEditable": "1",
- "itemIsHidden": "0",
- "itemIsHttpSave": "0",
- "itemIsNavigatorExpand": "",
- "itemIsRequired": "0",
- "itemIsShowFolder": "",
- "itemKeyFieldList": [],
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "鏁翠綋鎬�",
- "itemOR": "",
- "itemOutFieldList": [],
- "itemOutFields": "",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [],
- "itemSelectoutFieldList": [],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "text",
- "itemTypeText": "鍗曡鏂囨湰妗�",
- "itemValue": "N",
- "itemValueList": []
- },
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "0",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "isproductbring",
- "itemFieldWidth": "",
- "itemFieldWidthList": [],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "",
- "itemInObj": "",
- "itemIsEditable": "1",
- "itemIsHidden": "0",
- "itemIsHttpSave": "0",
- "itemIsNavigatorExpand": "",
- "itemIsRequired": "0",
- "itemIsShowFolder": "",
- "itemKeyFieldList": [],
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "鎴愬搧甯︽潵",
- "itemOR": "",
- "itemOutFieldList": [],
- "itemOutFields": "",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [],
- "itemSelectoutFieldList": [],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "text",
- "itemTypeText": "鍗曡鏂囨湰妗�",
- "itemValue": "N",
- "itemValueList": []
- },
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "0",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "isforging",
- "itemFieldWidth": "",
- "itemFieldWidthList": [],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "",
- "itemInObj": "",
- "itemIsEditable": "1",
- "itemIsHidden": "0",
- "itemIsHttpSave": "0",
- "itemIsNavigatorExpand": "",
- "itemIsRequired": "0",
- "itemIsShowFolder": "",
- "itemKeyFieldList": [],
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "鏄惁閿婚摳浠�",
- "itemOR": "",
- "itemOutFieldList": [],
- "itemOutFields": "",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [],
- "itemSelectoutFieldList": [],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "text",
- "itemTypeText": "鍗曡鏂囨湰妗�",
- "itemValue": "",
- "itemValueList": []
- },
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "1",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "processremark",
- "itemFieldWidth": "",
- "itemFieldWidthList": [],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "",
- "itemInObj": "",
- "itemIsEditable": "1",
- "itemIsHidden": "1",
- "itemIsHttpSave": "0",
- "itemIsNavigatorExpand": "",
- "itemIsRequired": "0",
- "itemIsShowFolder": "",
- "itemKeyFieldList": [],
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "宸ヨ壓澶囨敞",
- "itemOR": "",
- "itemOutFieldList": [],
- "itemOutFields": "",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [],
- "itemSelectoutFieldList": [],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "text",
- "itemTypeText": "鍗曡鏂囨湰妗�",
- "itemValue": "",
- "itemValueList": []
- },
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "1",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "materialtype",
- "itemFieldWidth": "",
- "itemFieldWidthList": [],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "",
- "itemInObj": "",
- "itemIsEditable": "1",
- "itemIsHidden": "1",
- "itemIsHttpSave": "0",
- "itemIsNavigatorExpand": "",
- "itemIsRequired": "0",
- "itemIsShowFolder": "",
- "itemKeyFieldList": [],
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "鐗╂枡绫诲瀷",
- "itemOR": "",
- "itemOutFieldList": [],
- "itemOutFields": "",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [],
- "itemSelectoutFieldList": [],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "text",
- "itemTypeText": "鍗曡鏂囨湰妗�",
- "itemValue": "",
- "itemValueList": []
- },
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "1",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "iscruxpart",
- "itemFieldWidth": "",
- "itemFieldWidthList": [],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "",
- "itemInObj": "",
- "itemIsEditable": "1",
- "itemIsHidden": "1",
- "itemIsHttpSave": "0",
- "itemIsNavigatorExpand": "",
- "itemIsRequired": "0",
- "itemIsShowFolder": "",
- "itemKeyFieldList": [],
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "鏄惁鍏抽敭浠�",
- "itemOR": "",
- "itemOutFieldList": [],
- "itemOutFields": "",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [],
- "itemSelectoutFieldList": [],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "select",
- "itemTypeText": "涓嬫媺鑿滃崟",
- "itemValue": "N",
- "itemValueList": [
- "鍚N}",
- "鏄瘂Y}"
- ]
- },
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "1",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "isimportantpart",
- "itemFieldWidth": "",
- "itemFieldWidthList": [],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "",
- "itemInObj": "",
- "itemIsEditable": "1",
- "itemIsHidden": "1",
- "itemIsHttpSave": "0",
- "itemIsNavigatorExpand": "",
- "itemIsRequired": "0",
- "itemIsShowFolder": "",
- "itemKeyFieldList": [],
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "鏄惁閲嶈浠�",
- "itemOR": "",
- "itemOutFieldList": [],
- "itemOutFields": "",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [],
- "itemSelectoutFieldList": [],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "select",
- "itemTypeText": "涓嬫媺鑿滃崟",
- "itemValue": "N",
- "itemValueList": [
- "鏄瘂Y}",
- "鍚N}"
- ]
- }
- ],
- "showCols": "2"
-},
- "typeFlag": 0, // 涓氬姟绫诲瀷0 or 閾炬帴绫诲瀷1
- "typeFlagText": "涓氬姟绫诲瀷鐨勮〃鍗�",// 涓氬姟绫诲瀷鏄剧ず鍊�
- "typeName": "ppart",// 涓氬姟绫诲瀷鍚�
- "viName": "ppartProp_test3", // 瑙嗗浘鍚嶇О
- "viType": 1, // 瑙嗗浘绫诲瀷
- "viTypeText": "琛ㄥ崟" // 瑙嗗浘涓枃鍚嶇О
+// 鍏嬮殕鎺ュ彛
+export function clone(params) {
+ return request({
+ url: "/api/portalVIController/clone",
+ method: "post",
+ data: params
+ })
}
-const dataForm = {
- "id": "",
- "prm": {
- "formQtName": "",
- "prmItemList": [
- {
- "itemAddFilter": "",
- "itemBat": "",
- "itemCols": "",
- "itemCtrlDisplyCol": "",
- "itemCtrlDisplyCondition": "",
- "itemCustomClass": "",
- "itemCut": "",
- "itemDateFormat": "",
- "itemDbl": "3",
- "itemEQ": "",
- "itemEditCondition": "",
- "itemEditableProgram": "",
- "itemField": "",
- "itemFieldWidth": "150,150,100,80,80,80,100,100,100,100,50,100,250",
- "itemFieldWidthList": [
+const cloneObj = {
+ "clonePortalVIDTOList": [{
+ "viName": "ppartProp",//--鍏嬮殕鐨勮〃鍗�/琛ㄦ牸鍚嶇О
+ "typeName": "ppart",//----鍏嬮殕鐨勪笟鍔＄被鍨�,涓衡�溾�� 鍒欎负褰撳墠涓氬姟绫诲瀷
+
+ "typeFlag": "0",//--涓氬姟绫诲瀷锛�0: 涓氬姟绫诲瀷锛�1锛氶摼鎺ョ被鍨�
+//--鍏嬮殕鐨勫璞�
+ "oldPortalVIDTO": {
+ "id": "5963B31F-287B-6B01-3544-D6ECF9CFDC96",
+ "prm": {
+ "formQtName": "",
+ "prmItemList": [
{
- "attributes": {},
- "key": "code",
- "value": "150"
+ "itemAddFilter": "",
+ "itemBat": "",
+ "itemCols": "0",
+ "itemCtrlDisplyCol": "",
+ "itemCtrlDisplyCondition": "",
+ "itemCustomClass": "",
+ "itemCut": "",
+ "itemDateFormat": "",
+ "itemDbl": "",
+ "itemEQ": "",
+ "itemEditCondition": "",
+ "itemEditableProgram": "",
+ "itemField": "anticollaboration",
+ "itemFieldWidth": "",
+ "itemFieldWidthList": [],
+ "itemHrefConf": "",
+ "itemHrefFields": "",
+ "itemHttpPathField": "",
+ "itemHttpVolumnPath": "",
+ "itemImgWH": "",
+ "itemInObj": "",
+ "itemIsEditable": "1",
+ "itemIsHidden": "0",
+ "itemIsHttpSave": "0",
+ "itemIsNavigatorExpand": "",
+ "itemIsRequired": "0",
+ "itemIsShowFolder": "",
+ "itemKeyFieldList": [],
+ "itemKeyFields": "",
+ "itemListTable": "",
+ "itemListTxt": "",
+ "itemListVal": "",
+ "itemName": "鍙嶅崗浣滄爣璇�",
+ "itemOR": "",
+ "itemOutFieldList": [],
+ "itemOutFields": "",
+ "itemOutType": "",
+ "itemPageSize": "",
+ "itemParentFolderName": "",
+ "itemQtName": "",
+ "itemQueryRefFields": "",
+ "itemQuerySql": "",
+ "itemRight": "",
+ "itemRows": "",
+ "itemScript": "",
+ "itemSearchFieldList": [],
+ "itemSelectoutFieldList": [],
+ "itemSeniorQueryBOS": [],
+ "itemSeniorQueryCols": "",
+ "itemSeniorQueryColsCounts": "",
+ "itemShowExpression": "",
+ "itemStyle": "",
+ "itemTips": "",
+ "itemTrim": "",
+ "itemTxf": "",
+ "itemType": "text",
+ "itemTypeText": "鍗曡鏂囨湰妗�",
+ "itemValue": "N",
+ "itemValueList": []
},
{
- "attributes": {},
- "key": "partoid.name",
- "value": "150"
+ "itemAddFilter": "",
+ "itemBat": "",
+ "itemCols": "0",
+ "itemCtrlDisplyCol": "",
+ "itemCtrlDisplyCondition": "",
+ "itemCustomClass": "",
+ "itemCut": "",
+ "itemDateFormat": "",
+ "itemDbl": "",
+ "itemEQ": "",
+ "itemEditCondition": "",
+ "itemEditableProgram": "",
+ "itemField": "holistic",
+ "itemFieldWidth": "",
+ "itemFieldWidthList": [],
+ "itemHrefConf": "",
+ "itemHrefFields": "",
+ "itemHttpPathField": "",
+ "itemHttpVolumnPath": "",
+ "itemImgWH": "",
+ "itemInObj": "",
+ "itemIsEditable": "1",
+ "itemIsHidden": "0",
+ "itemIsHttpSave": "0",
+ "itemIsNavigatorExpand": "",
+ "itemIsRequired": "0",
+ "itemIsShowFolder": "",
+ "itemKeyFieldList": [],
+ "itemKeyFields": "",
+ "itemListTable": "",
+ "itemListTxt": "",
+ "itemListVal": "",
+ "itemName": "鏁翠綋鎬�",
+ "itemOR": "",
+ "itemOutFieldList": [],
+ "itemOutFields": "",
+ "itemOutType": "",
+ "itemPageSize": "",
+ "itemParentFolderName": "",
+ "itemQtName": "",
+ "itemQueryRefFields": "",
+ "itemQuerySql": "",
+ "itemRight": "",
+ "itemRows": "",
+ "itemScript": "",
+ "itemSearchFieldList": [],
+ "itemSelectoutFieldList": [],
+ "itemSeniorQueryBOS": [],
+ "itemSeniorQueryCols": "",
+ "itemSeniorQueryColsCounts": "",
+ "itemShowExpression": "",
+ "itemStyle": "",
+ "itemTips": "",
+ "itemTrim": "",
+ "itemTxf": "",
+ "itemType": "text",
+ "itemTypeText": "鍗曡鏂囨湰妗�",
+ "itemValue": "N",
+ "itemValueList": []
},
{
- "attributes": {},
- "key": "validity",
- "value": "100"
+ "itemAddFilter": "",
+ "itemBat": "",
+ "itemCols": "0",
+ "itemCtrlDisplyCol": "",
+ "itemCtrlDisplyCondition": "",
+ "itemCustomClass": "",
+ "itemCut": "",
+ "itemDateFormat": "",
+ "itemDbl": "",
+ "itemEQ": "",
+ "itemEditCondition": "",
+ "itemEditableProgram": "",
+ "itemField": "isproductbring",
+ "itemFieldWidth": "",
+ "itemFieldWidthList": [],
+ "itemHrefConf": "",
+ "itemHrefFields": "",
+ "itemHttpPathField": "",
+ "itemHttpVolumnPath": "",
+ "itemImgWH": "",
+ "itemInObj": "",
+ "itemIsEditable": "1",
+ "itemIsHidden": "0",
+ "itemIsHttpSave": "0",
+ "itemIsNavigatorExpand": "",
+ "itemIsRequired": "0",
+ "itemIsShowFolder": "",
+ "itemKeyFieldList": [],
+ "itemKeyFields": "",
+ "itemListTable": "",
+ "itemListTxt": "",
+ "itemListVal": "",
+ "itemName": "鎴愬搧甯︽潵",
+ "itemOR": "",
+ "itemOutFieldList": [],
+ "itemOutFields": "",
+ "itemOutType": "",
+ "itemPageSize": "",
+ "itemParentFolderName": "",
+ "itemQtName": "",
+ "itemQueryRefFields": "",
+ "itemQuerySql": "",
+ "itemRight": "",
+ "itemRows": "",
+ "itemScript": "",
+ "itemSearchFieldList": [],
+ "itemSelectoutFieldList": [],
+ "itemSeniorQueryBOS": [],
+ "itemSeniorQueryCols": "",
+ "itemSeniorQueryColsCounts": "",
+ "itemShowExpression": "",
+ "itemStyle": "",
+ "itemTips": "",
+ "itemTrim": "",
+ "itemTxf": "",
+ "itemType": "text",
+ "itemTypeText": "鍗曡鏂囨湰妗�",
+ "itemValue": "N",
+ "itemValueList": []
},
{
- "attributes": {},
- "key": "lcstatus",
- "value": "80"
+ "itemAddFilter": "",
+ "itemBat": "",
+ "itemCols": "0",
+ "itemCtrlDisplyCol": "",
+ "itemCtrlDisplyCondition": "",
+ "itemCustomClass": "",
+ "itemCut": "",
+ "itemDateFormat": "",
+ "itemDbl": "",
+ "itemEQ": "",
+ "itemEditCondition": "",
+ "itemEditableProgram": "",
+ "itemField": "isforging",
+ "itemFieldWidth": "",
+ "itemFieldWidthList": [],
+ "itemHrefConf": "",
+ "itemHrefFields": "",
+ "itemHttpPathField": "",
+ "itemHttpVolumnPath": "",
+ "itemImgWH": "",
+ "itemInObj": "",
+ "itemIsEditable": "1",
+ "itemIsHidden": "0",
+ "itemIsHttpSave": "0",
+ "itemIsNavigatorExpand": "",
+ "itemIsRequired": "0",
+ "itemIsShowFolder": "",
+ "itemKeyFieldList": [],
+ "itemKeyFields": "",
+ "itemListTable": "",
+ "itemListTxt": "",
+ "itemListVal": "",
+ "itemName": "鏄惁閿婚摳浠�",
+ "itemOR": "",
+ "itemOutFieldList": [],
+ "itemOutFields": "",
+ "itemOutType": "",
+ "itemPageSize": "",
+ "itemParentFolderName": "",
+ "itemQtName": "",
+ "itemQueryRefFields": "",
+ "itemQuerySql": "",
+ "itemRight": "",
+ "itemRows": "",
+ "itemScript": "",
+ "itemSearchFieldList": [],
+ "itemSelectoutFieldList": [],
+ "itemSeniorQueryBOS": [],
+ "itemSeniorQueryCols": "",
+ "itemSeniorQueryColsCounts": "",
+ "itemShowExpression": "",
+ "itemStyle": "",
+ "itemTips": "",
+ "itemTrim": "",
+ "itemTxf": "",
+ "itemType": "text",
+ "itemTypeText": "鍗曡鏂囨湰妗�",
+ "itemValue": "",
+ "itemValueList": []
},
{
- "attributes": {},
- "key": "additionalunit",
- "value": "80"
+ "itemAddFilter": "",
+ "itemBat": "",
+ "itemCols": "1",
+ "itemCtrlDisplyCol": "",
+ "itemCtrlDisplyCondition": "",
+ "itemCustomClass": "",
+ "itemCut": "",
+ "itemDateFormat": "",
+ "itemDbl": "",
+ "itemEQ": "",
+ "itemEditCondition": "",
+ "itemEditableProgram": "",
+ "itemField": "processremark",
+ "itemFieldWidth": "",
+ "itemFieldWidthList": [],
+ "itemHrefConf": "",
+ "itemHrefFields": "",
+ "itemHttpPathField": "",
+ "itemHttpVolumnPath": "",
+ "itemImgWH": "",
+ "itemInObj": "",
+ "itemIsEditable": "1",
+ "itemIsHidden": "1",
+ "itemIsHttpSave": "0",
+ "itemIsNavigatorExpand": "",
+ "itemIsRequired": "0",
+ "itemIsShowFolder": "",
+ "itemKeyFieldList": [],
+ "itemKeyFields": "",
+ "itemListTable": "",
+ "itemListTxt": "",
+ "itemListVal": "",
+ "itemName": "宸ヨ壓澶囨敞",
+ "itemOR": "",
+ "itemOutFieldList": [],
+ "itemOutFields": "",
+ "itemOutType": "",
+ "itemPageSize": "",
+ "itemParentFolderName": "",
+ "itemQtName": "",
+ "itemQueryRefFields": "",
+ "itemQuerySql": "",
+ "itemRight": "",
+ "itemRows": "",
+ "itemScript": "",
+ "itemSearchFieldList": [],
+ "itemSelectoutFieldList": [],
+ "itemSeniorQueryBOS": [],
+ "itemSeniorQueryCols": "",
+ "itemSeniorQueryColsCounts": "",
+ "itemShowExpression": "",
+ "itemStyle": "",
+ "itemTips": "",
+ "itemTrim": "",
+ "itemTxf": "",
+ "itemType": "text",
+ "itemTypeText": "鍗曡鏂囨湰妗�",
+ "itemValue": "",
+ "itemValueList": []
},
{
- "attributes": {},
- "key": "distributeunittwo",
- "value": "80"
+ "itemAddFilter": "",
+ "itemBat": "",
+ "itemCols": "1",
+ "itemCtrlDisplyCol": "",
+ "itemCtrlDisplyCondition": "",
+ "itemCustomClass": "",
+ "itemCut": "",
+ "itemDateFormat": "",
+ "itemDbl": "",
+ "itemEQ": "",
+ "itemEditCondition": "",
+ "itemEditableProgram": "",
+ "itemField": "materialtype",
+ "itemFieldWidth": "",
+ "itemFieldWidthList": [],
+ "itemHrefConf": "",
+ "itemHrefFields": "",
+ "itemHttpPathField": "",
+ "itemHttpVolumnPath": "",
+ "itemImgWH": "",
+ "itemInObj": "",
+ "itemIsEditable": "1",
+ "itemIsHidden": "1",
+ "itemIsHttpSave": "0",
+ "itemIsNavigatorExpand": "",
+ "itemIsRequired": "0",
+ "itemIsShowFolder": "",
+ "itemKeyFieldList": [],
+ "itemKeyFields": "",
+ "itemListTable": "",
+ "itemListTxt": "",
+ "itemListVal": "",
+ "itemName": "鐗╂枡绫诲瀷",
+ "itemOR": "",
+ "itemOutFieldList": [],
+ "itemOutFields": "",
+ "itemOutType": "",
+ "itemPageSize": "",
+ "itemParentFolderName": "",
+ "itemQtName": "",
+ "itemQueryRefFields": "",
+ "itemQuerySql": "",
+ "itemRight": "",
+ "itemRows": "",
+ "itemScript": "",
+ "itemSearchFieldList": [],
+ "itemSelectoutFieldList": [],
+ "itemSeniorQueryBOS": [],
+ "itemSeniorQueryCols": "",
+ "itemSeniorQueryColsCounts": "",
+ "itemShowExpression": "",
+ "itemStyle": "",
+ "itemTips": "",
+ "itemTrim": "",
+ "itemTxf": "",
+ "itemType": "text",
+ "itemTypeText": "鍗曡鏂囨湰妗�",
+ "itemValue": "",
+ "itemValueList": []
},
{
- "attributes": {},
- "key": "anticollaboration",
- "value": "100"
+ "itemAddFilter": "",
+ "itemBat": "",
+ "itemCols": "1",
+ "itemCtrlDisplyCol": "",
+ "itemCtrlDisplyCondition": "",
+ "itemCustomClass": "",
+ "itemCut": "",
+ "itemDateFormat": "",
+ "itemDbl": "",
+ "itemEQ": "",
+ "itemEditCondition": "",
+ "itemEditableProgram": "",
+ "itemField": "iscruxpart",
+ "itemFieldWidth": "",
+ "itemFieldWidthList": [],
+ "itemHrefConf": "",
+ "itemHrefFields": "",
+ "itemHttpPathField": "",
+ "itemHttpVolumnPath": "",
+ "itemImgWH": "",
+ "itemInObj": "",
+ "itemIsEditable": "1",
+ "itemIsHidden": "1",
+ "itemIsHttpSave": "0",
+ "itemIsNavigatorExpand": "",
+ "itemIsRequired": "0",
+ "itemIsShowFolder": "",
+ "itemKeyFieldList": [],
+ "itemKeyFields": "",
+ "itemListTable": "",
+ "itemListTxt": "",
+ "itemListVal": "",
+ "itemName": "鏄惁鍏抽敭浠�",
+ "itemOR": "",
+ "itemOutFieldList": [],
+ "itemOutFields": "",
+ "itemOutType": "",
+ "itemPageSize": "",
+ "itemParentFolderName": "",
+ "itemQtName": "",
+ "itemQueryRefFields": "",
+ "itemQuerySql": "",
+ "itemRight": "",
+ "itemRows": "",
+ "itemScript": "",
+ "itemSearchFieldList": [],
+ "itemSelectoutFieldList": [],
+ "itemSeniorQueryBOS": [],
+ "itemSeniorQueryCols": "",
+ "itemSeniorQueryColsCounts": "",
+ "itemShowExpression": "",
+ "itemStyle": "",
+ "itemTips": "",
+ "itemTrim": "",
+ "itemTxf": "",
+ "itemType": "select",
+ "itemTypeText": "涓嬫媺鑿滃崟",
+ "itemValue": "N",
+ "itemValueList": [
+ "鍚N}",
+ "鏄瘂Y}"
+ ]
},
{
- "attributes": {},
- "key": "holistic",
- "value": "100"
- },
- {
- "attributes": {},
- "key": "scale",
- "value": "100"
- },
- {
- "attributes": {},
- "key": "source",
- "value": "100"
- },
- {
- "attributes": {},
- "key": "isforging",
- "value": "50"
- },
- {
- "attributes": {},
- "key": "isproductbring",
- "value": "100"
- },
- {
- "attributes": {},
- "key": "processremark",
- "value": "250"
+ "itemAddFilter": "",
+ "itemBat": "",
+ "itemCols": "1",
+ "itemCtrlDisplyCol": "",
+ "itemCtrlDisplyCondition": "",
+ "itemCustomClass": "",
+ "itemCut": "",
+ "itemDateFormat": "",
+ "itemDbl": "",
+ "itemEQ": "",
+ "itemEditCondition": "",
+ "itemEditableProgram": "",
+ "itemField": "isimportantpart",
+ "itemFieldWidth": "",
+ "itemFieldWidthList": [],
+ "itemHrefConf": "",
+ "itemHrefFields": "",
+ "itemHttpPathField": "",
+ "itemHttpVolumnPath": "",
+ "itemImgWH": "",
+ "itemInObj": "",
+ "itemIsEditable": "1",
+ "itemIsHidden": "1",
+ "itemIsHttpSave": "0",
+ "itemIsNavigatorExpand": "",
+ "itemIsRequired": "0",
+ "itemIsShowFolder": "",
+ "itemKeyFieldList": [],
+ "itemKeyFields": "",
+ "itemListTable": "",
+ "itemListTxt": "",
+ "itemListVal": "",
+ "itemName": "鏄惁閲嶈浠�",
+ "itemOR": "",
+ "itemOutFieldList": [],
+ "itemOutFields": "",
+ "itemOutType": "",
+ "itemPageSize": "",
+ "itemParentFolderName": "",
+ "itemQtName": "",
+ "itemQueryRefFields": "",
+ "itemQuerySql": "",
+ "itemRight": "",
+ "itemRows": "",
+ "itemScript": "",
+ "itemSearchFieldList": [],
+ "itemSelectoutFieldList": [],
+ "itemSeniorQueryBOS": [],
+ "itemSeniorQueryCols": "",
+ "itemSeniorQueryColsCounts": "",
+ "itemShowExpression": "",
+ "itemStyle": "",
+ "itemTips": "",
+ "itemTrim": "",
+ "itemTxf": "",
+ "itemType": "select",
+ "itemTypeText": "涓嬫媺鑿滃崟",
+ "itemValue": "N",
+ "itemValueList": [
+ "鏄瘂Y}",
+ "鍚N}"
+ ]
}
],
- "itemHrefConf": "",
- "itemHrefFields": "",
- "itemHttpPathField": "",
- "itemHttpVolumnPath": "",
- "itemImgWH": "0,0",
- "itemInObj": "A5791895-83D1-D63F-40C4-26705FF3A2BB",
- "itemIsEditable": "",
- "itemIsHidden": "",
- "itemIsHttpSave": "",
- "itemIsNavigatorExpand": "false",
- "itemIsRequired": "",
- "itemIsShowFolder": "false",
- "itemKeyFieldList": null,
- "itemKeyFields": "",
- "itemListTable": "",
- "itemListTxt": "",
- "itemListVal": "",
- "itemName": "",
- "itemOR": "",
- "itemOutFieldList": [
- "code",
- "partoid.name",
- "validity",
- "lcstatus",
- "additionalunit",
- "distributeunittwo",
- "anticollaboration",
- "holistic",
- "scale",
- "source",
- "isforging",
- "isproductbring",
- "processremark"
- ],
- "itemOutFields": "code,partoid.name,validity,lcstatus,additionalunit,distributeunittwo,anticollaboration,holistic,scale,source,isforging,isproductbring,processremark",
- "itemOutType": "",
- "itemPageSize": "",
- "itemParentFolderName": "",
- "itemQtName": "queryppartbypbom",
- "itemQueryRefFields": "",
- "itemQuerySql": "",
- "itemRight": "",
- "itemRows": "",
- "itemScript": "",
- "itemSearchFieldList": [
- "code",
- "partoid.name",
- "validity",
- "lcstatus",
- "additionalunit",
- "distributeunittwo",
- "anticollaboration",
- "holistic",
- "scale",
- "source",
- "isforging",
- "isproductbring",
- "processremark"
- ],
- "itemSelectoutFieldList": [
- "produceroute",
- "hotsurfaceroute"
- ],
- "itemSeniorQueryBOS": [],
- "itemSeniorQueryCols": "",
- "itemSeniorQueryColsCounts": "",
- "itemShowExpression": "",
- "itemStyle": "",
- "itemTips": "",
- "itemTrim": "",
- "itemTxf": "",
- "itemType": "",
- "itemTypeText": "",
- "itemValue": "",
- "itemValueList": []
- }
- ],
- "showCols": "3"
- },
- "typeFlag": 0,
- "typeFlagText": "涓氬姟绫诲瀷鐨勮〃鏍�",
- "typeName": "ppart",
- "viName": "ppart_auditlist_test",
- "viType": 0,
- "viTypeText": "琛ㄦ牸"
+ "showCols": "2"
+ },
+ "typeFlag": 0,
+ "typeFlagText": "涓氬姟绫诲瀷鐨勮〃鍗�",
+ "typeName": "ppart",
+ "viName": "ppartProp",
+ "viType": 1,
+ "viTypeText": "琛ㄥ崟"
+ }
+ }]
}
+
diff --git a/Source/plt-web/plt-web-ui/src/api/system/fileManager/index.vue b/Source/plt-web/plt-web-ui/src/api/system/fileManager/index.vue
new file mode 100644
index 0000000..aecd46e
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/api/system/fileManager/index.vue
@@ -0,0 +1,155 @@
+<template>
+ <!--鏂囦欢鏌滅鐞�-->
+ <basic-container>
+ <avue-crud
+ ref="fileCrud"
+ :data="tableData"
+ :option="option"
+ :page.sync="page"
+ :table-loading="tableLoading"
+ @on-load="getTableList"
+ @refresh-change="handleRefresh"
+ @search-change="handleSearch"
+ @search-reset="handleReset"
+ @size-change="sizeChange"
+ @current-change="currentChange"
+ >
+ <template slot="menuLeft" slot-scope="scope">
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="allDelHandler">瀵煎嚭</el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import basicOption from "@/util/basic-option";
+import {getLogListByContion} from "@/api/system/log/logBasic";
+
+export default {
+ name: "index",
+ data: function () {
+ return {
+ tableLoading: false,
+ tableData: [],
+ option: {
+ ...basicOption,
+ addBtn:false,
+ editBtn: false,
+ delBtn: false,
+ calcHeight: -60,
+ align:'left',
+ headerAlign:'center',
+ menu:false,
+ searchMenuSpan: 6,
+ searchIcon:false,
+ column: [
+ {
+ label: '鐢ㄦ埛鍚�',
+ prop: 'truename',
+ search:true,
+ searchSpan: 4,
+ searchLabel:'鎿嶄綔鐢ㄦ埛',
+ type:'select',
+ dicUrl:'/api/loginBasicController/getOperatingUsers',
+ sortable:true,
+ width: 150
+ }, {
+ label: '濮撳悕',
+ prop: 'username',
+ sortable:true,
+ width: 150
+ },{
+ label: '鐢ㄦ埛IP',
+ prop: 'userIp',
+ search:true,
+ searchSpan: 4,
+ sortable:true,
+ width: 150
+ },{
+ label: '妯″潡',
+ prop: 'moduleName',
+ sortable:true,
+ overHidden: true,
+ },{
+ label: '鎿嶄綔',
+ prop: 'type',
+ sortable:true,
+ width: 150
+ },{
+ label: '鏃堕棿',
+ prop: 'date',
+ type:'date',
+ search:true,
+ searchOrder: 1,
+ searchSpan: 8,
+ searchRange: true,
+ searchLabel:'鏌ヨ鏃ユ湡',
+ valueFormat:'yyyy-MM-dd',
+ width: 160
+ },{
+ label: '鎻忚堪',
+ prop: 'result',
+ overHidden: true,
+ width:380,
+ },
+ ]
+ },
+ page: {
+ currentPage: 1,
+ pageSize: 50,
+ total: 0,
+ pageSizes: [10, 30, 50, 100],
+ },
+ searchParams: {}
+ }
+ },
+ methods: {
+ // 琛ㄦ牸璇锋眰
+ getTableList() {
+ this.tableLoading = true;
+ getLogListByContion(this.page.currentPage, this.page.pageSize, {'logType':this.$route.query.logType,...this.searchParams}).then(res => {
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ this.tableLoading = false;
+ })
+ },
+
+ // 鎼滅储鏌ヨ
+ handleSearch(params, done) {
+ this.searchParams = {
+ userName:params.truename,
+ ipText:params.userIp,
+ startDate:params.date[0],
+ endDate:params.date[1]
+ };
+
+ this.getTableList();
+ done();
+ },
+
+ // 閲嶇疆鎼滅储鏉′欢
+ handleReset() {
+ this.searchParams = {};
+ this.getTableList();
+ },
+
+ // 鏉℃暟
+ sizeChange(val) {
+ this.page.pageSize = val;
+ },
+
+ // 椤电爜
+ currentChange(val) {
+ this.page.currentPage = val;
+ },
+
+ handleRefresh(){
+ this.getTableList();
+ }
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/plt-web/plt-web-ui/src/api/system/log/logBasic.js b/Source/plt-web/plt-web-ui/src/api/system/log/logBasic.js
new file mode 100644
index 0000000..47160ae
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/api/system/log/logBasic.js
@@ -0,0 +1,57 @@
+import request from '@/router/axios';
+
+// 鏃ュ織淇濆瓨鏈熼檺鏌ヨ
+export function getPeroid(params) {
+ return request({
+ url: "/api/loginBasicController/getPeroid",
+ method: "get",
+ params
+ });
+}
+// 淇濆瓨鏈熼檺淇濆瓨
+export function savePeriod(params) {
+ return request({
+ url: "/api/loginBasicController/savePeriod",
+ method: "post",
+ params: params
+ });
+}
+export function deleteLog(params) {
+ return request({
+ url: "/api/loginBasicController/deleteLog",
+ method: "delete",
+ params
+ })
+}
+
+//鑾峰彇鎿嶄綔鐢ㄦ埛
+export function getOperatingUsers( params) {
+ return request({
+ url: "/api/loginBasicController/getOperatingUsers",
+ method: "get",
+ params
+ });
+}
+
+export function getLogListByContion(page, limit, params) {
+ return request({
+ url: "/api/loginBasicController/getLogListByContion",
+ method: "post",
+ data: {
+ 'pageNo':page,
+ 'pageSize':limit,
+ ...params
+ }
+ });
+}
+
+// 瀵煎嚭
+export const exportLog = (params) => {
+ return request({
+ url: '/api/loginBasicController/exportLog',
+ method: 'get',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'},
+ responseType: 'blob',
+ params
+ })
+}
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
index 9e71cbf..4c265d2 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
@@ -274,7 +274,7 @@
roleId: this.nodeRow.oid,
type: this.type,
context: this.context,
- selectTreeList: data
+ selectTreeList: selectTreeList
}
authorizedUI(formData).then(res => {
if (res.data.success) {
diff --git a/Source/plt-web/plt-web-ui/src/views/fileManage/index.vue b/Source/plt-web/plt-web-ui/src/views/fileManage/index.vue
deleted file mode 100644
index 093967c..0000000
--- a/Source/plt-web/plt-web-ui/src/views/fileManage/index.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
- <!--鏂囦粨绠＄悊椤甸潰-->
- <basic-container>
-
- </basic-container>
-</template>
-
-<script>
-export default {
- name: "index"
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
index 9c6c63e..873a1b4 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
@@ -718,34 +718,6 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
-
- .headerCon {
- .el-button {
- width: 82px;
- }
- }
-}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
}
.smallBtn {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
index e5e94e5..f92c433 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
@@ -55,12 +55,6 @@
<el-input v-model="topName" placeholder="璇疯緭鍏ュ唴瀹�" size="mini" style="margin-right: 10px;"></el-input>
<el-button plain size="mini" type="success" @click="nameSearchHandler">鏌ヨ</el-button>
</span>
- <span style="display: flex; align-items: center;">
- <p
- style="display: flex; align-items: center; margin: 0 10px 0 0;flex-shrink: 0;font-size: 14px">鍏嬮殕鐩爣锛�</p>
- <el-input v-model="input" placeholder="璇疯緭鍏ュ唴瀹�" size="mini" style="margin-right: 10px;"></el-input>
- <el-button plain size="mini" type="success">鍏嬮殕鐩爣</el-button>
- </span>
</div>
</template>
<template slot="menu" slot-scope="scope">
@@ -72,12 +66,44 @@
</avue-crud>
</basic-container>
</el-main>
- <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :treeRadio="treeRadio" :editRow="editRow"></form-dialog>
+ <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio"></form-dialog>
<table-dialog ref="tableDialog" :TreeNodeRow="this.nodeRow" :treeRadio="treeRadio"
@updataTable="getRightPortalVIDatas"></table-dialog>
<!-- 瀵煎叆 -->
<upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
@updata="getRightPortalVIDatas"></upload-file>
+ <el-dialog
+ v-dialogDrag
+ :visible.sync="cloneVisible"
+ append-to-body="true"
+ class="avue-dialog"
+ title="鍏嬮殕"
+ width="50%">
+ <basic-container>
+ <div ref="TreeBox" style="height: calc(100vh - 294px);!important;">
+ <!-- 宸︿晶鏍� -->
+ <div style="height: calc(100vh - 370px);">
+ <div style="margin-bottom: 10px;display: flex;justify-content: center">
+ <el-radio v-model="cloneTreeRadio" label="0" @input="cloneTreeRadioChange">涓氬姟绫诲瀷鏍�</el-radio>
+ <el-radio v-model="cloneTreeRadio" label="1" @input="cloneTreeRadioChange">閾炬帴绫诲瀷鏍�</el-radio>
+ </div>
+ <avue-tree ref="cloneTree" v-loading="cloneTreeLoading" :data="cloneTreeData" :option="treeOption"
+ @node-click="cloneTreeNodeClick">
+ <span slot-scope="{ node, data }" class="el-tree-node__label">
+ <span style="font-size: 15px">
+ <i class="el-icon-s-promotion"></i>
+ {{ (node || {}).label }}
+ </span>
+ </span>
+ </avue-tree>
+ </div>
+ </div>
+ </basic-container>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="cloneVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="cloneSaveHandler">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</el-container>
</template>
@@ -85,7 +111,7 @@
import basicOption from "@/util/basic-option";
import FormDialog from "@/views/modelingMenu/ui/formDefine/components/formDialog";
import TableDialog from "@/views/modelingMenu/ui/formDefine/components/tableDialog";
-import {gridPortalVIDatas, getPortalVIById, deleteByIds, exportExcel} from "@/api/UI/formDefine/api";
+import {gridPortalVIDatas, getPortalVIById, deleteByIds, exportExcel, clone} from "@/api/UI/formDefine/api";
import {getBizTypes} from "@/api/modeling/businessType/api";
import {gridLink} from "@/api/modeling/linkType/api";
import func from "@/util/func";
@@ -95,6 +121,11 @@
components: {FormDialog, TableDialog},
data() {
return {
+ cloneTreeNode: {},
+ cloneTreeRadio: '0',
+ cloneTreeData: [],
+ cloneTreeLoading: false,
+ cloneVisible: false,
tipList: [
"瀵煎叆涓氬姟绫诲瀷鍚嶇О涓嶅彲涓虹┖",
"瀵煎叆鍚嶇О涓嶅彲涓虹┖涓斿悕绉板彧鑳戒负鑻辨枃瀛楁瘝",
@@ -149,7 +180,7 @@
},
dbClickList: [],
defaultData: [], // 鐢ㄤ簬鏌ヨ鎭㈠鍘熷鍊�,
- editRow:{},
+ editRow: {},
}
},
created() {
@@ -190,7 +221,7 @@
this.treeData = data;
this.treeLoading = false;
}).catch(error => {
- loading.close();
+ this.treeLoading = false;
});
},
@@ -280,7 +311,7 @@
// 缂栬緫鎸夐挳
editBtnClick(row) {
- console.log('row',row);
+ console.log('row', row);
// 琛ㄦ牸
if (row.viType === 0) {
const params = {
@@ -381,12 +412,13 @@
// 鍚嶇О鏌ヨ
nameSearchHandler() {
if (!this.topName) {
- this.data = this.defaultData;
+ this.getRightPortalVIDatas();
return;
}
- const list = this.data.filter(item => item.viName.includes(this.topName.trim()));
+ const list = this.defaultData.filter(item => item.viName.includes(this.topName.trim()));
this.data = list;
+ this.page.total = this.data.length;
},
// 鍒犻櫎鎸夐挳
@@ -457,7 +489,7 @@
this.$refs.upload.visible = true;
},
- // 瀵煎嚭
+ // 鍏嬮殕
copyClickHandler() {
if (this.selectList.length <= 0) {
this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
@@ -468,6 +500,103 @@
this.$message.error('鍙兘閫夋嫨涓�鏉℃暟鎹�');
return;
}
+
+ this.cloneVisible = true;
+ this.cloneTreeLoading = true;
+ getBizTypes().then(res => {
+ const data = res.data.data.map(item => {
+ this.processChildren(item); // 澶勭悊姣忎釜鑺傜偣
+ item.attributes.id = item.attributes.id;
+ return item.attributes; // 杩斿洖澶勭悊鍚庣殑 attributes
+ });
+ this.cloneTreeData = data;
+ this.cloneTreeLoading = false;
+ }).catch(error => {
+ this.cloneTreeLoading = false;
+ });
+ },
+
+ // 鍏嬮殕鏍戠偣鍑�
+ cloneTreeNodeClick(row) {
+ console.log(row);
+ this.cloneTreeNode = row;
+ },
+
+ // 鍏嬮殕鏍戠被鍨嬪垏鎹�
+ cloneTreeRadioChange(val) {
+ this.cloneTreeLoading = true;
+ if (val === "0") {
+ getBizTypes().then(res => {
+ const data = res.data.data.map(item => {
+ this.processChildren(item); // 澶勭悊姣忎釜鑺傜偣
+ item.attributes.id = item.attributes.id;
+ return item.attributes; // 杩斿洖澶勭悊鍚庣殑 attributes
+ });
+ this.cloneTreeData = data;
+ this.cloneTreeLoading = false;
+ });
+ } else {
+ gridLink().then(res => {
+ const data = res.data.data.map(item => {
+ item.id = item.name;
+ return item;
+ });
+ this.cloneTreeData = data;
+ this.cloneTreeLoading = false;
+ })
+ }
+ },
+
+ // 鏌ヨ琛ㄦ牸鏁版嵁璇︽儏
+ searchDetail() {
+ return new Promise((resolve, reject) => {
+ const params = {
+ id: this.selectList[0].id,
+ viType: this.selectList[0].viType
+ };
+ getPortalVIById(params).then(res => {
+ const obj = res.data.obj;
+ resolve(obj);
+ }).catch(error => {
+ reject(error);
+ });
+ });
+ },
+
+ // 鍏嬮殕淇濆瓨
+ async cloneSaveHandler() {
+ if (func.isEmptyObject(this.cloneTreeNode)) {
+ this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹繘琛屽厠闅�');
+ return;
+ }
+ const obj = await this.searchDetail();
+ this.$prompt('璇疯緭鍏ュ厠闅嗘枃浠跺悕绉�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ }).then(({value}) => {
+ console.log(obj);
+ const params = {
+ clonePortalVIDTOList: [
+ {
+ viName: value,
+ typeName: this.cloneTreeRadio === '0' ? this.cloneTreeNode.id : this.cloneTreeNode.name,
+ typeFlag: this.cloneTreeRadio,
+ oldPortalVIDTO: {...obj}
+ }
+ ],
+ }
+ clone(params).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success('鍏嬮殕鎴愬姛');
+ this.cloneVisible = false;
+ }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '鍙栨秷杈撳叆'
+ });
+ });
}
}
}
diff --git a/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue b/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue
new file mode 100644
index 0000000..ae1270c
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/views/system/fileCab/index.vue
@@ -0,0 +1,138 @@
+<template>
+ <!--鏂囦粨绠＄悊椤甸潰-->
+ <basic-container>
+ <avue-crud
+ ref="logCrud"
+ :data="tableData"
+ :option="option"
+ :page.sync="page"
+ :table-loading="tableLoading"
+ @on-load="getTableList"
+ @refresh-change="handleRefresh"
+ @search-change="handleSearch"
+ @search-reset="handleReset"
+ @size-change="sizeChange"
+ @current-change="currentChange"
+ >
+ <template slot="menuLeft" slot-scope="scope">
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import {exportLog, getLogListByContion} from "@/api/system/log/logBasic";
+import func from "@/util/func";
+import basicOption from "@/util/basic-option";
+
+export default {
+ name: "index",
+ data: function () {
+ return {
+ tableLoading: false,
+ tableData: [],
+ option: {
+ ...basicOption,
+ addBtn:false,
+ editBtn: false,
+ delBtn: false,
+ calcHeight: -60,
+ align:'left',
+ headerAlign:'center',
+ menu:false,
+ searchMenuSpan: 6,
+ searchIcon:false,
+ column: [
+ {
+ label: '鍗峰悕',
+ prop: 'truename',
+ width: 300
+ }, {
+ label: '鏈哄櫒绫诲瀷',
+ prop: 'username',
+ width: 150
+ },{
+ label: '璺緞鍚嶇О',
+ prop: 'userIp'
+ },{
+ label: '棣栭�夎矾寰�',
+ prop: 'moduleName',
+ },{
+ label: '鏈嶅姟鍣�',
+ prop: 'type',
+ width: 150
+ },{
+ label: '鍗锋湇鍔�',
+ prop: 'date',
+ }]
+ },
+ page: {
+ currentPage: 1,
+ pageSize: 50,
+ total: 0,
+ pageSizes: [10, 30, 50, 100],
+ },
+ searchParams: {}
+ }
+ },
+ methods: {
+ // 琛ㄦ牸璇锋眰
+ getTableList() {
+ this.tableLoading = true;
+ getLogListByContion(this.page.currentPage, this.page.pageSize, {'logType':this.$route.query.logType,...this.searchParams}).then(res => {
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ this.tableLoading = false;
+ })
+ },
+
+ // 鎼滅储鏌ヨ
+ handleSearch(params, done) {
+ this.searchParams = {
+ userName:params.truename,
+ ipText:params.userIp,
+ startDate:params.date[0],
+ endDate:params.date[1]
+ };
+
+ this.getTableList();
+ done();
+ },
+
+ // 閲嶇疆鎼滅储鏉′欢
+ handleReset() {
+ this.searchParams = {};
+ this.getTableList();
+ },
+
+ // 鏉℃暟
+ sizeChange(val) {
+ this.page.pageSize = val;
+ },
+
+ // 椤电爜
+ currentChange(val) {
+ this.page.currentPage = val;
+ },
+
+ handleRefresh(){
+ this.getTableList();
+ },
+ // 瀵煎嚭
+ exportClickHandler() {
+ const loading = this.$loading({});
+ exportLog().then(res => {
+ func.downloadFileByBlobHandler(res);
+ this.createdLoading = false
+ this.$message.success('瀵煎嚭鎴愬姛');
+ loading.close();
+ })
+ },
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/system/log/basicConf.vue b/Source/plt-web/plt-web-ui/src/views/system/log/basicConf.vue
new file mode 100644
index 0000000..c2c724d
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/views/system/log/basicConf.vue
@@ -0,0 +1,138 @@
+<template>
+ <!--鏃ュ織鍩虹閰嶇疆-->
+ <el-container>
+ <el-main>
+ <basic-container>
+ <div style="margin: 0 0 10px 20px">
+ <el-button v-if="form.delType==0" icon="el-icon-check" size="small" type="primary" @click="saveHandler">淇濆瓨</el-button>
+ <el-button v-else icon="el-icon-delete" size="small" type="danger" @click="delHandler">鍒犻櫎</el-button>
+ </div>
+ <avue-form ref="form" v-model="form" :option="formOption"></avue-form>
+ <div class="tip">
+ <div style="color: #D40000;margin-left: 0;">鏃ュ織鍩虹閰嶇疆璇存槑锛�</div>
+ <div>1銆佹棩蹇楀垹闄ゅ寘鍚墜鍔ㄥ垹闄ゅ拰鑷姩鍒犻櫎銆�</div>
+ <div>2銆佽嚜鍔ㄥ垹闄や細鏍规嵁鏃ュ織鐨勪繚瀛樻湡闄愭潵杩涜鏃ュ織鍒犻櫎銆�</div>
+ <div>3銆佹墜鍔ㄥ垹闄ゆ牴鎹�夊畾鐨勬椂闂存潵杩涜鏃ュ織鍒犻櫎銆�</div>
+ </div>
+ </basic-container>
+ </el-main>
+
+ </el-container>
+</template>
+
+<script>
+import {getPeroid,savePeriod,deleteLog} from "@/api/system/log/logBasic";
+export default {
+ name: "basicConf",
+ data: function () {
+ return {
+ form:{
+ period:'',
+ },
+ periodData:[],
+ formOption:{
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '鏃ュ織鍒犻櫎',
+ prop: 'delType',
+ span: 24,
+ labelWidth:120,
+ type: 'radio',
+ value: 0,
+ dicData: [
+ { label: '鑷姩鍒犻櫎', value: 0 },
+ { label: '鎵嬪姩鍒犻櫎', value: 1 },
+ ]
+ }, {
+ label: '淇濆瓨鏃ユ湡',
+ prop: 'period',
+ type: 'select',
+ labelWidth:120,
+ dicData: this.periodData,
+ props:{
+ label:'value',
+ value:'code'
+ },
+ rules: [{
+ required: true,
+ message: "璇烽�夋嫨淇濆瓨鏃ユ湡",
+ trigger: "blur"
+ }]
+ }, {
+ label: '璇烽�夋嫨鏃ユ湡',
+ prop: 'deleteDate',
+ type: 'date',
+ valueFormat:'yyyy-MM-dd',
+ labelWidth:120,
+ display: false,
+ rules: [{
+ required: true,
+ message: "璇烽�夋嫨鏃ユ湡",
+ trigger: "blur"
+ }]
+ }]
+ },
+ }
+ },
+ created() {
+ this.getPeroid();
+ },
+ watch: {
+ 'form.delType': {
+ handler(newval) {
+ if (newval ==0) {
+ this.formOption.column[1].display=true;
+ this.formOption.column[2].display=false;
+ }else {
+ this.formOption.column[1].display=false;
+ this.formOption.column[2].display=true;
+ }
+ }
+ },
+ },
+ methods:{
+ getPeroid:function (){
+ getPeroid().then(res => {
+ this.$refs.form.updateDic('period', res.data.data);
+ this.periodData=res.data.data;
+ this.form.period=res.data.data.filter(item=>{
+ return item.choose
+ })[0].code
+ }).catch(error => {
+ })
+ },
+ saveHandler:function (){
+ savePeriod({'period':this.form.period}).then(res => {
+ if (res.data.success) {
+ this.$message.success('淇濆瓨鎴愬姛')
+ }
+ });
+ },
+ delHandler() {
+ this.$refs.form.validate((valid,done) => {
+ if(valid){
+ deleteLog({'deleteDate':this.form.deleteDate}).then(res => {
+ if (res.data.success) {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ }
+ });
+ done()
+ }
+ })
+ },
+ }
+}
+</script>
+
+<style scoped>
+.tip{
+ font-size: 12px;
+ line-height: 24px;
+ color: #909399;
+ margin: 0 0 10px 20px;
+}
+.tip div{
+ margin-left: 30px;
+}
+</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/system/log/index.vue b/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
new file mode 100644
index 0000000..9b02091
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
@@ -0,0 +1,170 @@
+<template>
+ <basic-container>
+ <avue-crud
+ ref="logCrud"
+ :data="tableData"
+ :option="option"
+ :page.sync="page"
+ :table-loading="tableLoading"
+ @on-load="getTableList"
+ @refresh-change="handleRefresh"
+ @search-change="handleSearch"
+ @search-reset="handleReset"
+ @size-change="sizeChange"
+ @current-change="currentChange"
+ >
+ <template slot="menuLeft" slot-scope="scope">
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+import basicOption from "@/util/basic-option";
+import {getLogListByContion,getOperatingUsers,exportLog} from "@/api/system/log/logBasic";
+import func from "@/util/func";
+
+export default {
+ name: "index",
+ data: function () {
+ return {
+ tableLoading: false,
+ tableData: [],
+ option: {
+ ...basicOption,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ calcHeight: -60,
+ align: 'left',
+ headerAlign: 'center',
+ menu: false,
+ searchMenuSpan: 6,
+ searchIcon: false,
+ column: [
+ {
+ label: '鐢ㄦ埛鍚�',
+ prop: 'truename',
+ search: true,
+ searchSpan: 4,
+ searchLabel: '鎿嶄綔鐢ㄦ埛',
+ type: 'select',
+ dicUrl: '/api/loginBasicController/getOperatingUsers',
+ sortable: true,
+ width: 150
+ }, {
+ label: '濮撳悕',
+ prop: 'username',
+ sortable: true,
+ width: 150
+ }, {
+ label: '鐢ㄦ埛IP',
+ prop: 'userIp',
+ search: true,
+ searchSpan: 4,
+ sortable: true,
+ width: 150
+ }, {
+ label: '妯″潡',
+ prop: 'moduleName',
+ sortable: true,
+ overHidden: true,
+ }, {
+ label: '鎿嶄綔',
+ prop: 'type',
+ sortable: true,
+ width: 150
+ }, {
+ label: '鏃堕棿',
+ prop: 'date',
+ type: 'date',
+ search: true,
+ searchOrder: 1,
+ searchSpan: 8,
+ searchRange: true,
+ searchLabel: '鏌ヨ鏃ユ湡',
+ valueFormat: 'yyyy-MM-dd',
+ width: 160
+ }, {
+ label: '鎻忚堪',
+ prop: 'result',
+ overHidden: true,
+ width: 380,
+ },
+ ]
+ },
+ page: {
+ currentPage: 1,
+ pageSize: 50,
+ total: 0,
+ pageSizes: [10, 30, 50, 100],
+ },
+ searchParams: {}
+ }
+ },
+ watch: {
+ $route(to, from) {
+ this.getTableList();
+ }
+ },
+ methods: {
+ // 琛ㄦ牸璇锋眰
+ getTableList() {
+ this.tableLoading = true;
+ getLogListByContion(this.page.currentPage, this.page.pageSize, {'logType': this.$route.query.logType, ...this.searchParams}).then(res => {
+ this.tableData = res.data.data;
+ this.page.total = res.data.total;
+ this.tableLoading = false;
+ })
+ },
+
+ // 鎼滅储鏌ヨ
+ handleSearch(params, done) {
+ this.searchParams = {
+ userName: params.truename,
+ ipText: params.userIp,
+ startDate: params.date[0],
+ endDate: params.date[1]
+ };
+
+ this.getTableList();
+ done();
+ },
+
+ // 閲嶇疆鎼滅储鏉′欢
+ handleReset() {
+ this.searchParams = {};
+ this.getTableList();
+ },
+
+ // 鏉℃暟
+ sizeChange(val) {
+ this.page.pageSize = val;
+ },
+
+ // 椤电爜
+ currentChange(val) {
+ this.page.currentPage = val;
+ },
+
+ handleRefresh() {
+ this.getTableList();
+ },
+ // 瀵煎嚭
+ exportClickHandler() {
+ const loading = this.$loading({});
+ exportLog().then(res => {
+ func.downloadFileByBlobHandler(res);
+ this.createdLoading = false
+ this.$message.success('瀵煎嚭鎴愬姛');
+ loading.close();
+ })
+ },
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
index ee786da..f51774b 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
@@ -238,9 +238,7 @@
this.tableData = data;
this.page.total = res.data.total;
this.tableLoading = false;
- }).catch(err => {
- this.$message.error(err)
- });
+ })
},
// 琛ㄦ牸鍙充晶鍒锋柊鍥炬爣
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index a36c78d..cb210be 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -2,8 +2,8 @@
<el-container v-loading="createdLoading">
<el-aside>
<basic-container>
- <div style="max-height: calc(100vh - 170px);overflow: auto">
- <avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <div style="max-height: calc(100vh - 150px);overflow: auto">
+ <avue-tree :key="refresh" node-key="id" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
<i class="el-icon-s-promotion"></i>
@@ -17,7 +17,7 @@
<el-main>
<basic-container>
- <el-form ref="form" :model="form" label-width="85px" style="height: 79vh">
+ <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
<span v-if="form.childType !== 0">
<el-form-item label="妯″潡鍚嶏細">
<el-input v-model="form.name" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
@@ -202,6 +202,7 @@
addStatus: false,
editStatus: false,
nodeRow: {},
+ currentClickNode:null,
form: {},
treeData: [],
treeOption: {
@@ -255,9 +256,10 @@
},
methods: {
// 鏍戣鐐瑰嚮
- nodeClick(row) {
+ nodeClick(row,node) {
this.form = {...row};
this.nodeRow = {...row};
+ this.currentClickNode=node;
this.addStatus = false;
this.editStatus = false;
},
@@ -312,7 +314,7 @@
this.addStatus = false;
// this.resetFormValue();
this.form.childType = null;
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('add')
}
})
},
@@ -356,7 +358,7 @@
this.editStatus = false;
// this.resetFormValue();
this.form.childType = null;
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('edit')
}
})
},
@@ -371,7 +373,7 @@
delModule(this.form).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.resetFormValue();
+ this.handleRefreshTree('del')
this.addStatus = false;
this.editStatus = false;
}
@@ -389,8 +391,6 @@
exportFunctionSql({isFunction: true}).then(res => {
func.downloadFileByBlobHandler(res);
this.$message.success('瀵煎嚭鎴愬姛');
- }).catch(err => {
- this.$message.error(err);
});
},
@@ -425,12 +425,11 @@
}
})
addOperationType(list).then(res => {
- console.log(res)
if (res.data.code === 200) {
this.methodsVisble = false;
this.$message.success(res.data.msg);
this.form.childType = null;
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('add') // 鍒锋柊宸︿晶鏍�
}
})
},
@@ -460,7 +459,7 @@
updateAlias(params).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('edit')
}
})
},
@@ -480,7 +479,7 @@
console.log(res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.resetFormValue();
+ this.handleRefreshTree('del');
}
})
}).catch(() => {
@@ -506,6 +505,23 @@
// 瀵煎叆
upLoadClickHandler() {
this.$refs.upload.visible = true;
+ },
+ handleRefreshTree(type) {
+ //type:add\edit\del
+ if(type=="del"){
+ this.$refs.tree.remove(this.currentClickNode);
+ this.currentClickNode=null;
+ this.form={};
+ }else{
+ if (this.currentClickNode) {
+ let node = this.currentClickNode.parent;
+ node.loaded = false;
+ node.expand();
+ this.$refs.tree.setCurrentNode(this.currentClickNode);
+ }else {
+ this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ }
+ }
}
}
}
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index ed00511..15cbb86 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -2,8 +2,8 @@
<el-container v-loading="createdLoading">
<el-aside>
<basic-container>
- <div style="max-height: calc(100vh - 170px);overflow: auto">
- <avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <div style="max-height: calc(100vh - 150px);overflow: auto">
+ <avue-tree :key="refresh" node-key="id" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
<i class="el-icon-s-promotion"></i>
@@ -17,7 +17,7 @@
<el-main>
<basic-container>
- <el-form ref="form" :model="form" label-width="85px" style="height: 79vh">
+ <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
<span v-if="form.childType !== 0">
<el-form-item label="妯″潡鍚嶏細">
<el-input v-model="form.name" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
@@ -202,6 +202,7 @@
addStatus: false,
editStatus: false,
nodeRow: {},
+ currentClickNode:null,
form: {},
treeData: [],
treeOption: {
@@ -255,10 +256,11 @@
},
methods: {
// 鏍戣鐐瑰嚮
- nodeClick(row) {
+ nodeClick(row,node) {
console.log(row.childType);
this.form = {...row};
this.nodeRow = {...row};
+ this.currentClickNode = node;
this.addStatus = false;
this.editStatus = false;
},
@@ -313,7 +315,7 @@
this.addStatus = false;
// this.resetFormValue();
this.form.childType = null;
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('add')
}
})
},
@@ -357,7 +359,7 @@
this.editStatus = false;
// this.resetFormValue();
this.form.childType = null;
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('edit')
}
})
},
@@ -372,7 +374,7 @@
delModule(this.form).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.resetFormValue();
+ this.handleRefreshTree('del')
this.addStatus = false;
this.editStatus = false;
}
@@ -461,23 +463,21 @@
updateAlias(params).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('edit')
}
})
},
// 鍒犻櫎妯″潡涓嬪叧鑱旂殑鎿嶄綔绫诲瀷
deleteOperationClickHandler() {
- console.log(this.form);
const params = {
funcId: this.form.funcId,
operId: this.form.operId
}
delFuncOperation(params).then(res => {
- console.log(res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.resetFormValue();
+ this.handleRefreshTree('del');
}
})
},
@@ -489,14 +489,29 @@
func.downloadFileByBlobHandler(res);
this.createdLoading = false
this.$message.success('瀵煎嚭鎴愬姛');
- }).catch(err => {
- this.$message.error(err);
})
},
// 瀵煎叆
upLoadClickHandler() {
this.$refs.upload.visible = true;
+ },
+ handleRefreshTree(type) {
+ //type:add\edit\del
+ if(type=="del"){
+ this.$refs.tree.remove(this.currentClickNode);
+ this.currentClickNode=null;
+ this.form={};
+ }else{
+ if (this.currentClickNode) {
+ let node = this.currentClickNode.parent;
+ node.loaded = false;
+ node.expand();
+ this.$refs.tree.setCurrentNode(this.currentClickNode);
+ }else {
+ this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ }
+ }
}
}
}
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
index cea9234..afbb76d 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
@@ -2,8 +2,8 @@
<el-container>
<el-aside>
<basic-container>
- <div style="max-height: calc(100vh - 170px);overflow: auto">
- <avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <div style="max-height: calc(100vh - 150px);overflow: auto">
+ <avue-tree :key="refresh" node-key="id" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
<i class="el-icon-s-promotion"></i>
@@ -17,7 +17,7 @@
<el-main>
<basic-container>
- <el-form ref="form" :model="form" label-width="85px" style="height: 79vh">
+ <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
<el-form-item label="鍚嶇О锛�">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
</el-form-item>
@@ -73,6 +73,7 @@
editStatus:false,
addStatus: false,
nodeRow: {},
+ currentClickNode:null,
form: {},
treeData: [],
treeOption: {
@@ -111,10 +112,11 @@
},
methods: {
// 鏍戣鐐瑰嚮
- nodeClick(row) {
+ nodeClick(row,node) {
console.log(row);
this.form = {...row};
this.nodeRow = {...row};
+ this.currentClickNode=node;
this.addStatus = false;
this.editStatus = false;
},
@@ -173,7 +175,7 @@
addOperationType(params).then(res => {
if(res.data.code === 200){
this.$message.success(res.data.msg);
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('add')
this.addStatus = false;
}
})
@@ -227,7 +229,7 @@
updateOperationType(params).then(res => {
if(res.data.code === 200){
this.$message.success(res.data.msg);
- this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ this.handleRefreshTree('edit')
this.editStatus = false;
}
})
@@ -243,7 +245,7 @@
delOperationType(this.form).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.resetFormValue();
+ this.handleRefreshTree('del')
this.addStatus = false;
this.editStatus = false;
this.nodeRow = {};
@@ -262,10 +264,25 @@
exportFunctionSql({isFunction: false}).then(res => {
func.downloadFileByBlobHandler(res);
this.$message.success('瀵煎嚭鎴愬姛');
- }).catch(err => {
- this.$message.error(err);
});
},
+ handleRefreshTree(type) {
+ //type:add\edit\del
+ if(type=="del"){
+ this.$refs.tree.remove(this.currentClickNode);
+ this.currentClickNode=null;
+ this.form={};
+ }else{
+ if (this.currentClickNode) {
+ let node = this.currentClickNode.parent;
+ node.loaded = false;
+ node.expand();
+ this.$refs.tree.setCurrentNode(this.currentClickNode);
+ }else {
+ this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
+ }
+ }
+ }
}
}
</script>
--
Gitblit v1.9.3