Merge branch 'dev-2.19.0' of http://101.36.160.140:21044/province-vue-qh/province-vue-all into dev-2.19.0

package.json

@@ -15,8 +15,8 @@
 		"preview": "vite preview",
 		"build": "vite build --mode production",
 		"prod": "vite  --mode production",
-		"build:prod": "vite build --mode production",
-    "build:test": "vite build --mode test"
+		"build:prod": "node --max_old_space_size=8192 node_modules/vite/bin/vite.js build --mode production",
+    "build:test": "node --max_old_space_size=8192 node_modules/vite/bin/vite.js build --mode test"
 	},
 	"dependencies": {
 		"@amap/amap-jsapi-loader": "1.0.1",

src/views/business/personnel/personnelDel.vue

@@ -146,10 +146,28 @@
 					<a-form-item class="form-item" label="专业" name="major" :label-col="{ span: 10 }">
 						<a-input placeholder="请输入专业" :disabled="code" v-model:value="formState.major" />
 					</a-form-item>
+					<a-form-item class="form-item" label="个人简介" :label-col="{ span: 10 }">
+						<a-textarea
+							style="width: 620px"
+							placeholder="请输入个人简介"
+							v-model:value="formState.personalProfile"
+							:disabled="code"
+							allow-clear
+						/>
+					</a-form-item>
+				</div>
 
-					<a-form-item class="form-item" label="" name="username" :label-col="{ span: 10 }"> </a-form-item>
-
-					<!--  -->
+				<div class="attachment">
+					<a-form-item ref="uploadDataList" class="form-item" label="附件" name="certificate" :label-col="{ span: 3 }">
+						<DIYUPLoad
+							:beforeUpload="beforeUpload"
+							multiple
+							:disabled="code"
+							:change="changeUpload"
+							listType="picture-card"
+							v-model:urls="formState.certificate"
+						></DIYUPLoad>
+					</a-form-item>
 				</div>
 
 				<a-form-item>
@@ -191,6 +209,7 @@
 	import { defineComponent } from 'vue'
 	import business from '@/api/business/dictionary.js'
 	import businessDel from '@/api/business/personnelApi.js'
+	import global from '@/api/basic.info/global'
 	export default {
 		name: 'ApplicationExtension',
 		components: {},
@@ -212,7 +231,9 @@
 				positionNature: '',
 				onDutyStatus: '',
 				staffCategory: '',
-				major: ''
+				major: '',
+				personalProfile: '',
+				certificate: ''
 			})
 
 			watch(
@@ -243,8 +264,8 @@
 			const huiXian = async () => {
 				if (code.value) {
 					const res = await businessDel.EmPersonInfoDetail({ id: route.query.id })
-					console.log(res)
 					formState.value = res
+					formState.value.certificate = (res.certificate || '').split(',').filter((v) => v)
 				}
 			}
 
@@ -295,11 +316,14 @@
 			}
 
 			// 回显示
-			const onFinish = (values) => {
+			const onFinish = () => {
+				if (Array.isArray(formState.value.certificate)) {
+					formState.value.certificate = formState.value.certificate.join(',')
+				}
 				if (route.query.id) {
-					pustEdit({ id: route.query.id, ...values })
+					pustEdit({ id: route.query.id, ...formState.value })
 				} else {
-					pustFrom(values)
+					pustFrom(formState.value)
 					formState.value = {
 						name: '',
 						gender: '',
@@ -315,7 +339,9 @@
 						positionNature: '',
 						onDutyStatus: '',
 						staffCategory: '',
-						major: ''
+						major: '',
+						personalProfile: '',
+						certificate: ''
 					}
 				}
 				router.back()
@@ -328,7 +354,21 @@
 				console.log(val)
 			}
 
+			function changeUpload(fd) {
+				return global.uploadFile(fd).then((reg) => {
+					uploadDataList.value.clearValidate()
+					return reg
+				})
+			}
+			const uploadDataList = ref(null)
+			function beforeUpload() {
+				uploadDataList.value.clearValidate()
+			}
+
 			return {
+				beforeUpload,
+				uploadDataList,
+				changeUpload,
 				isEmail,
 				validateIdCard,
 				isMobileData,

src/views/emergencyExercise/templateManagementEdit.vue

@@ -147,7 +147,7 @@
 			</a-row>
 			<a-row :gutter="42">
 				<a-col :span="24">
-					<a-form-item label="附件上传" name="fileList">
+					<a-form-item label="附件上传" name="attachment">
 						<common-update
 							:action="uploadAction"
 							:file-list="formData.fileList"

src/views/emergencySupport/analysis.vue

@@ -2,6 +2,7 @@
 	import { count, getAllChildrenData } from '@/api/emergencySupport'
 	import { approveState2Name2 } from '@/views/emergencySupport/emergencySupportCommon'
 	import { dictItem } from '@/utils/systemUtils'
+	import {message} from "ant-design-vue";
 	const columns = [
 		{
 			title: '序号',
@@ -92,18 +93,18 @@
 		})
 	}
 	const load = (areaCode) => {
-		if (level == 0) {
+		if (level.value === 0) {
 			return count({}).then((list) => {
 				dataSource.value = list
 			})
-		} else if (level === 1) {
+		} else if (level.value === 1) {
 			const q = {
 				managementAreaCity: areaCode
 			}
 			return count(q).then((list) => {
 				dataSource.value = list
 			})
-		} else if (level === 2) {
+		} else if (level.value === 2) {
 			const q = {
 				managementAreaCounty: areaCode
 			}
@@ -116,10 +117,11 @@
 	}
 	const tableRef = ref()
 	const refresh = () => {
-		level = 0
+		level.value = 0
 		lastArea.value = null
 		areaTableShow.value = true
 		siteTableShow.value = false
+		stack.value = []
 		load()
 	}
 	const searchForm = ref({
@@ -145,17 +147,36 @@
 	onMounted(() => {
 		refresh()
 	})
-	let level = 0
+	const level = ref(0)
 	const lastArea = ref(null)
+	const stack = ref([])
 	const queryNext = (data) => {
-		level++
+		level.value = level.value + 1
 		lastArea.value = data.area
+		stack.value.push(data.area)
 		load(data.area)
 	}
+	const back = () => {
+		level.value = level.value - 1
+		stack.value.pop()
+		areaTableShow.value = true
+		siteTableShow.value = false
+		if(stack.value.length <= 0) {
+			level.value = 0
+			lastArea.value = null
+			refresh()
+		}else {
+			const code = stack.value[stack.value.length - 1]
+			lastArea.value = code
+			load(code)
+		}
+
+	}
 </script>
 
 <template>
 	<a-card :bordered="false">
+		<a-button v-if="stack.length > 0" class="mb-2" @click="back">上一层</a-button>
 		<a-table v-show="areaTableShow" :columns="columns" :data-source="dataSource" bordered :pagination="false">
 			<template #bodyCell="{ column, text, record }">
 				<a

src/views/emergencySupport/emergencyDeliveryCompanyAnalysis.vue

@@ -109,12 +109,31 @@
 
 	let level = 0
 	let lastArea = ref(null)
+	const stack = ref([])
 	const queryNext = (data) => {
 		level++
 		lastArea.value = data.area
+		stack.value.push(data.area)
 		load(data.area)
 	}
 
+	const back = () => {
+		level --
+		stack.value.pop()
+		areaTableShow.value = true
+		companyTableShow.value = false
+		if(stack.value.length <= 0) {
+			level = 0
+			lastArea.value = null
+			refresh()
+		}else {
+			const code = stack.value[stack.value.length - 1]
+			lastArea.value = code
+			load(code)
+		}
+
+	}
+
 	onMounted(() => {
 		refresh()
 	})
@@ -122,6 +141,7 @@
 
 <template>
 	<a-card :bordered="false">
+		<a-button v-if="stack.length > 0" class="mb-2" @click="back">上一层</a-button>
 		<a-table v-show="areaTableShow" :columns="columns" :data-source="dataSource" bordered :pagination="false">
 			<template #bodyCell="{ column, text, record }">
 				<a

src/views/emergencySupport/emergencyProcessingCompanyAnalysis.vue

@@ -117,12 +117,31 @@
 
 	let level = 0
 	let lastArea = ref(null)
+	const stack = ref([])
 	const queryNext = (data) => {
 		level++
 		lastArea.value = data.area
+		stack.value.push(data.area)
 		load(data.area)
 	}
 
+	const back = () => {
+		level --
+		stack.value.pop()
+		areaTableShow.value = true
+		companyTableShow.value = false
+		if(stack.value.length <= 0) {
+			level = 0
+			lastArea.value = null
+			refresh()
+		}else {
+			const code = stack.value[stack.value.length - 1]
+			lastArea.value = code
+			load(code)
+		}
+
+	}
+
 	onMounted(() => {
 		refresh()
 	})
@@ -130,6 +149,7 @@
 
 <template>
 	<a-card :bordered="false">
+		<a-button v-if="stack.length > 0" class="mb-2" @click="back">上一层</a-button>
 		<a-table v-show="areaTableShow" :columns="columns" :data-source="dataSource" bordered :pagination="false">
 			<template #bodyCell="{ column, text, record }">
 				<a