修改bug

pagesA/fire/architecture/add_architecture/add_architecture.vue

@@ -169,6 +169,7 @@
 	export default {
 		data() {
 			return {
+				orgaction:[],  //单位
 				screenHeight: this.$screenHeight,
 				wheight: '',
 				index: 0,
@@ -251,7 +252,9 @@
 			}).exec()
 		},
 		computed: {},
-		onLoad: function() {
+		onLoad: function(option) {
+			this.formData.orgName = option.orgName ? option.orgName : ''
+			this.formData.orgId = option.orgId ? option.orgId : ''
 			getOrgId({
 				pageNo: this.pageNo,
 				pageSize: this.pageSize,

pagesA/fire/architecture/architecture_details/architecture_details.vue

@@ -5,80 +5,80 @@
 			<u--form ref="customForm" :model="formData" labelPosition="top" labelWidth="250" labelAlign="left">
 				<view class=" flex  flex-direction width100">
 					<u-form-item label="楼宇名称" prop="buildingName" :required="true">
-						<u-input v-model="formData.buildingName" placeholder="必填。楼宇名称" :disabled="true"/>
+						<u-input v-model="formData.buildingName" placeholder="必填。楼宇名称" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="所属单位" prop="orgName" :required="true">
-						<u--input v-model="formData.orgName" disabled placeholder="必选。请选择所属单位"/>
+						<u--input v-model="formData.orgName" disabled placeholder="必选。请选择所属单位" />
 					</u-form-item>
 					<u-form-item label="楼宇编号	">
-						<u-input v-model="formData.buildingCode" placeholder="楼宇编号" :disabled="true"/>
+						<u-input v-model="formData.buildingCode" placeholder="楼宇编号" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="楼龄	">
-						<u-input v-model="formData.buildingAge" placeholder="楼龄" :disabled="true"/>
+						<u-input v-model="formData.buildingAge" placeholder="楼龄" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="楼层	">
-						<u-input v-model="formData.buildingFloor" placeholder="楼层" :disabled="true"/>
+						<u-input v-model="formData.buildingFloor" placeholder="楼层" :disabled="true" />
 					</u-form-item>
 
 					<u-form-item label="档案负责人">
-						<u-input v-model="formData.dafzr" placeholder="档案负责人" :disabled="true"/>
+						<u-input v-model="formData.dafzr" placeholder="档案负责人" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="占地面积">
-						<u-input v-model="formData.zdmj" placeholder="占地面积" :disabled="true"/>
+						<u-input v-model="formData.zdmj" placeholder="占地面积" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="产权信息	">
-						<u-input v-model="formData.ownership" placeholder="产权信息" :disabled="true"/>
+						<u-input v-model="formData.ownership" placeholder="产权信息" :disabled="true" />
 					</u-form-item>
-					<u-form-item prop="dlwz"  label="地理位置">
-								<u-input v-model="formData.dlwz" placeholder="地理位置" :disabled="true"/>
+					<u-form-item prop="dlwz" label="地理位置">
+						<u-input v-model="formData.dlwz" placeholder="地理位置" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="有无避难层" prop="ywbnc">
-						<u--input v-model="formData.ywbnc" disabled  placeholder="有无避难层"/>
+						<u--input v-model="formData.ywbnc" disabled placeholder="有无避难层" />
 					</u-form-item>
 					<u-form-item label="避难层层数">
-						<u-input v-model="formData.bncsl" placeholder="避难层层数	" :disabled="true"/>
+						<u-input v-model="formData.bncsl" placeholder="避难层层数	" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="避难层面积">
-						<u-input v-model="formData.bncmj" placeholder="避难层面积" :disabled="true"/>
+						<u-input v-model="formData.bncmj" placeholder="避难层面积" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="避难层位置">
-						<u-input v-model="formData.bncwz" placeholder="避难层位置" :disabled="true"/>
+						<u-input v-model="formData.bncwz" placeholder="避难层位置" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="安全出口数">
-						<u-input v-model="formData.aqcks" placeholder="安全出口数" :disabled="true"/>
+						<u-input v-model="formData.aqcks" placeholder="安全出口数" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="建筑数量	">
-						<u-input v-model="formData.jzsl" placeholder="建筑数量" :disabled="true"/>
+						<u-input v-model="formData.jzsl" placeholder="建筑数量" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="建筑高度	">
-						<u-input v-model="formData.buildingHeight" placeholder="建筑高度" :disabled="true"/>
+						<u-input v-model="formData.buildingHeight" placeholder="建筑高度" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="建筑面积	">
-						<u-input v-model="formData.jzmj" placeholder="建筑面积" :disabled="true"/>
+						<u-input v-model="formData.jzmj" placeholder="建筑面积" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="建筑结构	">
-						<u-input v-model="formData.buildingStructure" placeholder="建筑结构" :disabled="true"/>
+						<u-input v-model="formData.buildingStructure" placeholder="建筑结构" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="消防车道数" prop="xfcds">
-						<u-input v-model="formData.xfcds" placeholder="消防车道数" :disabled="true"/>
+						<u-input v-model="formData.xfcds" placeholder="消防车道数" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="消防电梯数" prop="xfdts">
-						<u-input v-model="formData.xfdts" placeholder="消防电梯数" :disabled="true"/>
+						<u-input v-model="formData.xfdts" placeholder="消防电梯数" :disabled="true" />
 					</u-form-item>
 					<u-form-item prop="xfcdwz" label="消防车登高操作场地位置">
-						<u-input v-model="formData.xfcdwz" placeholder="消防车登高操作场地位置" :disabled="true"/>
+						<u-input v-model="formData.xfcdwz" placeholder="消防车登高操作场地位置" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="消防控制室位置" prop="xfkzswz">
-						<u-input v-model="formData.xfkzswz" placeholder="消防控制室位置" :disabled="true"/>
+						<u-input v-model="formData.xfkzswz" placeholder="消防控制室位置" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="自动消防设施情况">
-						<u--input v-model="formData.zdxfss" disabled  placeholder="自动消防设施情况"/>
+						<u--input v-model="formData.zdxfss" disabled placeholder="自动消防设施情况" />
 					</u-form-item>
 					<u-form-item label="耐火等级	">
-						<u-input v-model="formData.fireRating" placeholder="耐火等级" :disabled="true"/>
+						<u-input v-model="formData.fireRating" placeholder="耐火等级" :disabled="true" />
 					</u-form-item>
 					<u-form-item label="燃气类型	">
-						<u-input v-model="formData.rqlx" placeholder="燃气类型" :disabled="true"/>
+						<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="请输入重点部位" />
@@ -113,11 +113,12 @@
 			return {
 				formData: {},
 				screenHeight: this.$screenHeight,
-				wheight: ''
+				wheight: '',
+				orgaction:[]  //单位
 			};
 		},
 		onLoad: function(option) {
-
+			
 			var data = option.id;
 			that = this;
 			// 接收来自上个页面传递的参数

pagesA/fire/architecture/index.vue

@@ -224,7 +224,7 @@
 				console.log(val, 'val');
 				this.isLoaded = false
 				uni.navigateTo({
-					url: '/pagesA/fire/architecture/architecture_details/architecture_details?id=' + val.id,
+					url: `/pagesA/fire/architecture/architecture_details/architecture_details?id=${val.id}`,
 					events: {
 						// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
 						acceptDataFromOpenedPage: function(val) {
@@ -254,7 +254,7 @@
 			addClick() {
 				this.isLoaded = false
 				uni.navigateTo({
-					url: '/pagesA/fire/architecture/add_architecture/add_architecture'
+					url: `/pagesA/fire/architecture/add_architecture/add_architecture?&orgName=${this.formData.orgName}&orgId=${this.formData.orgId}`,
 				});
 			},
 

pagesA/fire/check_inspection/check_inspection.vue

@@ -6,7 +6,7 @@
 				<u-form-item prop="orgName" @click="
 						showOrg = true;
 						hideKeyboard();
-					" label="单位选择:" labelWidth="80px">
+					" label="单位选择:" labelWidth="120px">
 					<u--input border="none" disabled v-model="formData.orgName" placeholder="请选择所属单位"></u--input>
 					<u-icon slot="right" name="arrow-down" class="danwei"></u-icon>
 				</u-form-item>

pagesA/fire/drill/add_drill/add_drill.vue

@@ -150,6 +150,8 @@
 		// 在 vue页面，向起始页通过事件传递数据
 		// 在 vue页面，向起始页通过事件传递数据
 		onLoad: function(option) {
+			this.formData.orgName = option.orgName ? option.orgName : ''
+			this.formData.orgId = option.orgId ? option.orgId : ''
 			this.actions2.map(i => {
 				i.name = i.label;
 				i.id = i.value;

pagesA/fire/drill/index.vue

@@ -250,7 +250,7 @@
 			addClick() {
 				this.isLoaded = false
 				uni.navigateTo({
-					url: '/pagesA/fire/drill/add_drill/add_drill'
+					url: `/pagesA/fire/drill/add_drill/add_drill?&orgName=${this.formData.orgName}&orgId=${this.formData.orgId}`,
 				});
 			},
 

pagesA/fire/fire_device/add_device/add_device.vue

@@ -174,6 +174,8 @@
 		},
 		// 在 vue页面，向起始页通过事件传递数据
 		onLoad: function(option) {
+			this.formData.orgName = option.orgName ? option.orgName : ''
+			this.formData.orgId = option.orgId ? option.orgId : ''
 			this.actions2.map(i => {
 				i.name = i.label;
 				i.id = i.value;

pagesA/fire/fire_device/index.vue

@@ -391,7 +391,7 @@
 			addClick() {
 				this.isLoaded = false
 				uni.navigateTo({
-					url: '/pagesA/fire/fire_device/add_device/add_device'
+					url: `/pagesA/fire/fire_device/add_device/add_device?&orgName=${this.formData.orgName}&orgId=${this.formData.orgId}`,
 				});
 			},
 			// 隐藏键盘

pagesA/fire/fire_inspetItem/streetCzfpczl.vue

@@ -112,7 +112,6 @@
 				})
 			},
 			delClick(val) {
-				this.isLoaded = false
 				delSure(delCzfpczl, val, this)
 			},
 			addClick() {

pagesA/fire/fire_inspetItem/streetDpccdtfpczl.vue

@@ -108,7 +108,6 @@
 				})
 			},
 			delClick(val) {
-				this.isLoaded = false
 				delSure(delDpccdtfpczl, val,this)
 			},
 			addClick() {

pagesA/fire/fire_inspetItem/streetDypczl.vue

@@ -24,8 +24,10 @@
 				</uni-card>
 			</view>
 		</view>
-		<view v-else-if="list.length==0 && isLoaded" style="text-align:center;">
-			暂无数据
+		<view v-else-if="list.length==0 && isLoaded" style="text-align: center;">
+			<view class="text-gray" style="padding-top: 20px;">
+				<img :src="tan90" alt="暂无数据" />
+			</view>
 		</view>
 		<image :src="Group" @click="addClick" class="tiantupian-street"></image>
 	<!-- 加载中 -->
@@ -108,7 +110,6 @@
 				})
 			},
 			delClick(val) {
-				this.isLoaded = false
 				delSure(delDypczl, val, this)
 			},
 			addClick() {

pagesA/fire/fire_station/add_fireStation/add_fireStation.vue

@@ -163,6 +163,8 @@
 		},
 		// 在 vue页面，向起始页通过事件传递数据
 		onLoad: function(option) {
+			this.formData.org_name = option.orgName ? option.orgName : ''
+			this.formData.orgId = option.orgId ? option.orgId : ''
 			// 获取单位id
 			getOrgId({
 				pageNo: this.pageNo,

pagesA/fire/fire_station/index.vue

@@ -251,7 +251,7 @@
 			addClick() {
 				this.isLoaded = false
 				uni.navigateTo({
-					url: '/pagesA/fire/fire_station/add_fireStation/add_fireStation'
+					url: `/pagesA/fire/fire_station/add_fireStation/add_fireStation?&orgName=${this.formData.orgName}&orgId=${this.formData.orgId}`
 				});
 			},
 			//微型消防站运行

pagesA/fire/fpd_detection/add_detection/add_detection.vue

@@ -198,6 +198,8 @@
 		// 在 vue页面，向起始页通过事件传递数据
 		// 在 vue页面，向起始页通过事件传递数据
 		onLoad: function(option) {
+			this.formData.orgName = option.orgName ? option.orgName : ''
+			this.formData.orgId = option.orgId ? option.orgId : ''
 			this.actions2.map(i => {
 				i.name = i.label;
 				i.id = i.value;

pagesA/fire/fpd_detection/fpd_detection.vue

@@ -111,7 +111,8 @@
 				keyword: '',
 				// 存放orgid,orgname
 				formData: {
-					orgName: ''
+					orgName: '',
+					orgId:''
 				},
 				show: false,
 				showtimeStart: false,
@@ -156,7 +157,7 @@
 			addClick() {
 				this.isLoaded = false
 				uni.navigateTo({
-					url: '/pagesA/fire/fpd_detection/add_detection/add_detection'
+					url:`/pagesA/fire/fpd_detection/add_detection/add_detection?&orgName=${this.formData.orgName}&orgId=${this.formData.orgId}`,
 				});
 			},
 			// 模态框内容

pagesB/fire/fireSpecial/addSpecial/index.vue

@@ -154,6 +154,7 @@
 		onLoad(option) {
 			this.formData.orgName = option.orgName ? option.orgName : ''
 			this.formData.orgId = option.orgId ? option.orgId : ''
+			//单位信息
 			this.orgaction = option.orgaction ? JSON.parse(option.orgaction) : []
 			this.actionsSex.map(i => i.name = i.label)
 			uni.setNavigationBarTitle({

utils/common.js

@@ -171,7 +171,7 @@ export function takePhotos(vm) {
 }
 export function choiceStreet(vm) {
 	const deptValue = uni.getStorageSync('getDepartment_key'); //所有部门
-	const deptId = uni.getStorageSync('getUserInfo_key').userInfo.deptId; //登录用户部门id
+	const deptId = uni.getStorageSync('getUserInfo_key').streetInfo.id; //登录用户
 	var newArrar = {}; //新对象
 	if (deptId) {
 		console.log(deptValue, 'deptValue部门', deptId);