改变冲突

src/components/DesignForm/assembly/index.ts

@@ -248,7 +248,7 @@ const selectOption: any = [
 			config: {}
 		},
 		{
-<<<<<<< HEAD
+
 		  type: 'colorPicker',
 		  label: '取色器',
 		  icon: 'color',
@@ -257,7 +257,8 @@ const selectOption: any = [
 			modelValue: ''
 		  },
 		  config: {}
-=======
+		},
+		{
 			type: 'orgCentent',
 			label: '行政组织',
 			icon: 'sliders',
@@ -274,7 +275,6 @@ const selectOption: any = [
 			control: {
 			},
 			config: {}
->>>>>>> liwenxuan_v4
 		}
 	  ]
 	},

src/components/DesignForm/formControlAttr.vue

@@ -14,14 +14,14 @@ import { PublicAtrr } from '@/api/DesignForm/types'
 
 import { chineseToPinyin } from '@/api/DesignForm/requestapi'
 
-<<<<<<< HEAD
+
 //数学计算公式编辑器
 import MathFormula from '@/components/DesignForm/math/mathFormula.vue'
-=======
+
 import { uploadUrl } from '@/api/DesignForm'
 import { UploadFilled } from '@element-plus/icons-vue'
 import { UploadFile, UploadFiles } from 'element-plus/es/components/upload/src/upload';
->>>>>>> liwenxuan_v4
+
 
 const props = withDefaults(			//接收父级参数
     defineProps<{
@@ -1301,7 +1301,7 @@ const isNotWrite = (val:any) =>{
 	}
 	return false
 }
-<<<<<<< HEAD
+
 const unitInfo = ref<any>()
 const formListmap = ref<any>()
 const subUnit = ref<any>()
@@ -1356,7 +1356,7 @@ const updataDigit = (key:sring,val:any) => {
 	})
 	// console.log("默认值处理-5-->",props.formConfig)
 }
-=======
+
 
 //liwenxuan 20240108 vidioupload  start
 
@@ -1506,9 +1506,6 @@ const changeCurrentUploadImgid = (clickedRow:any) => {
 
 //liwenxuan 20240111 carousel  end  
 
-
-
->>>>>>> liwenxuan_v4
 </script>
 <template>
 	<div  class="sidebar-tools">
@@ -1517,10 +1514,8 @@ const changeCurrentUploadImgid = (clickedRow:any) => {
 				<el-form size="small" class="form">
 					<div class=""><h3>通用属性</h3></div>
 					<template v-for="(item, index) in attrList" :key="index">
-<<<<<<< HEAD
-=======
 
->>>>>>> liwenxuan_v4
+
 						<el-form-item :label="item.label">
 							<el-select
 								v-if="item.type === 'select'"
@@ -1545,7 +1540,7 @@ const changeCurrentUploadImgid = (clickedRow:any) => {
 								v-model="item.value"
 								@change="controlChange(item, $event)"
 							/>
-<<<<<<< HEAD
+
 							<template v-else-if="item.type === 'digitpage'">
 								<el-row>
 									<el-col :span="12">
@@ -1579,7 +1574,7 @@ const changeCurrentUploadImgid = (clickedRow:any) => {
 								<MathFormula  v-model:show="mathBoxShow" :sub-unit="subUnit" :unit-info="attrList" :form-listmap="formListmap" @updata-digit="updataDigit" />
 								
 							</template>
-=======
+
 							
 							<el-row v-else-if="item.type === 'uploadvideo_url'">
 								<!-- {{ controlData.control }} -->
@@ -1637,7 +1632,7 @@ const changeCurrentUploadImgid = (clickedRow:any) => {
 							
 
 
->>>>>>> liwenxuan_v4
+
 							<el-input
 								v-else
 								:type="item.inputStyle"
@@ -1646,10 +1641,7 @@ const changeCurrentUploadImgid = (clickedRow:any) => {
 								@input="controlChange(item, $event)"
 							/>
 							
-<<<<<<< HEAD
 
-=======
->>>>>>> liwenxuan_v4
 						</el-form-item>
 
 						

src/components/DesignForm/public/form/form.vue

@@ -166,7 +166,7 @@ const forEachGetFormModel = (list: FormList[], obj: any) => {
 
 // 表单组件值改变事件 tProp为子表格相关
 provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) => {
-<<<<<<< HEAD
+
 	// console.log("表单组件值改变事件----------1--------->",key)
 	// console.log("表单组件值改变事件----------2--------->",value)
 	// console.log("表单组件值改变事件----------3--------->",data)
@@ -241,9 +241,9 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
 	// console.log("监听表单-5-constControlChange-->",type)
 	// console.log("监听表单-6-constControlChange-->",attribute)
 
-=======
+
 	console.log("监听表单--constControlChange-->",key, value, data, tProp,type,attribute)
->>>>>>> liwenxuan_v4
+
 	if (typeof props.changeKeyVal === 'function') {
 		props.changeKeyVal(key, value,type,attribute)
 	}
@@ -1089,11 +1089,7 @@ defineExpose({
 				'detail-form': type === 3 || type === 4 || type === 1
 			}"
 		>
-<<<<<<< HEAD
-			
-=======
 
->>>>>>> liwenxuan_v4
 			<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list" />
 			
 			<slot></slot>

src/components/DesignForm/public/form/formGroup.vue

@@ -427,13 +427,13 @@ onMounted(()=>{
 					</div>
 					
 				</template>
-<<<<<<< HEAD
+
 				<DigitPage v-else-if="element.type === 'digitpage'" :data="element" />
-=======
+
 				<VideoUpAndPlay  v-else-if="element.type === 'videoUpAndPlay'" :data="element" />
 				<LowcodeCarsusel  v-else-if="element.type === 'lowcodeCarsusel'" :data="element" />
 				<SignatureMap  v-else-if="element.type === 'signaturemap'" :data="element" />
->>>>>>> liwenxuan_v4
+
 				<OrgCentent v-else-if="element.type === 'orgCentent'" :data="element" />
 				<BaiduMap v-else-if="element.type === 'baidumap'" :data="element" />
 				<OrgCitys v-else-if="element.type === 'organization'" :data="element" />

src/types/components.d.ts

@@ -50,6 +50,7 @@ declare module '@vue/runtime-core' {
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
+    ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']

src/views/sysworkflow/codepage/page.vue

@@ -4,7 +4,7 @@
 @ 备注: 模拟计算公式编辑器
 -->
 <template>
-<<<<<<< HEAD
+
 	<el-dialog
     v-model="isShow"
     title="公式编辑"
@@ -410,19 +410,4 @@ const computeNumber = (val:string) =>{
 }
 
 </style>
-=======
-	<SignatureMap />
-	<PaintBoard @updataconbt="qianming" />
-</template>
-<script lang='ts' setup>
-import PaintBoard   from '@/widget/writingboard/paintBoard.vue';
-
-const qianming = (val:any) =>{
-	console.log("图片回传--->",val)
-}
 
-</script>
-<style  lang='scss' scoped>
-
-</style>
->>>>>>> liwenxuan_v4

src/widget/index.ts

@@ -6,13 +6,13 @@ import urlLink from './urllink/index.vue'
 import orgCitys from './orgcitys/index.vue'
 import baiduMap from './baidumap/index.vue'
 import orgCentent from './org/index.vue'
-<<<<<<< HEAD
+
 import digitPage from './digitpage/index.vue'
-=======
+
 import signatureMap from './writingboard/index.vue'
 import videoUpAndPlay from './videoupload/index.vue'
 import lowcodeCarsusel from './carousel/index.vue'
->>>>>>> liwenxuan_v4
+
 
 export default (app: any)	=> {
 	app.component('SerialNumber', serialNumber)
@@ -20,11 +20,11 @@ export default (app: any)	=> {
 	app.component('OrgCitys', orgCitys)
 	app.component('BaiduMap', baiduMap)
 	app.component('OrgCentent', orgCentent)
-<<<<<<< HEAD
+
 	app.component('DigitPage', digitPage)
-=======
+
 	app.component('SignatureMap', signatureMap)
 	app.component('VideoUpAndPlay',videoUpAndPlay)
 	app.component('LowcodeCarsusel',lowcodeCarsusel)
->>>>>>> liwenxuan_v4
+
 }