修改工作流vue页面编译不规范错误

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",

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
 			}));

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,

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,

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<martixFieldStruct[]>()
@@ -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

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

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

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

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;

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;

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;
 }

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}`;
   });

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')

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();
+		// }
 	});
 	
 	

src/views/dashboard/components/application.vue

@@ -21,7 +21,7 @@ const appId = ref<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')

src/views/dashboard/components/dltbhb.vue

@@ -33,7 +33,7 @@ const props = defineProps({
 		}
 	}
 })
-const creeTime = ref<string>(new Date())
+const creeTime = ref<any>(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(() => {
 				</el-col>
 			</el-row>
 		</div>
-		<div ref="dlTargetThChart"  v-loading="loading" element-loading-text="Loading..." class="allOrgAxisCares">
+		<div ref="dlTargetThChart"  v-loading="loadingDlTHbi" element-loading-text="Loading..." class="allOrgAxisCares">
 			
 		</div>
 	</el-card>

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;
 							}
 						  },

src/views/dashboard/components/userinfo.vue

@@ -23,7 +23,7 @@ const props = defineProps({
 			<el-row :gutter="10">
 				<el-col :xs="24" :sm="12" :md="11" :lg="11" :xl="10" class="readback">
 					<!--人员头像-->
-					<el-avatar shape="square" :fit="cover" :src="props.userStore.avatar!=''?props.userStore.avatar:UserRole" style="width:100%; height:130px;" />
+					<el-avatar shape="square" fit="cover" :src="props.userStore.avatar!=''?props.userStore.avatar:UserRole" style="width:100%; height:130px;" />
 				</el-col>
 				<el-col :xs="24" :sm="12" :md="13" :lg="13" :xl="14" class="greenColor">
 					<!--人员信息-->

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<sendOrgCont>()
+const orgListCont = ref<orgInfo[]>([])
 const educationOrgId = ref<number>(309)
 const masterBody = ref<any>(null)
 const drawerWidht = ref<any>()
@@ -35,7 +35,6 @@ function getOrgList(){
 			console.log("获取行政组织-2-->",data)
 			orgListCont.value = data.list
 			educationOrgId.value = data.current
-			
 		})
 }
 

src/views/dashboard/index_20231108.vue

@@ -1,398 +0,0 @@
-<!--
-@ 作者: 秦东
-@ 时间: 2023-11-06 13:39:13
-@ 备注: 首页
--->
-<script lang='ts' setup>
-import * as echarts from 'echarts';	//引入图形界面
-
-import { useUserStore } from "@/store/modules/user";
-
-
-import { sendOrgCont } from '@/api/displayboardapi/types'
-import { getOrgChiled,getCompanyDeparment,targetListForDepartment } from '@/api/displayboardapi/indexapi'
-
-import UserInfo from "@/views/dashboard/components/userinfo.vue";
-
-import DingLiangTongBiHuanBi from "@/views/dashboard/components/dltbhb.vue";
-
-import EducationChart from "@/views/dashboard/components/education.vue";
-
-const userStore = useUserStore();
-
-const legendList = new Array
-const seriesData = new Array
-const orgListCont = ref<sendOrgCont>()
-const educationOrgId = ref<number>(309)
-//公司主部门
-const mainOrgList = ref<any[]>([])
-const targetListAry = ref<any[]>([])
-const targetXingListAry = ref<any[]>([])
-//定性同比环比分析
-const dingXingYear = ref<number>()
-const dingXingOrg = ref<any>()
-const dingXingTarget = ref<any>()
-//定量指标目标达成
-const dingLiangDaChengYear = ref<number>()
-const dingLiangDaChengOrg = ref<any>()
-const dingLiangDaChengTarget = ref<any>()
-//定量同比环比分析
-const dingLiangYear = ref<number>()
-const dingLiangOrg = ref<any>()
-const dingLiangTarget = ref<any>()
-
-const loadPage = ref(false)
-/**
- * 获取行政组织
- */
-function getOrgList(){
-	getOrgChiled({id:313})
-		.then(( {data} )=>{
-			console.log("获取行政组织-2-->",data)
-			orgListCont.value = data.list
-			educationOrgId.value = data.current
-			
-		})
-}
-
-
-
-//根据行政组织获取指标
-const orgAboutTarget = (orgId:string,tarAttribute:number) =>{
-	let sendIfo = {
-		id:orgId,
-		attribute:tarAttribute
-	}
-	targetListForDepartment(sendIfo)
-		.then((data:any) =>{
-			console.log("获取指标-1-->",data)
-			if(tarAttribute==1){
-				targetXingListAry.value = data.data
-				if(data.data&&data.data.length>0){
-					dingXingTarget.value = data.data[0].id
-				}
-			}else{
-				targetListAry.value = data.data
-				if(data.data&&data.data.length>0){
-					dingLiangDaChengTarget.value = data.data[0].id
-					dingLiangTarget.value = data.data[0].id.toString()
-				}
-			}
-			
-		})
-		.finally(() =>{
-			loadPage.value = true
-		})
-}
-
-//所有行政组织月度画图对象
-const orgYearFullMonths = ref<any>()
-const orgAllYears = ref<any>()	//当前年
-const allOrgOneMonth = ref<any>() //指定月
-const oenOrgAllYears = ref<any>() //单一行政指定年
-const oenOrg = ref<any>() //单一行政组织
-//行政组织月度绩效
-const departmentYears = ref<any>(null)
-
-//渲染完页面再执行
-onMounted(() => {
-	let dataTime:any = new Date();
-	console.log("dataTime--->",dataTime.getFullYear())
-	let timeStrint:any = dataTime;
-	dingXingYear.value = dataTime
-	dingLiangDaChengYear.value = dataTime
-	dingLiangYear.value = dataTime
-	console.log("timeStrint-1-->",dataTime,dingLiangYear)
-	getOrgList();
-	orgYearFullMonths.value = echarts.init(departmentYears.value)
-	let option = {
- 
- tooltip: {
-   trigger: 'axis'
- },
- legend: {
-   data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine'],
-   bottom:0
- },
- grid: {
-   top:"20px",
-   left: '1%',
-   right: '2%',
-   bottom: '30px',
-   containLabel: true
- },
- toolbox: {
-   feature: {
-	 saveAsImage: {}
-   }
- },
- xAxis: {
-   type: 'category',
-   boundaryGap: false,
-   data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
- },
- yAxis: {
-   type: 'value'
- },
- series: [
-   {
-	 name: 'Email',
-	 type: 'line',
-	 stack: 'Total',
-	 data: [120, 132, 101, 134, 90, 230, 210]
-   },
-   {
-	 name: 'Union Ads',
-	 type: 'line',
-	 stack: 'Total',
-	 data: [220, 182, 191, 234, 290, 330, 310]
-   },
-   {
-	 name: 'Video Ads',
-	 type: 'line',
-	 stack: 'Total',
-	 data: [150, 232, 201, 154, 190, 330, 410]
-   },
-   {
-	 name: 'Direct',
-	 type: 'line',
-	 stack: 'Total',
-	 data: [320, 332, 301, 334, 390, 330, 320]
-   },
-   {
-	 name: 'Search Engine',
-	 type: 'line',
-	 stack: 'Total',
-	 data: [820, 932, 901, 934, 1290, 1330, 1320]
-   }
- ]
-};
-
-	orgYearFullMonths.value.setOption(option)
-})
-</script>
-<template>
-		<div ref="masterBody" class="app-container" style="margin-top:10px;">
-			<el-row :gutter="10">
-				<el-col :xs="24" :sm="16" :md="16" :lg="18" :xl="19" class="readback">
-					<el-card shadow="always" :body-style="{ padding: '10px' }" style = "border-radius: 12px;margin-top: 10px;">
-						<!--分厂数据统计-->
-						<div class="orgAllMothsTitle">
-							<el-text class="titleInfo">2023年绩效成绩</el-text>
-							<el-date-picker
-								v-model="allOrgOneMonth"
-								type="year"
-								placeholder="请选择时间"
-							/>
-						</div>
-						<div ref="departmentYears" class="allOrgAxisCares">
-							
-						</div>
-					</el-card>
-				</el-col>
-				<el-col :xs="24" :sm="8" :md="8" :lg="6" :xl="5" class="greenColor">
-					<UserInfo :user-store="userStore" />
-				</el-col>
-			</el-row>
-			<el-row :gutter="10" class="cart_top_juLi">
-				<el-col :xs="24" :sm="16" :md="16" :lg="18" :xl="19" class="readback">
-
-					<el-row :gutter="10">
-						<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" class="readback">
-						
-							<el-card shadow="always" :body-style="{ padding: '10px' }" style = "border-radius: 12px;margin-top: 10px;">
-								<!--单月全厂统计-->
-								<div class="orgAllMothsTitle">
-									<el-text class="titleInfo">2023年10月绩效成绩</el-text>
-									<el-date-picker
-										v-model="orgAllYears"
-										type="month"
-										placeholder="请选择时间"
-									/>
-								</div>
-								<div ref="departmentMonths" class="allOrgAxisCares">
-									
-								</div>
-							</el-card>
-						
-						</el-col>
-						<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" class="readback">
-							
-							<el-card shadow="always" :body-style="{ padding: '10px' }" style = "border-radius: 12px;margin-top: 10px;">
-								<!--单一行政组织全年统计-->
-								<div class="orgAllMothsTitle">
-									<el-text class="titleInfo">2023年备煤绩效成绩</el-text>
-									<div>
-										<el-select v-model="oenOrg" placeholder="" style="width:100px">
-											<el-option
-												v-for="item in options"
-												:key="item.value"
-												:label="item.label"
-												:value="item.value">
-											</el-option>
-										</el-select>
-										<el-date-picker
-											v-model="oenOrgAllmonth"
-											type="month"
-											placeholder="请选择时间"
-											style="width:120px"
-										/>
-									</div>
-								</div>
-								<div ref="departmentMonths" class="allOrgAxisCares">
-									
-								</div>
-							</el-card>
-						
-						</el-col>
-					</el-row>
-					
-					
-
-
-
-				</el-col>
-				<el-col :xs="24" :sm="8" :md="8" :lg="6" :xl="5" class="greenColor">
-				
-					<el-card shadow="always" :body-style="{ padding: '10px' }"  style = "border-radius: 12px;margin-top: 10px;; height: 335px">
-						<!--单月全厂统计-->
-						<div class="orgAllMothsTitle">
-							<el-text class="titleInfo">热门新闻</el-text>	
-						</div>
-						<div ref="departmentMonths" class="allOrgAxisCares">
-									
-						</div>
-					</el-card>
-				
-				</el-col>
-			</el-row>
-			<el-row :gutter="10" class="cart_top_juLi">
-				<el-col :xs="24" :sm="16" :md="16" :lg="18" :xl="19" class="readback">
-				
-					<el-row :gutter="10">
-						<el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="8">
-							<el-card shadow="always" :body-style="{ padding: '10px' }" style = "border-radius: 12px;margin-top: 10px;">
-								<div class="orgAllMothsTitle">
-									<el-row>
-										<el-col :span="8">
-											<el-date-picker
-												v-model="dingXingYear"
-												type="year"
-												placeholder="请选择时间"
-												style="width:100%"
-											/>
-										</el-col>
-										<el-col :span="8">
-											<el-select v-model="dingXingOrg" placeholder="" style="width:100%">
-												<el-option
-													v-for="item in mainOrgList"
-													:key="item.id"
-													:label="item.name"
-													:value="item.id">
-												</el-option>
-											</el-select>
-										</el-col>
-										<el-col :span="8">
-											<el-select v-model="dingXingTarget" placeholder="" style="width:100%">
-												<el-option
-													v-for="item in targetXingListAry"
-													:key="item.id"
-													:label="item.name"
-													:value="item.id">
-												</el-option>
-											</el-select>
-										</el-col>
-									</el-row>
-								</div>
-								<div ref="departmentMonths" class="allOrgAxisCares">
-									
-								</div>
-							</el-card>
-						</el-col>
-						<el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="8">
-							<el-card shadow="always" :body-style="{ padding: '10px' }" style = "border-radius: 12px;margin-top: 10px;">
-								<div class="orgAllMothsTitle">
-									<el-row>
-										<el-col :span="8">
-											<el-date-picker
-												v-model="dingLiangDaChengYear"
-												type="year"
-												placeholder="请选择时间"
-												style="width:100%"
-											/>
-										</el-col>
-										<el-col :span="8">
-											<el-select v-model="dingLiangDaChengOrg" placeholder="" style="width:100%">
-												<el-option
-													v-for="item in mainOrgList"
-													:key="item.id"
-													:label="item.name"
-													:value="item.id">
-												</el-option>
-											</el-select>
-										</el-col>
-										<el-col :span="8">
-											<el-select v-model="dingLiangDaChengTarget" placeholder="" style="width:100%">
-												<el-option
-													v-for="item in targetListAry"
-													:key="item.id"
-													:label="item.name"
-													:value="item.id">
-												</el-option>
-											</el-select>
-										</el-col>
-									</el-row>
-								</div>
-								<div ref="departmentMonths" class="allOrgAxisCares">
-									
-								</div>
-							</el-card>
-						</el-col>
-						<el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="8">
-							<!--定量指标同比环比-->
-							<DingLiangTongBiHuanBi v-if="loadPage"  :main-org-list="mainOrgList" :target-list-ary="targetListAry" :dlyear="dingLiangYear" :ding-liang-org="dingLiangOrg" :ding-liang-target="dingLiangTarget" />
-						</el-col>
-					</el-row>
-				
-				</el-col>
-				<el-col :xs="24" :sm="8" :md="8" :lg="6" :xl="5" class="greenColor">
-					<EducationChart :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
-					
-				</el-col>
-			</el-row>
-		</div>
-</template>
-<style  lang='scss' scoped>
-.readback{
-	// background-color:#FF0000;
-	.allOrgAxisCares{
-		display: block;
-		width:100%;
-		height:280px;
-		overflow:auto;
-	}
-	
-}
-.orgAllMothsTitle{
-	width:100%;
-	display: flex;
-	align-items: center;
-	justify-content:space-between;
-		
-}
-.greenColor{
-	// background-color:#FFAC52;
-	
-	// padding:0 10px 0 10px;
-}
-.span_icon_left{
-	margin-right:10px;
-}
-.cart_top_juLi{
-	// margin-top:10px;
-}
-.titleInfo{
-	font-size: 20px;
-	font-weight: bold;
-}
-</style>

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 = () =>{
 								<el-button :loading-icon="Eleme" :loading="originTestLoad" type="primary" @click="originTestLink">测试链接</el-button>
 							</td>
 							<td align="right">
-								<el-text class="mx-1" :type="originTextType">
-									<i v-if="originConfig.state == 1" class="fa fa-check"></i>
-									<i v-else-if="originConfig.state == 2" class="fa fa-close"></i>
-									<span v-else>未测试</span>
+								<el-text v-if="originConfig.state == 1" class="mx-1" type="success">
+									<i  class="fa fa-check"></i>
+								</el-text>
+								<el-text v-else-if="originConfig.state == 2" class="mx-1" type="danger">
+									<i  class="fa fa-close"></i>
+								</el-text>
+								<el-text v-else class="mx-1" type="info">
+									<span>未测试</span>
 								</el-text>
-								
 							</td>
 						</tr>
 					</table>
@@ -262,10 +265,14 @@ const migrateRedisInfo = () =>{
 					<table border="0">
 						<tr>
 							<td align="left">
-								<el-text class="mx-1" :type="targetTextType">
-									<i v-if="targetConfig.state == 1" class="fa fa-check"></i>
-									<i v-else-if="targetConfig.state == 2" class="fa fa-close"></i>
-									<span v-else>未测试</span>
+								<el-text v-if="targetConfig.state == 1" class="mx-1" type="success">
+									<i  class="fa fa-check"></i>
+								</el-text>
+								<el-text v-else-if="targetConfig.state == 2" class="mx-1" type="danger">
+									<i  class="fa fa-close"></i>
+								</el-text>
+								<el-text v-else class="mx-1" type="info">
+									<span>未测试</span>
 								</el-text>
 							</td>
 							<td  width="50">

src/views/sysworkflow/flow/flowDrawingBoard.vue

@@ -64,23 +64,32 @@ let directorMaxLeveling = ref<number>(0);
 const shenPiTitle = ref<string>("")
 const activeTabs = ref<string>("");			//当前版本
 
-const versionList = ref<flowversion[]>(); //工作流版本列表
+const versionList = reactive<flowversion[]>([]); //工作流版本列表
 const enableFlow = ref<any>();
 const isRead = ref(false)
-const enableVersion = ref<string>();
+const enableVersion = ref<string>("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
 					}