修改微型消防站按钮逻辑

pagesA/fire/architecture/add_architecture/add_architecture.vue

@@ -131,6 +131,9 @@
 								<isLodingModel v-if="loading"></isLodingModel>
 						</uni-file-picker>
 					</u-form-item>
+					<u-form-item label="重点部位" prop="xfdts">
+						<u-input v-model="formData.zdbw" placeholder="请输入重点部位" />
+					</u-form-item>
 				</view>
 				
 			</u--form>

pagesA/fire/architecture/architecture_details/architecture_details.vue

@@ -80,6 +80,9 @@
 					<u-form-item label="燃气类型	">
 						<u-input v-model="formData.rqlx" placeholder="燃气类型" :disabled="true"/>
 					</u-form-item>
+					<u-form-item label="重点部位" prop="xfdts">
+						<u-input v-model="formData.zdbw" placeholder="请输入重点部位" />
+					</u-form-item>
 					<u-form-item label="总平面图纸名称	">
 						<view class="buju">
 							<text v-if="formData.dwpmtzmc == '' || formData.dwpmtzmc == null">无</text>

pagesA/fire/architecture/edit_architecture/edit_architecture.vue

@@ -33,6 +33,9 @@
 					<u-form-item label="产权信息	">
 						<u-input v-model="formData.ownership" placeholder="请输入产权信息" />
 					</u-form-item>
+					<u-form-item label="重点部位" prop="xfdts">
+						<u-input v-model="formData.zdbw" placeholder="请输入重点部位" />
+					</u-form-item>
 					<u-form-item prop="dlwz" @tap="agree_poup()">
 						<!-- <u-input v-model="formData.dlwz" placeholder="请输入地理位置" /> -->
 						<!-- <input class="footer_content_input" type="text" v-model="formData.dlwz" placeholder="请选择地理位置"

pagesA/fire/fire_station/people_fireStation/people_fireStation.vue

@@ -85,13 +85,21 @@
 		</div>
 		<div>
 			<u-popup :show="showDel" title="确认删除？" mode="center">
-				<div style="width: 300rpx;height: 200rpx;">
-					<p>是否删除该内容？</p>
-					<button class="antherBtn" @click="makeSureDel">确认</button>
-					<button class="antherBtn" @click="showDel = false">取消</button>
+				<div style="width: 400rpx;height: 200rpx;margin: 20rpx 20rpx;">
+					<p style="font-size: 35rpx;color: black;">是否删除该数据项？</p>
+					<p style="font-size: 20rpx;color: gray;">确认删除？</p>
+					<div style="display: flex;justify-content: space-around;align-items: center;margin-top: 40rpx;">
+						<button class="antherBtn" @click="makeSureDel" style="background-color: red;">确认</button>
+						<button class="antherBtn" @click="showDel = false">取消</button>
+					</div>
 				</div>
 			</u-popup>
 		</div>
+		<div>
+			<u-modal :show="show123" @confirm="confirm" @cancel="cancel" @close="close" asyncClose
+				closeOnClickOverlay showCancelButton confirmColor="red" title="是否删除该数据项" content="确认删除？"
+				ref="uModal"></u-modal>
+		</div>
 		<button @click="addNewPeople" class="circleBtn">+</button>
 	</view>
 </template>
@@ -158,6 +166,7 @@
 				phoneRules: false, //对电话的正则验证
 				showDel: false,
 				delId: '',
+				show123:false,
 			}
 		},
 		methods: {
@@ -295,11 +304,13 @@
 
 			},
 			delUser(row) {
-				this.showDel = true
+				this.show123 = true
 				this.delId = row.id
-
 			},
 			makeSureDel() {
+				
+			},
+			confirm() {
 				delFirePeople(this.delId).then(res => {
 					if (res.data) {
 						uni.showToast({
@@ -315,10 +326,16 @@
 							}
 						});
 						this.getAllFire()
-						this.showDel = false
+						this.show123 = false
 					}
 				})
 			},
+			cancel(){
+				this.show123 = false
+			},
+			close() {
+				this.show123 = false
+			},
 			editUser(row) {
 				this.editPeopleId = row.id
 				getMesbyid({

pagesA/fire/metting_regsiter/metting_sigin.vue

@@ -84,6 +84,12 @@
 					</view>
 				</u-popup>
 			</div>
+			<div>
+				<u-modal :show="show123" @confirm="confirm" @cancel="cancel" @close="close" asyncClose
+					closeOnClickOverlay showCancelButton confirmColor="red" title="是否删除该数据项" content="确认删除？"
+					ref="uModal"></u-modal>
+			</div>
+			<!-- <button @click="show123 = true">11</button> -->
 			<button class="circleBtn" @click="addNewPeople">+</button>
 		</view>
 	</view>
@@ -135,9 +141,16 @@
 				phoneRules: false,
 				tableSure: true,
 				tableSure1: false,
+				showDel: false,
+				makeDelId: "",
+				show123: false
 			}
 		},
 		methods: {
+			open() {
+				// 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
+				this.$refs.popup.open('center')
+			},
 			getUser() {
 				getUserProfile().then(res => {
 					this.doorId = res.data.dept.id
@@ -149,11 +162,11 @@
 					pageNo: 1,
 					pageSize: 10
 				}).then(res => {
-					if(res.data.list.length != 0){
+					if (res.data.list.length != 0) {
 						this.tableList = res.data.list
 						this.tableSure = true
 						this.tableSure1 = false
-					}else{
+					} else {
 						this.tableSure = false
 						this.tableSure1 = true
 					}
@@ -230,24 +243,11 @@
 
 			},
 			delUser(row) {
-				console.log(row, '123');
-				delPeople(row.id).then(res => {
-					if (res.data) {
-						uni.showToast({
-							title: '删除成功',
-							icon: 'success', // 图标类型，可选值：'success', 'loading', 'none'
-							duration: 2000, // 持续时间，单位为毫秒，默认值为 1500
-							mask: false, // 是否显示透明蒙层，防止触摸穿透，默认值为 false
-							success() {
-								console.log('toast消息提示显示成功');
-							},
-							fail(err) {
-								console.error('toast消息提示显示失败', err);
-							}
-						});
-						this.getAllPeople()
-					}
-				})
+				this.makeDelId = row.id
+				this.show123 = true
+			},
+			makeSureDel() {
+
 			},
 			editUser(row) {
 				getOne({
@@ -339,6 +339,32 @@
 			},
 			noAdd() {
 				this.meetList = []
+			},
+			confirm() {
+				delPeople(this.makeDelId).then(res => {
+					if (res.data) {
+						uni.showToast({
+							title: '删除成功',
+							icon: 'success', // 图标类型，可选值：'success', 'loading', 'none'
+							duration: 2000, // 持续时间，单位为毫秒，默认值为 1500
+							mask: false, // 是否显示透明蒙层，防止触摸穿透，默认值为 false
+							success() {
+								console.log('toast消息提示显示成功');
+							},
+							fail(err) {
+								console.error('toast消息提示显示失败', err);
+							}
+						});
+						this.getAllPeople()
+						this.show123 = false
+					}
+				})
+			},
+			cancel() {
+				this.show123 = false//取消
+			},
+			close() {
+				this.show123 = false //遮罩层
 			}
 		},
 		onShow() {
@@ -472,11 +498,25 @@
 		/* background-color: red; */
 		border: 2rpx solid #4DB1B6;
 	}
-	.noMesBox{
+
+	.noMesBox {
 		width: 400rpx;
 		height: 400rpx;
 		margin: 0 auto;
 		text-align: center;
 		line-height: 400rpx;
 	}
+
+	/deep/ .antherBtn {
+		width: 50%;
+		height: 50rpx;
+		margin-bottom: 30rpx;
+		border: none;
+		/* background-color: #4DB1B6; */
+		color: black;
+		text-align: center;
+		line-height: 50rpx;
+		font-size: 30rpx;
+		/* border-radius: 0rpx; */
+	}
 </style>

pagesA/fire/staff_info/add_staff/add_staff.vue

@@ -38,6 +38,9 @@
 					<u-form-item label="毕业学校">
 						<u-input v-model="formData.byxx" placeholder="请输入毕业学校" />
 					</u-form-item>
+					<u-form-item label="职业资格证书">
+						<u-input v-model="formData.zzzs" placeholder="请输入职业资格证书" />
+					</u-form-item>
 					<u-form-item label="人员性别" prop="empGender" @click="
 							showSex = true;
 							hideKeyboard();

pagesA/fire/staff_info/edit_staff/edit_staff.vue

@@ -47,7 +47,9 @@
 						<u--input v-model="formData.empXl" prop="empXl" disabled disabledColor="#ffffff"
 							placeholder="选择学历"></u--input>
 					</u-form-item>
-
+					<u-form-item label="职业资格证书">
+						<u-input v-model="formData.zzzs" placeholder="请输入职业资格证书" />
+					</u-form-item>
 					<!-- 入伍时间 -->
 					<!-- <view class="flex flex-direction-row" style="margin-top:30rpx">
 						<text class="text-Width">入伍时间：</text>
@@ -76,11 +78,13 @@
 					<u-form-item label="婚姻情况	"><u-input v-model="formData.hyqk" placeholder="请输入婚姻情况" /></u-form-item>
 
 					<u-form-item label="籍贯">
-						<u-input v-model="formData.jgdm" placeholder="请输入籍贯" @click.native="showPickerJiguan" disabled class="jiguan"/>
+						<u-input v-model="formData.jgdm" placeholder="请输入籍贯" @click.native="showPickerJiguan" disabled
+							class="jiguan" />
 					</u-form-item>
 					<!-- <u-form-item label="警官证号"><u-input v-model="formData.jgzh" placeholder="请输入警官证号" /></u-form-item> -->
 					<u-form-item label="民族">
-						<u-input v-model="formData.mzdm" placeholder="请选择民族" @click.native="showPicker" disabled class="jiguan" />
+						<u-input v-model="formData.mzdm" placeholder="请选择民族" @click.native="showPicker" disabled
+							class="jiguan" />
 					</u-form-item>
 					<!-- 	<u-form-item
 						label="人员类别"

pagesA/fire/staff_info/staff_details/staff_details.vue

@@ -31,6 +31,9 @@
 				<u-form-item label="学历">
 					<u--input v-model="formData.empXl" prop="empXl" disabled placeholder="选择学历"></u--input>
 				</u-form-item>
+				<u-form-item label="职业资格证书">
+					<u-input v-model="formData.zzzs" placeholder="请输入职业资格证书" />
+				</u-form-item>
 				<u-form-item label="专业	"><u-input v-model="formData.empZy" disabled placeholder="专业" /></u-form-item>
 				<u-form-item label="婚姻情况	"><u-input v-model="formData.hyqk" disabled placeholder="婚姻情况" /></u-form-item>
 

pagesA/fire/unit_info/unit_info_details/unit_info_details.vue

@@ -51,6 +51,9 @@
 				<u-form-item label="归口部门">
 					<u-input v-model="formData.gkbm" placeholder="归口部门" :disabled="true" />
 				</u-form-item>
+				<u-form-item label="重点部位" prop="xfdts">
+					<u-input v-model="formData.zdbw" placeholder="请输入重点部位" />
+				</u-form-item>
 				<u-form-item label="单位成立时间：">
 					<uni-datetime-picker v-model="formData.dwclsj" type="date" :disabled="true"></uni-datetime-picker>
 				</u-form-item>