From 3557cf5dcd92c52b51d1614f561f76b26a18e429 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Tue, 14 Nov 2023 17:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E6=B5=81vu?= =?UTF-8?q?e=E9=A1=B5=E9=9D=A2=E7=BC=96=E8=AF=91=E4=B8=8D=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + .../workflow/dialog/employeesDialog.vue | 20 +- .../workflow/dialog/employeesRoleDialog.vue | 30 +- src/components/workflow/dialog/formWord.vue | 18 +- src/components/workflow/dialog/matrix.vue | 6 +- .../workflow/dialog/positionDialog.vue | 10 +- src/components/workflow/dialog/roleDialog.vue | 10 +- .../workflow/drwer/approverDrawer.vue | 2 +- .../workflow/drwer/conditionDrawer.vue | 12 +- .../workflow/drwer/copyerDrawer.vue | 2 +- .../workflow/drwer/promoterDrawer.vue | 2 +- src/components/workflow/nodeWrap.vue | 2 +- src/views/appstore/appmarket/ccwl.vue | 2 +- src/views/dashboard/components/allorgyear.vue | 11 +- .../dashboard/components/application.vue | 2 +- src/views/dashboard/components/dltbhb.vue | 12 +- .../dashboard/components/sanlianping.vue | 6 +- src/views/dashboard/components/userinfo.vue | 2 +- src/views/dashboard/index.vue | 5 +- src/views/dashboard/index_20231108.vue | 398 ------------------ src/views/redismanage/datamigration/index.vue | 27 +- .../sysworkflow/flow/flowDrawingBoard.vue | 23 +- 22 files changed, 113 insertions(+), 490 deletions(-) delete mode 100644 src/views/dashboard/index_20231108.vue diff --git a/package.json b/package.json index d114b61c2..e253438c0 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "@types/md5": "^2.3.2", "@types/nprogress": "^0.2.0", "@types/path-browserify": "^1.0.0", + "@types/uuid": "^9.0.7", "@typescript-eslint/eslint-plugin": "^5.59.6", "@typescript-eslint/parser": "^5.59.6", "autoprefixer": "^10.4.14", diff --git a/src/components/workflow/dialog/employeesDialog.vue b/src/components/workflow/dialog/employeesDialog.vue index 905802cff..32c014b62 100644 --- a/src/components/workflow/dialog/employeesDialog.vue +++ b/src/components/workflow/dialog/employeesDialog.vue @@ -43,27 +43,27 @@ let list = computed(()=> { isDepartment: props.isdepartment, type: 'department', data: departments.value.childDepartments, - isActive: (item)=> $func.toggleClass(checkedDepartmentList.value, item), - change: (item)=> $func.toChecked(checkedDepartmentList.value, item), - next: (item)=> getDepartmentList(item.id) + isActive: (item:any)=> $func.toggleClass(checkedDepartmentList.value, item), + change: (item:any)=> $func.toChecked(checkedDepartmentList.value, item), + next: (item:any)=> getDepartmentList(item.id) },{ type: 'employee', data: departments.value.employees, - isActive: (item)=> $func.toggleClass(checkedEmployessList.value, item), - change: (item)=> $func.toChecked(checkedEmployessList.value, item), + isActive: (item:any)=> $func.toggleClass(checkedEmployessList.value, item), + change: (item:any)=> $func.toChecked(checkedEmployessList.value, item), }] }) let resList = computed(()=>{ let data = [{ type: 'employee', data: checkedEmployessList.value, - cancel: (item)=> $func.removeEle(checkedEmployessList.value, item) + cancel: (item:any)=> $func.removeEle(checkedEmployessList.value, item) }] if(props.isdepartment){ data.unshift({ type: 'department', data: checkedDepartmentList.value, - cancel: (item)=> $func.removeEle(checkedDepartmentList.value, item) + cancel: (item:any)=> $func.removeEle(checkedDepartmentList.value, item) }) } return data @@ -84,17 +84,17 @@ const closeDialog = ()=> { emits('update:visible', false) } -watch(()=> props.visible, (val)=>{ +watch(()=> props.visible, (val:any)=>{ if(val){ getDepartmentList(); searchVal.value = ""; // console.log("props.data:",props.data) if(props.data){ - checkedEmployessList.value = props.data.filter(item=>item.type===1).map(({name,targetId})=>({ + checkedEmployessList.value = props.data.filter((item:any)=>item.type===1).map(({name,targetId})=>({ employeeName: name, id: targetId })); - checkedDepartmentList.value = props.data.filter(item=>item.type===3).map(({name,targetId})=>({ + checkedDepartmentList.value = props.data.filter((item:any)=>item.type===3).map(({name,targetId})=>({ departmentName: name, id: targetId })); diff --git a/src/components/workflow/dialog/employeesRoleDialog.vue b/src/components/workflow/dialog/employeesRoleDialog.vue index fabf3d7c5..45a320141 100644 --- a/src/components/workflow/dialog/employeesRoleDialog.vue +++ b/src/components/workflow/dialog/employeesRoleDialog.vue @@ -47,8 +47,8 @@ let list = computed(()=> { not: false, data: roles.value, isDepartment: props.isDepartment, - isActive: (item)=> $func.toggleClass(checkedRoleList.value, item, 'roleId'), - change: (item)=> $func.toChecked(checkedRoleList.value, item, 'roleId') + isActive: (item:any)=> $func.toggleClass(checkedRoleList.value, item, 'roleId'), + change: (item:any)=> $func.toChecked(checkedRoleList.value, item, 'roleId') }] }else{ return [ @@ -56,14 +56,14 @@ let list = computed(()=> { isDepartment: props.isDepartment, type: 'department', data: departments.value.childDepartments, - isActive: (item)=> $func.toggleClass(checkedDepartmentList.value, item), - change: (item)=> $func.toChecked(checkedDepartmentList.value, item), - next: (item)=> getDepartmentList(item.id) + isActive: (item:any)=> $func.toggleClass(checkedDepartmentList.value, item), + change: (item:any)=> $func.toChecked(checkedDepartmentList.value, item), + next: (item:any)=> getDepartmentList(item.id) },{ type: 'employee', data: departments.value.employees, - isActive: (item)=> $func.toggleClass(checkedEmployessList.value, item), - change: (item)=> $func.toChecked(checkedEmployessList.value, item), + isActive: (item:any)=> $func.toggleClass(checkedEmployessList.value, item), + change: (item:any)=> $func.toChecked(checkedEmployessList.value, item), } ] } @@ -73,38 +73,38 @@ let resList = computed(()=>{ let data = [{ type: 'role', data: checkedRoleList.value, - cancel: (item)=> $func.removeEle(checkedRoleList.value, item, 'roleId') + cancel: (item:any)=> $func.removeEle(checkedRoleList.value, item, 'roleId') },{ type: 'employee', data: checkedEmployessList.value, - cancel: (item)=> $func.removeEle(checkedEmployessList.value, item) + cancel: (item:any)=> $func.removeEle(checkedEmployessList.value, item) }] if(props.isDepartment){ data.splice(1, 0, { type: 'department', data: checkedDepartmentList.value, - cancel: (item)=> $func.removeEle(checkedDepartmentList.value, item) + cancel: (item:any)=> $func.removeEle(checkedDepartmentList.value, item) }) } return data }) -watch(()=> props.visible, (val)=>{ +watch(()=> props.visible, (val:any)=>{ // console.log("props.data====》",props.data) if(val){ activeName.value = "1"; getDepartmentList(); searchVal.value = ""; - checkedEmployessList.value = props.data.filter(item=>item.type===1).map(({name,targetId,icon,iconToBase64})=>({ + checkedEmployessList.value = props.data.filter((item:any)=>item.type===1).map(({name,targetId,icon,iconToBase64})=>({ employeeName: name, id: targetId, icon: icon, iconToBase64: iconToBase64 })); - checkedRoleList.value = props.data.filter(item=>item.type===2).map(({name,targetId})=>({ + checkedRoleList.value = props.data.filter((item:any)=>item.type===2).map(({name,targetId})=>({ roleName: name, roleId: targetId })); - checkedDepartmentList.value = props.data.filter(item=>item.type===3).map(({name,targetId})=>({ + checkedDepartmentList.value = props.data.filter((item:any)=>item.type===3).map(({name,targetId})=>({ departmentName: name, id: targetId })); @@ -129,7 +129,7 @@ const saveDialog = ()=> { ...checkedRoleList.value, ...checkedEmployessList.value, ...checkedDepartmentList.value - ].map(item=>({ + ].map((item:any)=>({ type: item.employeeName?1:(item.roleName?2:3), targetId: item.id || item.roleId, name: item.employeeName || item.roleName || item.departmentName, diff --git a/src/components/workflow/dialog/formWord.vue b/src/components/workflow/dialog/formWord.vue index 080e9e9d3..bf82f33a8 100644 --- a/src/components/workflow/dialog/formWord.vue +++ b/src/components/workflow/dialog/formWord.vue @@ -38,9 +38,9 @@ let list = computed(() => { type: 'formword', not: false, data: formWordList.value, - isActive: (item) => $func.toggleClass(checkedFormList.value, item, 'id'), + isActive: (item:any) => $func.toggleClass(checkedFormList.value, item, 'id'), - change: (item) => { + change: (item:any) => { checkedFormList.value = [item] } }] @@ -49,8 +49,8 @@ let list = computed(() => { type: 'formword', not: true, data: formWordList.value, - isActive: (item) => $func.toggleClass(checkedFormList.value, item, 'id'), - change: (item)=> $func.toChecked(checkedFormList.value, item), + isActive: (item:any) => $func.toggleClass(checkedFormList.value, item, 'id'), + change: (item:any)=> $func.toChecked(checkedFormList.value, item), }] } @@ -60,13 +60,13 @@ let resList = computed(() => { return [{ type: 'formword', data: checkedFormList.value, - cancel: (item) => $func.removeEle(checkedFormList.value, item, 'id') + cancel: (item:any) => $func.removeEle(checkedFormList.value, item, 'id') }] }else{ return [{ type: 'formword', data: checkedFormList.value, - cancel: (item)=> $func.removeEle(checkedFormList.value, item) + cancel: (item:any)=> $func.removeEle(checkedFormList.value, item) }] } }) @@ -78,11 +78,11 @@ let isShow = computed({ get() { return props.visible }, - set(val) { + set(val:any) { closeDialog() } }) -watch(() => props.visible, (val) => { +watch(() => props.visible, (val:any) => { if (val) { gainFormTableWorde(props.formid,props.formtype); searchVal.value = ""; @@ -97,7 +97,7 @@ watch(() => props.visible, (val) => { let total = computed(() => checkedFormList.value.length) const saveDialog = () => { - let checkedList = checkedFormList.value.map(item => ({ + let checkedList = checkedFormList.value.map((item:any) => ({ type: props.formtype, name: item.name, id: item.id, diff --git a/src/components/workflow/dialog/matrix.vue b/src/components/workflow/dialog/matrix.vue index 0abbd09eb..33de875a2 100644 --- a/src/components/workflow/dialog/matrix.vue +++ b/src/components/workflow/dialog/matrix.vue @@ -78,13 +78,13 @@ function searchMatrixList(){ matrixContList.value = data.list total.value = data.total if(data.list.length > 0){ - farstId.val = data.list[0].id*1 + farstId.value = data.list[0].id*1 // matrixIsClick.matrixid = data.list[0].id*1 // matrixIsClick.matrixName = data.list[0].name } }).finally(()=>{ loading.value = false - gainMatrixNeed(farstId.val); + gainMatrixNeed(farstId.value); }) } const factorList = ref() @@ -123,7 +123,7 @@ const pickval = (val:martixFieldStruct) =>{ } //选择条件 const pickSelect = (val:any) =>{ - factorList.value.forEach(item=>{ + factorList.value.forEach((item:any)=>{ if(item.id==val){ matrixIsClick.factorid = item.id*1 matrixIsClick.factorName = item.name diff --git a/src/components/workflow/dialog/positionDialog.vue b/src/components/workflow/dialog/positionDialog.vue index 8de6bbefe..c6fd8bcc6 100644 --- a/src/components/workflow/dialog/positionDialog.vue +++ b/src/components/workflow/dialog/positionDialog.vue @@ -28,11 +28,11 @@ let list = computed(() => { return [{ type: 'position', data: positionList.value, - isActive: (item) => $func.toggleClass(checkedRoleList.value, item, 'id'), + isActive: (item:any) => $func.toggleClass(checkedRoleList.value, item, 'id'), // change: (item) => { // checkedRoleList.value = [item] // } - change: (item)=> $func.toChecked(checkedRoleList.value, item), + change: (item:any)=> $func.toChecked(checkedRoleList.value, item), }] }) let resList = computed(() => { @@ -40,7 +40,7 @@ let resList = computed(() => { type: 'position', data: checkedRoleList.value, // cancel: (item) => $func.removeEle(checkedRoleList.value, item, 'id') - cancel: (item)=> $func.removeEle(checkedRoleList.value, item) + cancel: (item:any)=> $func.removeEle(checkedRoleList.value, item) }] }) let visibleDialog = computed({ @@ -51,7 +51,7 @@ let visibleDialog = computed({ closeDialog() } }) -watch(() => props.visible, (val) => { +watch(() => props.visible, (val:any) => { if (val) { getPostList(); searchVal.value = ""; @@ -63,7 +63,7 @@ watch(() => props.visible, (val) => { }) let total = computed(() => checkedRoleList.value.length) const saveDialog = () => { - let checkedList = checkedRoleList.value.map(item => ({ + let checkedList = checkedRoleList.value.map((item:any) => ({ type: 4, targetId: item.id.toString(), name: item.name diff --git a/src/components/workflow/dialog/roleDialog.vue b/src/components/workflow/dialog/roleDialog.vue index f83a25a0e..517ce3a87 100644 --- a/src/components/workflow/dialog/roleDialog.vue +++ b/src/components/workflow/dialog/roleDialog.vue @@ -30,8 +30,8 @@ let list = computed(() => { not: true, isDepartment:false, data: roles.value, - isActive: (item) => $func.toggleClass(checkedRoleList.value, item, 'roleId'), - change: (item) => { + isActive: (item:any) => $func.toggleClass(checkedRoleList.value, item, 'roleId'), + change: (item:any) => { checkedRoleList.value = [item] } }] @@ -40,7 +40,7 @@ let resList = computed(() => { return [{ type: 'role', data: checkedRoleList.value, - cancel: (item) => $func.removeEle(checkedRoleList.value, item, 'roleId') + cancel: (item:any) => $func.removeEle(checkedRoleList.value, item, 'roleId') }] }) let visibleDialog = computed({ @@ -51,7 +51,7 @@ let visibleDialog = computed({ closeDialog() } }) -watch(() => props.visible, (val) => { +watch(() => props.visible, (val:any) => { if (val) { getRoleList(); searchVal.value = ""; @@ -63,7 +63,7 @@ watch(() => props.visible, (val) => { }) let total = computed(() => checkedRoleList.value.length) const saveDialog = () => { - let checkedList = checkedRoleList.value.map(item => ({ + let checkedList = checkedRoleList.value.map((item:any) => ({ type: 2, targetId: item.roleId, name: item.roleName diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue index d94c0d404..94fee1a1b 100644 --- a/src/components/workflow/drwer/approverDrawer.vue +++ b/src/components/workflow/drwer/approverDrawer.vue @@ -89,7 +89,7 @@ watch(approverConfig1, (val:any)=>{ if(data.code == 0){ nodeOptional.value = data.data.allcont if(data.data.allcont && data.data.allcont.length > 0){ - data.data.allcont.forEach(item => { + data.data.allcont.forEach((item:any) => { if(item.type == 3){ isExecutor.value = true return diff --git a/src/components/workflow/drwer/conditionDrawer.vue b/src/components/workflow/drwer/conditionDrawer.vue index acdd1e367..75d48fca7 100644 --- a/src/components/workflow/drwer/conditionDrawer.vue +++ b/src/components/workflow/drwer/conditionDrawer.vue @@ -86,8 +86,8 @@ watch(visible,(val:any)=>{ gainNodeFactor(sendData) .then(({data}) =>{ // console.log("......>",data) - if(data.length > 0){ - data.forEach(item=>{ + if(data && data.length > 0){ + data.forEach((item:any)=>{ flowFactorList.value.push({ id:flowFactorList.value.length+1, name:item.name, @@ -204,15 +204,15 @@ const initFactor = () => { const delTiaoJian = (val:any) => { let currLent = tableList.value.length if(currLent>0){ - let guoduTable = [] - tableList.value.forEach(item=>{ + let guoduTable = new Array + tableList.value.forEach((item:any)=>{ if(item.factorid != val.factorid){ guoduTable.push(item) } }) tableList.value = guoduTable } - flowFactorList.value.forEach(item=>{ + flowFactorList.value.forEach((item:any)=>{ if(item.keyid == val.factorid){ item.isok=false } @@ -308,7 +308,7 @@ const addOrEditUser = (val:any) => { checkedList.value = val } //保存选中得数据 -const sureCopyer = (data) => { +const sureCopyer = (data:any) => { // console.log("保存选中人",data) // copyerConfig.value.nodeUserList = data; copyerVisible.value = false; diff --git a/src/components/workflow/drwer/copyerDrawer.vue b/src/components/workflow/drwer/copyerDrawer.vue index 52a519448..63ead45d3 100644 --- a/src/components/workflow/drwer/copyerDrawer.vue +++ b/src/components/workflow/drwer/copyerDrawer.vue @@ -32,7 +32,7 @@ const addCopyer = () => { copyerVisible.value = true; checkedList.value = copyerConfig.value.nodeUserList } -const sureCopyer = (data) => { +const sureCopyer = (data:any) => { // console.log("保存选中人",data) copyerConfig.value.nodeUserList = data; copyerVisible.value = false; diff --git a/src/components/workflow/drwer/promoterDrawer.vue b/src/components/workflow/drwer/promoterDrawer.vue index 5306acd28..e08228444 100644 --- a/src/components/workflow/drwer/promoterDrawer.vue +++ b/src/components/workflow/drwer/promoterDrawer.vue @@ -33,7 +33,7 @@ const addPromoter = () => { checkedList.value = flowPermission.value promoterVisible.value = true; } -const surePromoter = (data) => { +const surePromoter = (data:any) => { flowPermission.value = data; promoterVisible.value = false; } diff --git a/src/components/workflow/nodeWrap.vue b/src/components/workflow/nodeWrap.vue index 11b2b3e6c..fde58cb1a 100644 --- a/src/components/workflow/nodeWrap.vue +++ b/src/components/workflow/nodeWrap.vue @@ -104,7 +104,7 @@ const addTerm = () => { const delTerm = (index: any) => { // eslint-disable-next-line vue/no-mutating-props props.nodeConfig.conditionNodes.splice(index, 1); - props.nodeConfig.conditionNodes.map((item, index) => { + props.nodeConfig.conditionNodes.map((item:any, index:any) => { item.priorityLevel = index + 1; item.nodeName = `条件${index + 1}`; }); diff --git a/src/views/appstore/appmarket/ccwl.vue b/src/views/appstore/appmarket/ccwl.vue index a95043035..78d00b2eb 100644 --- a/src/views/appstore/appmarket/ccwl.vue +++ b/src/views/appstore/appmarket/ccwl.vue @@ -18,7 +18,7 @@ function lookappcont(id:number){ //跳转地址 const jumpUrl = (val:any) =>{ createOneClickLogin({url:val}) - .then(data =>{ + .then((data:any) =>{ console.log("跳转地址--->",data.data) if(data.code == 0){ window.open(data.data,'_blank') diff --git a/src/views/dashboard/components/allorgyear.vue b/src/views/dashboard/components/allorgyear.vue index a91227961..3c44a69c8 100644 --- a/src/views/dashboard/components/allorgyear.vue +++ b/src/views/dashboard/components/allorgyear.vue @@ -85,8 +85,11 @@ const orgChartDrowData = () => { }, series: dataAry }; - orgYearFullMonths.value.clear(); - orgYearFullMonths.value.setOption(option) + if(orgYearFullMonths.value){ + orgYearFullMonths.value.clear(); + orgYearFullMonths.value.setOption(option) + } + } orgAllYearLoading.value = false @@ -105,7 +108,9 @@ onMounted(() => { orgChartDrowData(); window.addEventListener('resize', () => { - orgYearFullMonths.value.resize(); + // if(orgYearFullMonths.value){ + orgYearFullMonths.value.resize(); + // } }); diff --git a/src/views/dashboard/components/application.vue b/src/views/dashboard/components/application.vue index 61690a986..2b0fc94f6 100644 --- a/src/views/dashboard/components/application.vue +++ b/src/views/dashboard/components/application.vue @@ -21,7 +21,7 @@ const appId = ref() //跳转地址 const jumpUrl = (val:any) =>{ createOneClickLogin({url:val}) - .then(data =>{ + .then((data:any) =>{ console.log("跳转地址--->",data.data) if(data.code == 0){ window.open(data.data,'_blank') diff --git a/src/views/dashboard/components/dltbhb.vue b/src/views/dashboard/components/dltbhb.vue index d1111fe6b..e1b72199a 100644 --- a/src/views/dashboard/components/dltbhb.vue +++ b/src/views/dashboard/components/dltbhb.vue @@ -33,7 +33,7 @@ const props = defineProps({ } } }) -const creeTime = ref(new Date()) +const creeTime = ref(new Date()) const loadingDlTHbi = ref(false) const dingLiangOrgIng = ref() @@ -56,10 +56,10 @@ const gainDltbhxfx = () =>{ console.log(" props.dlyear.data", data) }) } -watch(props.mainOrgList,()=>{ +watch(()=>props.mainOrgList,()=>{ }) -watch(props.targetListAry,()=>{ +watch(()=>props.targetListAry,()=>{ console.log("改变值---1-->",props.targetListAry) if(props.targetListAry&&props.targetListAry.length > 0){ console.log("改变值----->",props.targetListAry) @@ -67,10 +67,10 @@ watch(props.targetListAry,()=>{ } }) -watch(props.dingLiangOrg,()=>{ +watch(()=>props.dingLiangOrg,()=>{ dingLiangOrgIng.value = props.dingLiangOrg }) -watch(props.dingLiangTarget,()=>{ +watch(()=>props.dingLiangTarget,()=>{ dingLiangTargetIng.value = props.dingLiangTarget }) @@ -121,7 +121,7 @@ onMounted(() => { -
+
diff --git a/src/views/dashboard/components/sanlianping.vue b/src/views/dashboard/components/sanlianping.vue index dcfa061c6..a50eef1c4 100644 --- a/src/views/dashboard/components/sanlianping.vue +++ b/src/views/dashboard/components/sanlianping.vue @@ -101,7 +101,7 @@ const drawDlTbHbFx = () =>{ datetime:[timeYears] } bdTtsyoy(sendInfo) - .then((data)=>{ + .then((data:any)=>{ if(data.code == 0){ let seriesAry = new Array if(data.data.series&&data.data.series.length>0){ @@ -263,7 +263,7 @@ const bdBdtTsMubiao = () =>{ name: data.data.series[0].name, type: data.data.series[0].type, tooltip: { - valueFormatter: function (value) { + valueFormatter: function (value:any) { return value + data.data.series[0].tooltip; } }, @@ -273,7 +273,7 @@ const bdBdtTsMubiao = () =>{ name: data.data.series[1].name, type: data.data.series[1].type, tooltip: { - valueFormatter: function (value) { + valueFormatter: function (value:any) { return value + data.data.series[1].tooltip; } }, diff --git a/src/views/dashboard/components/userinfo.vue b/src/views/dashboard/components/userinfo.vue index 46156ca93..4537401f7 100644 --- a/src/views/dashboard/components/userinfo.vue +++ b/src/views/dashboard/components/userinfo.vue @@ -23,7 +23,7 @@ const props = defineProps({ - + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 289265b71..ba0021956 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -9,7 +9,7 @@ import * as echarts from 'echarts'; //引入图形界面 import { useUserStore } from "@/store/modules/user"; -import { sendOrgCont } from '@/api/displayboardapi/types' +import { orgInfo } from '@/api/displayboardapi/types' import { getOrgChiled,getCompanyDeparment,targetListForDepartment } from '@/api/displayboardapi/indexapi' import UserInfo from "@/views/dashboard/components/userinfo.vue"; @@ -22,7 +22,7 @@ import Application from "@/views/dashboard/components/application.vue"; import HostNews from "@/views/dashboard/components/hostnews.vue"; const userStore = useUserStore(); -const orgListCont = ref() +const orgListCont = ref([]) const educationOrgId = ref(309) const masterBody = ref(null) const drawerWidht = ref() @@ -35,7 +35,6 @@ function getOrgList(){ console.log("获取行政组织-2-->",data) orgListCont.value = data.list educationOrgId.value = data.current - }) } diff --git a/src/views/dashboard/index_20231108.vue b/src/views/dashboard/index_20231108.vue deleted file mode 100644 index e184d333a..000000000 --- a/src/views/dashboard/index_20231108.vue +++ /dev/null @@ -1,398 +0,0 @@ - - - - diff --git a/src/views/redismanage/datamigration/index.vue b/src/views/redismanage/datamigration/index.vue index eac84dc36..f9377499d 100644 --- a/src/views/redismanage/datamigration/index.vue +++ b/src/views/redismanage/datamigration/index.vue @@ -162,7 +162,7 @@ const migrateRedisInfo = () =>{ dblist:originCheckList.value //选择库 } moveOldRedisToNewRedis(sendInfo) - .then((data)=>{ + .then((data:any)=>{ console.log("进行源Redis连接测试",data) logList.value = data.data }) @@ -248,12 +248,15 @@ const migrateRedisInfo = () =>{ 测试链接 - - - - 未测试 + + + + + + + + 未测试 - @@ -262,10 +265,14 @@ const migrateRedisInfo = () =>{
- - - - 未测试 + + + + + + + + 未测试 diff --git a/src/views/sysworkflow/flow/flowDrawingBoard.vue b/src/views/sysworkflow/flow/flowDrawingBoard.vue index 4e35557db..3e46ac127 100644 --- a/src/views/sysworkflow/flow/flowDrawingBoard.vue +++ b/src/views/sysworkflow/flow/flowDrawingBoard.vue @@ -64,23 +64,32 @@ let directorMaxLeveling = ref(0); const shenPiTitle = ref("") const activeTabs = ref(""); //当前版本 -const versionList = ref(); //工作流版本列表 +const versionList = reactive([]); //工作流版本列表 const enableFlow = ref(); const isRead = ref(false) -const enableVersion = ref(); +const enableVersion = ref("1"); //获取工作流版本列表 const getFlowVerList = ()=>{ gainFlowVersionList({id:props.customerFormKey.toString()}) .then(({data})=>{ + console.log("获取工作流版本列表-->",data) + // versionList = data; + versionList.splice(0,versionList.length) if(data){ if(data.length>0){ - versionList.value = data; + // versionList = data; data.forEach(item=>{ if(item.state == 1){ activeTabs.value = item.id enableFlow.value = item enableVersion.value = item.id } + versionList.push({ + id:item.id, + key:item.key, + state:item.state, + version:item.version + }) }) isRead.value = true }else{ @@ -104,7 +113,7 @@ const getFlowVerList = ()=>{ //首次加载页面 onMounted(async ()=>{ - + // getFlowVerList() }) //初始化工作流数据 const initWorkFlowData = async() => { @@ -348,12 +357,12 @@ const setupState = (val:number) =>{ status:val } switchFlowVersion(sendCont) - .then((data)=>{ + .then((data:any)=>{ ElMessage.success(data.msg); // activeTabs.value = enableVersion.value // enableFlow.value.id = enableVersion.value - if(versionList.value.length > 0){ - versionList.value.forEach(item=>{ + if(versionList.length > 0){ + versionList.forEach(item=>{ if(item.id == enableVersion.value){ enableFlow.value = item }