wanghao 1 рік тому
батько
коміт
c5974af083

+ 11 - 9
pages/statistics/historyDetailsCourtyard.vue

@@ -1,23 +1,25 @@
 <template>
-	<view>
-		<view class="uni-media-list">
+	<scroll-view>
+		<view class="uni-media-list" v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList" :key="key"
+					v-if="isEdit(value)">
 
 			<view class="uni-media-list-body">
-				<view v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList" :key="key"
-					v-if="isEdit(value)">
+				<view >
 					<view class="uni-media-list-text-top">
-						<view class="tit-text">施工时间:</view>{{value.updateTime}}
+						<view class="tit-text">施工时间222:</view>{{value.updateTime}}
 					</view>
+					<view class="uni-media-list-text-top">
 					<view class="uni-common-mt" style="width: 100%;">
-						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
+						<text class="tit-text" style=" font-size: 13px;color:
 									#000;margin-top: 5px;">施工内容:</text>
-						<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
+						<view style="width: 100%;box-sizing: border-box;">
 							<textarea class="textarea" maxlength="255" placeholder-style="padding: 10rpx;"
-								style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal; min-height: 30px;"
+								style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
 								auto-height :value="value.remark"
 								@blur="bindTextAreaBlur($event.target.value,key)"></textarea>
 						</view>
 					</view>
+					</view>
 					<view
 						v-if="title=='开挖前'||title=='开挖后'||title=='焊口照片'||title=='隐蔽工程'||title=='除锈刷油'||title=='打磨'||title=='全貌照片'">
 						<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
@@ -341,7 +343,7 @@
 		<view class="action-btn" v-if="hideButton==false">
 			<button @click="submit" class="btn cu-btn block bg-blue lg round">确认</button>
 		</view>
-	</view>
+	</scroll-view>
 </template>
 
 <script>

+ 111 - 99
pages/statistics/history_details_bottom_leg.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<scroll-view>
 		<view class="uni-media-list" v-for="(value, key) in dataJson.zEngineeringNodeBo.zEngineeringInfoBoList"
 			:key="key" v-if="isEdit(value)">
 
@@ -8,23 +8,26 @@
 					<view class="uni-media-list-text-top">
 						<view class="tit-text">施工时间:</view>{{value.updateTime}}
 					</view>
-					<view class="uni-common-mt" style="width: 100%;">
-						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-									#000;margin-top: 5px;">施工内容:</text>
-						<view style="width: 100%;padding-right: 20rpx;box-sizing: border-box;">
-							<textarea class="textarea" maxlength="255" placeholder-style="padding: 10rpx;"
-								style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal; min-height: 30px;"
-								auto-height :value="value.zEngineeringMaterialBo[0].remark"
-								@blur="bindTextAreaBlur($event.target.value,key)"></textarea>
+					<view class="uni-media-list-text-top">
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="tit-text">施工内容:</text>
+							<view style="width: 100%;box-sizing: border-box;">
+								<textarea class="textarea" maxlength="255" placeholder-style="padding: 10rpx;"
+									style="width: 100%;height: 100%;border: 1rpx solid #cccccc; border-radius: 15rpx;padding: 10rpx;line-height:normal;"
+									auto-height :value="value.zEngineeringMaterialBo[0].remark"
+									@blur="bindTextAreaBlur($event.target.value,key)"></textarea>
+							</view>
 						</view>
 					</view>
 
+
 					<view class="uni-media-list-text-top" style="border-bottom: 1px solid #f8f8f8;">
 						<view class="tit-text">
 							施工位置
 						</view>
 						<view style="display: flex; align-items: center; justify-content: right; width: 70%;">
-							<view v-if="isEmpty(value.constructAddre)" @click="pickerShow('position')" style="margin-right: 20rpx;">
+							<view v-if="isEmpty(value.constructAddre)" @click="pickerShow('position')"
+								style="margin-right: 20rpx;">
 								<span style="color: darkgray;">请选择施工位置</span>
 							</view>
 							<view v-else @click="pickerShow('position',key)" style="margin-right: 20rpx;">
@@ -37,110 +40,119 @@
 						</view>
 
 					</view>
-
-					<view class="uni-common-mt" style="width: 100%;">
-						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-							#000;margin-top: 5px; margin-left: 8px;">沟上部分照片:</text>
-					</view>
-					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-						<image :src="loadImgSrc('updateimg.png')" mode=""
-							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(0,key)">
-						</image>
-						<view v-for="(item,index) in  value.onTheDitch" :key="index" style="position: relative;">
-							<view
-								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-									@click="showPhoto(index,value.onTheDitch)">
-								</image>
-							</view>
-							<view v-else>
-								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-							</view>
-							<view @click="removeht(index,key,0)"
-								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+					<view class="uni-media-list-text-top">
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="tit-text">沟上部分照片:</text>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; ">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; "
+									@click="chooseimage(0,key)">
 								</image>
+								<view v-for="(item,index) in  value.onTheDitch" :key="index"
+									style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode=""
+											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,value.onTheDitch)">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item"
+											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="removeht(index,key,0)"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
 							</view>
 						</view>
 					</view>
-
-					<view class="uni-common-mt" style="width: 100%;">
-						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-							#000;margin-top: 5px; margin-left: 8px;">开挖前照片:</text>
-					</view>
-					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-						<image :src="loadImgSrc('updateimg.png')" mode=""
-							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(1,key)">
-						</image>
-						<view v-for="(item,index) in  value.beforeBottom" :key="index" style="position: relative;">
-							<view
-								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-									@click="showPhoto(index,value.beforeBottom)">
-								</image>
-							</view>
-							<view v-else>
-								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-							</view>
-							<view @click="removeht(index,key,1)"
-								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+					<view class="uni-media-list-text-top">
+						<view class="uni-common-mt" style="width: 100%;">
+							<text class="tit-text">开挖前照片:</text>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; ">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(1,key)">
 								</image>
+								<view v-for="(item,index) in  value.beforeBottom" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,value.beforeBottom)">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="removeht(index,key,1)"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
 							</view>
 						</view>
 					</view>
-
+					
+				
+<view class="uni-media-list-text-top">
 					<view class="uni-common-mt" style="width: 100%;">
-						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-							#000;margin-top: 5px; margin-left: 8px;">下沟照片:</text>
-					</view>
-					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-						<image :src="loadImgSrc('updateimg.png')" mode=""
-							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(2,key)">
-						</image>
-						<view v-for="(item,index) in  value.legBackfilling" :key="index" style="position: relative;">
-							<view
-								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-									@click="showPhoto(index,value.legBackfilling)">
+						<text class="tit-text" style=" font-size: 13px;color:
+							#000;margin-top: 5px;">下沟照片:</text>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; ">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(2,key)">
 								</image>
+								<view v-for="(item,index) in  value.legBackfilling" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,value.legBackfilling)">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="removeht(index,key,2)"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
 							</view>
-							<view v-else>
-								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-							</view>
-							<view @click="removeht(index,key,2)"
-								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
-								</image>
-							</view>
-						</view>
 					</view>
-
-					<view class="uni-common-mt" style="width: 100%;">
-						<text class="uni-title uni-common-pl" style=" font-size: 13px;color:
-							#000;margin-top: 5px; margin-left: 8px;">回填照片:</text>
 					</view>
-					<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; margin-left: 10px;">
-						<image :src="loadImgSrc('updateimg.png')" mode=""
-							style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(3,key)">
-						</image>
-						<view v-for="(item,index) in  value.inferiorSulcus" :key="index" style="position: relative;">
-							<view
-								v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
-								<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-									@click="showPhoto(index,value.inferiorSulcus)">
-								</image>
-							</view>
-							<view v-else>
-								<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
-							</view>
-							<view @click="removeht(index,key,3)"
-								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
-								<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+					
+<view class="uni-media-list-text-top">
+					<view class="uni-common-mt" style="width: 100%;">
+						<text class="tit-text" style=" font-size: 13px;color:
+							#000;margin-top: 5px;">回填照片:</text>
+							<view class="" style="display: flex; flex-wrap: wrap;margin-top: 10px; ">
+								<image :src="loadImgSrc('updateimg.png')" mode=""
+									style="width: 200rpx; height: 150rpx; margin: 0 12rpx;; " @click="chooseimage(3,key)">
 								</image>
+								<view v-for="(item,index) in  value.inferiorSulcus" :key="index" style="position: relative;">
+									<view
+										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'||item.substring(item.length-4)=='jpeg' ">
+										<image :src="item" mode="" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
+											@click="showPhoto(index,value.inferiorSulcus)">
+										</image>
+									</view>
+									<view v-else>
+										<video :src="item" style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"></video>
+									</view>
+									<view @click="removeht(index,key,3)"
+										style="position: absolute; top: 0; right: 14rpx; border-radius: 50%;">
+										<image :src="loadImgSrc('icon_close.png')" style=" width: 15px; height: 15px;">
+										</image>
+									</view>
+								</view>
 							</view>
-						</view>
 					</view>
+						</view>
 				</view>
 			</view>
 		</view>
@@ -152,7 +164,7 @@
 		<view class="action-btn" v-if="hideButton==false">
 			<button @click="submit" class="btn cu-btn block bg-blue lg round">确认</button>
 		</view>
-	</view>
+	</scroll-view>
 </template>
 
 <script>

+ 180 - 1
uni.scss

@@ -60,4 +60,183 @@ $uni-font-size-title:20px;
 $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:26px;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:15px;
+$uni-font-size-paragraph:15px;
+
+	.container {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 10px;
+			position: relative;
+
+		}
+
+		.uni-list {
+			border: 1xp solid #eee;
+		}
+
+		.to-right-icon {
+			width: 15px;
+			height: 15px;
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+		}
+
+
+		.text {
+			font-size: 16px;
+			color: #333;
+		}
+
+		.background {
+			// border: 15px solid hsla(0, 0%, 100%, .5);
+			background: white;
+			background-clip: padding-box;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			margin: 20rpx 10rpx;
+			/*从padding开始往外面裁剪背景*/
+
+
+		}
+
+		.btn {
+			width: 715rpx;
+			height: 69rpx;
+			background: #79A4F0;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-family: Microsoft YaHei;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin-top: 40rpx;
+			margin-bottom: 100rpx;
+		}
+
+
+		.number {
+			display: flex;
+			/* 水平居中显示子元素 */
+			align-items: flex-start;
+			/* 垂直居中显示子元素 */
+			justify-content: space-between;
+			/* 左右间距等于间距大小 */
+			padding: 10px;
+			/* 设置padding以提高视觉效果 */
+		}
+
+		.tj-btn {
+			height: 69rpx;
+			background: #3184f0;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin: 40rpx 70rpx;
+
+		}
+
+		.sc-btn {
+			height: 69rpx;
+			background: #f0686b;
+			border-radius: 6rpx;
+			font-size: 25rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			line-height: 69rpx;
+			margin: 40rpx;
+
+		}
+
+		.num-style {
+			background: #e8f4f9;
+			margin: 20rpx;
+			padding: 10rpx;
+			border-radius: 20rpx;
+			border: 1px solid #d4e3f0;
+		}
+
+
+		.textarea {
+			margin-top: 10upx;
+			width: 100%;
+			border: 1rpx solid red;
+			min-height: 100upx;
+			line-height: 20px;
+		}
+
+		page {
+			background: #f2f2f2;
+		}
+
+		.flex-x {
+			display: flex;
+			align-items: center;
+		}
+
+		.template_title,
+		.template_title1,
+		.template_title_list {
+			height: 90rpx;
+			background: #fff;
+			justify-content: space-between;
+			padding: 0 30rpx;
+			box-sizing: border-box;
+		}
+
+		.template_title1 {
+			background: none;
+		}
+
+		.template_title_list {
+			margin-bottom: 4rpx;
+		}
+
+		.template_title>view,
+		.template_title1>view {
+			font-size: 32rpx;
+			color: #8f8f8f;
+			flex-shrink: 0;
+			margin-right: 20rpx;
+		}
+
+		.template_title>input {
+			font-size: 28rpx;
+			color: #808080;
+			text-align: right;
+			flex-grow: 1;
+		}
+
+		/* 添加内容 */
+
+		.add_con>text {
+			font-size: 40rpx;
+			color: #f16765;
+			display: block;
+			margin-right: 20rpx;
+			margin-left: 10rpx;
+			line-height: 44rpx;
+		}
+
+		.add_con>view {
+			font-size: 32rpx;
+			color: #7885cb;
+		}
+
+		/* 删除内容 */
+
+		.del {
+			font-size: 32rpx;
+			color: #f16765;
+			margin-right: 14rpx;
+			padding: 20rpx;
+		}
+
+		input {
+			flex-grow: 1;
+			font-size: 28rpx;
+			color: #808080;
+		}