From 5cfff1e8e336391536a6be7077c4cde29a6a6605 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 17 Dec 2024 14:42:37 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formTable/index.vue | 132 +++++++++++++++++++++++++++++
 1 file changed, 132 insertions(+)

diff --git a/src/components/formTable/index.vue b/src/components/formTable/index.vue
index af69e2b..593d201 100644
--- a/src/components/formTable/index.vue
+++ b/src/components/formTable/index.vue
@@ -620,6 +620,7 @@ onMounted(() => {
 	nextTick(() => {
 		appendRemoveStyle(true)
 	})
+	getAsfs()
 })
 onUnmounted(() => {
 	if (eventName) {
@@ -1826,6 +1827,137 @@ function arrayEqual(a: string[], b: any[]) {
 }
 
 //liwenxuan 241209 关联选项设置 显示隐藏效果 end
+//liwenxuan 241217 数据范围动态 start
+let asfRangeDoubleCondiChangeObj = ref();
+provide("asfRangeDoubleCondiChangeObj", asfRangeDoubleCondiChangeObj);
+const asfs: any[] = [];
+const tables: any[] = [];
+let oldModelStr = "";
+watch(
+	() => model.value,
+	(newVal) => {
+		//console.log(1)
+		let currentChangeKey = "";
+		const newModelStr = JSON.stringify(newVal);
+		let oldModelStr1 = oldModelStr;
+		if (newModelStr !== oldModelStr1 && oldModelStr1 != "") {
+			let oldVal = JSON.parse(oldModelStr1);
+			/* console.log(oldVal)
+			console.log(newVal) */
+			for (const key in newVal) {
+				if (JSON.stringify(newVal[key]) !== JSON.stringify(oldVal[key])) {
+					currentChangeKey = key;
+				}
+			}
+		}
+		let rangeFormulaArr = [];
+		
+		if (asfs.length > 0) {
+			/* console.log(currentChangeKey)
+			console.log(asfs) */
+			asfs.forEach((element: any) => {
+				let asfName = element.name;
+
+				if (
+					element.control.dataRangeGongShi &&
+					element.control.dataRangeGongShi.mathsFormula &&
+					element.control.dataRangeGongShi.mathsFormula.length > 0
+				) {
+					let asfRangeDoubleCondi = element.control.dataRangeGongShi.mathsFormula;
+
+					if (currentChangeKey != "") {
+						let a = asfRangeDoubleCondi.split(":");
+						let field = a[a.length - 1];
+						if (currentChangeKey == field) {
+							let toShowDoubleCondiValVal = model.value[currentChangeKey];
+							//console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
+							let obj = {
+								asfName: asfName,
+								toShowDoubleCondiValVal: toShowDoubleCondiValVal,
+							};
+							asfRangeDoubleCondiChangeObj.value = obj;
+						}
+					}
+				}
+			});
+		}
+		oldModelStr = newModelStr;
+	},
+	{ deep: true }
+);
+
+function getAsfs() {
+	setTimeout(() => {
+		let dataList = ref({});
+		dataList.value = props.formData.list;
+
+		if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
+		for (let i = 0; i < dataList.value.length; i++) {
+			if (dataList.value[i].type == "associatedForms") {
+			asfs.push(dataList.value[i]);
+			} else if (
+			dataList.value[i].type == "card" ||
+			dataList.value[i].type == "flex" ||
+			dataList.value[i].type == "div" ||
+			dataList.value[i].type == "table"
+			) {
+			if (dataList.value[i].type == "table") {
+				tables.push(dataList.value[i]);
+			}
+
+			dataList.value[i].list.forEach((element: any) => {
+				if (element.type == "associatedForms") {
+				asfs.push(element);
+				}
+			});
+			} else if (dataList.value[i].type == "grid") {
+			let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+
+			if (columns.length > 0) {
+				for (let z = 0; z < columns.length; z++) {
+				for (let x = 0; x < columns[z].list.length; x++) {
+					let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+					if (a.type == "associatedForms") {
+					asfs.push(a);
+					}
+				}
+				}
+			}
+			} else if (dataList.value[i].type == "tabs") {
+			//tabs标签页有可能再嵌套一层flex或者table
+			let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+			if (columns.length > 0) {
+				for (let z = 0; z < columns.length; z++) {
+				for (let x = 0; x < columns[z].list.length; x++) {
+					let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+					if (a.type == "associatedForms") {
+					asfs.push(a);
+					} else if (a.type == "flex" || a.type == "table") {
+					if (a.type == "table") {
+						tables.push(dataList.value[i]);
+					}
+
+					if (a.list.length > 0) {
+						for (let m = 0; m < a.list.length; m++) {
+						let q = JSON.parse(JSON.stringify(a.list[m]));
+
+						if (q.type == "associatedForms") {
+							asfs.push(q);
+						}
+						}
+					}
+					}
+				}
+				}
+			}
+			}
+		}
+		}
+	}, 500);
+}
+//liwenxuan 241217 数据范围动态 end
 
 
 

From 2fe7ab9060deabb9dfbf9c8bb5803d662d165efb Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Sun, 29 Dec 2024 14:55:45 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formTable/formItemGroup.vue | 375 ++++++++++++++++++++-
 src/components/lowCode/formItem.vue        |   5 +
 src/components/lowCode/tablePage.vue       |   2 +-
 src/views/formTable/page/cardPage.vue      |   5 +-
 4 files changed, 381 insertions(+), 6 deletions(-)

diff --git a/src/components/formTable/formItemGroup.vue b/src/components/formTable/formItemGroup.vue
index 6db2c0f..0fb1e67 100644
--- a/src/components/formTable/formItemGroup.vue
+++ b/src/components/formTable/formItemGroup.vue
@@ -6,6 +6,7 @@
 <script lang='ts' setup>
 import { onBeforeRouteLeave } from 'vue-router'
 import { FormList } from "@/api/lowCode/form/type"
+import request from '@/utils/axios/index'
 import { jsonParseStringify,getGroupName } from '@/utils/lowCode/item/index'
 import { constFormBtnEvent,constFormProps } from '@/api/lowCode/utils';
 import { useDesignFormStore } from '@/utils/pinia/stores/lowCode/designForm'
@@ -46,6 +47,7 @@ const activeKey = computed(() => {
 onMounted(() => {
     // console.log("初始", state)
     // console.log("初始1", dataList.value)
+	getAsfs()
 })
 watch(()=>dataList.value,(val:any) => {
     // console.log("监听组件列表变化", val)
@@ -78,7 +80,7 @@ const getFormItemDivStyle = (ele: any) => {
 
 const getFormItemLableStyle = (ele: any) => {
     if(ele?.labelStyle){ 
-      console.log("返回栅格宽度3",AnalysisCss(ele))
+      //console.log("返回栅格宽度3",AnalysisCss(ele))
     	return AnalysisCss(ele?.labelStyle)
     }
 }
@@ -94,6 +96,373 @@ const clickBtn = (control: any) => {
 		injectBtnEvent && injectBtnEvent(control)
     }
 }
+//liwenxuan 关联表单数据填充 241219 start
+let emits = defineEmits(["asfValueChanged"]);
+const asfs: any[] = [];
+const tables: any[] = [];
+
+function getAsfs() {
+	setTimeout(() => {
+		let dataList = ref({});
+		dataList.value = props.data
+
+		if (dataList && Array.isArray(dataList.value) && dataList.value.length > 0) {
+		for (let i = 0; i < dataList.value.length; i++) {
+			//console.log(dataList.value[i])
+			if (dataList.value[i].type == "associatedForms") {
+			asfs.push(dataList.value[i]);
+			} else if (
+			dataList.value[i].type == "card" ||
+			dataList.value[i].type == "flex" ||
+			dataList.value[i].type == "div" ||
+			dataList.value[i].type == "table"
+			) {
+			if (dataList.value[i].type == "table") {
+				tables.push(dataList.value[i]);
+			}
+
+			dataList.value[i].list.forEach((element: any) => {
+				if (element.type == "associatedForms") {
+				asfs.push(element);
+				}
+			});
+			} else if (dataList.value[i].type == "grid") {
+			let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+
+			if (columns.length > 0) {
+				for (let z = 0; z < columns.length; z++) {
+				for (let x = 0; x < columns[z].list.length; x++) {
+					let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+					if (a.type == "associatedForms") {
+					asfs.push(a);
+					}
+				}
+				}
+			}
+			} else if (dataList.value[i].type == "tabs") {
+			//tabs标签页有可能再嵌套一层flex或者table
+			let columns = JSON.parse(JSON.stringify(dataList.value[i].columns));
+			if (columns.length > 0) {
+				for (let z = 0; z < columns.length; z++) {
+				for (let x = 0; x < columns[z].list.length; x++) {
+					let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+
+					if (a.type == "associatedForms") {
+					asfs.push(a);
+					} else if (a.type == "flex" || a.type == "table") {
+					if (a.type == "table") {
+						tables.push(dataList.value[i]);
+					}
+
+					if (a.list.length > 0) {
+						for (let m = 0; m < a.list.length; m++) {
+						let q = JSON.parse(JSON.stringify(a.list[m]));
+
+						if (q.type == "associatedForms") {
+							asfs.push(q);
+						}
+						}
+					}
+					}
+				}
+				}
+			}
+			}
+		}
+		}
+	}, 500);
+}
+
+function asfValueChanged(val: any) {
+	//alert(1)
+	/* console.log("formItemGroup-asfValueChanged",val)
+		console.log(val.currentVal)
+		console.log(val.fillFieldsMaster)
+		console.log(val.fillFieldsChild) */
+
+	//[key][props.rowIndex][key1]
+	/* console.log(val.tableFlag)
+		console.log(val.key)
+		console.log(val.propsRowIndex)
+		console.log(val.key1) */
+	let fillFieldsMaster = "";
+	let masterFillRoleFieldsArray1: any[] = [];
+
+	if (val.fillFieldsMaster.length > 0) {
+		fillFieldsMaster = val.fillFieldsMaster.substring(0, val.fillFieldsMaster.length - 1);
+		let masterFillRoleFieldsArray = fillFieldsMaster.split(";");
+		//console.log(masterFillRoleFieldsArray)
+		masterFillRoleFieldsArray.forEach((item: any) => {
+		let itemArray = item.split("_");
+		itemArray.splice(0, 1);
+
+		itemArray = itemArray.map((item1: any) => item1.split(":").pop());
+		//console.log(itemArray)
+		masterFillRoleFieldsArray1.push(itemArray);
+		});
+	}
+
+	if (val.fillFieldsChild && val.fillFieldsChild.length > 0) {
+		/* console.log(val.asfFormId)
+			console.log(val.masterOnField) */
+		let fillFieldsChild = JSON.parse(val.fillFieldsChild);
+		if (fillFieldsChild && fillFieldsChild.length > 0) {
+		fillFieldsChild = fillFieldsChild.filter((element: any) => {
+			if (containsDangerousWords(element.filterCondition.gongShi.mathsFormula)) {
+			//alert("筛选条件非法")
+			console.log("筛选条件非法===>" + element.filterCondition.conditionHtml);
+			} else {
+			return element;
+			}
+		});
+		}
+		//console.log(fillFieldsChild)
+		
+		
+		getAsfTableFill(val.asfFormId, val.glbbddbd, val.currentVal, fillFieldsChild).then(
+		({ data }) => {
+			//console.log(data)
+			if (data && data.length > 0) {
+			data.forEach((dataElement: any) => {
+				tables.forEach((tableItem: any) => {
+				if (dataElement.tableName == tableItem.name) {
+					//console.log(formProps.value.model)
+					//console.log(tableItem)
+					//console.log(dataElement)
+					let tableName = dataElement.tableName;
+					//console.log(tableName)
+					if (tableItem.list.length > 0) {
+					let tableRowArray: { type: any; name: any }[] = [];
+					tableItem.list.forEach((listItem: any) => {
+						//console.log(listItem)
+						tableRowArray.push({
+						type: listItem.type,
+						name: listItem.name,
+						});
+					});
+					//console.log(tableRowArray)
+					const result = generateXResult(dataElement, tableRowArray);
+					//console.log(result);
+					formProps.value.model[tableName] = result;
+					}
+				}
+				});
+			});
+			}
+		}
+		);
+	}
+
+	//emits("asfValueChanged",val)
+	if (val.options.length > 0) {
+		//console.log(val.options)
+		if (val.options[0].fillRolesFieldsMap) {
+		val.options.forEach((item: any) => {
+			if (item.fillRolesFieldsMap.value == val.currentVal) {
+			//console.log(masterFillRoleFieldsArray1)
+			if (masterFillRoleFieldsArray1.length > 0) {
+				masterFillRoleFieldsArray1.forEach((item1: any) => {
+				//console.log(item.fillRolesFieldsMap)
+				//console.log(item1)
+				let x = convertObjectToArray(getNewObject(item.fillRolesFieldsMap, item1));
+				//console.log(x)
+				let strOrNumber = convertToStringOrNumber(x[1]);
+				let strOrNumberOrArray;
+				if (isString(strOrNumber) && strOrNumber.includes("[")) {
+					strOrNumberOrArray = convertIfValidNumberArray(strOrNumber);
+				}
+				/* console.log(strOrNumber)
+								console.log(strOrNumberOrArray) */
+
+				/* console.log(x[1])
+								console.log(strOrNumberOrArray)
+								console.log(formProps.value.model[x[0]]) */
+				if (strOrNumberOrArray) {
+					formProps.value.model[x[0]] = strOrNumberOrArray;
+				} else {
+					/* console.log(x)
+									console.log(formProps.value.model)
+									console.log(val.tableFlag)
+									console.log(val.key)
+									console.log(val.propsRowIndex)
+									console.log(val.key1) */
+
+					if (val.tableFlag) {
+					//console.log(formProps.value.model)
+					let urlArr = findPathInObject(formProps.value.model, x[0]);
+					//console.log(urlArr)
+					if (urlArr[0] == x[0]) {
+						formProps.value.model[x[0]] = strOrNumber;
+					} else {
+						formProps.value.model[val.key][val.propsRowIndex][x[0]] = strOrNumber;
+					}
+					} else {
+					formProps.value.model[x[0]] = strOrNumber;
+					}
+				}
+
+				//console.log(formProps.value.model[x[0]])
+				});
+			}
+			}
+		});
+		}
+	}
+	}
+
+function getNewObject(obj: any, arr: any) {
+	//console.log(obj)
+	//console.log(arr)
+	let key = arr[0];
+	let newKey = arr[1];
+	if (obj[key]) {
+		return { [newKey]: obj[key] };
+	}
+	return {};
+}
+
+	function findPathInObject(obj: any, target: string): string[] {
+		function search(obj: any, target: string, path: string[] = []): string[] | null {
+			if (typeof obj === "object" && obj !== null) {
+			for (let key in obj) {
+				let newPath = path.concat(key);
+				if (key === target) {
+				return newPath;
+				} else if (Array.isArray(obj[key])) {
+				for (let i = 0; i < obj[key].length; i++) {
+					let result = search(obj[key][i], target, newPath);
+					if (result) {
+					return result;
+					}
+				}
+				} else if (typeof obj[key] === "object" && obj[key] !== null) {
+				let result = search(obj[key], target, newPath);
+				if (result) {
+					return result;
+				}
+				}
+			}
+			}
+			return null;
+		}
+
+		return search(obj, target) || [];
+	}
+
+	interface DetailObject {
+	[key: string]: any;
+	}
+
+	interface TableRow {
+	type: string;
+	name: string;
+	}
+
+	function generateXResult(
+	dataElement: { tableDetail: DetailObject[] },
+	tableRowArray: TableRow[]
+	): DetailObject[] {
+	const xResult: DetailObject[] = [];
+	const propertyNames = tableRowArray.map((item) => item.name);
+	for (const detail of dataElement.tableDetail) {
+		const obj: DetailObject = {};
+		propertyNames.forEach((name) => {
+		let strOrNumber = convertToStringOrNumber(detail[name]);
+		let strOrNumberOrArray;
+		if (isString(strOrNumber) && strOrNumber.includes("[")) {
+			strOrNumberOrArray = convertIfValidNumberArray(strOrNumber);
+		}
+		if (strOrNumberOrArray) {
+			obj[name] = strOrNumberOrArray;
+		} else {
+			obj[name] = strOrNumber;
+		}
+		});
+		xResult.push(obj);
+	}
+	return xResult;
+	}
+	function getAsfTableFill(
+	asfFormId: any,
+	glbbddbd: any,
+	currentVal: any,
+	fillFieldsChild: any
+	) {
+	/* console.log(asfFormId)
+		console.log(glbbddbd)
+		console.log(fillFieldsChild) */
+	/* asfFormId = JSON.stringify(asfFormId)
+		glbbddbd = JSON.stringify(glbbddbd)
+		currentVal = JSON.stringify(currentVal) */
+	fillFieldsChild = JSON.stringify(fillFieldsChild);
+	return request({
+		url: "/javasys/lowCode/AssociatedForms/getAsfTableFill",
+		method: "post",
+		data: {
+		asfFormId: asfFormId,
+		glbbddbd: glbbddbd,
+		currentVal: currentVal,
+		fillFieldsChild: fillFieldsChild,
+		},
+	});
+	}
+	function containsDangerousWords(str: string | undefined): boolean {
+	if (str === undefined) {
+		return false;
+	}
+	const dangerousWords = new Set<string>([
+		"drop",
+		"table",
+		"where",
+		"select",
+		"insert",
+		"update",
+		"delete",
+		"and",
+		"or",
+		"union",
+		"order by",
+		"group by",
+		"having",
+		"exec",
+		"execute",
+	]);
+	const words = str.split(" ");
+	for (const word of words) {
+		if (dangerousWords.has(word.toLowerCase())) {
+		return true;
+		}
+	}
+	return false;
+	}
+	function isString(value: any): value is string {
+	return typeof value === "string";
+	}
+	function convertIfValidNumberArray(str: string): number[] | null {
+	const regex = /^\[(\d+(,\d+)*)?\]$/;
+	if (regex.test(str)) {
+		const numbersStr = str.slice(1, -1);
+		if (numbersStr.length === 0) {
+		return [];
+		}
+		return numbersStr.split(",").map((item) => Number(item));
+	} else {
+		return null;
+	}
+	}
+	function convertToStringOrNumber(str: string): number | string {
+	const isOnlyNumbers = /^\d+$/.test(str);
+	return isOnlyNumbers ? Number(str) : str;
+	}
+	function convertObjectToArray(obj: any) {
+	for (let key in obj) {
+		return [key, obj[key]];
+	}
+	return [];
+	}
+
+//liwenxuan 关联表单数据填充 241219 end
 // 根据表单设置不显示指定字段
 const linksIf = (obj: FormList) => {
 	const { type } = formProps.value;
@@ -168,7 +537,7 @@ const linksIf = (obj: FormList) => {
 				</template>
 				<template v-else-if="element.type === 'table'">
 					<el-text v-if="element.item&&element.item.name">{{element.item.name}}}</el-text>
-					<TablePage  :data="element" :type="type"  />
+					<TablePage  :data="element" :type="type" @asf-value-changed="asfValueChanged" />
 				</template>
 				<template v-else-if="element.type === 'grid'">
 					<el-row class="form-row" :style="type === 15?'padding: 0 0 20px 0;':''" :class="[element.className]">
@@ -258,7 +627,7 @@ const linksIf = (obj: FormList) => {
 						</el-button>
 					</div>
 				</template>
-				<FormItem v-else :data="element" />
+				<FormItem v-else :data="element" @asf-value-changed="asfValueChanged" />
 			</div>
         </div>
     
diff --git a/src/components/lowCode/formItem.vue b/src/components/lowCode/formItem.vue
index 0059b4e..46447c2 100644
--- a/src/components/lowCode/formItem.vue
+++ b/src/components/lowCode/formItem.vue
@@ -62,6 +62,10 @@ const emits = defineEmits<{
 	(e: 'optionsValue3Get1', val: any,fieldName: string): void
 	(e: 'asfValueChanged', val: any): void
 }>()
+function asfValueChanged(val:any){
+	//console.log("formItem-asfValueChanged",val)
+	emits("asfValueChanged",val)
+}
 const route = useRoute()
 const formProps = inject(constFormProps, {}) as any
 const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
@@ -782,6 +786,7 @@ const currentComponent = computed(() => {
                     :options="options"
                     :row-index = "rowIndex"
                     v-model="value"
+                    @asf-value-changed="asfValueChanged"
                 />
                 <!--穿梭框-->
                 <component
diff --git a/src/components/lowCode/tablePage.vue b/src/components/lowCode/tablePage.vue
index 37d05b2..02e1789 100644
--- a/src/components/lowCode/tablePage.vue
+++ b/src/components/lowCode/tablePage.vue
@@ -183,7 +183,7 @@ const emits = defineEmits<{
 }>()
 
 function asfValueChanged(val:any){
-	//console.log("childTable-asfValueChanged",val)
+	console.log("tablePage-asfValueChanged",val)
 	emits("asfValueChanged",val)
 }
 </script>
diff --git a/src/views/formTable/page/cardPage.vue b/src/views/formTable/page/cardPage.vue
index 7bb20f4..60db50a 100644
--- a/src/views/formTable/page/cardPage.vue
+++ b/src/views/formTable/page/cardPage.vue
@@ -151,7 +151,7 @@ const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
 	gainFormPageListCont(sendData)
 		.then((data)=>{
 			
-			//console.log("获取列表详细信息----------------->",data)
+			console.log("获取列表详细信息----------------->",data)
 			//liwenxuan 关联表单数据获取 start
 			
 			let dataList = data
@@ -172,6 +172,7 @@ const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
 					asfQueryParamsItem.field = asfDetails[j].field
 					
 					let asfToSelectIds = []
+                    console.log(data.data.list)
 					for(let i = 0;i<data.data.list.length;i++){
 						let asfMasterAndAsfId:any = {}
 						asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
@@ -736,7 +737,7 @@ defineExpose({
                                 </tr> 
                                 <tr v-else-if="item.attribute!='-'&&item.attribute!='checkBut'&&item.attribute!='check'&&item.attribute!='but'"   @click="openLook(itval)">
                                     <td class="cardInfoTitle leftTdWat">{{item.label}}：</td>
-                                    <td v-if="item.fieldClass==='associatedForms'" class="cardInfoTitleAsf" @click="showAsfDetailDialog(item, itval, asfQueryParams); $event.stopPropagation();">{{itval[item.field]}}</td>
+                                    <td v-if="item.fieldClass==='associatedForms'" class="cardInfoTitleAsf" ><span @click="showAsfDetailDialog(item, itval, asfQueryParams); $event.stopPropagation();">{{itval[item.field]}}</span></td>
                                     <td v-else class="cardInfoTitle">{{itval[item.field]}}</td><!-- liwenxuan {{itval[item.field]}}-->
                                 </tr> 
                                 <tr v-else-if="item.attribute=='checkBut'&&item.field=='-'">

From bf82ee3652ba84b057ffc12424d6793b1f794f11 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 8 Jan 2025 09:54:39 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E5=92=8C=E6=89=AB=E4=B8=80=E6=89=AB=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f776db0..6a135ac 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -255,6 +255,42 @@ const openNews = (val:any,name:string) => {
 </script>
 <template>
     <div>
+        <div class="mt-4">
+            <div class="mt-4">
+                <div style="display: flex; justify-content: center;">
+                    <el-input
+
+                    style="width: 90%;"
+                    placeholder="请输入搜索内容"
+                    class="input-with-select"
+                    >
+                    <template #prepend>
+                        <el-button  class="footSvg " ><SvgIcon icon-class="search" size="18"  /></el-button>
+                    </template>
+                    </el-input>
+                    
+                    <el-dropdown placement="top-end">
+                        <!-- <el-button> topEnd </el-button> -->
+                        <!-- <span split-button style="margin-top: 1.8%; width: 8%; border: 0px;background-color: #F5F5F5;" ><Plus /></span> -->
+                        <span class="el-dropdown-link" >
+                        <!-- <el-icon class="el-icon--right"><arrow-down /></el-icon> -->
+                        <el-icon :size="22" style="margin-top: 26%; margin-left: 17%; background-color: #F5F5F5;">
+                            <CirclePlus />
+                        </el-icon>
+                        </span>
+                        <template #dropdown>
+                            <el-dropdown-menu>
+                            <el-dropdown-item><el-icon :size="16"><SetUp /></el-icon>扫一扫</el-dropdown-item>
+                            
+                            </el-dropdown-menu>
+                        </template>
+                    </el-dropdown>
+                </div>
+                
+                
+            </div>
+            <!--  -->
+        </div>
         <el-scrollbar ref="scrollBox" class="indexBody" @scroll="onHandleScroll">
             <CarouselPage :num="4" />
             <el-card style="margin-top: 5px;" shadow="always">

From 2cc0b0dabb8c81f785b9e3a9a9143be5a6342ba1 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 8 Jan 2025 10:00:31 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E5=92=8C=E6=89=AB=E4=B8=80=E6=89=AB=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 6a135ac..438ec7d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -260,7 +260,7 @@ const openNews = (val:any,name:string) => {
                 <div style="display: flex; justify-content: center;">
                     <el-input
 
-                    style="width: 90%;"
+                    style="width: 92%;"
                     placeholder="请输入搜索内容"
                     class="input-with-select"
                     >
@@ -274,7 +274,7 @@ const openNews = (val:any,name:string) => {
                         <!-- <span split-button style="margin-top: 1.8%; width: 8%; border: 0px;background-color: #F5F5F5;" ><Plus /></span> -->
                         <span class="el-dropdown-link" >
                         <!-- <el-icon class="el-icon--right"><arrow-down /></el-icon> -->
-                        <el-icon :size="22" style="margin-top: 26%; margin-left: 17%; background-color: #F5F5F5;">
+                        <el-icon :size="22" style="margin-top: 26%; margin-left: 7%; background-color: #F5F5F5; ">
                             <CirclePlus />
                         </el-icon>
                         </span>
@@ -382,7 +382,7 @@ const openNews = (val:any,name:string) => {
 <style  lang='scss' scoped>
 .indexBody{
     width:100%;
-    height: calc(100vh - 65px);
+    height: calc(100vh - 97px);
     padding: 0 5px 0px 5px;
     .cardContBox{
 		display: flex;

From 178cb63862c610d4a1c11c003be8814d36982c45 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 8 Jan 2025 14:52:17 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=89=AB=E7=A0=81=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json             |   6 ++
 package.json                  |   1 +
 src/utils/router/index.ts     |   5 ++
 src/views/home/index.vue      |   2 +-
 src/views/home/scanQrCode.vue | 165 ++++++++++++++++++++++++++++++++++
 5 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 src/views/home/scanQrCode.vue

diff --git a/package-lock.json b/package-lock.json
index 1019f2f..7d61c22 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
         "axios": "^1.7.7",
         "element-plus": "^2.8.6",
         "font-awesome": "^4.7.0",
+        "html5-qrcode": "^2.3.8",
         "js-beautify": "^1.15.1",
         "nprogress": "^0.2.0",
         "path": "^0.12.7",
@@ -3895,6 +3896,11 @@
       "resolved": "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz",
       "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ=="
     },
+    "node_modules/html5-qrcode": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmmirror.com/html5-qrcode/-/html5-qrcode-2.3.8.tgz",
+      "integrity": "sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ=="
+    },
     "node_modules/htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz",
diff --git a/package.json b/package.json
index f1821b0..bd95f16 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "axios": "^1.7.7",
     "element-plus": "^2.8.6",
     "font-awesome": "^4.7.0",
+    "html5-qrcode": "^2.3.8",
     "js-beautify": "^1.15.1",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
diff --git a/src/utils/router/index.ts b/src/utils/router/index.ts
index 6883a97..85ba1a1 100644
--- a/src/utils/router/index.ts
+++ b/src/utils/router/index.ts
@@ -20,6 +20,11 @@ export const staticRouting : RouteRecordRaw[] = [
         component: () => import('@/views/home/index.vue'),
         meta: { hidden: true },
     },
+    {
+        path: '/scanQrCode',
+        component: () => import('@/views/home/scanQrCode.vue'),
+        meta: { hidden: true },
+    },
     {
         path: '/login',
         component: () => import('@/views/login/index.vue'),
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 438ec7d..61e4d7f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -280,7 +280,7 @@ const openNews = (val:any,name:string) => {
                         </span>
                         <template #dropdown>
                             <el-dropdown-menu>
-                            <el-dropdown-item><el-icon :size="16"><SetUp /></el-icon>扫一扫</el-dropdown-item>
+                            <el-dropdown-item @click="router.push('/scanQrCode')"><el-icon :size="16"><SetUp /></el-icon>扫一扫</el-dropdown-item>
                             
                             </el-dropdown-menu>
                         </template>
diff --git a/src/views/home/scanQrCode.vue b/src/views/home/scanQrCode.vue
new file mode 100644
index 0000000..bdb8696
--- /dev/null
+++ b/src/views/home/scanQrCode.vue
@@ -0,0 +1,165 @@
+<template>
+    <div class="scanCode">
+      <div class="container">
+        <div class="qrcode">
+          <div id="reader"></div>
+        </div>
+      </div>
+      <div class="btn">
+        <div class="left-back">
+          <van-icon name="arrow-left" @click="clickBack" />
+        </div>
+        <div class="right-file">
+          <van-uploader
+            v-model="fileList"
+            :preview-image="false"
+            :after-read="dealSelectFiles"
+          >
+            <van-icon name="photo-o"
+          /></van-uploader>
+        </div>
+      </div>
+    </div>
+  </template>
+  ​
+  <script>
+  import { reactive } from "vue";
+  import { defineComponent, toRefs, onMounted, onUnmounted } from "vue";
+  import { Html5Qrcode } from "html5-qrcode";
+  
+  export default defineComponent({
+    setup() {
+      const state = reactive({
+        html5QrCode: null,
+        fileList: [],
+      });
+      const start = () => {
+        state.html5QrCode
+          .start(
+            { facingMode: "environment" },
+            {
+              fps: 1,
+              qrbox: { width: 250, height: 250 },
+            },
+            (decodedText, decodedResult) => {
+              console.log("decodedText", decodedText);
+              console.log("decodedResult", decodedResult);
+            }
+          )
+          .catch((err) => {
+            console.log("扫码错误信息", err);
+            let message = ""; // 错误信息处理仅供参考，具体描述自定义
+            if (typeof err == "string") {
+              message = "二维码识别失败！";
+            } else {
+              if (err.name == "NotAllowedError") {
+                message = "您需要授予相机访问权限！";
+              }
+              if (err.name == "NotFoundError") {
+                message = "这个设备上没有摄像头！";
+              }
+              if (err.name == "NotSupportedError") {
+                message =
+                  "摄像头访问只支持在安全的上下文中，如https或localhost！";
+              }
+              if (err.name == "NotReadableError") {
+                message = "相机被占用！";
+              }
+              if (err.name == "OverconstrainedError") {
+                message = "安装摄像头不合适！";
+              }
+              if (err.name == "StreamApiNotSupportedError") {
+                message = "此浏览器不支持流API！";
+              }
+            }
+          });
+      };
+      const getCameras = () => {
+        Html5Qrcode.getCameras()
+          .then((devices) => {
+            if (devices && devices.length) {
+              state.html5QrCode = new Html5Qrcode("reader");
+              start();
+            }
+          })
+          .catch((err) => {
+            alert("摄像头无访问权限！");
+          });
+      };
+      const stop = () => {
+        state.html5QrCode
+          .stop()
+          .then((ignore) => {
+            console.log("停止扫码", ignore);
+          })
+          .catch((err) => {
+            console.log(err);
+            alert("停止扫码失败");
+          });
+      };
+      const dealSelectFiles = () => {
+        try {
+          window.qrcode.callback = (result) => {
+            alert("成功了，结果是：" + result);
+          }; // get select files.
+          let file = state.fileList[0].file;
+          var reader = new FileReader();
+          reader.onload = (function () {
+            return function (e) {
+              window.qrcode.decode(e.target.result);
+            };
+          })(file);
+          reader.readAsDataURL(file);
+        } catch (error) {
+          alert("图片识别失败！");
+        }
+      };
+      onMounted(() => {
+        getCameras();
+      });
+      onUnmounted(() => {
+        //扫描设备是否在运行
+        if (state.html5QrCode.isScanning) {
+          stop();
+        }
+      });
+      return {
+        ...toRefs(state),
+        getCameras,
+        dealSelectFiles,
+      };
+    },
+  });
+  </script>
+  
+  <style lang="scss" scoped>
+  .scanCode {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    background: rgba(0, 0, 0);
+  }
+  .container {
+    height: 90vh;
+    position: relative;
+    width: 100%;
+  }
+  ​.qrcode {
+    height: 100%;
+  }
+  #reader {
+    top: 50%;
+    left: 0;
+    transform: translateY(-50%);
+  }
+  .btn {
+    flex: 1;
+    padding: 3vw;
+    display: flex;
+    justify-content: space-around;
+    color: #fff;
+    font-size: 8vw;
+    align-items: flex-start;
+  }
+  </style>
+  ​
\ No newline at end of file