Browse Source

Merge remote-tracking branch 'origin/dev-2.19.0' into dev-2.19.0

Lita-Tako 4 months ago
parent
commit
9d5ab1cb1b

+ 229 - 229
src/views/auth/login/login.vue

@@ -44,263 +44,263 @@
44 44
 	</div>
45 45
 </template>
46 46
 <script setup>
47
-import LoginInput from './LoginInput.vue'
47
+	import LoginInput from './LoginInput.vue'
48 48
 
49
-const showPWD = ref(false)
50
-import loginApi from '@/api/auth/loginApi'
51
-import PhoneLoginForm from './phoneLoginForm.vue'
52
-import ThreeLogin from './threeLogin.vue'
53
-import smCrypto from '@/utils/smCrypto'
54
-import { required } from '@/utils/formRules'
55
-import { afterLogin } from './util'
56
-import configData from '@/config'
57
-import configApi from '@/api/dev/configApi'
58
-import tool from '@/utils/tool'
59
-import { message } from 'ant-design-vue'
49
+	const showPWD = ref(false)
50
+	import loginApi from '@/api/auth/loginApi'
51
+	import PhoneLoginForm from './phoneLoginForm.vue'
52
+	import ThreeLogin from './threeLogin.vue'
53
+	import smCrypto from '@/utils/smCrypto'
54
+	import { required } from '@/utils/formRules'
55
+	import { afterLogin } from './util'
56
+	import configData from '@/config'
57
+	import configApi from '@/api/dev/configApi'
58
+	import tool from '@/utils/tool'
59
+	import { message } from 'ant-design-vue'
60 60
 
61
-import { globalStore, iframeStore, keepAliveStore, viewTagsStore, enumMaplistStore } from '@/store'
62
-const { proxy } = getCurrentInstance()
61
+	import { globalStore, iframeStore, keepAliveStore, viewTagsStore, enumMaplistStore } from '@/store'
62
+	const { proxy } = getCurrentInstance()
63 63
 
64
-const activeKey = ref('userAccount')
65
-const captchaOpen = ref(configData.SYS_BASE_CONFIG.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN)
66
-const validCodeBase64 = ref('')
67
-const loading = ref(false)
64
+	const activeKey = ref('userAccount')
65
+	const captchaOpen = ref(configData.SYS_BASE_CONFIG.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN)
66
+	const validCodeBase64 = ref('')
67
+	const loading = ref(false)
68 68
 
69
-const ruleForm = reactive({
70
-	// account: 'superAdmin',
71
-	// password: '123456',
72
-	account: '',
73
-	password: '',
74
-	validCode: '',
75
-	validCodeReqNo: '',
76
-	autologin: false
77
-})
69
+	const ruleForm = reactive({
70
+		// account: 'superAdmin',
71
+		// password: '123456',
72
+		account: '',
73
+		password: '',
74
+		validCode: '',
75
+		validCodeReqNo: '',
76
+		autologin: false
77
+	})
78 78
 
79
-const rules = reactive({
80
-	account: [required(proxy.$t('login.accountError'), 'blur')],
81
-	password: [required(proxy.$t('login.PWError'), 'blur')]
82
-})
83
-const lang = ref([
84
-	{
85
-		name: '简体中文',
86
-		value: 'zh-cn'
87
-	},
88
-	{
89
-		name: 'English',
90
-		value: 'en'
91
-	}
92
-])
93
-const config = ref({
94
-	lang: tool.data.get('APP_LANG') || proxy.$CONFIG.LANG,
95
-	theme: tool.data.get('APP_THEME') || 'default'
96
-})
79
+	const rules = reactive({
80
+		account: [required(proxy.$t('login.accountError'), 'blur')],
81
+		password: [required(proxy.$t('login.PWError'), 'blur')]
82
+	})
83
+	const lang = ref([
84
+		{
85
+			name: '简体中文',
86
+			value: 'zh-cn'
87
+		},
88
+		{
89
+			name: 'English',
90
+			value: 'en'
91
+		}
92
+	])
93
+	const config = ref({
94
+		lang: tool.data.get('APP_LANG') || proxy.$CONFIG.LANG,
95
+		theme: tool.data.get('APP_THEME') || 'default'
96
+	})
97 97
 
98
-const store = globalStore()
99
-const kStore = keepAliveStore()
100
-const iStore = iframeStore()
101
-const vStore = viewTagsStore()
102
-// const StoreDEl = enumMaplistStore()
98
+	const store = globalStore()
99
+	const kStore = keepAliveStore()
100
+	const iStore = iframeStore()
101
+	const vStore = viewTagsStore()
102
+	const StoreDEl = enumMaplistStore()
103 103
 
104
-const setSysBaseConfig = store.setSysBaseConfig
105
-const clearKeepLive = kStore.clearKeepLive
106
-const clearIframeList = iStore.clearIframeList
107
-const clearViewTags = vStore.clearViewTags
108
-// const businessDElasync = StoreDEl.businessDElasync
104
+	const setSysBaseConfig = store.setSysBaseConfig
105
+	const clearKeepLive = kStore.clearKeepLive
106
+	const clearIframeList = iStore.clearIframeList
107
+	const clearViewTags = vStore.clearViewTags
108
+	const businessDElasync = StoreDEl.businessDElasync
109 109
 
110
-const sysBaseConfig = computed(() => {
111
-	return store.sysBaseConfig
112
-})
110
+	const sysBaseConfig = computed(() => {
111
+		return store.sysBaseConfig
112
+	})
113 113
 
114
-onMounted(() => {
115
-	let formData = ref(configData.SYS_BASE_CONFIG)
116
-	configApi.configSysBaseList().then((data) => {
117
-		if (data) {
118
-			data.forEach((item) => {
119
-				formData.value[item.configKey] = item.configValue
120
-			})
121
-			captchaOpen.value = formData.value.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN
122
-			tool.data.set('SNOWY_SYS_BASE_CONFIG', formData.value)
123
-			setSysBaseConfig(formData.value)
124
-			refreshSwitch()
125
-		}
114
+	onMounted(() => {
115
+		let formData = ref(configData.SYS_BASE_CONFIG)
116
+		configApi.configSysBaseList().then((data) => {
117
+			if (data) {
118
+				data.forEach((item) => {
119
+					formData.value[item.configKey] = item.configValue
120
+				})
121
+				captchaOpen.value = formData.value.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN
122
+				tool.data.set('SNOWY_SYS_BASE_CONFIG', formData.value)
123
+				setSysBaseConfig(formData.value)
124
+				refreshSwitch()
125
+			}
126
+		})
126 127
 	})
127
-})
128 128
 
129
-onBeforeMount(() => {
130
-	clearViewTags()
131
-	clearKeepLive()
132
-	clearIframeList()
133
-})
129
+	onBeforeMount(() => {
130
+		clearViewTags()
131
+		clearKeepLive()
132
+		clearIframeList()
133
+	})
134 134
 
135
-// 监听语言
136
-watch(
137
-	() => config.value.lang,
138
-	(newValue) => {
139
-		proxy.$i18n.locale = newValue
140
-		tool.data.set('APP_LANG', newValue)
141
-	}
142
-)
143
-// 主题
144
-watch(
145
-	() => config.value.theme,
146
-	(newValue) => {
147
-		document.body.setAttribute('data-theme', newValue)
148
-	}
149
-)
150
-// 通过开关加载内容
151
-const refreshSwitch = () => {
152
-	// 判断是否开启验证码
153
-	if (captchaOpen.value === 'true') {
154
-		// 加载验证码
155
-		loginCaptcha()
156
-		// 加入校验
157
-		rules.validCode = [required(proxy.$t('login.validError'), 'blur')]
135
+	// 监听语言
136
+	watch(
137
+		() => config.value.lang,
138
+		(newValue) => {
139
+			proxy.$i18n.locale = newValue
140
+			tool.data.set('APP_LANG', newValue)
141
+		}
142
+	)
143
+	// 主题
144
+	watch(
145
+		() => config.value.theme,
146
+		(newValue) => {
147
+			document.body.setAttribute('data-theme', newValue)
148
+		}
149
+	)
150
+	// 通过开关加载内容
151
+	const refreshSwitch = () => {
152
+		// 判断是否开启验证码
153
+		if (captchaOpen.value === 'true') {
154
+			// 加载验证码
155
+			loginCaptcha()
156
+			// 加入校验
157
+			rules.validCode = [required(proxy.$t('login.validError'), 'blur')]
158
+		}
158 159
 	}
159
-}
160 160
 
161
-// 获取验证码
162
-const loginCaptcha = () => {
163
-	loginApi.getPicCaptcha().then((data) => {
164
-		validCodeBase64.value = data.validCodeBase64
165
-		ruleForm.validCodeReqNo = data.validCodeReqNo
166
-	})
167
-}
168
-//登陆
169
-const loginForm = ref()
170
-const login = async () => {
171
-	if (!ruleForm.account) {
172
-		message.error('请输入账号')
173
-		return
174
-	}
175
-	if (!ruleForm.password) {
176
-		message.error('请输入密码')
177
-		return
161
+	// 获取验证码
162
+	const loginCaptcha = () => {
163
+		loginApi.getPicCaptcha().then((data) => {
164
+			validCodeBase64.value = data.validCodeBase64
165
+			ruleForm.validCodeReqNo = data.validCodeReqNo
166
+		})
178 167
 	}
179
-	loading.value = true
180
-	const loginData = {
181
-		account: ruleForm.account,
182
-		// 密码进行SM2加密,传输过程中看到的只有密文,后端存储使用hash
183
-		password: smCrypto.doSm2Encrypt(ruleForm.password),
184
-		validCode: ruleForm.validCode,
185
-		validCodeReqNo: ruleForm.validCodeReqNo
168
+	//登陆
169
+	const loginForm = ref()
170
+	const login = async () => {
171
+		if (!ruleForm.account) {
172
+			message.error('请输入账号')
173
+			return
174
+		}
175
+		if (!ruleForm.password) {
176
+			message.error('请输入密码')
177
+			return
178
+		}
179
+		loading.value = true
180
+		const loginData = {
181
+			account: ruleForm.account,
182
+			// 密码进行SM2加密,传输过程中看到的只有密文,后端存储使用hash
183
+			password: smCrypto.doSm2Encrypt(ruleForm.password),
184
+			validCode: ruleForm.validCode,
185
+			validCodeReqNo: ruleForm.validCodeReqNo
186
+		}
187
+		// 获取token
188
+		try {
189
+			const loginToken = await loginApi.login(loginData)
190
+			afterLogin(loginToken)
191
+			businessDElasync()
192
+		} catch (err) {
193
+			loading.value = false
194
+			loginCaptcha()
195
+		}
186 196
 	}
187
-	// 获取token
188
-	try {
189
-		const loginToken = await loginApi.login(loginData)
190
-		afterLogin(loginToken)
191
-	} catch (err) {
192
-		loading.value = false
193
-		loginCaptcha()
197
+	const configLang = (key) => {
198
+		config.value.lang = key
194 199
 	}
195
-	// businessDElasync()
196
-}
197
-const configLang = (key) => {
198
-	config.value.lang = key
199
-}
200 200
 </script>
201 201
 <style lang="less">
202
-.login_background {
203
-	background: url('/img/login_bg.png') no-repeat center;
204
-	position: relative;
205
-	width: 100%;
206
-	height: 100%;
207
-	.login_left {
208
-		position: absolute;
209
-		top: 204px;
210
-		left: 190px;
211
-		img {
212
-			width: 700px;
213
-		}
214
-	}
215
-	.login_background_front {
216
-		background: url('/img/login/LOGO.png') no-repeat center;
217
-		width: 800px;
218
-		height: 92px;
219
-		position: absolute;
220
-		left: 10%;
221
-		top: 10%;
222
-	}
223
-	.login_main {
224
-		width: 570px;
225
-		height: 500px;
226
-		position: absolute;
227
-		right: 80px;
228
-		top: 200px;
229
-		background: rgba(255, 255, 255, 0.75);
230
-		border-radius: 8px;
231
-	}
232
-	.login_head {
202
+	.login_background {
203
+		background: url('/img/login_bg.png') no-repeat center;
204
+		position: relative;
233 205
 		width: 100%;
234
-		display: flex;
235
-		justify-content: space-between;
236
-		align-items: center;
237
-		overflow: hidden;
238
-		white-space: nowrap;
239
-		padding: 50px 0 40px;
240
-		user-select: none;
241
-		.text {
242
-			padding: 0 30px;
243
-			font-size: 25px;
244
-		}
245
-		&:before,
246
-		&:after {
247
-			width: 50%;
248
-			height: 1px;
249
-			content: '';
250
-			background: rgba(0, 0, 0, 0.3);
251
-		}
252
-	}
253
-	.login_form {
254
-		margin: 0 50px;
255
-		.icon {
256
-			font-size: 16px;
257
-			padding: 0 6px;
258
-			color: #666;
206
+		height: 100%;
207
+		.login_left {
208
+			position: absolute;
209
+			top: 204px;
210
+			left: 190px;
211
+			img {
212
+				width: 700px;
213
+			}
259 214
 		}
260
-		.LoginInput {
261
-			font-size: 15px;
262
-			box-shadow: 0 0 3px rgba(0, 0, 0, 0.06);
263
-			margin-top: 30px;
215
+		.login_background_front {
216
+			background: url('/img/login/LOGO.png') no-repeat center;
217
+			width: 800px;
218
+			height: 92px;
219
+			position: absolute;
220
+			left: 10%;
221
+			top: 10%;
264 222
 		}
265
-		.login_auto {
266
-			margin-top: 20px;
267
-			.auto_text {
268
-				color: #444;
269
-			}
223
+		.login_main {
224
+			width: 570px;
225
+			height: 500px;
226
+			position: absolute;
227
+			right: 80px;
228
+			top: 200px;
229
+			background: rgba(255, 255, 255, 0.75);
230
+			border-radius: 8px;
270 231
 		}
271
-		.login_btn {
272
-			cursor: pointer;
232
+		.login_head {
273 233
 			width: 100%;
274
-			border: none;
275
-			background: url('/img/login_btn.png') no-repeat center;
276
-			height: 74px;
277
-			line-height: 50px;
278
-			color: #fff;
279
-			font-size: 18px;
280
-			font-weight: bold;
281
-			letter-spacing: 10px;
282
-			margin-top: 50px;
283 234
 			display: flex;
284
-			justify-content: center;
285
-			align-items: flex-start;
286
-		}
287
-		.login_forgetbox {
288
-			margin-top: 20px;
289
-			text-align: right;
290
-			.login_forget {
291
-				color: #444;
235
+			justify-content: space-between;
236
+			align-items: center;
237
+			overflow: hidden;
238
+			white-space: nowrap;
239
+			padding: 50px 0 40px;
240
+			user-select: none;
241
+			.text {
242
+				padding: 0 30px;
243
+				font-size: 25px;
244
+			}
245
+			&:before,
246
+			&:after {
247
+				width: 50%;
248
+				height: 1px;
249
+				content: '';
250
+				background: rgba(0, 0, 0, 0.3);
292 251
 			}
293 252
 		}
294
-	}
295
-	@media (max-width: 1000px) {
296
-		.login_background_front {
297
-			left: 50%;
298
-			margin-left: -400px;
253
+		.login_form {
254
+			margin: 0 50px;
255
+			.icon {
256
+				font-size: 16px;
257
+				padding: 0 6px;
258
+				color: #666;
259
+			}
260
+			.LoginInput {
261
+				font-size: 15px;
262
+				box-shadow: 0 0 3px rgba(0, 0, 0, 0.06);
263
+				margin-top: 30px;
264
+			}
265
+			.login_auto {
266
+				margin-top: 20px;
267
+				.auto_text {
268
+					color: #444;
269
+				}
270
+			}
271
+			.login_btn {
272
+				cursor: pointer;
273
+				width: 100%;
274
+				border: none;
275
+				background: url('/img/login_btn.png') no-repeat center;
276
+				height: 74px;
277
+				line-height: 50px;
278
+				color: #fff;
279
+				font-size: 18px;
280
+				font-weight: bold;
281
+				letter-spacing: 10px;
282
+				margin-top: 50px;
283
+				display: flex;
284
+				justify-content: center;
285
+				align-items: flex-start;
286
+			}
287
+			.login_forgetbox {
288
+				margin-top: 20px;
289
+				text-align: right;
290
+				.login_forget {
291
+					color: #444;
292
+				}
293
+			}
299 294
 		}
300
-		.login_main {
301
-			left: calc(50% - 285px);
302
-			top: 24%;
295
+		@media (max-width: 1000px) {
296
+			.login_background_front {
297
+				left: 50%;
298
+				margin-left: -400px;
299
+			}
300
+			.login_main {
301
+				left: calc(50% - 285px);
302
+				top: 24%;
303
+			}
303 304
 		}
304 305
 	}
305
-}
306 306
 </style>

+ 1 - 1
src/views/business/construction/form.vue

@@ -12,7 +12,7 @@
12 12
 			<div class="form">
13 13
 				<a-row>
14 14
 					<a-col :span="12">
15
-						<a-form-item class="form-item" label="制度名称" name="systemName" :label-col="{ span: 10 }">
15
+						<a-form-item class="form-item" label="名称" name="systemName" :label-col="{ span: 10 }">
16 16
 							<a-input
17 17
 								placeholder="请输入制度名称"
18 18
 								style="width: 250px"

+ 7 - 1
src/views/business/construction/index.vue

@@ -28,6 +28,12 @@
28 28
 		<div class="list" style="margin-top: 10px">
29 29
 			<a-table :dataSource="tableData" :pagination="pagination" :columns="tableColumns">
30 30
 				<template #bodyCell="{ column, record }">
31
+					<template v-if="column.dataIndex == 'sysType'">
32
+						<div v-if="record.sysType == 1">岗位调整通知</div>
33
+						<div v-if="record.sysType == 2">制度管理</div>
34
+						<div v-if="record.sysType == 3">人事任免通知</div>
35
+					</template>
36
+
31 37
 					<template v-if="column.key === '操作'">
32 38
 						<a-button type="link" @click="onView('view', record)">查看</a-button>
33 39
 						<a-button type="link" @click="onView('edit', record)">编辑</a-button>
@@ -60,7 +66,7 @@
60 66
 				return `${index + 1}`
61 67
 			}
62 68
 		},
63
-		{ title: '制度名称', dataIndex: 'systemName' },
69
+		{ title: '名称', dataIndex: 'systemName' },
64 70
 		{ title: '类型', dataIndex: 'sysType' },
65 71
 		{ title: '发布内容', dataIndex: 'publishContent' },
66 72
 		{ title: '发布时间', dataIndex: 'publishTime' },

+ 2 - 2
src/views/business/enterprise/index.vue

@@ -3,7 +3,7 @@
3 3
 		<a-space class="header">
4 4
 			<div class="input-box">
5 5
 				<div class="silt-title">
6
-					<span style="width: 70px; margin-right: 12px; display: block">{{ '单位信息' }}</span>
6
+					<span style="width: 70px; margin-right: 12px; display: block">{{ '企业名称' }}</span>
7 7
 					<a-input style="width: 220px" v-model:value="informationData.dwmc" placeholder="请输入" />
8 8
 				</div>
9 9
 				<div class="input-box-sle">
@@ -110,7 +110,7 @@
110 110
 			}
111 111
 		},
112 112
 		{
113
-			title: '单位信息',
113
+			title: '企业名称',
114 114
 			dataIndex: 'dwmc',
115 115
 			align: 'center',
116 116
 			key: 'dwmc'

+ 25 - 4
src/views/business/grain/grainDel.vue

@@ -68,10 +68,30 @@
68 68
 							:options="options"
69 69
 						></a-select>
70 70
 					</a-form-item>
71
+					<!-- 3333 -->
72
+					<a-form-item
73
+						class="form-item"
74
+						label="库点类别"
75
+						:rules="[{ required: true, message: 'Please input your username!' }]"
76
+						name="effectiveCapacity"
77
+						:label-col="{ span: 10 }"
78
+					>
79
+						<a-input :disabled="code" :value="cocName(formState.depotClass)" />
80
+					</a-form-item>
71 81
 
72 82
 					<a-form-item
73 83
 						class="form-item"
74
-						label="有效仓容"
84
+						label="设计仓容(T)"
85
+						:rules="[{ required: true, message: 'Please input your username!' }]"
86
+						name="effectiveCapacity"
87
+						:label-col="{ span: 10 }"
88
+					>
89
+						<a-input :disabled="code" v-model:value="formState.designCapacity" />
90
+					</a-form-item>
91
+
92
+					<a-form-item
93
+						class="form-item"
94
+						label="有效仓容(T)"
75 95
 						:rules="[{ required: true, message: 'Please input your username!' }]"
76 96
 						name="effectiveCapacity"
77 97
 						:label-col="{ span: 10 }"
@@ -81,7 +101,7 @@
81 101
 					<a-form-item
82 102
 						class="form-item"
83 103
 						:rules="[{ required: true, message: 'Please input your username!' }]"
84
-						label="有效罐容"
104
+						label="有效罐容(T)"
85 105
 						name="yxgr	"
86 106
 						:label-col="{ span: 10 }"
87 107
 					>
@@ -89,9 +109,9 @@
89 109
 					</a-form-item>
90 110
 					<a-form-item
91 111
 						class="form-item"
92
-						label="库点面积"
112
+						label="库点面积(平方米)"
93 113
 						name="depotArea"
94
-						:label-col="{ span: 10 }"
114
+						:label-col="{ span: 11 }"
95 115
 						:rules="[{ required: true, message: 'Please input your username!' }]"
96 116
 					>
97 117
 						<a-input :disabled="code" v-model:value="formState.depotArea" />
@@ -307,6 +327,7 @@
307 327
 			}
308 328
 
309 329
 			return {
330
+				cocName,
310 331
 				cocYES_NO,
311 332
 				cocPROPERTY_RIGHTS,
312 333
 				router,

+ 55 - 3
src/views/business/locationInformation/locationInformationDel.vue

@@ -44,7 +44,36 @@
44 44
 						<a-input :disabled="code" v-model:value="formState.storagetankName" />
45 45
 					</a-form-item>
46 46
 
47
-					<!--  -->
47
+					<!-- 这里 -->
48
+
49
+					<!-- <a-form-item
50
+						:rules="[{ required: true, message: 'Please input your username!' }]"
51
+						class="form-item"
52
+						label="库点类别"
53
+						name="tankCapacity"
54
+						:label-col="{ span: 10 }"
55
+					>
56
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
57
+					</a-form-item>
58
+					<a-form-item
59
+						:rules="[{ required: true, message: 'Please input your username!' }]"
60
+						class="form-item"
61
+						label="设计仓容(T)"
62
+						name="tankCapacity"
63
+						:label-col="{ span: 10 }"
64
+					>
65
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
66
+					</a-form-item>
67
+					<a-form-item
68
+						:rules="[{ required: true, message: 'Please input your username!' }]"
69
+						class="form-item"
70
+						label="有效仓容(T)"
71
+						name="tankCapacity"
72
+						:label-col="{ span: 10 }"
73
+					>
74
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
75
+					</a-form-item> -->
76
+
48 77
 					<a-form-item
49 78
 						:rules="[{ required: true, message: 'Please input your username!' }]"
50 79
 						class="form-item"
@@ -54,6 +83,29 @@
54 83
 					>
55 84
 						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
56 85
 					</a-form-item>
86
+
87
+					<!-- <a-form-item
88
+						:rules="[{ required: true, message: 'Please input your username!' }]"
89
+						class="form-item"
90
+						label="有效罐容(T)"
91
+						name="tankCapacity"
92
+						:label-col="{ span: 10 }"
93
+					>
94
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
95
+					</a-form-item> -->
96
+
97
+					<!-- <a-form-item
98
+						:rules="[{ required: true, message: 'Please input your username!' }]"
99
+						class="form-item"
100
+						label="库点面积(平方米)"
101
+						name="tankCapacity"
102
+						:label-col="{ span: 10 }"
103
+					>
104
+						<a-input :disabled="code" v-model:value="formState.tankCapacity" />
105
+					</a-form-item> -->
106
+
107
+					<!-- ================= -->
108
+
57 109
 					<a-form-item
58 110
 						class="form-item"
59 111
 						label="建造时间"
@@ -106,10 +158,10 @@
106 158
 							:options="options"
107 159
 						></a-select>
108 160
 					</a-form-item>
109
-					<a-form-item class="form-item" label="罐内直径" name="diameter" :label-col="{ span: 10 }">
161
+					<a-form-item class="form-item" label="罐内直径(米)" name="diameter" :label-col="{ span: 10 }">
110 162
 						<a-input :disabled="code" v-model:value="formState.diameter" />
111 163
 					</a-form-item>
112
-					<a-form-item class="form-item" label="罐内高度" name="height" :label-col="{ span: 10 }">
164
+					<a-form-item class="form-item" label="罐内高度(米)" name="height" :label-col="{ span: 10 }">
113 165
 						<a-input :disabled="code" v-model:value="formState.height" />
114 166
 					</a-form-item>
115 167
 					<a-form-item class="form-item" label="检定方式" name="checkWay" :label-col="{ span: 10 }">

+ 11 - 5
src/views/business/personnel/personnelDel.vue

@@ -146,7 +146,10 @@
146 146
 					<a-form-item class="form-item" label="专业" name="major" :label-col="{ span: 10 }">
147 147
 						<a-input placeholder="请输入专业" :disabled="code" v-model:value="formState.major" />
148 148
 					</a-form-item>
149
-					<a-form-item class="form-item" label="个人简介" :label-col="{ span: 10 }">
149
+				</div>
150
+
151
+				<div class="attachment">
152
+					<a-form-item class="form-item" label="个人简介" :label-col="{ span: 3 }">
150 153
 						<a-textarea
151 154
 							style="width: 620px"
152 155
 							placeholder="请输入个人简介"
@@ -155,10 +158,13 @@
155 158
 							allow-clear
156 159
 						/>
157 160
 					</a-form-item>
158
-				</div>
159
-
160
-				<div class="attachment">
161
-					<a-form-item ref="uploadDataList" class="form-item" label="附件" name="certificate" :label-col="{ span: 3 }">
161
+					<a-form-item
162
+						ref="uploadDataList"
163
+						class="form-item"
164
+						label="上传证书"
165
+						name="certificate"
166
+						:label-col="{ span: 3 }"
167
+					>
162 168
 						<DIYUPLoad
163 169
 							:beforeUpload="beforeUpload"
164 170
 							multiple