bug处理

src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/record.vue

@@ -83,8 +83,8 @@
 									list-type="picture"
 									:before-upload="beforeImgUpload"
 								>
-									<i class="el-icon-plus avatar-uploader-icon"></i>
+									<div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
-									最多三张图片
+									最多三张图片</div>
 								</el-upload>
 							</div>
 

src/views/modules/shequzhili/tuceng/anquan/shebei/record.vue

@@ -54,7 +54,7 @@
 						</template>
 					</el-table-column>
 
-					<el-table-column prop="inspectResult" label="检查结果" align="center" width="200px">
+					<el-table-column prop="inspectResult" label="检查结果" align="center">
 						<template slot-scope="scope">
 							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
 								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
@@ -102,8 +102,7 @@
 									list-type="picture"
 									:before-upload="beforeImgUpload"
 								>
-									<i class="el-icon-plus avatar-uploader-icon"></i>
+									<div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
									最多三张图片</div>
-									最多三张图片
 								</el-upload>
 							</div>
 

src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue

@@ -7,62 +7,46 @@
 		</span>
 		<div>
 			<div class="dialog-h-content scroll-h">
-				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'" v-if="pageType != 'view'">
+				<el-form :inline="true" :model="formData" ref="form" :rules="dataRule" :label-width="'90px'"
+					v-if="pageType != 'view'">
 					<el-row>
 						<el-col :span="8">
 							<el-form-item label="上报时间" prop="reportTime">
 								<template slot-scope="scope">
-									<el-date-picker v-model="formData.reportTime" type="date" class="input-width" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+									<el-date-picker v-model="formData.reportTime" type="date" class="input-width"
+										value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
 								</template>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="隐患场所" prop="dangerPlaceName">
-								<el-input v-model="formData.dangerPlaceName" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model="formData.dangerPlaceName" class="u-item-width-normal" size="small"
+									clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="所属网格" prop="gridId">
-								<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部" size="small" clearable>
+								<el-select class="u-item-width-normal" v-model="formData.gridId" placeholder="全部"
-									<el-option v-for="item in gridList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+									size="small" clearable>
+									<el-option v-for="item in gridList" :key="item.value" :label="item.label"
+										:value="item.value"></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="24">
 							<el-form-item label="隐患内容" prop="dangerContent">
-								<el-input
+								<el-input type="textarea" :rows="2" style="width:500px" v-model="formData.dangerContent"
-									type="textarea"
+									:disabled="disabled" class="u-item-width-normal" size="small" clearable
-									:rows="2"
+									placeholder="请输入"></el-input>
-									style="width:500px"
-									v-model="formData.dangerContent"
-									:disabled="disabled"
-									class="u-item-width-normal"
-									size="small"
-									clearable
-									placeholder="请输入"
-								></el-input>
-
 								<div v-if="pageType != 'view'" style="margin-top:10px">
 									<!-- :data="{ customerId: customerId }" -->
-
+									<el-upload :headers="$getElUploadHeaders()" class="avatar-uploader"
-									<el-upload
+										:action="uploadUrl" :data="{ customerId: customerId }" :show-file-list="true"
-										:headers="$getElUploadHeaders()"
+										:file-list="formData.imgList" :on-preview="handleImgPreview"
-										class="avatar-uploader"
+										:on-success="handleImgSuccess" :on-remove="handleImgRemove"
-										:action="uploadUrl"
+										:on-exceed="handleImgExceed" :before-upload="beforeImgUpload"
-										:data="{ customerId: customerId }"
+										list-type="picture-card" :limit="3">
-										:show-file-list="true"
+										<i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
-										:file-list="formData.imgList"
-										:on-preview="handleImgPreview"
-										:on-success="handleImgSuccess"
-										:on-remove="handleImgRemove"
-										:on-exceed="handleImgExceed"
-										:before-upload="beforeImgUpload"
-										list-type="picture-card"
-										:limit="3"
-									>
-										<i class="el-icon-plus avatar-uploader-icon"></i>
-										最多三张图片
-									</el-upload>
 								</div>
 								<!-- {{ formData.imgList }} -->
 								<!-- <div class="div-content" v-if="pageType != 'add'">
@@ -83,34 +67,24 @@
 							</el-select>
 						</el-form-item> -->
 							<el-form-item label="上报人" prop="reportPerson">
-								<el-input v-model="formData.reportPerson" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model="formData.reportPerson" class="u-item-width-normal" size="small"
+									clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="联系电话" prop="mobile">
-								<el-input v-model="formData.mobile" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
+								<el-input v-model="formData.mobile" class="u-item-width-normal" size="small" clearable
+									placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="隐患位置" prop="location" style="display: block">
-								<el-select
+								<el-select v-model="formData.location" :disabled="disabled" filterable remote
-									v-model="formData.location"
+									:reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
-									:disabled="disabled"
+									:loading="loading" @keyup.enter.native="remoteMethod(formData.location)">
-									filterable
+									<el-option v-for="(item, index) in searchOptions"
-									remote
+										@click.native="handleClickKey(index)" :key="item.value" :label="item.label"
-									:reserve-keyword="true"
+										:value="item.value"></el-option>
-									placeholder="请输入关键词"
-									:remote-method="remoteMethod"
-									:loading="loading"
-									@keyup.enter.native="remoteMethod(formData.location)"
-								>
-									<el-option
-										v-for="(item, index) in searchOptions"
-										@click.native="handleClickKey(index)"
-										:key="item.value"
-										:label="item.label"
-										:value="item.value"
-									></el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -123,7 +97,8 @@
 							<el-form-item label="上报时间" prop="reportTime">{{ formData.reportTime }}</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="隐患场所" prop="dangerPlaceName">{{ formData.dangerPlaceName }}</el-form-item>
+							<el-form-item label="隐患场所"
+								prop="dangerPlaceName">{{ formData.dangerPlaceName }}</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="所属网格" prop="gridId">{{ formData.gridName }}</el-form-item>
@@ -132,18 +107,15 @@
 							<el-form-item label="隐患内容" prop="dangerContent">
 								<div>{{ formData.dangerContent }}</div>
 								<div class="div-content">
-									<el-image
+									<el-image v-if="formData.showImgList.length > 0" style="width: 146px; height: 146px"
-										v-if="formData.showImgList.length > 0"
+										:src="formData.showImgList[0]" fit="cover"
-										style="width: 146px; height: 146px"
+										:preview-src-list="formData.showImgList"></el-image>
-										:src="formData.showImgList[0]"
-										fit="cover"
-										:preview-src-list="formData.showImgList"
-									></el-image>
 								</div>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="处理情况" prop="handleStateName">{{ formData.handleStateName }}</el-form-item>
+							<el-form-item label="处理情况"
+								prop="handleStateName">{{ formData.handleStateName }}</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="上报人" prop="reportPerson">{{ formData.reportPerson }}</el-form-item>
@@ -166,7 +138,10 @@
 				<!-- <el-button size="small" @click="resetData" v-if="pageType != 'view'">重置</el-button> -->
 				<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
 			</div>
-			<div class="recordBox"><record :disabled="disabled" :formType="pageType" :id="detailIdcopy" :info="{ agencyId: agencyId }"></record></div>
+			<div class="recordBox">
+				<record :disabled="disabled" :formType="pageType" :id="detailIdcopy" :info="{ agencyId: agencyId }">
+				</record>
+			</div>
 		</div>
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="handleCancle" size="small">关 闭</el-button>
@@ -174,12 +149,20 @@
 		</span>
 	</el-dialog>
 </template>
-
 <script>
-import { isMobile } from '@/utils/validate';
+	import {
-import { mapGetters } from 'vuex';
+		isMobile
-import { Loading } from 'element-ui'; // 引入Loading服务
+	} from '@/utils/validate';
-import { requestPost, requestGet } from '@/js/dai/request';
+	import {
+		mapGetters
+	} from 'vuex';
+	import {
+		Loading
+	} from 'element-ui'; // 引入Loading服务
+	import {
+		requestPost,
+		requestGet
+	} from '@/js/dai/request';
 	import daiMap from '@/utils/dai-map';
 	import nextTick from 'dai-js/tools/nextTick';
 	import record from './record';
@@ -189,7 +172,6 @@ var search;
 	var markers;
 	var infoWindowList;
 	var geocoder; // 新建一个正逆地址解析类
-
 	export default {
 		props: {
 			dialogVisible: {
@@ -217,7 +199,6 @@ export default {
 				default: false
 			}
 		},
-
 		data() {
 			let checkMObile = (rule, value, callback) => {
 				if (value === '') {
@@ -236,8 +217,20 @@ export default {
 				agencyId: '',
 				gridList: [], //所属网格list--场所区域
 				placeTypeList: [], //场所类型
-			handleStateArray: [{ value: '0', label: '待处理' }, { value: '1', label: '处理完成' }],
+				handleStateArray: [{
-			equipmentCategoryCodeArray: [{ value: '0', label: '九小场所' }, { value: '1', label: '企事业单位' }],
+					value: '0',
+					label: '待处理'
+				}, {
+					value: '1',
+					label: '处理完成'
+				}],
+				equipmentCategoryCodeArray: [{
+					value: '0',
+					label: '九小场所'
+				}, {
+					value: '1',
+					label: '企事业单位'
+				}],
 				list: {},
 				formData: {
 					reportTime: '',
@@ -250,13 +243,41 @@ export default {
 					location: ''
 				},
 				dataRule: {
-				reportTime: [{ required: true, message: '上报时间不能为空', trigger: 'bulr' }],
+					reportTime: [{
-				dangerPlaceName: [{ required: true, message: '隐患场所不能为空', trigger: 'bulr' }],
+						required: true,
-				dangerContent: [{ required: true, message: '隐患内容不能为空', trigger: 'bulr' }],
+						message: '上报时间不能为空',
-				reportPerson: [{ required: true, message: '上报人不能为空', trigger: 'bulr' }],
+						trigger: 'bulr'
-				mobile: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+					}],
-				gridId: [{ required: true, validator: '所属网格不能为空', trigger: 'blur' }],
+					dangerPlaceName: [{
-				location: [{ required: true, message: '场所地址不能为空', trigger: 'blur' }]
+						required: true,
+						message: '隐患场所不能为空',
+						trigger: 'bulr'
+					}],
+					dangerContent: [{
+						required: true,
+						message: '隐患内容不能为空',
+						trigger: 'bulr'
+					}],
+					reportPerson: [{
+						required: true,
+						message: '上报人不能为空',
+						trigger: 'bulr'
+					}],
+					mobile: [{
+						required: true,
+						message: '联系电话不能为空',
+						trigger: 'blur'
+					}],
+					gridId: [{
+						required: true,
+						validator: '所属网格不能为空',
+						trigger: 'blur'
+					}],
+					location: [{
+						required: true,
+						message: '场所地址不能为空',
+						trigger: 'blur'
+					}]
 					// content: [{ required: true, message: '详细说明不能为空', trigger: 'bulr' }, { max: 1000, message: '不能超出1000个字符', trigger: 'blur' }]
 				},
 				//地图
@@ -269,7 +290,9 @@ export default {
 			};
 		},
 		watch: {},
-	components: { record },
+		components: {
+			record
+		},
 		created() {},
 		async mounted() {
 			console.log('detailId', this.detailId);
@@ -286,7 +309,6 @@ export default {
 			await this.endLoading();
 			this.endLoading();
 		},
-
 		methods: {
 			// handleImgSuccess(res, row) {
 			// 	if (res.code === 0 && res.msg === 'success') {
@@ -340,37 +362,47 @@ export default {
 					message: '文件数量最多不超过三个'
 				});
 			},
-
 			async loadGrid() {
 				const url = '/gov/org/customergrid/gridoption';
 				let params = {
 					agencyId: this.agencyId,
 					purpose: 'query'
 				};
-			const { data, code, msg } = await requestPost(url, params);
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, params);
 				if (code === 0) {
 					this.gridList = data;
 				} else {
 					this.$message.error(msg);
 				}
 			},
-
 			async getDetail() {
 				const url = `/actual/base/hiddenDangerRecord/detail/${this.detailIdcopy}`;
-			const { data, code, msg } = await requestPost(url);
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url);
 				if (code === 0) {
 					console.log('详情数据', data);
-				this.formData = { ...data };
+					this.formData = {
+						...data
+					};
 					this.formData.showImgList = this.formData.imgList;
 					this.formData.imgList = this.formData.imgList.map(item => {
-					return { url: item, name: '' };
+						return {
+							url: item,
+							name: ''
+						};
 					});
 					this.initMap();
 				} else {
 					this.$message.error(msg);
 				}
 			},
-
 			handleComfirm() {
 				this.save();
 			},
@@ -399,7 +431,6 @@ export default {
 				// 		this.btnDisable = false;
 				// 	});
 			},
-
 			async save() {
 				console.log('this.formData', this.formData);
 				this.formData.imgList = this.formData.imgList.map(item => {
@@ -412,12 +443,18 @@ export default {
 				} else {
 					url = '/actual/base/hiddenDangerRecord/update';
 				}
-			params = { ...this.formData };
+				params = {
-			const { data, code, msg } = await requestPost(url, params);
+					...this.formData
+				};
+				const {
+					data,
+					code,
+					msg
+				} = await requestPost(url, params);
 				if (code === 0) {
 					this.$message.success('操作成功');
-
+					this.detailIdcopy = data
-				this.handleCancle();
+					// this.handleCancle();
 					// // this.resetData();
 				} else if (code >= 8000) {
 					this.$message.error(msg);
@@ -447,8 +484,10 @@ export default {
 			},
 			// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
 			initMap() {
-			let { latitude, longitude } = this.$store.state.user;
+				let {
-
+					latitude,
+					longitude
+				} = this.$store.state.user;
 				if (this.formData.latitude && this.formData.longitude) {
 					latitude = this.formData.latitude;
 					longitude = this.formData.longitude;
@@ -457,24 +496,21 @@ export default {
 					latitude = 39.9088810666821;
 					longitude = 116.39743841556731;
 				}
-
 				this.$nextTick(() => {
-				map = new daiMap(
+					map = new daiMap(document.getElementById('app_event'), {
-					document.getElementById('app_event'),
+						latitude,
-					{ latitude, longitude },
+						longitude
-					{
+					}, {
 						zoom: 16.2, // 设置地图缩放级别
 						pitch: 43.5, // 设置俯仰角
 						rotation: 45 // 设置地图旋转角度
-					}
+					});
-				);
 					// 监听地图平移结束
 					map.on('dragend', e => {
 						if (!this.disabled) {
 							this.handleMoveCenter(e);
 						}
 					});
-
 					map.setCenter(latitude, longitude);
 					if (this.formData.latitude) {
 						map.setMarker(latitude, longitude);
@@ -483,12 +519,17 @@ export default {
 			},
 			async handleMoveCenter() {
 				//修改地图中心点
-			const { lat, lng } = map.getCenter();
+				const {
+					lat,
+					lng
+				} = map.getCenter();
 				this.formData.latitude = lat;
 				this.formData.longitude = lng;
 				map.setMarker(lat, lng);
-
+				let {
-			let { msg, data } = await map.getAddress(lat, lng);
+					msg,
+					data
+				} = await map.getAddress(lat, lng);
 				if (msg == 'success') {
 					this.formData.location = data.address;
 					this.searchValue = data.address;
@@ -498,24 +539,27 @@ export default {
 			async remoteMethod(query) {
 				if (query !== '') {
 					this.loading = true;
-				const { msg, data } = await map.searchNearby(query);
+					const {
+						msg,
+						data
+					} = await map.searchNearby(query);
 					this.loading = false;
 					this.resultList = [];
-
 					if (msg == 'success' && data.resultList && data.resultList.length > 0) {
 						if (data.resultList && data.resultList.length > 0) {
 							this.resultList = data.resultList;
 							this.searchOptions = this.resultList.map(item => {
-							return { value: `${item.id}`, label: `${item.address + item.name}` };
+								return {
+									value: `${item.id}`,
+									label: `${item.address + item.name}`
+								};
 							});
 						}
 					} else {
-					this.searchOptions = [
+						this.searchOptions = [{
-						{
 							value: '0',
 							label: '未检索到结果'
-						}
+						}];
-					];
 					}
 				} else {
 					this.searchOptions = [];
@@ -530,7 +574,6 @@ export default {
 				this.formData.longitude = lonlat[0];
 				this.formData.location = selPosition.address + selPosition.name;
 			},
-
 			// handleImgRemove(file, row) {
 			// 	let url = file.url || file.response.data.url;
 			// 	if (url) {
@@ -538,12 +581,10 @@ export default {
 			// 		this.computeImgShowList(row);
 			// 	}
 			// },
-
 			beforeImgUpload(file) {
 				const isLt1M = file.size / 1024 / 1024 < 10;
 				const srcType = file.type;
 				const format = file.name.split('.').pop();
-
 				if (!isLt1M) {
 					this.$message.error('上传文件大小不能超过 10MB!');
 					return false;
@@ -561,6 +602,7 @@ export default {
 	@import '@/assets/scss/modules/management/form-main.scss';
 	@import '@/assets/scss/modules/management/form.scss';
 	@import '@/assets/scss/modules/visual/a_customize.scss';
+
 	.el-dialog__body {
 		padding: 30px 80px;
 	}

src/views/modules/shequzhili/tuceng/anquan/yinhuan/record.vue

@@ -27,7 +27,7 @@
 							<el-select v-if="scope.row.isEdit" v-model="scope.row.handleState" placeholder="请选择" class="input-width" size="small" clearable>
 								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
 							</el-select>
-							<div v-else class="div-content">{{ scope.row.handleState == 1 ? '处理完成' : '待处理' }}</div>
+							<div v-else class="div-content">{{ scope.row.handleState == 1 ? '已处理' : '待处理' }}</div>
 						</template>
 					</el-table-column>
 					<el-table-column prop="remark" label="备注" align="center" width="200px">
@@ -108,10 +108,7 @@ export default {
 			tempRow: {},
 
 			optionResult: [
-				{
+				
-					label: '待处理',
-					value: '0'
-				},
 				{
 					label: '已处理',
 					value: '1'

src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue

@@ -29,7 +29,7 @@
 								<el-input v-model="formData.contactNum" :disabled="disabled" class="u-item-width-normal" size="small" clearable placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="6">
+						<el-col :span="18">
 							<el-form-item label="所处位置" prop="location" style="display: block">
 								<el-select
 									v-model="formData.location"

src/views/modules/shequzhili/tuceng/zhonghe/shebei/record.vue

@@ -54,7 +54,7 @@
 						</template>
 					</el-table-column>
 
-					<el-table-column prop="inspectResult" label="检查结果" align="center" width="200px">
+					<el-table-column prop="inspectResult" label="检查结果" align="center" >
 						<template slot-scope="scope">
 							<el-select v-if="scope.row.isEdit" v-model="scope.row.inspectResult" placeholder="请选择" class="input-width" size="small" clearable>
 								<el-option v-for="subItem in optionResult" :key="subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
@@ -102,8 +102,7 @@
 									list-type="picture"
 									:before-upload="beforeImgUpload"
 								>
-									<i class="el-icon-plus avatar-uploader-icon"></i>
+									<div v-if="scope.row.imgList.length != 3"><i class="el-icon-plus avatar-uploader-icon"></i>
									最多三张图片</div>
-									最多三张图片
 								</el-upload>
 							</div>