现场档案新增完善其他相机和其他备注等

pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -65,8 +65,9 @@
 					<evan-radio v-model="formMess.cable_hole" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.cable_hole" label="2" class="margin-right-xs">其他</evan-radio>
 					<input type="text" style="width:30%" v-model="formMess.cable_hole_describe">
-					<image mode="aspectFit" :src="imageList[0].cable_hole_image?imageList[0].cable_hole_image:'/static/cameraIcon.png'"
-						data-mark="cable_hole" @tap="goCamera('cable_hole_image','cable_hole_picture')"></image>
+					<image mode="aspectFit"
+						:src="imageList[0].cable_hole_image?imageList[0].cable_hole_image:'/static/cameraIcon.png'"
+						@tap="goCamera('cable_hole_image','cable_hole_picture')"></image>
 				</view>
 			</view>
 			<view class="form-item extraDis radioSec">
@@ -76,9 +77,9 @@
 					<evan-radio v-model="formMess.damage" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.damage" label="2" class="margin-right-xs">其他</evan-radio>
 					<input type="text" style="width:30%" v-model="formMess.damage_describe">
-					<!-- <image src="../../../static/cameraIcon.png"></image> -->
-					<image mode="aspectFit" :src="imageList[0].damage_image?imageList[0].damage_image:'/static/cameraIcon.png'"
-						data-mark="2" @tap="goCamera('damage_image','damage_picture')"></image>
+					<image mode="aspectFit"
+						:src="imageList[0].damage_image?imageList[0].damage_image:'/static/cameraIcon.png'"
+						@tap="goCamera('damage_image','damage_picture')"></image>
 				</view>
 			</view>
 			<view class="form-item extraDis radioSec">
@@ -87,11 +88,11 @@
 					<evan-radio v-model="formMess.water_leakage" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.water_leakage" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.water_leakage" label="2" class="margin-right-xs">其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.water_leakage_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].water_leakage_image?imageList[0].water_leakage_image:'/static/cameraIcon.png'"
+						@tap="goCamera('water_leakage_image','water_leakage_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.water_leakage" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.water_leakage" label="0">否</evan-radio> -->
 			</view>
 			<view class="form-item extraDis radioSec">
 				<view class="title"><text class="necessary">*</text>灭火器配置不足:</view>
@@ -102,12 +103,14 @@
 						class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.annihilator_insufficient_configuration" label="2"
 						class="margin-right-xs">其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.annihilator_insufficient_configuration_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].annihilator_insufficient_configuration_image?imageList[0].annihilator_insufficient_configuration_image:'/static/cameraIcon.png'"
+						@tap="goCamera('annihilator_insufficient_configuration_image','annihilator_insufficient_configuration_picture')">
+					</image>
+
 				</view>
-				<!-- <evan-radio v-model="formMess.annihilator_insufficient_configuration" label="1" class="margin-right-xl">
-					是</evan-radio>
-				<evan-radio v-model="formMess.annihilator_insufficient_configuration" label="0">否</evan-radio> -->
+
 			</view>
 			<view class="form-item extraDis radioSec">
 				<view class="title"><text class="necessary">*</text>灭火器超期:</view>
@@ -115,11 +118,12 @@
 					<evan-radio v-model="formMess.annihilator_overdue" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.annihilator_overdue" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.annihilator_overdue" label="2" class="margin-right-xs">其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.annihilator_overdue_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].annihilator_overdue_image?imageList[0].annihilator_overdue_image:'/static/cameraIcon.png'"
+						@tap="goCamera('annihilator_overdue_image','annihilator_overdue_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.annihilator_overdue" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.annihilator_overdue" label="0">否</evan-radio> -->
+
 			</view>
 			<view class="info-tit margin-left-xs">
 				<text class="cuIcon-titles margin-right-xs"></text>
@@ -131,8 +135,10 @@
 					<evan-radio v-model="formMess.pile_up_sundries" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.pile_up_sundries" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.pile_up_sundries" label="2" class="margin-right-xs">其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.pile_up_sundries_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].pile_up_sundries_image?imageList[0].pile_up_sundries_image:'/static/cameraIcon.png'"
+						@tap="goCamera('pile_up_sundries_image','pile_up_sundries_picture')"></image>
 				</view>
 				<!-- <evan-radio v-model="formMess.pile_up_sundries" label="1" class="margin-right-xl">是</evan-radio>
 				<evan-radio v-model="formMess.pile_up_sundries" label="0">否</evan-radio> -->
@@ -146,11 +152,12 @@
 					</evan-radio>
 					<evan-radio v-model="formMess.serious_ash_deposition" label="2" class="margin-right-xs">其他
 					</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.serious_ash_deposition_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].serious_ash_deposition_image?imageList[0].serious_ash_deposition_image:'/static/cameraIcon.png'"
+						@tap="goCamera('serious_ash_deposition_image','serious_ash_deposition_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.serious_ash_deposition" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.serious_ash_deposition" label="0">否</evan-radio> -->
+
 			</view>
 			<view class="form-item extraDis radioSec">
 				<view class="title"><text class="necessary">*</text>配电房周围环境潮湿:</view>
@@ -161,11 +168,11 @@
 					</evan-radio>
 					<evan-radio v-model="formMess.around_environment_humid" label="2" class="margin-right-xs">其他
 					</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.around_environment_humid_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].around_environment_humid_image?imageList[0].around_environment_humid_image:'/static/cameraIcon.png'"
+						@tap="goCamera('around_environment_humid_image','around_environment_humid_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.around_environment_humid" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.around_environment_humid" label="0">否</evan-radio> -->
 			</view>
 
 			<view class="form-item extraDis radioSec">
@@ -177,11 +184,11 @@
 					</evan-radio>
 					<evan-radio v-model="formMess.around_pile_up_sundries" label="2" class="margin-right-xs">其他
 					</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.around_pile_up_sundries_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].around_pile_up_sundries_image?imageList[0].around_pile_up_sundries_image:'/static/cameraIcon.png'"
+						@tap="goCamera('around_pile_up_sundries_image','around_pile_up_sundries_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.around_pile_up_sundries" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.around_pile_up_sundries" label="0">否</evan-radio> -->
 			</view>
 
 			<view class="info-tit margin-left-xs">
@@ -194,11 +201,11 @@
 					<evan-radio v-model="formMess.no_electrician" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.no_electrician" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.no_electrician" label="2" class="margin-right-xs">其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.no_electrician_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].no_electrician_image?imageList[0].no_electrician_image:'/static/cameraIcon.png'"
+						@tap="goCamera('no_electrician_image','no_electrician_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.no_electrician" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.no_electrician" label="0">否</evan-radio> -->
 			</view>
 			<view class="form-item extraDis radioSec">
 				<view class="title"><text class="necessary">*</text>电工人数配置不足:</view>
@@ -206,11 +213,11 @@
 					<evan-radio v-model="formMess.electrician_lack" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.electrician_lack" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.electrician_lack" label="2" class="margin-right-xs">其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.electrician_lack_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].electrician_lack_image?imageList[0].electrician_lack_image:'/static/cameraIcon.png'"
+						@tap="goCamera('electrician_lack_image','electrician_lack_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.electrician_lack" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.electrician_lack" label="0">否</evan-radio> -->
 			</view>
 			<view class="form-item extraDis radioSec">
 				<view class="title"><text class="necessary">*</text>电工证超期:</view>
@@ -221,12 +228,13 @@
 					</evan-radio>
 					<evan-radio v-model="formMess.overdue_electrician_certificate" label="2" class="margin-right-xs">其他
 					</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.overdue_electrician_certificate_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].overdue_electrician_certificate_image?imageList[0].overdue_electrician_certificate_image:'/static/cameraIcon.png'"
+						@tap="goCamera('overdue_electrician_certificate_image','overdue_electrician_certificate_picture')">
+					</image>
 				</view>
-				<!-- <evan-radio v-model="formMess.overdue_electrician_certificate" label="1" class="margin-right-xl">是
-				</evan-radio>
-				<evan-radio v-model="formMess.overdue_electrician_certificate" label="0">否</evan-radio> -->
+
 			</view>
 
 
@@ -255,12 +263,12 @@
 						否</evan-radio>
 					<evan-radio v-model="formMess.blanket_insufficient_configuration" label="2" class="margin-right-xs">
 						其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.blanket_insufficient_configuration_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].blanket_insufficient_configuration_image?imageList[0].blanket_insufficient_configuration_image:'/static/cameraIcon.png'"
+						@tap="goCamera('blanket_insufficient_configuration_image','blanket_insufficient_configuration_picture')">
+					</image>
 				</view>
-				<!-- <evan-radio v-model="formMess.blanket_insufficient_configuration" label="1" class="margin-right-xl">是
-				</evan-radio>
-				<evan-radio v-model="formMess.blanket_insufficient_configuration" label="0">否</evan-radio> -->
 			</view>
 			<view class="form-item extraDis radioSec">
 				<view class="title"><text class="necessary">*</text>接地线与存放位置编号:</view>
@@ -268,11 +276,11 @@
 					<evan-radio v-model="formMess.ground_wire" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.ground_wire" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.ground_wire" label="2" class="margin-right-xs">其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.ground_wire_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].ground_wire_image?imageList[0].ground_wire_image:'/static/cameraIcon.png'"
+						@tap="goCamera('ground_wire_image','ground_wire_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.ground_wire" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.ground_wire" label="0">否</evan-radio> -->
 			</view>
 			<!-- 安全工器具 -->
 			<view class="info-tit margin-left-xs">
@@ -285,11 +293,11 @@
 					<evan-radio v-model="formMess.analog_screen" label="1" class="margin-right-xl">是</evan-radio>
 					<evan-radio v-model="formMess.analog_screen" label="0" class="margin-right-xl">否</evan-radio>
 					<evan-radio v-model="formMess.analog_screen" label="2" class="margin-right-xs">其他</evan-radio>
-					<input type="text" style="width:30%">
-					<image src="../../../static/cameraIcon.png"></image>
+					<input type="text" style="width:30%"  v-model="formMess.analog_screen_describe">
+					<image mode="aspectFit"
+						:src="imageList[0].analog_screen_image?imageList[0].analog_screen_image:'/static/cameraIcon.png'"
+						@tap="goCamera('analog_screen_image','analog_screen_picture')"></image>
 				</view>
-				<!-- <evan-radio v-model="formMess.analog_screen" label="1" class="margin-right-xl">是</evan-radio>
-				<evan-radio v-model="formMess.analog_screen" label="0">否</evan-radio> -->
 			</view>
 			<view class="form-item">
 				<view class="title">备注:</view>
@@ -492,9 +500,6 @@
 
 		data() {
 			return {
-				cable_hole_image: '',
-				damage_image: '',
-
 				noClick: true,
 
 				baseValue: '1',
@@ -513,49 +518,100 @@
 
 					"cable_hole": "0",
 					cable_hole_describe: '',
-					cable_hole_picture: '',
 
 					"damage": "0",
 					"damage_describe": "",
-					"damage_picture": "",
-
 
 					"water_leakage": "0",
+					"water_leakage_describe": "",
+					
 					"annihilator_insufficient_configuration": "0",
+					"annihilator_insufficient_configuration_describe": "",
+					
+					
 					"annihilator_overdue": "0",
+					"annihilator_overdue_describe": "",
 
 					"pile_up_sundries": "0",
+					"pile_up_sundries_describe": "",
+					
 					"serious_ash_deposition": "0",
+					"serious_ash_deposition_describe": "",
+					
 					"around_environment_humid": "0",
+					"around_environment_humid_describe": "",
+					
 					"around_pile_up_sundries": "0",
+					"around_pile_up_sundries_describe": "",
 
 					"no_electrician": "0",
+					"no_electrician_describe": "",
+					
 					"electrician_lack": "0",
+					"electrician_lack_describe": "",
+					
 					"overdue_electrician_certificate": "0",
+					"overdue_electrician_certificate_describe": "",
 
 					"electric_test_overdue": "",
 
 					"old_equipment": "",
 
 					"blanket_insufficient_configuration": "0",
+					"blanket_insufficient_configuration_describe": "",
+					
 					"ground_wire": "0",
+					"ground_wire_describe": "",
 
 
 					"analog_screen": "0",
+					"analog_screen_describe": "",  
 					"remarks": "",
 				},
 
 				id: 0,
 				detailInfo: {},
 				//上传图片
-				imageList:[	
-					{cable_hole_image:'',damage_image:''},
-					{cable_hole_picture:'',damage_picture:''}
+				imageList: [{
+						cable_hole_image: '',
+						damage_image: '',
+						water_leakage_image: '',
+						annihilator_insufficient_configuration_image: '',
+						annihilator_overdue_image: '',
+						pile_up_sundries_image: '',
+						serious_ash_deposition_image:'',
+						around_environment_humid_image:'',
+						around_pile_up_sundries_image:'',
+						no_electrician_image:'',
+						electrician_lack_image:'',
+						overdue_electrician_certificate_image:'',
+						blanket_insufficient_configuration_image:'',
+						ground_wire_image:'',
+						analog_screen_image:''
+						
+					},
+					{
+						cable_hole_picture: '',
+						damage_picture: '',
+						water_leakage_picture: '',
+						annihilator_insufficient_configuration_picture: '',
+						annihilator_overdue_picture: '',
+						pile_up_sundries_picture: '',
+						serious_ash_deposition_picture:'',
+						around_environment_humid_picture:'',
+						around_pile_up_sundries_picture:'',
+						no_electrician_picture:'',
+						electrician_lack_picture:'',
+						overdue_electrician_certificate_picture:'',
+						blanket_insufficient_configuration_picture:'',
+						ground_wire_picture:'',
+						analog_screen_picture:''
+					}
 				]
-					
-					
-				
-				
+
+
+
+
 
 			}
 		},
@@ -581,15 +637,16 @@
 		},
 		methods: {
 
-			goCamera(name,upimage) {
-					const that = this;
+			goCamera(name, upimage) {
+				const that = this;
 
 
 				uni.chooseImage({
-					count: 1, // 最多可以选择的图片张数，默认9
+					count: 1, // 最多可以选择的图片张数
 					sizeType: ['original', 'compressed'], //original 原图，compressed 压缩图，默认二者都有
 					sourceType: ['camera'], //album 从相册选图，camera 使用相机，默认二者都有。如需直接开相机或直接选相册，请只使用一个选项
 					success: function(res) {
+						console.log(res.tempFilePaths[0])
 						that.imageList[0][name] = res.tempFilePaths[0];
 						console.log(res.tempFilePaths[0])
 						uni.uploadFile({
@@ -600,11 +657,7 @@
 								'user': 'test'
 							},
 							success: (uploadFileRes) => {
-								// that.formMess.cable_hole_picture = JSON.parse(uploadFileRes.data)
-								// 	.img_url;
-									// that.imageList[1][upimage]=JSON.parse(uploadFileRes.data)
-									// .img_url;
-									that.imageList[0][name]=JSON.parse(uploadFileRes.data)
+								that.imageList[1][upimage] = JSON.parse(uploadFileRes.data)
 									.img_url;
 							}
 						});
@@ -719,29 +772,64 @@
 					"cable_hole": this.formMess.cable_hole,
 					"cable_hole_describe": this.formMess.cable_hole_describe,
 					"cable_hole_picture": this.imageList[1].cable_hole_picture,
-					
-					
+
 					"damage": this.formMess.damage,
 					"damage_describe": this.formMess.damage_describe,
 					"damage_picture": this.imageList[1].damage_picture,
+
+
+					"water_leakage": this.formMess.water_leakage,
+					"water_leakage_describe": this.formMess.water_leakage_describe,
+					"water_leakage_picture": this.imageList[1].water_leakage_picture,
 					
 					
-					"water_leakage": this.formMess.water_leakage,
-					"annihilator_insufficient_configuration": this.formMess
-						.annihilator_insufficient_configuration,
+					"annihilator_insufficient_configuration": this.formMess.annihilator_insufficient_configuration,
+					"annihilator_insufficient_configuration_describe": this.formMess.annihilator_insufficient_configuration_describe,
+					"annihilator_insufficient_configuration_picture": this.imageList[1].annihilator_insufficient_configuration_picture,
+					
 					"annihilator_overdue": this.formMess.annihilator_overdue,
+					"annihilator_overdue_describe": this.formMess.annihilator_overdue_describe,
+					"annihilator_overdue_picture": this.imageList[1].annihilator_overdue_picture,
+					
 					"pile_up_sundries": this.formMess.pile_up_sundries,
+					"pile_up_sundries_describe": this.formMess.pile_up_sundries_describe,
+					"pile_up_sundries_picture": this.imageList[1].pile_up_sundries_picture,
+					
 					"serious_ash_deposition": this.formMess.serious_ash_deposition,
+					"serious_ash_deposition_describe": this.formMess.serious_ash_deposition_describe,
+					"serious_ash_deposition_picture": this.imageList[1].serious_ash_deposition_picture,
+					
 					"around_environment_humid": this.formMess.around_environment_humid,
+					"around_environment_humid_describe": this.formMess.around_environment_humid_describe,
+					"around_environment_humid_picture": this.imageList[1].around_environment_humid_picture,
+					
 					"around_pile_up_sundries": this.formMess.around_pile_up_sundries,
+					"around_pile_up_sundries_describe": this.formMess.around_pile_up_sundries_describe,
+					"around_pile_up_sundries_picture": this.imageList[1].around_pile_up_sundries_picture,
+					
 					"no_electrician": this.formMess.no_electrician,
+					"no_electrician_describe": this.formMess.no_electrician_describe,
+					"no_electrician_picture": this.imageList[1].no_electrician_picture,
+					
 					"electrician_lack": this.formMess.electrician_lack,
+					"electrician_lack_describe": this.formMess.electrician_lack_describe,
+					"electrician_lack_picture": this.imageList[1].electrician_lack_picture,
+					
 					"overdue_electrician_certificate": this.formMess.overdue_electrician_certificate,
+					"overdue_electrician_certificate_describe": this.formMess.overdue_electrician_certificate_describe,
+					"overdue_electrician_certificate_picture": this.imageList[1].overdue_electrician_certificate_picture,
 
 					"blanket_insufficient_configuration": this.formMess.blanket_insufficient_configuration,
+					"blanket_insufficient_configuration_describe": this.formMess.blanket_insufficient_configuration_describe,
+					"blanket_insufficient_configuration_picture": this.imageList[1].blanket_insufficient_configuration_picture,
 
 					"ground_wire": this.formMess.ground_wire,
+					"ground_wire_describe": this.formMess.ground_wire_describe,
+					"ground_wire_picture": this.imageList[1].ground_wire_picture,
+					
 					"analog_screen": this.formMess.analog_screen,
+					"analog_screen_describe": this.formMess.analog_screen_describe,
+					"analog_screen_picture": this.imageList[1].analog_screen_picture,
 
 					"old_equipment": this.formMess.old_equipment,
 					"remarks": this.formMess.remarks,