修改首页的通知显示，动火新增特种，主动检查的修改

pages/index.vue

@@ -5,7 +5,8 @@
 		 <view class="bgTopImg">
 			<image slot="right" :src="`${urls}/navBg@2x.png`" class="bgTopImg"></image>
 		</view> -->
-		<view class="container  uni-container" style="display:flex;flex-direction: column;justify-content: space-between;height: 100%;">
+		<view class="container  uni-container"
+			style="display:flex;flex-direction: column;justify-content: space-between;height: 100%;">
 			<view class="nav">
 				<!-- 	<u-scroll-list indicatorColor="#fff0f0" indicatorActiveColor="#f56c6c" >
 				<view class="scroll-list" style="flex-direction: row;">
@@ -18,13 +19,20 @@
 				</view>
 			</u-scroll-list> -->
 				<view>
-					<u-grid :border="false" col="4">
+					<u-grid :border="false" col="4" v-if="!isStreetPerson">
 						<u-grid-item v-for="(item, listIndex) in goodsArr" :key="listIndex">
 							<image @click="handleToInfo(item.menuUrl)" class="scroll-list__goods-item__image  "
 								:src="item.thumbnail" mode=""></image>
 							<text class="grid-text">{{ item.name }}</text>
 						</u-grid-item>
 					</u-grid>
+					<u-grid :border="false" col="3" v-else>
+						<u-grid-item v-for="(item, listIndex) in goodsStreet" :key="listIndex">
+							<image @click="handleToInfo(item.menuUrl)" class="scroll-list__goods-item__image  "
+								:src="item.thumbnail" mode=""></image>
+							<text class="grid-text">{{ item.name }}</text>
+						</u-grid-item>
+					</u-grid>
 					<u-toast ref="uToast" />
 				</view>
 			</view>
@@ -117,23 +125,31 @@
 						<text slot="value" style="font-size: 28rpx;color: #4CB2B6;" @click="goInformDetails">更多</text>
 					</u-cell>
 				</u-cell-group>
-				<uni-card v-if="tableDatas.length>0" >
+				<uni-card v-if="tableDatas.length>0">
 					<uni-row class="demo-uni-row" :gutter="20" width="100%">
-						<uni-col :span="24" style="margin-bottom: 10rpx;display: flex;justify-content:space-between;"><text style="font-weight:600;font-size: 34rpx;">{{ tableDatas[0].taskName }}</text><image :src="zhuanfa" class="back-size back-sizes" @click="forward(tableDatas[0])"></image></uni-col>
-						<uni-col :span="24" style="margin-bottom: 10rpx;display: flex;"><text style="color:#728F90">任务说明:</text><rich-text :nodes="tableDatas[0].taskContent?tableDatas[0].taskContent:''" class="conts"></rich-text>
+						<uni-col :span="24"
+							style="margin-bottom: 10rpx;display: flex;justify-content:space-between;"><text
+								style="font-weight:600;font-size: 34rpx;">{{ tableDatas[0].taskName }}</text>
+							<image :src="zhuanfa" class="back-size back-sizes" @click="forward(tableDatas[0])"></image>
+						</uni-col>
+						<uni-col :span="24" style="margin-bottom: 10rpx;display: flex;"><text
+								style="color:#728F90">任务说明:</text><rich-text
+								:nodes="tableDatas[0].taskContent?tableDatas[0].taskContent:''"
+								class="conts"></rich-text>
 						</uni-col>
-						<uni-col :span="24"><text style="color:#728F90">任务发布者:</text><text>{{tableDatas[0].senderName}}</text>
+						<uni-col :span="24"><text
+								style="color:#728F90">任务发布者:</text><text>{{tableDatas[0].senderName}}</text>
 						</uni-col>
 					</uni-row>
 					<uni-row class="demo-uni-row" :gutter="20" width="100%">
-<!-- 						<uni-col :span="24"> -->
-							<view class="flex btn-box" style="width: 50%;float: right;">
-								<u-button shape="circle" size="small" color="#F7C41E" text="查看详情"
-									@click="addClickDetail(tableDatas[0].broadId)" style="margin-right: 10rpx;"></u-button>
-								<u-button shape="circle" size="small" color="#4CB2B6"  style="margin-left: 10rpx;" text="去完成"
-									@click="addClickModify(tableDatas[0])"></u-button>
-								
-							</view>
+						<!-- 						<uni-col :span="24"> -->
+						<view class="flex btn-box" style="width: 50%;float: right;">
+							<u-button shape="circle" size="small" color="#F7C41E" text="查看详情"
+								@click="addClickDetail(tableDatas[0].broadId)" style="margin-right: 10rpx;"></u-button>
+							<u-button shape="circle" size="small" color="#4CB2B6" style="margin-left: 10rpx;" text="去完成"
+								@click="addClickModify(tableDatas[0])"></u-button>
+
+						</view>
 						<!-- </uni-col> -->
 					</uni-row>
 				</uni-card>
@@ -144,7 +160,7 @@
 			<!-- 图表-->
 			<view class="charts-box">
 				<!-- 注意：这里的opts是uCharts的配置，eopts是ECharts的配置，不要搞混，如果不需要用在各种小程序端，是不需要传uCharts的opts的，只需要传eopts即可！！！这里加opts是为了覆盖uCharts的rose图的默认图例配置的位置 -->
-			<!-- 	<qiun-data-charts type="column" :eopts="opts" :opts="opts" :chartData="chartsDataLine3"  v-if="chartsDataLine3.series[0].itemStyle.normal.color=='#D2D8E2'"
+				<!-- 	<qiun-data-charts type="column" :eopts="opts" :opts="opts" :chartData="chartsDataLine3"  v-if="chartsDataLine3.series[0].itemStyle.normal.color=='#D2D8E2'"
 					:echartsH5="true" :echartsApp="true" /> -->
 			</view>
 
@@ -160,7 +176,7 @@
 						<u-checkbox :customStyle="{marginBottom: '8px'}" :label="item.nickname" :name="item.id">
 						</u-checkbox>
 					</u-checkbox-group>
-		
+
 				</view>
 				<view v-else>
 					此单位下暂无可转发人员
@@ -177,7 +193,7 @@
 		</u-popup>
 		<!-- 加载中 -->
 		<isLodingModel></isLodingModel>
-				
+
 		<u-modal :show="show" @confirm="confirm" @cancel="cancel" @close="close" asyncClose closeOnClickOverlay
 			showCancelButton confirmColor="red" :title="title" :content="content" ref="uModal"></u-modal>
 	</view>
@@ -190,23 +206,23 @@
 		isNeedInfo
 	} from '@/api/notice'; // 通知公告列表
 	import {
-		checkGetPerson,//单位转发任务获取人员
-		taskList,//获取除草稿箱以外的列表  //获取当前日期的任务列表
+		checkGetPerson, //单位转发任务获取人员
+		taskList, //获取除草稿箱以外的列表  //获取当前日期的任务列表
 		checkSubmitForwardTask, //确认转发任务
 	} from "@/api/check_active";
 	import storage from '@/utils/storage';
 	let that = null;
 	import config from '@/config'
-	const baseUrlImg=config.baseUrlImg
+	const baseUrlImg = config.baseUrlImg
 	export default {
 		data() {
 			return {
-				urls:baseUrlImg,
-				bgImg:`${baseUrlImg}/navBg@2x.png`,
+				urls: baseUrlImg,
+				bgImg: `${baseUrlImg}/navBg@2x.png`,
 				opts: {
-				   legend:{
-					       show: false
-				   },
+					legend: {
+						show: false
+					},
 					color: ["#D2D8E2"],
 					yAxis: {
 						data: [{
@@ -241,11 +257,11 @@
 						}
 					}
 				},
-				
+
 				chartsDataLine3: {},
-				tongzhi:`${baseUrlImg}/tongzhi.png`,
+				tongzhi: `${baseUrlImg}/tongzhi.png`,
 				gonggao: `${baseUrlImg}/gonggao.png`,
-				laba:`${baseUrlImg}/laba.png`,
+				laba: `${baseUrlImg}/laba.png`,
 				//import biankuang from '@/static/images/biankuang.png'
 				LoadingModel: false,
 				show: false, //弹出框
@@ -253,7 +269,7 @@
 				content: '个人信息尚未完善,是否完善个人基本信息？',
 				arrtongzhi: [],
 				arrgonggao: [],
-				personInfo:[],
+				personInfo: [],
 				checkedList2: [], //检查单位已选择列表
 				// 数据  //数据接口，已读接口（id,全部）---通知列表，详情
 				// tableDatas: [{
@@ -292,7 +308,7 @@
 					"taskStatus": 0,
 					"taskType": "" //任务类型 1对应主动检查
 				},
-				zhuanfa:`${baseUrlImg}/zhuanfa.png`,
+				zhuanfa: `${baseUrlImg}/zhuanfa.png`,
 				// 通知公告数据
 				tableData: [],
 				// tableData数据加载中
@@ -301,7 +317,7 @@
 				checkactiveOption: {},
 				goodsArr: [{
 						name: '每日巡查',
-						thumbnail:`${baseUrlImg}/meirixuncha.png`,
+						thumbnail: `${baseUrlImg}/meirixuncha.png`,
 						menuUrl: '/pagesA/fire/inspection_active/index'
 					},
 					{
@@ -311,7 +327,7 @@
 					},
 					{
 						name: '主动检查',
-						thumbnail:`${baseUrlImg}/renwuguanli.png`,
+						thumbnail: `${baseUrlImg}/renwuguanli.png`,
 						menuUrl: `/pagesA/fire/check_inspection/check_inspection`
 					},
 					{
@@ -320,20 +336,42 @@
 						menuUrl: '/pagesA/fire/hidden_trouble/index'
 					}
 				],
-				checkboxShow2:false
+				goodsStreet: [{
+						name: '街道消防检查',
+						thumbnail: `${baseUrlImg}/meirixuncha.png`,
+						menuUrl: '/pagesA/fire/fire_inspetItem/fire_inspetItem'
+					},
+					{
+						name: '消防工作档案',
+						thumbnail: `${baseUrlImg}/zhudongjiancha.png`,
+						menuUrl: `/pagesA/fire/archive/nav`
+					},
+					{
+						name: '微型消防站',
+						thumbnail: `${baseUrlImg}/renwuguanli.png`,
+						menuUrl: `/pagesA/fire/fire/fire_station/index`
+					},
+				],
+				checkboxShow2: false,
+				isStreetPerson: false
 			};
 		},
 		// 在 vue页面，向起始页通过事件传递数据
 		onShow: function() {
 			this.getServerData();
-			const date = new Date()	
+			const date = new Date()
 			this.formData.receivDate = uni.$u.timeFormat(date, 'yyyy-mm-dd')
 			this.getDatas()
 			this.getData()
 		},
 		onLoad: function(option) {
-		
-			that = this;
+			const deptId = uni.getStorageSync('getUserInfo_key').streetInfo ? uni.getStorageSync('getUserInfo_key')
+				.streetInfo
+				.id : ''; //登录用户
+			if (deptId != '') {
+					this.isStreetPerson = true
+				}
+				that = this;
 			// // 判断用户信息是否需要完善
 			// const value = uni.getStorageSync('getUserInfo_key');
 			// if (
@@ -360,7 +398,7 @@
 			//图表
 			getServerData() {
 				//区域图
-				this.chartsDataLine3  = {
+				this.chartsDataLine3 = {
 					categories: ['提交', '待完成', '审核', '打回', '完成'],
 					series: [{
 						name: "",
@@ -378,7 +416,7 @@
 						}
 					}]
 				}
-	
+
 
 			},
 			// 获取数据
@@ -386,17 +424,19 @@
 				this.$modal.isLoadingModel(true);
 				this.LoadingModel = true;
 				getNoticeList({
-                 
+
 				}).then(response => {
 					this.LoadingModel = false;
 					this.$modal.isLoadingModel(this.LoadingModel);
 					// 为数据赋值：通过展开运算符的形式，进行新旧数据的拼接
-					this.tableData = response.data??[...this.tableData, ...response.data.list];
-					if (this.tableData&&this.tableData.length>0) {
-						this.arrtongzhi = this.tableData.filter(i => i.type == 1);
-						this.arrgonggao = this.tableData.filter(i => i.type == 2);
+					// this.tableData = response.data ?? [...this.tableData, ...response.data.list];
+					console.log(this.tableData);
+					if (this.tableData && response.data?.list.length > 0) {
+						this.arrtongzhi = response.data.list.filter(i => i.type == 1);
+						console.log(this.arrtongzhi, '通知');
+						this.arrgonggao =response.data.list.filter(i => i.type == 2);
 					}
-					console.log(this.arrtongzhi, '通知', this.arrgonggao);
+					
 					// this.checkactiveGetEchart();
 				});
 			},
@@ -478,7 +518,7 @@
 			},
 			//转发
 			forward(val) { //展示转发的弹出层
-			console.log(val,'vavavava');
+				console.log(val, 'vavavava');
 				this.ids = val.id //当前点击任务的id
 				this.checkboxShow2 = true
 				this.FormDataTask.broadId = val.broadId
@@ -490,7 +530,7 @@
 				checkGetPerson({
 					orgId: val.orgId
 				}).then(response => {
-					console.log(response,'11111111');
+					console.log(response, '11111111');
 					this.personInfo = response.data
 				})
 			},
@@ -520,7 +560,7 @@
 				this.loading = true
 				this.pageNo = 1
 				taskList(JSON.stringify(this.formData)).then(response => {
-					this.tableDatas= response.data.list
+					this.tableDatas = response.data.list
 				})
 			},
 			// =====================================================
@@ -577,15 +617,16 @@
 		border-radius: 24rpx;
 	}
 
-	/deep/.u-button.data-v-3bf2dba7,.u-grid-item {
+	/deep/.u-button.data-v-3bf2dba7,
+	.u-grid-item {
 		width: 30%;
 		float: right;
 	}
 
-	/deep/.uni-card--border{
+	/deep/.uni-card--border {
 		border-radius: 24rpx !important;
 		box-shadow: 0px 1px 14px 0px rgba(211, 211, 211, 0.3) !important;
-		border:none !important;
+		border: none !important;
 	}
 
 	::v-deep .u-navbar__content {
@@ -646,7 +687,8 @@
 		// margin-bottom: 30rpx;
 
 		.u-grid-item[data-v-99a45d26],
-		.u-grid-item.data-v-99a45d26,.u-grid-item {
+		.u-grid-item.data-v-99a45d26,
+		.u-grid-item {
 			margin-bottom: 30rpx;
 		}
 	}
@@ -669,7 +711,8 @@
 	}
 
 	/deep/.u-notice-bar[data-v-4eff50a7],
-	/deep/.u-notice-bar.data-v-4eff50a7,/deep/.u-notice-bar{
+	/deep/.u-notice-bar.data-v-4eff50a7,
+	/deep/.u-notice-bar {
 		border-radius: 20rpx;
 	}
 
@@ -703,16 +746,18 @@
 		margin-bottom: 0;
 	}
 
-	.back-size,.back-sizes {
+	.back-size,
+	.back-sizes {
 		width: 60rpx;
 		height: 30rpx;
 		margin: 0 20rpx 0 60rpx;
 	}
-	
-.back-sizes{
-	width:32rpx;
-	height: 32rpx;
-}
+
+	.back-sizes {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
 	.back-notice {
 		position: absolute;
 		top: 0;
@@ -728,7 +773,8 @@
 	}
 
 	/deep/.u-navbar__content__left[data-v-75dad532],
-	/deep/.u-navbar__content__right[data-v-75dad532],/deep/.u-navbar__content__right {
+	/deep/.u-navbar__content__right[data-v-75dad532],
+	/deep/.u-navbar__content__right {
 		display: none !important;
 	}
 
@@ -739,4 +785,4 @@
 		margin-left: -10rpx;
 		border-left: 6rpx solid #4CB2B6;
 	}
-</style>
+</style>

pagesA/fire/check_active/check_list/check_list.vue

@@ -186,12 +186,17 @@
 		shijianc,
 		downSee
 	} from '@/utils/common.js'
+	import {
+		DICT_TYPE,
+		getDictDatas
+	} from "@/utils/dict";
 	//任务状态，0代表未执行刚建好，可修改，1表示已执行不能改
 	import config from '@/config'
 	const baseUrlImg = config.baseUrlImg
 	export default {
 		data() {
 			return {
+				taskTypeDict:getDictDatas(DICT_TYPE.TASK_TYPE),
 				urls: baseUrlImg,
 				moren: `${baseUrlImg}/checkActive/moren.png`, //默认图片
 				zhengchang: `${baseUrlImg}/checkActive/zhengchang.png`,
@@ -223,6 +228,7 @@
 			})
 
 		},
+
 		methods: {
 			// 下载附件
 			down(appendix) {
@@ -343,7 +349,11 @@
 					}).then(res => {
 						this.sender = res.data
 					})
-
+                     this.taskTypeDict.map(i=>{
+						 if(i.value==this.tableData?.taskInfo?.taskType){
+							 this.tableData.taskInfo.taskType=i.label
+						 }
+					 })
 				});
 			}
 		}

pagesA/fire/check_inspection/check_inspection.vue

@@ -332,6 +332,7 @@
 				screenHeight: this.$screenHeight,
 				// ----扫码选择隐患
 				showPopupDanger: false,
+				dangerDict:getDictDatas(DICT_TYPE.DANGER_RESULT),
 				choiceDanger: getDictDatas(DICT_TYPE.DANGER_TYPE),
 				checkedPopupDanger: [], //
 				// ----扫码选择隐患
@@ -581,6 +582,14 @@
 				}).then(response => {
 					this.loading = false
 					this.tableData = [...this.tableData, ...response.data.list]
+					this.dangerDict.map(i=>{
+						this.tableData.map(k=>{
+							if(k?.handleResult==i.value){
+								k.handleResult=i.label
+							}
+						})
+						
+					})
 					// this.tableData = response.data.list
 					this.total = response.data.total
 				})
@@ -662,10 +671,15 @@
 			// #endif
 			descriptFpd() { //隐患描述点击确认
 				this.show5 = false
-				this.handleResult = this.handleResult
+				// this.handleResult = this.handleResult
+				this.handleMethod=this.handleResult
 				if (this.manualPopup) {
-					this.checkManualData[0].handleResult = this.handleResult
+					// this.checkManualData[0].handleResult = this.handleResult
+					this.checkManualData[0].handleMethod= this.handleResult
+					this.checkManualData[0].handleResult=1
+					
 				}
+				this.handleResult =1
 				this.checkPopupConfirm()
 
 				// this.maShow=false
@@ -680,11 +694,13 @@
 			},
 			checkPopupYinHuan() {
 				this.handleMethod = "生成隐患" //生成隐患
-				this.handleResult = "不正常"
+				// this.handleResult = "不正常"
+				this.handleResult = 2
 				console.log(this.checkManualData, 'this.checkManualData[this.checkManualData[');
 				if (this.manualPopup) { //手动检查
 					this.checkManualData[0].handleMethod = "生成隐患"
-					this.checkManualData[0].handleResult = "不正常"
+					// this.checkManualData[0].handleResult = "不正常"
+					this.checkManualData[0].handleResult = 2
 				}
 				this.checkPopupConfirm()
 			},

pagesA/fire/check_inspection/inspect_detail/inspect_detail.vue

@@ -7,7 +7,7 @@
 		<view class="uni-container">
 			<view class="flex  flex-direction width100">
 				<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-				<u--form ref="uForm" :model="formData" labelPosition="left" labelWidth="90" labelAlign="left">
+				<u--form ref="uForm" :model="formData" labelPosition="left" labelWidth="110" labelAlign="left">
 					<view class="">
 						<view style="display: flex;">
 							<view class="">
@@ -114,6 +114,7 @@
 		data() {
 			return {
 				urls: baseUrlImg,
+				dangerDict:getDictDatas(DICT_TYPE.DANGER_RESULT),
 				moren: `${baseUrlImg}/checkActive/moren.png`, //默认图片
 				zhengchang: `${baseUrlImg}/checkActive/zhengchang.png`,
 				// 数据加载中
@@ -163,7 +164,12 @@
 				}).then(response => {
 					console.log(response);
 					// // 为数据赋值：通过展开运算符的形式，进行新旧数据的拼接 
-					this.formData = response.data ? response.data : {}
+					this.formData = response.data ? response.data : {},
+					this.dangerDict.map(i=>{
+						if(this.formData?.activeInspect?.handleResult==i.value){
+							this.formData.activeInspect.handleResult=i.label
+						}
+					})
 					this.loading = false;
 				});
 			},

pagesA/fire/fire_device/add_device/add_device.vue

@@ -116,7 +116,7 @@
 				showSex: false, //有无避难层
 				showSex4: false, //设备状态
 				showSex5: false, //所属单位
-				actions2: getDictDatas(DICT_TYPE.DICT_FIRE_DECIVE_TYPE),
+				actions2: getDictDatas(DICT_TYPE.FPD_TYPE),
 				actions4: [{
 						id: 0,
 						name: '正常'

pagesA/fire/fire_device/edit_device/edit_device.vue

@@ -120,7 +120,7 @@
 				showSex: false, //有无避难层
 				showSex4: false, //设备状态
 				showSex5: false, //所属单位
-				actions2: getDictDatas(DICT_TYPE.DICT_FIRE_DECIVE_TYPE),
+				actions2: getDictDatas(DICT_TYPE.FPD_TYPE),
 				actions4: [{
 					id: 0,
 					name: '正常'

pagesA/fire/fire_device/index.vue

@@ -40,15 +40,15 @@
 							</view>
 							<view class="">
 								<view class="title-fpdname">
-									设施类别:{{item.fpdName}}
+									{{item.fpdName}}
 								</view>
 								<view class="title-fpdcode">
 									{{`设施编号:${item.fpdCode}`}}
 								</view>
 							</view>
-							<!-- <view class="">
+							<view class="">
 								{{`设施类别:${item.fpdTypeName?item.fpdTypeName:''}`}}
-							</view> -->
+							</view>
 						</view>
 					</template>
 					<view class="titles">{{ item.buildingName }}</view>
@@ -127,10 +127,15 @@
 		getOrgId //获取orgId
 	} from '@/api/fire_device';
 	import config from '@/config'
+	import {
+		DICT_TYPE,
+		getDictDatas
+	} from '@/utils/dict';
 	const baseUrlImg = config.baseUrlImg
 	export default {
 		data() {
 			return {
+				typeDict: getDictDatas(DICT_TYPE.FPD_TYPE),
 				screenHeight: this.$screenHeight,
 				isLoaded: false,
 				Group: `${baseUrlImg}/checkActive/Group.png`,
@@ -324,14 +329,16 @@
 					this.loading = false
 					this.total=response.data.total
 					// this.tableData = response.data.records;
-					console.log(this.tableData, '获得消防设施详细信息');
+					console.log(this.tableData, '获得消防设施详细信息',this.typeDict	);
 					// 根据返回值，显示记录类型的中文名称
 					this.tableData.map(i => {
-						if (i.fpdType == 1) {
-							i.fpdTypeName = '设备类型1'
-						} else if (i.fpdType == 2) {
-							i.fpdTypeName = '设备类型2'
-						}
+						this.typeDict.map(k=>{
+							
+							if(i.fpdType==k.fpdType){
+								console.log(i.fpdType,'i.fpdType');
+								i.i.fpdTypeName=k.fpdName
+							}
+						})
 					})
 
 				}).catch(err => {

pagesA/fire/fire_station/people_fireStation/people_fireStation.vue

@@ -131,12 +131,17 @@
 	import config from '@/config'
 	const baseUrlImg = config.baseUrlImg
 	import navInfo from '@/pagesA/components/my-nav/nav'
+	import {
+		DICT_TYPE,
+		getDictDatas
+	} from '@/utils/dict';
 	export default {
 		components: {
 			navInfo
 		},
 		data() {
 			return {
+				
 				membersList: [], //添加的人员数组
 				resultId: '',
 				value: 0,
@@ -185,27 +190,13 @@
 				showDel: false,
 				delId: '',
 				show123: false,
-				selectType: [], //选项
+				selectType:getDictDatas(DICT_TYPE.MICROEMPTYPE), //选项
 				addIds: '',
 				empList: null,
 				type: ''
 			}
 		},
 		methods: {
-			getTypePeople() {
-				getDict({
-					pageNo: 1,
-					pageSize: 10,
-					dictType: "micro_emp_type"
-				}).then(res => {
-					this.selectType = res.data.list.map(item => {
-						return {
-							value: item.value,
-							text: item.label
-						}
-					})
-				})
-			},
 			addNewPeople() {
 				if (this.addIds) {
 					const MAX_LENGTH = 1; // 假设你想限制数组最大长度为6
@@ -508,7 +499,10 @@
 			this.type = options.type ? options.type : ''
 		},
 		onShow() {
-			this.getTypePeople()
+			this.selectType.map(i => {
+				i.text = i.label;
+				i.value = i.value;
+			});
 			this.getGround()
 			if (this.addIds) {
 				this.getAllFire()

pagesB/fire/fireSpecial/addSpecial/index.vue

@@ -97,6 +97,9 @@
 		getDictDatas
 	} from "@/utils/dict";
 	const baseUrlImg = config.baseUrlImg
+	import {
+		getOrgId //获取orgId
+	} from '@/api/architecture';
 	export default {
 		data() {
 			return {
@@ -155,8 +158,26 @@
 		onLoad(option) {
 			this.formData.orgName = option.orgName ? option.orgName : ''
 			this.formData.orgId = option.orgId ? option.orgId : ''
+			if(!option.orgId){
+				getOrgId({
+					pageNo: this.pageNo,
+					pageSize: this.pageSize,
+					userId: this.$store.state.user.id
+				}).then(response => {
+					// 取到用户对应的单位名称与id
+					response.data.map(v => {
+						this.orgaction.push({
+							id: v.dwid,
+							name: v.orgName
+						});
+					});
+					this.formData.orgName = response.data[0].orgName ? response.data[0].orgName : '';
+					this.formData.orgId = response.data[0].dwid;
+					console.log(this.formData.orgName,'his.formData.orgName');
+				});
+			}
 			//单位信息
-			this.orgaction = option.orgaction ? JSON.parse(option.orgaction) : []
+			this.orgaction = option.orgaction ? JSON.parse(option.orgaction) : [],
 			this.actionsSex.map(i => i.name = i.label)
 			uni.setNavigationBarTitle({
 				title: option.title

pagesB/fire/fireWork/addWork/index.vue

@@ -10,8 +10,14 @@
 						<u-input v-model="formData.workReason" placeholder="请输入" :disabled="isview" />
 					</u-form-item>
 					<u-form-item label="动火作业执行人" prop="executor" :required="true"
-						@click="showExecutor = true; hideKeyboard()">
-						<u-input v-model="formData.executor" placeholder="请选择" :disabled="isview" />
+						style="position: relative;">
+						<view slot="label" style="display: flex;">
+							<text style="color:#000;font-size: 15px;"><text style="color: red;margin-right: 4px">*</text>动火作业执行人</text>
+							<u-button @click="onAddPerson" shape="circle" size="mini" style="margin-bottom: 10px;width: 80px;" :custom-style="{backgroundColor: '#4CB2B6',color:'#fff',padding:'12px 0'}">新增人员</u-button>
+						</view>
+						<view class=""  @click="addPerson">
+							<u-input v-model="formData.executor" placeholder="请选择" :disabled="isview" />
+						</view>
 					</u-form-item>
 					<u-form-item label="动火台账状态" prop="workStatus" :required="true" v-if="isview">
 						<u-input v-model="formData.workStatus" placeholder="请选择" :disabled="isview" />
@@ -191,6 +197,9 @@
 				this.isedit = false
 				this.isview = false
 			}
+			
+		},
+		onShow() {
 			// 获取动火作业执行人数据
 			let arrOrg = []
 			arrOrg.push(this.formData.orgId)
@@ -203,10 +212,19 @@
 				this.actionsExecutor.map(i => {
 					i.name = i.empName
 				})
-
+			
 			});
 		},
 		methods: {
+			onAddPerson(){
+				uni.navigateTo({
+					url: `/pagesB/fire/fireSpecial/addSpecial/index?title=新增特种人员`
+				})
+			},
+			addPerson() {
+				this.showExecutor = true;
+				uni.hideKeyboard()
+			},
 			clickExecutor(e) { //动火台账执行人
 				this.formData.executor = e.name
 			},

utils/common.js

@@ -101,6 +101,7 @@ export function delSure(delInterface, val, context) {
 			context.queryParams.pageNo = 1;
 			context.list = []
 			context.getData()
+			this.$forceUpdate()
 		}
 	});
 }

utils/dict.js

@@ -93,7 +93,8 @@ export const DICT_TYPE = {
 	// ==========隐患管理模块 ==========
 	DANGER_TYPE: 'dangerType',
 	FIRE_WORK_STATUS: "fire_work_status", //动火台账状态
-
+    MICROEMPTYPE:"micro_emp_type",
+	DANGER_RESULT:"danger_result"
 	// ========== 数据字典映射 =================
 
 };