dev:暂存危大工程代码

main.js

@@ -35,9 +35,9 @@ Vue.prototype.COMPANY = ""
 if (process.env.NODE_ENV === 'development') {
   // 开发环境
   console.log('开发环境')
-  Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址
+  // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址
 	// Vue.prototype.url_config = 'http://47.93.215.234:11211/' // 鞍钢测试地址
-  // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
+  Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
   // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
   // Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
   // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地

pages/login/login.vue

@@ -259,7 +259,7 @@ export default {
   position: fixed;
   left: 20rpx;
   right: 20rpx;
-  bottom: 50rpx;
+  bottom: 15%;
 
   > view {
     padding: 20rpx 0;

pages/projectEnd/dangerBigProject/addFinallyAcceptance.vue

@@ -9,9 +9,9 @@
 			<view class="plan-form">
 				<view class="form-item b-bottom">
 					<view class="form-lable"><text class="tag">*</text>验收单位</view>
-					<picker @change="bindPickerChange" :value="typeIndex" range-key="name" :range="typeList">
+					<picker @change="bindPickerChange" :value="typeIndex" range-key="enterpriseName" :range="enterpriseInfoList">
 						<view style="display: flex;align-items: center;">
-							<view class="uni-input" style="margin-right: 10px;">{{typeList[typeIndex] ? typeList[typeIndex].name : ""}}</view>
+							<view class="uni-input" style="margin-right: 10px;">{{enterpriseInfoList[typeIndex] ? enterpriseInfoList[typeIndex].name : ""}}</view>
 							<uni-icons2 type="arrowright" size="20"></uni-icons2>
 						</view>
 					</picker>
@@ -28,8 +28,8 @@
 				<view class="form-item b-bottom">
 					<view class="form-lable"><text class="tag">*</text>验收时间</view>
 					<dateTimePicker :placeholder="'请选择验收时间'" :disabled="isDisabled"
-					  :start="startTime" :fields="'minute'" :default-value="inspectTime"
+					  :start="checkedTime" :fields="'minute'" :default-value="inspectTime"
-						@change="bindPickerChange($event,'startTime')"
+						@change="bindPickerChange($event,'checkedTime')"
 					  class="form-content">
 					  <view class="uni-input">
 					    <!-- <text>{{addForm.inspectTime}}</text> -->
@@ -52,6 +52,11 @@ import { computed } from "vue";
 		},
 		data(){
 			return{
+				projectSn: '',
+				enterpriseInfoList: [],
+				isDisabled: false,
+				checkedTime: '',
+				
 				statusBarHeight: 0,
 				title: "下发验证任务",
 				inspectTime:'',
@@ -74,24 +79,50 @@ import { computed } from "vue";
 				}]
 			}
 		},
+		created() {
+			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail'))
+		},
 		onShow(){
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 		},
 		onLoad(val){
 			this.formData.dangerousEngineeringId = val.id
+			this.getEnterpriseInfoList()
 		},
 		methods:{
+			async getEnterpriseInfoList(){
+				await this.sendRequest({
+					url:'xmgl/enterpriseInfo/list',
+					method:'post',
+					data:{
+						// engineeringId: this.detailId,
+						projectSn: this.projectSn,
+					},
+					success:res=>{
+						uni.hideLoading()
+						console.log("xmgl/xzDangerousEngineeringAcceptance/list",res);
+						this.enterpriseInfoList = res.result;
+						
+						
+					}
+				})
+			},
+			
+			
 			checkRadio(val){
 				this.formData.acceptanceResult = val
 			},
+			
 			bindTextAreaBlur(e){
 				console.log(e)
 				this.formData.acceptanceDescribe = e.detail.value
 			},
+			
 			bindInputBlur(e){
 				console.log(e)
 				this.formData.acceptanceRegion = e.detail.value
 			},
+			
 			uploadImg() {
 				var that = this
 				uni.chooseImage({
@@ -113,6 +144,7 @@ import { computed } from "vue";
 					}
 				})
 			},
+			
 			//删除附件
 			deleteImg(val, type) {
 				let that = this;
@@ -153,10 +185,12 @@ import { computed } from "vue";
 					urls: [url]
 				})
 			},
+			
 			bindLength(e){
 				// console.log(e)
 				this.textareaLengh = e.detail.value.split('').length
 			},
+			
 			saveForm(){
 				// console.log(this.formData)
 				let data = {
@@ -205,6 +239,7 @@ import { computed } from "vue";
 					}
 				})
 			},
+			
 			bindPickerChange(e){
 				this.typeIndex = e.target.value
 				this.formData.acceptanceType = this.typeList[e.target.value].id

pages/projectEnd/dangerBigProject/details.vue

@@ -123,10 +123,10 @@
 					id: 7,
 					name: "管控要点"
 				},
-				// {
+				{
-				// 	id: 8,
+					id: 8,
-				// 	name: "最终验收"
+					name: "最终验收"
-				// }
+				}
 				],
 				activeIndex: 1,
 				detailId: "",

pages/projectEnd/dangerBigProject/finallyAcceptance.vue

@@ -1,20 +1,20 @@
 <template>
 	<view class="danger-project">
-		<view class="finally" >
+		<view class="finally" v-if="finallyCheckList.length > 0">
 			<view style="padding:10px;">
-				危大工程名称：基坑
+				<text style="font-weight: bold;">危大工程名称：</text>基坑
 			</view>
 			<view style="padding:10px;">
-				计划时间：基坑
+				<text style="font-weight: bold;">计划时间：</text>基坑
 			</view>
 			<view style="padding:10px;">
-				验收人：基坑
+				<text style="font-weight: bold;">验收人：</text>基坑
 			</view>
 			<view style="padding:10px;">
-				验收结果：基坑
+				<text style="font-weight: bold;">验收结果：</text>基坑
 			</view>
 		</view>
-		<view class="no-data">
+		<view class="no-data" v-else>
 			<image class="img" src="/static/noData.png"></image>
 			<text class="txt">暂无数据</text>
 		</view>