From a5a27e231cb2aa2c2a045df11ad90e5eda547ae9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十一月 2024 18:11:59 +0800
Subject: [PATCH] 密级传参问题，以及同步整合代码
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 7 ++-
Source/plt-web/plt-web-ui/src/views/system/user/index.vue | 39 ++++++++++++-------
Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue | 2
Source/plt-web/plt-web-ui/src/api/authority/secure/classification.js | 2
Source/plt-web/plt-web-ui/src/views/wel/index.vue | 11 -----
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 2
6 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/api/authority/secure/classification.js b/Source/plt-web/plt-web-ui/src/api/authority/secure/classification.js
index df84d01..e5fb8e4 100644
--- a/Source/plt-web/plt-web-ui/src/api/authority/secure/classification.js
+++ b/Source/plt-web/plt-web-ui/src/api/authority/secure/classification.js
@@ -11,6 +11,6 @@
return request({
url: '/api/secretGradeController/saveSecretGrade',
method: 'post',
- params: params
+ data: params
})
}
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
index ddebd32..86fe00f 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/secure/classification/index.vue
@@ -1,4 +1,4 @@
-<template>
+ <template>
<el-container>
<basic-container style="height: calc(100vh - 118px);width: 100%;">
<avue-form ref="form" v-model="form" :option="formOption" @submit="saveHandler"></avue-form>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index 70f5973..646a7e6 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -1022,7 +1022,7 @@
if (this.nodeRow.id === 'topNode') {
this.$message.error('璇烽�夋嫨瀛愯妭鐐硅繘琛屼慨鏀�')
return;
- }debugger;
+ }
this.form = {...this.nodeRow};
this.form.inputRevisionFlag = JSON.parse(this.form.inputRevisionFlag); // 瀛楃涓瞗alse杞崲涓哄竷灏斿��
// this.form.fName = this.nodeRow.id === 'topNode' ? "" : this.nodeRow.id;
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index 8f61d44..5bdf0cc 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -249,7 +249,7 @@
eventOption: {
...basicOption,
addBtn: false,
- editBtn: false,
+ // editBtn: false,
delBtn: false,
refreshBtn: false,
highlightCurrentRow: true,
@@ -791,8 +791,9 @@
// 缂栬緫鎵撳紑琛ㄥ崟鍓�
beforeOpen(done, type) {
if (type === 'edit') {
- this.form.showType = 'Ludc';
- this.$set(this.form, 'showType', 'Ludc');
+ console.log('edit');
+ // this.form.showType = 'Ludc';
+ // this.$set(this.form, 'showType', "terminology");
// this.$set(this.option.group[0].column[0],'value','Ludc');
// this.option.group[0].column[0].value = 'Ludc';
done();
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 1f75a2b..3751399 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
@@ -78,7 +78,8 @@
</el-dialog>
<!-- 瀵煎叆浜哄憳 -->
- <upload-file ref="upload" :tipList="tipList" :fileType="upFileType" :fileUrl="fileUrl" title="瀵煎叆浜哄憳" @updata="getTableList"></upload-file>
+ <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆浜哄憳"
+ @updata="getTableList"></upload-file>
<!-- 鍒嗛厤閮ㄩ棬瀵硅瘽妗� -->
<el-dialog
@@ -129,14 +130,14 @@
name: "userManage",
data: function () {
return {
- departSearchObj:{},
- departSearchValue:'',
+ departSearchObj: {},
+ departSearchValue: '',
loadKey: 0,
departStatus: '', // 鍖哄垎涓嶅悓鏂瑰紡鎵撳紑閮ㄩ棬瀵硅瘽妗�
departCurrenRow: {},
departOption: {
...basicOption,
- addBtn:false,
+ addBtn: false,
rowKey: 'oid',
rowParentKey: 'parentId',
selection: false,
@@ -145,12 +146,12 @@
menu: false,
refreshBtn: false,
gridBtn: false,
- header:false,
+ header: false,
column: [
{
label: '鍚嶇О',
prop: 'name',
- align:'left'
+ align: 'left'
},
{
label: '缂栧彿',
@@ -192,8 +193,8 @@
leftRoleData: [], // 鍒嗛厤瑙掕壊绌挎妗嗗乏渚у垵濮嬫暟鎹�
rightRoleData: [], // 鍒嗛厤瑙掕壊绌挎妗嗗彸渚у垵濮嬫暟鎹�
transferTitle: ['鐜版湁瑙掕壊', '鎷ユ湁瑙掕壊'],
- tipList:["瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」","閮ㄩ棬鍒椾笂涓嬬骇鍏崇郴蹇呴』鎸夌収鍙嶆枩鏉犻殧寮�(/)"],
- lastIndex:null,
+ tipList: ["瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」", "閮ㄩ棬鍒椾笂涓嬬骇鍏崇郴蹇呴』鎸夌収鍙嶆枩鏉犻殧寮�(/)"],
+ lastIndex: null,
}
},
created() {
@@ -279,8 +280,12 @@
row,
this.$refs.userCrud,
this.lastIndex,
- (newIndex) => { this.lastIndex = newIndex; },
- () => { this.selectList = []; }
+ (newIndex) => {
+ this.lastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
);
},
@@ -358,7 +363,7 @@
},
// 鏂板
- rowSaveHandler(row, done,loading) {
+ rowSaveHandler(row, done, loading) {
if (row.password != row.confirmPassword) {
this.$message.error('璇锋鏌ヤ袱娆″瘑鐮佹槸鍚﹁緭鍏ヤ竴鑷达紒')
return this.$refs.userCrud.$refs.dialogForm.$refs.tableForm.allDisabled = false;
@@ -380,7 +385,7 @@
},
// 缂栬緫
- rowUpdateHandler(row, index, done,loading) {
+ rowUpdateHandler(row, index, done, loading) {
if (row.password != row.confirmPassword) {
this.$message.error('璇锋鏌ヤ袱娆″瘑鐮佹槸鍚﹁緭鍏ヤ竴鑷达紒')
return this.$refs.userCrud.$refs.dialogForm.$refs.tableForm.allDisabled = false;
@@ -477,8 +482,14 @@
departmentQueryController({queryAllLevel: true}).then(res => {
const data = res.data.treeData;
this.departData = this.departDtaFormAtter(data);
- this.option.column[7].dicData=[{oid:'ALLDept',name:'鎵�鏈夐儴闂�',expand:true,disabled:true,children:this.departData}]
- this.option.column[7].defaultExpandedKeys=['ALLDept'];
+ this.option.column[7].dicData = [{
+ oid: 'ALLDept',
+ name: '鎵�鏈夐儴闂�',
+ expand: true,
+ disabled: true,
+ children: this.departData
+ }]
+ this.option.column[7].defaultExpandedKeys = ['ALLDept'];
}).catch(err => {
this.$message.error(err);
})
diff --git a/Source/plt-web/plt-web-ui/src/views/wel/index.vue b/Source/plt-web/plt-web-ui/src/views/wel/index.vue
index f40d866..ee3dc07 100644
--- a/Source/plt-web/plt-web-ui/src/views/wel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/wel/index.vue
@@ -3,14 +3,6 @@
<el-row>
<el-col :span="24">
<basic-container v-loading="loading">
- <!-- <div style="display: flex">-->
- <!-- <div style="height: 80px; width: 50px; overflow: hidden;margin-right: 20px">-->
- <!-- <img src="../../../public/img/mainTop.png" style="height: 100%; width: 100%; object-fit: contain;" />-->
- <!-- </div>-->
- <!-- <avue-text-ellipsis :text="text" :height="80" :width="1600" use-tooltip placement="top">-->
- <!-- <small slot="more">...</small>-->
- <!-- </avue-text-ellipsis>-->
- <!-- </div>-->
<avue-data-tabs :option="topOption"></avue-data-tabs>
</basic-container>
</el-col>
@@ -95,7 +87,6 @@
data() {
return {
loading: false,
- text: '鍖椾含瀹忓崥杩滆揪绉戞妧鏈夐檺鍏徃锛堜互涓嬬畝绉扳�滃畯鍗氳繙杈锯�濓級闀挎湡涓撴敞浜庡埗閫犱笟淇℃伅鍖栧缓璁撅紝涓哄鎴锋彁渚涗紒涓氫俊鎭寲鏁翠綋瑙ｅ喅鏂规鍙婄浉鍏宠蒋浠剁爺鍙戙�佸挩璇㈠強瀹炴柦鏈嶅姟銆傚畯鍗氳繙杈惧鎴风兢浣撴兜鐩栬埅绌恒�佽埅澶┿�佽埞鑸躲�佸叺鍣ㄣ�佹苯杞︺�侀�氱敤鏈烘銆佺數瀛愮瓑鍒堕�犺涓氾紝閫氳繃涓庡鎴锋繁搴﹀悎浣滐紝鎵挎媴浜嗗椤瑰浗瀹剁骇杞欢鐮斿彂涓庢妧鏈湇鍔￠」鐩紝鎷ユ湁澶氶」鍏锋湁鑷富鐭ヨ瘑浜ф潈鐨勮蒋浠朵骇鍝併�備负浜嗙粰瀹㈡埛鎻愪緵鏇村鐨勬妧鏈垱鏂拌兘鍔涘強鐩稿簲鐨勪紒涓氱骇绠＄悊鏀拺骞冲彴锛屽畯鍗氳繙杈剧爺鍙戜簡鍏锋湁鑷富鐭ヨ瘑浜ф潈鐨勪紒涓氱骇淇℃伅鍖栨暣浣撹В鍐虫柟妗堬紝鍚屾椂閽堝瀹㈡埛鐨勭壒瀹氶渶姹傦紝鎻愪緵浜嗛珮搴﹀彲瀹氬埗鐨勪笓涓氬簲鐢ㄣ�備负浜嗚繘涓�姝ユ彁鍗囨妧鏈湇鍔¤兘鍔涳紝瀹忓崥杩滆揪鎶曞叆涓撻棬鍔涢噺鍦ㄥ墠娌挎妧鏈柟闈㈣繘琛屾帰绱紝鍦ㄤ紒涓氱鏈変簯璁＄畻鍜屽ぇ鏁版嵁绛夐鍩熶笉鏂彇寰楃獊鐮淬�傞殢鐫�鏂颁竴浠ｄ笟鍔′笌绠＄悊鎶�鏈钩鍙扮殑鎺ㄥ嚭锛屾洿澧炲己浜嗗叕鍙镐负瀹㈡埛鎻愪緵楂樿川閲忋�佸叏鏂逛綅銆佹繁灞傛鏈嶅姟鐨勬妧鏈兘鍔涖�傚畯鍗氳繙杈句竴鐩寸鎵库�滅敤鏅烘収涓哄鎴峰垱閫犱环鍊尖�濈殑瀹楁棬锛屾効浠モ�滆瘹淇¤礋璐ｂ�濈殑鎬佸害鍜屼笓涓氬寲鐨勬湇鍔★紝鍦ㄤ紒涓氫俊鎭寲鍙戝睍鐨勯亾璺笂锛屼笌瀹㈡埛涓�璧锋垚闀匡紝鍏卞悓瑙佽瘉鎴愬姛锛�',
activeNames: ['1', '2', '3', '5'],
logActiveNames: ['28'],
topOption: {
@@ -123,7 +114,7 @@
borderRadius: 10,
normal: {
color: function (colors) {
- var colorList = ['rgb(230, 71, 88)', 'rgb(178, 159, 255)','rgb(27, 201, 142)'];
+ const colorList = ['rgb(230, 71, 88)', 'rgb(178, 159, 255)', 'rgb(27, 201, 142)'];
return colorList[colors.dataIndex];
}
}
--
Gitblit v1.9.3