修复地图问题及添加页面宽度问题

src/api/DesignForm/requestapi.ts

@@ -589,3 +589,11 @@ export function setOftenApp(data: any) {
 		data: data
 	});
 }
+//获取表单地图翻页数据
+export function gainFormPageMapCont(data: any) {
+	return request({
+		url: '/systemapi/customer_form/gainFormPageMapCont',
+		method: 'post',
+		data: data
+	});
+}

src/components/DesignForm/app/calendar/calendar1/calendarItem.vue

@@ -17,6 +17,12 @@ const props = defineProps({
 	drawerWith:{
 		type:Number,
 		default:0
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
 	}
 });
 
@@ -52,6 +58,43 @@ const lookPageInfo = (val:any) => {
 	pageInfoCont.value = val
 	lookPageInfoIsShow.value = true;	
 }
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 08:30:49
+@ 功能: 判断是否有标题
+*/
+const writeListTitle = (val:any) => {
+	var titleAry = [];
+	let firstWord = ""
+	if(props.viewSetup.form && props.viewSetup.form.title){
+		if(props.viewSetup.form.title.length > 0){
+			props.viewSetup.form.title.forEach((item,index)=>{
+				// console.log("判断是否有标题--"+index+"-->",val[item])
+				if(val[item]){
+					titleAry.push(val[item])
+				}
+			})
+		}
+	}
+	if(titleAry.length > 0){
+		return titleAry.join()
+	}else{
+		let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
+		for (let key in val) {
+			if (val.hasOwnProperty(key)) {
+				if(!powerAry.includes(key)){
+					if(val[key] != '' && val[key] != null){
+						firstWord = val[key]
+					}
+				}
+			}
+		}
+		return firstWord
+	}
+	
+}
+
 </script>
 <template>
     <div
@@ -75,7 +118,7 @@ const lookPageInfo = (val:any) => {
 		</div>
 		<div  v-if="col.list&&col.list.length" class="dayList">
 			<div v-for="lt in col.list" :key="lt.id" class="dayLogCont" @click="lookPageInfo(lt)">
-				{{ lt.serialNumber1718584909710 }}
+				{{ writeListTitle(lt) }}
 			</div>
 		</div>
         <FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="props.drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />

src/components/DesignForm/app/calendar/calendar1/calendarPage.vue

@@ -30,6 +30,12 @@ const props = defineProps({
 	drawerWith:{
 		type:Number,
 		default:0
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
 	}
 });
 const  taday = ref<any>([]);
@@ -191,9 +197,9 @@ defineExpose({
 			</div>
 		</div>
 		<div class="weekNumber">
-			<MonthPage ref="monthPageRef" v-if="curtteDayType==1" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" />
+			<MonthPage ref="monthPageRef" v-if="curtteDayType==1" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" :view-setup="props.viewSetup" />
-			<WeekPage ref="weekPageRef" v-if="curtteDayType==2" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" />
+			<WeekPage ref="weekPageRef" v-if="curtteDayType==2" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" :view-setup="props.viewSetup" />
-			<DayPage ref="dayPageRef" v-if="curtteDayType==3" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" />
+			<DayPage ref="dayPageRef" v-if="curtteDayType==3" :body-hight="props.bodyHight" :ta-day="taday"  :search-send="props.searchSend" :drawer-with="props.drawerWith" :view-setup="props.viewSetup" />
 		</div>
 	</div>
 </template>

src/components/DesignForm/app/calendar/calendar1/dayPage.vue

@@ -27,6 +27,12 @@ const props = defineProps({
 	drawerWith:{
 		type:Number,
 		default:0
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
 	}
 });
 
@@ -117,6 +123,7 @@ defineExpose({
 				<CalendarItem
                     :col="dayInfo"
                     :time="selectedTime"
+					:view-setup="props.viewSetup"
 					:drawer-with="props.drawerWith"
                     @changeTargetDate="changeDate"
                 ></CalendarItem>

src/components/DesignForm/app/calendar/calendar1/monthPage.vue

@@ -30,6 +30,12 @@ const props = defineProps({
 	drawerWith:{
 		type:Number,
 		default:0
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
 	}
 });
 const TBody = ref<any[]>([])
@@ -126,6 +132,7 @@ defineExpose({
                             :col="col"
                             :time="selectedTime"
 							:drawer-with="props.drawerWith"
+							:view-setup="props.viewSetup"
                             @changeTargetDate="changeDate"
                         ></CalendarItem>
 					</div>

src/components/DesignForm/app/calendar/calendar1/weekPage.vue

@@ -27,6 +27,12 @@ const props = defineProps({
 	drawerWith:{
 		type:Number,
 		default:0
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
 	}
 });
 
@@ -120,6 +126,7 @@ defineExpose({
 					<CalendarItem
 						:col="item"
 						:time="selectedTime"
+						:view-setup="props.viewSetup"
 						:drawer-with="props.drawerWith"
 						@changeTargetDate="changeDate"
 					></CalendarItem>

src/components/DesignForm/app/cardPage.vue

@@ -176,6 +176,34 @@ const imgSrcAry = (val:any) => {
 */
 const cardInfo = (val:any,cla:string) => {
 	if(cla=="title"){
+		if(props.viewSetup.form.title){
+			var titleAry = [];
+			if(props.viewSetup.form.title.length > 0){
+				props.viewSetup.form.title.forEach((item,index)=>{
+					// console.log("判断是否有标题--"+index+"-->",val[item])
+					if(val[item]){
+						titleAry.push(val[item])
+					}
+				})
+			}
+			if(titleAry.length>0){
+				return titleAry.join()
+			}else{
+				let firstWord = ""
+				let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
+				for (let key in val) {
+					if (val.hasOwnProperty(key)) {
+						if(!powerAry.includes(key)){
+							if(val[key] != '' && val[key] != null){
+								firstWord = val[key]
+							}
+						}
+					}
+				}
+				return firstWord
+			}
+			
+		}
 		if(val[props.viewSetup.form.titleWork]){
 			return val[props.viewSetup.form.titleWork]
 		}
@@ -267,9 +295,11 @@ const lookPageInfo = (val:any) => {
 	.title{
 		font-size:14px;
 		font-weight:bold;
-		overflow: hidden;
+		display: -webkit-box;
-		text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
-		white-space: nowrap;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
 	}
 	.content{
 		color: #909399;

src/components/DesignForm/app/index.vue

@@ -254,9 +254,12 @@ const selectionChange = (row: any) => {
 @ 功能: 获取表格头内容
 */
 const columnsFilter = computed(() => {
+	
     if (!state.columnsCheck?.length) {
+		// console.log("props.data判断是否有标题",props.data)
       	return props.data.columns
     } else {
+		// console.log("props.data.columns判断是否有标题",props.data)
 		return props.data.columns.filter((item: any) => {
 			return state.columnsCheck.includes(item.prop || item.type)
 		})
@@ -791,6 +794,61 @@ const tabsView = (val:any,types:number) => {
 			break;
 	}
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 08:30:49
+@ 功能: 判断是否有标题
+*/
+const writeListTitle = (val:any,viewConfig:any) => {
+	// console.log("判断是否有标题--1-->",val)
+	// console.log("判断是否有标题--2-->",viewConfig)
+	var titleAry = [];
+	if(viewConfig.form && viewConfig.form.title){
+		if(viewConfig.form.title.length > 0){
+			viewConfig.form.title.forEach((item,index)=>{
+				// console.log("判断是否有标题--"+index+"-->",val[item])
+				if(val[item]){
+					titleAry.push(val[item])
+				}
+			})
+		}
+	}
+	if(titleAry.length > 0){
+		return titleAry.join()
+	}else{
+		let firstWord = ""
+				let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
+				for (let key in val) {
+					if (val.hasOwnProperty(key)) {
+						if(!powerAry.includes(key)){
+							if(val[key] != '' && val[key] != null){
+								firstWord = val[key]
+							}
+						}
+					}
+				}
+				return firstWord
+	}
+	
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 10:27:21
+@ 功能: 判断是否有标题
+*/
+const judgeListTitle = (val:any,viewConfig:any) => {
+	// console.log("判断是否有标题--3-->",val)
+	// console.log("判断是否有标题--4-->",viewConfig)
+	if(val && val.fieldClass=='_lableTitle'){
+		if(viewConfig.form && viewConfig.form.title){
+			if(viewConfig.form.title.length > 0){
+				return true
+			}
+		}
+	}
+	return false
+}
 
 </script>
 <template>
@@ -1057,6 +1115,11 @@ const tabsView = (val:any,types:number) => {
 								</el-button-group>
 							</template>
 						</el-table-column>
+						<el-table-column v-else-if="item.fieldClass=='_lableTitle'" label="标题" config="" min-width="320">
+							<template #default="scope">
+								{{writeListTitle(scope.row,viewPage.list)}}
+							</template>
+						</el-table-column>
 						<el-table-column v-else  :prop="item.field" :label="item.label" config="" min-width="220">
 							<template v-if="item.help" #header="scope">
 								{{ scope.column.label }}
@@ -1067,18 +1130,18 @@ const tabsView = (val:any,types:number) => {
 								{{ judjeRadio(scope.row[scope.column.property],item.options) }}
 							</template>
 							<template v-if="item.fieldClass=='upload'" #default="scope" >
-							<div class="demo-image__error">
+								<div class="demo-image__error">
-								<el-image
+									<el-image
-									style="width: 50px; height: 50px"
+										style="width: 50px; height: 50px"
-									:src="scope.row[scope.column.property]"
+										:src="scope.row[scope.column.property]"
-								>
+									>
-									<template #error>
+										<template #error>
-										<div class="image-slot">
+											<div class="image-slot">
-											<el-icon><Picture /></el-icon>
+												<el-icon><Picture /></el-icon>
-										</div>
+											</div>
-									</template>
+										</template>
-								</el-image>
+									</el-image>
-							</div>
+								</div>
 							</template>
 							<template v-if="item.fieldClass=='switch'" #default="scope">	
 								
@@ -1128,10 +1191,10 @@ const tabsView = (val:any,types:number) => {
 				</div>
 			</el-col>
 			<el-col  v-if="viewType==2" :span="24">
-				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265" :drawer-with="drawerWith" :view-setup="viewPage.card"  />
+				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265" :drawer-with="drawerWith" :view-setup="viewPage.date"  />
 			</el-col>
 			<el-col  v-if="viewType==3" :span="24">
-				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" />
+				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.time" />
 			</el-col>
 			<el-col  v-if="viewType==4" :span="24">
 				<GanttPageIng ref="ganttPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.gantt" />

src/components/DesignForm/app/mapPage.vue

@@ -4,6 +4,11 @@
 @ 备注: 地图视图
 -->
 <script lang='ts' setup>
+
+import { gainFormPageMapCont } from '@/api/DesignForm/requestapi'
+
+import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
+
 const props = defineProps({
 	searchSend:{
 		type:Object,
@@ -27,6 +32,16 @@ const longitude= ref<number>(117.14272945140574)
 const latitude= ref<number>(35.91808471435389)
 /**
 @ 作者: 秦东
+@ 时间: 2024-07-25 13:24:25
+@ 功能: 查询参数
+*/
+const searchQuery = reactive({
+	// formId
+})
+const totalNum = ref(0)
+const mapDataList = ref([]) // 表格行数据
+/**
+@ 作者: 秦东
 @ 时间: 2024-07-19 14:55:24
 @ 功能: 引入外部js
 */
@@ -45,6 +60,7 @@ const mapInit = () => {
 	var opts = {type: BMAP_NAVIGATION_CONTROL_LARGE}    
 	map.addControl(new BMap.NavigationControl(opts));	//添加控件
 	map.addControl(new BMap.ScaleControl());
+	// map.addControl(new BMap.LocationControl());
 	map.addControl(new BMap.MapTypeControl());
 	map.enableScrollWheelZoom(); // 启用滚轮放大缩小
 
@@ -67,7 +83,19 @@ const mapInit = () => {
 	// map.addOverlay(markerd);
   	
 }
-
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:24:06
+@ 功能: 查看详细内容
+*/
+const tablePageClass = ref(1)
+const lookPageInfoIsShow = ref(false)
+const pageInfoCont = ref<any>()
+const lookPageInfo = (val:any) => {
+	tablePageClass.value = 4;
+	pageInfoCont.value = val
+	lookPageInfoIsShow.value = true;	
+}
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-19 15:31:05
@@ -75,33 +103,82 @@ const mapInit = () => {
 */
 const mapHandle = (map:any) => {
 	let blz = []
-	for(var i = 1; i < 5;){
+	
-		const points = new BMap.Point(117.14372945240574,35.92808471455389+i); // 创建点坐标
+	// for(var i = 1; i < 5;){
+	// 	const points = new BMap.Point(117.14372945240574,35.92808471455389+i); // 创建点坐标
+	// 	map.centerAndZoom(points, 16);
+	// 	// var markerd = new BMap.Marker(points);
+	// 	// map.addOverlay(markerd);
+	// 	// let blz = "label"+i
+	// 	blz[i] = new BMap.Label("山东恒信高科"+i, {       // 创建文本标注
+	// 		position: points,                          // 设置标注的地理位置
+	// 		offset: new BMap.Size(10, 20)           // 设置标注的偏移量
+	// 	})
+	// 	blz[i].addEventListener("click", function(){  
+	// 		alert(i);  
+	// 	});
+	// 	map.addOverlay(blz[i]);
+	// 	i++
+	// }
+	// console.log("设置标注的偏移量",mapDataList.value);
+	mapDataList.value.forEach((item,index)=>{
+		// console.log("设置标注的偏移量---->",item);
+		const points = new BMap.Point(item._latitude,item._longitude); // 创建点坐标
 		map.centerAndZoom(points, 16);
-		// var markerd = new BMap.Marker(points);
+		blz[index] = new BMap.Label(item.input1721369489569, {       // 创建文本标注
-		// map.addOverlay(markerd);
-		// let blz = "label"+i
-		blz[i] = new BMap.Label("山东恒信高科"+i, {       // 创建文本标注
 			position: points,                          // 设置标注的地理位置
 			offset: new BMap.Size(10, 20)           // 设置标注的偏移量
 		})
-		blz[i].addEventListener("click", function(){  
+		blz[index] .addEventListener("click", function(){  
-			alert(i);  
+			// alert(item.input1721369489569);  
+			lookPageInfo(item)
 		});
-		map.addOverlay(blz[i]);
+		map.addOverlay(blz[index]);
-		i++
+	})
-	}
+}
+
 
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 13:23:33
+@ 功能: 获取数据
+*/
+const gainMapLog = (val:any) => {
+	val.viewClass = {
+		class:"map"
+	}
+	// console.log(props.searchSend)
+	gainFormPageMapCont(val)
+		.then(({data})=>{
+			totalNum.value = data.total
+			// console.log("卡片获取数据--》",data)
+			mapDataList.value = data.list
+			loadJScript()
+		})
 }
 
 
 onMounted(() =>{
-	loadJScript()
+	// gainMapLog(props.searchSend)
+	
+	nextTick(() =>{
+		gainMapLog(props.searchSend)
+	})
 })
+
+//翻页
+const currentChange = (current: number) => {
+	props.searchSend.page = current
+    gainMapLog(props.searchSend)
+}
 </script>
 <template>
 	<div>
 		<div id="pickMapView" :ref="mapId" class="openMapView"></div>
+		<div class="mapPage">
+			<el-pagination layout="prev, pager, next" :total="totalNum" @current-change="currentChange" />
+		</div>
+		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="props.drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="gainMapLog(props.searchSend)" />
 	</div>
 </template>
 <style  lang='scss' scoped>
@@ -110,4 +187,13 @@ onMounted(() =>{
 	margin: 10px 0 0 0;
 	height: calc(100vh - 320px);
 }
+.mapPage{
+	position: fixed;
+	bottom: 4.5rem;
+    right: 5rem;
+	border-radius: .25rem;
+    background-color: #fff;
+    box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.5);
+	z-index:999
+}
 </style>

src/components/DesignForm/app/timeAxis.vue

@@ -37,6 +37,12 @@ const props = defineProps({
 	drawerWith:{
 		type:Number,
 		default:0
+	},
+	viewSetup:{
+		type:Object,
+		default(){
+			return {}
+		}
 	}
 });
 const svg = `
@@ -130,6 +136,9 @@ defineExpose({
 */
 const judgeGainVal = (key:string,val:any) => {
 	// console.log("判断当前值--1->",val)
+	if(key=="_lableTitle"){
+		return writeListTitle(val)
+	}
 	if(val[key]){
 		return val[key]
 	}
@@ -171,6 +180,41 @@ const lookPageInfo = (val:any) => {
 	pageInfoCont.value = val
 	lookPageInfoIsShow.value = true;	
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 08:30:49
+@ 功能: 判断是否有标题
+*/
+const writeListTitle = (val:any) => {
+	var titleAry = [];
+	let firstWord = ""
+	if(props.viewSetup.form && props.viewSetup.form.title){
+		if(props.viewSetup.form.title.length > 0){
+			props.viewSetup.form.title.forEach((item,index)=>{
+				// console.log("判断是否有标题--"+index+"-->",val[item])
+				if(val[item]){
+					titleAry.push(val[item])
+				}
+			})
+		}
+	}
+	if(titleAry.length > 0){
+		return titleAry.join()
+	}else{
+		let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
+		for (let key in val) {
+			if (val.hasOwnProperty(key)) {
+				if(!powerAry.includes(key)){
+					if(val[key] != '' && val[key] != null){
+						firstWord = val[key]
+					}
+				}
+			}
+		}
+		return firstWord
+	}
+	
+}
 </script>
 <template>
 	<ul v-infinite-scroll="loadTimeLog" class="infinite-list" :infinite-scroll-disabled="timeDisabled">
@@ -209,7 +253,6 @@ const lookPageInfo = (val:any) => {
 							border
 						>
 							<el-descriptions-item v-for="itemField in showWork"  :label="itemField.label" >
-								
 								{{judgeGainVal(itemField.field,item)}}
 							</el-descriptions-item>
 						</el-descriptions>

src/components/DesignForm/designLayout/designLayoutButPage.vue

@@ -26,7 +26,7 @@ const emits = defineEmits(["update:dataVal"]);
 */
 const getUpdataVal = computed({
 	get: () => {
-        console.log("获取和更新数值-->props.place",props.place);
+        // console.log("获取和更新数值-->props.place",props.place);
         return props.dataVal[props.place]
     },
 	set: (val) => {
@@ -104,4 +104,4 @@ const setGutter = (val: String) =>{
 </template>
 <style  lang='scss' scoped>
 
-</style>
+</style>

src/components/DesignForm/designLayout/yuanjao.vue

@@ -36,7 +36,7 @@ const props = defineProps({
 @ 功能: 处理边框圆角
 */
 const boxHornCope = (val:number) => {
-    console.log("处理边框圆角",val)
+    // console.log("处理边框圆角",val)
     if(val == 1){
         props.layouytStyle.divbox="all"
     }else{
@@ -49,7 +49,7 @@ const boxHornCope = (val:number) => {
     // radiusLeftBot.value = 0
     // radiusrightBot.value = 0
 
-    console.log("处理边框圆角",props.layouytStyle)
+    // console.log("处理边框圆角",props.layouytStyle)
 }
 onBeforeMount(() => {
     props.layouytStyle.divbox = "all"
@@ -61,7 +61,7 @@ onBeforeMount(() => {
 */
 
 const sliderChange = (val:number) => {
-  console.log("处理边框圆角112",val)
+//   console.log("处理边框圆角112",val)
   props.layouytStyle.borderRadius = val
 }
 /**

src/components/DesignForm/tableListPage/formPageCont.vue

@@ -231,12 +231,20 @@ const submitEdit = (type: string,val?:any) => {
 		closeDrawer()
 	}
 }
+const jsuanKuandu = () => {
+	if(props.pageInfo.flowIsOpen==1){
+		return 900 + 350
+	}else{
+		return 900
+	}
+	
+}
 </script>
 <template>
 	<el-drawer
 		v-model="openOfClose"
 		title="查看表单内容"
-		:size="drawerWith"
+		:size="jsuanKuandu()"
 		:with-header="false" 
 		:close-on-click-modal="false" 
 		:close-on-press-escape="false" 

src/components/DesignForm/tableListPage/index.vue

@@ -784,6 +784,61 @@ const tabsView = (val:any,types:number) => {
 			break;
 	}
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 08:30:49
+@ 功能: 判断是否有标题
+*/
+const writeListTitle = (val:any,viewConfig:any) => {
+	// console.log("判断是否有标题--1-->",val)
+	// console.log("判断是否有标题--2-->",viewConfig)
+	var titleAry = [];
+	if(viewConfig.form && viewConfig.form.title){
+		if(viewConfig.form.title.length > 0){
+			viewConfig.form.title.forEach((item,index)=>{
+				// console.log("判断是否有标题--"+index+"-->",val[item])
+				if(val[item]){
+					titleAry.push(val[item])
+				}
+			})
+		}
+	}
+	if(titleAry.length > 0){
+		return titleAry.join()
+	}else{
+		let firstWord = ""
+				let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
+				for (let key in val) {
+					if (val.hasOwnProperty(key)) {
+						if(!powerAry.includes(key)){
+							if(val[key] != '' && val[key] != null){
+								firstWord = val[key]
+							}
+						}
+					}
+				}
+				return firstWord
+	}
+	
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 10:27:21
+@ 功能: 判断是否有标题
+*/
+const judgeListTitle = (val:any,viewConfig:any) => {
+	// console.log("判断是否有标题--3-->",val)
+	// console.log("判断是否有标题--4-->",viewConfig)
+	if(val && val.fieldClass=='_lableTitle'){
+		if(viewConfig.form && viewConfig.form.title){
+			if(viewConfig.form.title.length > 0){
+				return true
+			}
+		}
+	}
+	return false
+}
 </script>
 <template>
 	<div ref="container" v-loading="state.loading" class="table-list-comm">
@@ -1049,6 +1104,11 @@ const tabsView = (val:any,types:number) => {
 								</el-button-group>
 							</template>
 						</el-table-column>
+						<el-table-column v-else-if="item.fieldClass=='_lableTitle'" label="标题" config="" min-width="320">
+							<template #default="scope">
+								{{writeListTitle(scope.row,viewPage.list)}}
+							</template>
+						</el-table-column>
 						<el-table-column v-else  :prop="item.field" :label="item.label" config=""  min-width="220">
 							<template v-if="item.help" #header="scope">
 								{{ scope.column.label }}
@@ -1123,7 +1183,7 @@ const tabsView = (val:any,types:number) => {
 				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265" :drawer-with="drawerWith" :view-setup="viewPage.card"  />
 			</el-col>
 			<el-col  v-if="viewType==3" :span="24">
-				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" />
+				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.time" />
 			</el-col>
 			<el-col  v-if="viewType==4" :span="24">
 				<GanttPage ref="ganttPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.gantt" />
@@ -1206,7 +1266,7 @@ const tabsView = (val:any,types:number) => {
 
 
 		<el-dialog v-model="asfShowDetailsFlag" title="关联表单详情查看" top="20px" style="margin-top:70px,margin-left:270px">
-                的事发生飞洒地方撒旦撒旦发
+                
         </el-dialog>
 	
 	</div>

src/views/matrix/index.vue

@@ -84,7 +84,7 @@ function searchMatrixList() {
     loading.value = true
     getMatrixList(searchArchiveQuery)
         .then(({ data }) => {
-            console.log("获取矩阵列表->", data)
+            // console.log("获取矩阵列表->", data)
             matrixContList.value = data.list
             total.value = data.total
         }).finally(() => { loading.value = false })

src/views/matrix/matrixcont/setupmatrixuser_black.vue

@@ -73,7 +73,7 @@ function initData(){
 	if(props.userShow){
 		getMatrixField({id:props.matrixcont.id})
 			.then(({data})=>{
-				console.log("监听数据---->",data)
+				// console.log("监听数据---->",data)
 				data.factor.forEach(item=>{
 					tabelColumn.push({
 						id:item.id,

src/views/sysworkflow/flow/index.vue

@@ -20,8 +20,8 @@ const customerFormKey = ref<string>()
 const scrollContainer = ref<any>(null)
 const fixedElement = ref<any>(null)
 const scrollToFixed = () =>{
-	console.log("scrollToFixed",scrollContainer.value?.offsetTop)
+	// console.log("scrollToFixed",scrollContainer.value?.offsetTop)
-	console.log("scrollToFixed",fixedElement.value?.offsetTop)
+	// console.log("scrollToFixed",fixedElement.value?.offsetTop)
 	scrollContainer.value.scrollIntoView({
 		behavior: "smooth"
 	})

src/views/sysworkflow/lowcodepage/appCardPage.vue

@@ -192,7 +192,8 @@ const state = reactive({
 			isClick:false,
 			form:{
 				sortWord:"",
-				sortClass:1
+				sortClass:1,
+				title:[]
 			}
 		},
 		date:{
@@ -201,7 +202,8 @@ const state = reactive({
 			form:{
 				startTime:"",
 				endTime:"",
-				dayType:1
+				dayType:1,
+				title:[]
 			}
 		}
 		,
@@ -210,7 +212,8 @@ const state = reactive({
 			isClick:false,
 			form:{
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		}
 		,
@@ -222,7 +225,8 @@ const state = reactive({
 				endTime:"",
 				dayType:2,
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		}
 		,
@@ -232,7 +236,8 @@ const state = reactive({
 			form:{
 				mapWord:"",
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		},
 		card:{
@@ -248,7 +253,8 @@ const state = reactive({
 				imgPadding:2,
 				titleWork:"",
 				describe:"",
-				ranks:3
+				ranks:3,
+				title:[]
 			}
 		}
 	}

src/views/sysworkflow/lowcodepage/appListPage.vue

@@ -179,7 +179,8 @@ const state = reactive({
 			isClick:false,
 			form:{
 				sortWord:"",
-				sortClass:1
+				sortClass:1,
+				title:[]
 			}
 		},
 		date:{
@@ -188,7 +189,8 @@ const state = reactive({
 			form:{
 				startTime:"",
 				endTime:"",
-				dayType:1
+				dayType:1,
+				title:[]
 			}
 		}
 		,
@@ -197,7 +199,8 @@ const state = reactive({
 			isClick:false,
 			form:{
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		}
 		,
@@ -209,7 +212,8 @@ const state = reactive({
 				endTime:"",
 				dayType:2,
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		}
 		,
@@ -219,7 +223,8 @@ const state = reactive({
 			form:{
 				mapWord:"",
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		},
 		card:{
@@ -235,7 +240,8 @@ const state = reactive({
 				imgPadding:2,
 				titleWork:"",
 				describe:"",
-				ranks:3
+				ranks:3,
+				title:[]
 			}
 		}
 	}

src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue

@@ -78,18 +78,7 @@ const drawerOpenOrClose =   computed({
 	},
 });
 
-const drawbox =   computed({
+const drawbox =   ref(props.drawerwith)
-	get: () => {
-		if(props.drawerwith > 1200){
-			return '50%';
-		}else{
-			return props.drawerwith
-		}
-	},
-	set: (val:number) => {
-		return val
-	},
-});
 const isFlowTable = ref(false) //判断是不是流程表单
 //获取表单数据
 const getTaskFormData = () =>{
@@ -129,7 +118,11 @@ const getTaskFormData = () =>{
 //监听页面变化
 watch(()=>props.isopen,()=>{
 	if(props.isopen){
-		
+			if(isFlow.value == 2){
+				drawbox.value =  800 + 350
+			}else{
+				drawbox.value = 800
+			}
 		// getTaskFormData();
 		initLoadData();
 	}else{

src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue

@@ -75,6 +75,10 @@ const drawbox =   computed({
 		if(props.drawerwith > 1200){
 			return '50%';
 		}else{
+			console.log("isFlowTable",isFlowTable.value)
+			if(isFlowTable.value){
+				return '90%'
+			}
 			return props.drawerwith
 		}
 	},

src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue

@@ -77,7 +77,8 @@ const stateList = reactive({
 			isClick:false,
 			form:{
 				sortWord:"",
-				sortClass:1
+				sortClass:1,
+				title:[]
 			}
 		},
 		date:{
@@ -86,7 +87,8 @@ const stateList = reactive({
 			form:{
 				startTime:"",
 				endTime:"",
-				dayType:1
+				dayType:1,
+				title:[]
 			}
 		}
 		,
@@ -95,7 +97,8 @@ const stateList = reactive({
 			isClick:false,
 			form:{
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		}
 		,
@@ -107,7 +110,8 @@ const stateList = reactive({
 				endTime:"",
 				dayType:2,
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		}
 		,
@@ -117,7 +121,8 @@ const stateList = reactive({
 			form:{
 				mapWord:"",
 				sortWord:"",
-				sort:1
+				sort:1,
+				title:[]
 			}
 		},
 		card:{
@@ -133,7 +138,8 @@ const stateList = reactive({
 				imgPadding:2,
 				titleWork:"",
 				describe:"",
-				ranks:3
+				ranks:3,
+				title:[]
 			}
 		}
 	}

src/widget/org/index.vue

@@ -170,7 +170,7 @@ function haveOrgTreeInfo(){
 }
 //加载数据
 onMounted(() => {
-	console.log("加载叔叔");
+	// console.log("加载叔叔");
 	haveOrgTreeInfo();
 });
 </script>