二次提交

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

api/common.js

@@ -1,156 +1,199 @@
 import utils from '../common/request.js'
 export default {
 	//选择行政区
-	getDistrict(data){
-	    return utils.requestFn(`/system/dict/data/type/district`, data)
+	getDistrict(data) {
+		return utils.requestFn(`/system/dict/data/type/district`, data)
 	},
 	//选择小区
-	getArea(data){
-	    return utils.requestEn(`/mobile/area/getArea`, data)
+	getArea(data) {
+		return utils.requestEn(`/mobile/area/getArea`, data)
 	},
 	//选择单元
-	getUnit(data){
-	    return utils.requestEn(`/mobile/unit/getUnit`, data)
+	getUnit(data) {
+		return utils.requestEn(`/mobile/unit/getUnit`, data)
 	},
 	//选择楼宇
-	getBuilding(data){
-	    return utils.requestEn(`/mobile/building/getBuilding`, data)
+	getBuilding(data) {
+		return utils.requestEn(`/mobile/building/getBuilding`, data)
 	},
 	//选择房屋(门牌)
-	getHouse(data){
-	    return utils.requestEn(`/mobile/house/getHouse`, data)
+	getHouse(data) {
+		return utils.requestEn(`/mobile/house/getHouse`, data)
 	},
 	//公告列表
-	getNoticeList(data){
-	    return utils.requestEn(`/mobile/notice/list`, data)
+	getNoticeList(data) {
+		return utils.requestEn(`/mobile/notice/getNotice`, data)
 	},
 	//关于我们
-	getAboutUs(data){
-	    return utils.requestEn(`/mobile/aboutUs/getOne`, data)
+	getAboutUs(data) {
+		return utils.requestEn(`/mobile/aboutUs/getOne`, data)
 	},
 	//服务说明
-	getExplain(data){
-	    return utils.requestEn(`/mobile/explain/getOne`, data)
+	getExplain(data) {
+		return utils.requestEn(`/mobile/explain/getOne`, data)
 	},
 	//上门类型
-	getDic(data){
-	    return utils.requestEn(`/mobile/order/getDic`, data)
+	getDic(data) {
+		return utils.requestEn(`/mobile/order/getDic`, data)
 	},
 	//管子类别
-	getPipeType(data){
-	    return utils.requestEn(`/mobile/pipeType/getPipeType`, data)
+	getPipeType(data) {
+		return utils.requestEn(`/mobile/pipeType/getPipeType`, data)
 	},
 	//管子长度
-	getPipeLength(data){
-	    return utils.requestEn(`/mobile/pipeLength/getPipeLength`, data)
+	getPipeLength(data) {
+		return utils.requestEn(`/mobile/pipeLength/getPipeLength`, data)
 	},
 	//历史施工
-	getListAll(data){
-	    return utils.requestFn(`/mobile/order/getListAll`, data)
+	getListAll(data) {
+		return utils.requestFn(`/mobile/order/getListAll`, data)
 	},
 	//历史施工（查看详情页）
-	getOrderPhoto(data){
-	    return utils.requestEn(`/mobile/orderPhoto/getPhoto`, data)
+	getOrderPhoto(data) {
+		return utils.requestEn(`/mobile/orderPhoto/getPhoto`, data)
 	},
 	//提交数据
-	submitOrder(data){
-	    return utils.requestFn(`/mobile/order`, data,'POST')
+	submitOrder(data) {
+		return utils.requestFn(`/mobile/order`, data, 'POST')
 	},
 	//工程列表
-	getEngineList(data){
-	    return utils.requestEn(`/mobile/otherEngine/getList`, data)
+	getEngineList(data) {
+		return utils.requestEn(`/mobile/otherEngine/getList`, data)
 	},
 	//查看非市政项目
-	getEngineDetail(data){
-	    return utils.requestEn(`/mobile/otherEngine/getById`, data)
+	getEngineDetail(data) {
+		return utils.requestEn(`/mobile/otherEngine/getById`, data)
 	},
 	//查看非市政项目页 确认上传照片
-	updateEnginePhoto(data){
-	    return utils.requestFn(`/mobile/otherEngine`, data,'PUT')
+	updateEnginePhoto(data) {
+		return utils.requestFn(`/mobile/otherEngine`, data, 'PUT')
 	},
 	//门牌验证
 	// getOrderForStatus(data){
 	//     return utils.requestEn(`/mobile/order/getOrderForStatus`, data)
 	// },
 	//首页轮播图
-	getLunBo(data){
-	    return utils.requestEn(`/mobile/rotation/list`, data)
+	getLunBo(data) {
+		return utils.requestEn(`/mobile/rotation/list`, data)
 	},
 	//获取项目类型
-	getProjectType(data){
-	    return utils.requestEn(`/mobile/order/getDic`, data)
+	getProjectType(data) {
+		return utils.requestEn(`/mobile/order/getDic`, data)
 	},
 	//获取项目列表
-	getProjectList(data){
-	    return utils.requestEn(`/mobile/otherEngine/getList`, data)
+	getProjectList(data) {
+		return utils.requestEn(`/mobile/otherEngine/getList`, data)
 	},
 	//自闭阀类型
-	getProject(data){
-	    return utils.requestEn(`/mobile/valve/getValveType`, data)
+	getProject(data) {
+		return utils.requestEn(`/mobile/valve/getValveType`, data)
 	},
 	//上传照片
-	getImage(data){
-	    return utils.requestFn(`/obs`, data,'POST')
+	getImage(data) {
+		return utils.requestFn(`/obs`, data, 'POST')
 	},
 	//获取用户名
-	getUserName(data){
-	    return utils.requestFn(`/mobile/user/getName`, data)
+	getUserName(data) {
+		return utils.requestFn(`/mobile/user/getName`, data)
 	},
 	//工程列表
-	getList(data){
+	getList(data) {
 		return utils.requestEn(`/mobile/order/getList`, data)
 	},
 	//小区合格率
-	getExamineArea(data){
+	getExamineArea(data) {
 		return utils.requestEn(`/mobile/area/getExamineArea`, data)
 	},
 
 	//列表
-	getOtherList(data){
+	getOtherList(data) {
 		return utils.requestEn(`/mobile/order/getOtherList`, data)
 	},
 	//职工合格率
-	getExamineWorker(data){
+	getExamineWorker(data) {
 		return utils.requestEn(`/mobile/area/getExamineWorker`, data)
 	},
 	//小区服务统计
-	getExamineServe(data){
+	getExamineServe(data) {
 		return utils.requestEn(`/mobile/area/getExamineServe`, data)
 	},
 	//管材类别统计
-	getExaminePipeType(data){
+	getExaminePipeType(data) {
 		return utils.requestEn(`/mobile/area/getExaminePipeType`, data)
 	},
 	//管材长度统计
-	getExaminePipeLength(data){
+	getExaminePipeLength(data) {
 		return utils.requestEn(`/mobile/area/getExaminePipeLength`, data)
 	},
 	//自闭阀类别统计
-	getExamineValveType(data){
+	getExamineValveType(data) {
 		return utils.requestEn(`/mobile/area/getExamineValveType`, data)
 	},
 	//小区汇总统计
-	getAreaSum(data){
+	getAreaSum(data) {
 		return utils.requestEn(`/mobile/area/getAreaSum`, data)
 	},
 	//获取职工
-	getWorker(data){
+	getWorker(data) {
 		return utils.requestEn(`/mobile/area/getWorker`, data)
 	},
 
-	getById(data){
+	getById(data) {
 		return utils.requestEn(`/mobile/order/getById`, data)
 	},
-	
-	getOrderList(data){
+
+	getOrderList(data) {
 		return utils.requestEn(`/mobile/order/getList`, data)
 	},
 	//修改
-	getUpdateOrder(data){
-	    return utils.requestFn(`/mobile/order`, data, 'PUT')
+	getUpdateOrder(data) {
+		return utils.requestFn(`/mobile/order`, data, 'PUT')
 	},
 	//选择门牌(安检，工程管理页)
-	getAllHouse(data){
-	    return utils.requestEn(`/mobile/house/getAllHouse`, data)
+	getAllHouse(data) {
+		return utils.requestEn(`/mobile/house/getAllHouse`, data)
+	},
+	//选择门牌(安检，工程管理页)
+	getDictInfo(data) {
+		return utils.requestEn(`/mobile/sysInfo/dict`, data)
+	}, //选择门牌(安检，工程管理页)
+	getUnitList(data) {
+		return utils.requestEn(`/mobile/unit/getUnit`, data)
+	},
+	getBuildingList(data) {
+		return utils.requestEn(`/mobile/building/getBuilding`, data)
+	},
+	getArea() {
+		return utils.requestEn(`/mobile/area/getArea`)
+	},
+	getDictInfoList(data) {
+		return utils.requestEn(`/mobile/sysInfo/dictlist`, data, 'POST')
+	},
+	setregulatorBox(data) {
+		return utils.requestEn(`/mobile/regulatorBox`, data, 'POST')
+	},
+	setwarningPile(data) {
+		return utils.requestEn(`/mobile/warningPile`, data, 'Put')
 	},
-}
+	getwarningPileList(data) {
+		return utils.requestEn(`/mobile/warningPile/getList`, data)
+	},
+	getwarningPileInfo(data) {
+		return utils.requestEn(`/mobile/warningPile/${data}`)
+	},
+	setcourtyardNetworkManagement(data) {
+		return utils.requestEn(`/mobile/courtyardNetworkManagement`, data, 'POST')
+	},
+	setemergencyRepair(data) {
+		return utils.requestEn(`/mobile/emergencyRepair`, data, 'POST')
+	},
+	getOne() {
+		return utils.requestEn(`/mobile/explain/getOne`)
+	},
+	getWorker() {
+		return utils.requestEn(`/mobile/user/getWorker`)
+	}
+	
+
+
+}

common/http.js

@@ -1,8 +1,8 @@
 // 配置信息
 export default {
 	// webUrl: 'http://127.0.0.1:8080',
-	webUrl: 'https://cczdsz.com/prod-api/',
+	//webUrl: 'https://cczdsz.com/prod-api/',
 	// webUrl: 'http://192.168.0.129:8080',
-	//webUrl: 'http://192.168.4.20:8080',
+	webUrl: 'http://192.168.4.20:8080',
 	
 }

pages.json

@@ -3,20 +3,53 @@
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	
+	{
+	
+		//登录
+		"path": "pages/login/login",
+		"style": {
+			"navigationStyle": "custom"
+		}
+	},
+	{
+	    "path" : "pages/noLogin/PressureRegulatingBox/PressureRegulatingBox",
+	    "style" :                                                                                    
+	    {
+	        "navigationStyle": "custom"
+	    }
+	    
+	},
+	// {
+	//     "path" : "pages/noLogin/PressureRegulatingBox/PressureRegulatingBox",
+	//     "style" :                                                                                    
+	//     {
+	//         "navigationStyle": "custom"
+	//     }
+	    
+	// },
+	// {
+	
+	// 	//登录
+	// 	"path": "pages/login/login",
+	// 	"style": {
+	// 		"navigationStyle": "custom"
+	// 	}
+	// },
 		{
 				"path": "pages/index/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
 },
-		{
+		// {
 		
-			//登录
-			"path": "pages/login/login",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
+		// 	//登录
+		// 	"path": "pages/login/login",
+		// 	"style": {
+		// 		"navigationStyle": "custom"
+		// 	}
+		// },
 		{
 			//上传市政项目
 			"path": "pages/noLogin/uploadProject",
@@ -225,6 +258,42 @@
             }
             
         }
+        ,{
+            "path" : "pages/noLogin/WarningPileForm/WarningPileForm",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+		,{
+		    "path" : "pages/noLogin/WarningPileList",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+        ,{
+            "path" : "pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        // ,{
+        //     "path" : "pages/noLogin/PressureRegulatingBox/PressureRegulatingBox",
+        //     "style" :                                                                                    
+        //     {
+        //         "navigationBarTitleText": "",
+        //         "enablePullDownRefresh": false
+        //     }
+            
+        // }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -254,7 +323,7 @@
 			// {
 			// 	"pagePath": "pages/chart/chartAll",
 			// 	"text": "统计",
-			// 	"iconPath": "static/icon/chart.png",
+			// 	"iconPath": "static/icon/chart.png", 
 			// 	"selectedIconPath": "static/icon/chart.png"
 			// }
 		]

pages/index/index.vue

@@ -58,27 +58,21 @@
 			<view class="font-thirty-six darkgray"  @click="more()"  >
 				更多<u-icon name="arrow-right" ></u-icon>
 			</view>
-			
-		</view>
-		<view class="notice" v-for="(item,index) in list" :key="index">
-			<view class="row-item" style="margin: 30rpx 0;">
-				<rich-text :nodes="item.text"></rich-text>
-			</view>
 		</view>
+		<view   v-for="(item,index) in list" style="margin: 30rpx 0;">
+				<u-parse class="title" :html="item.text"></u-parse>
 		</view>
-		<view class="notice" v-for="(item,index) in list" :key="index">
-			<!-- <view class="justify-content"> -->
+		<view class="notice" :key="index">
+			<view class="row-item" style="margin: 30rpx 0;">
+				<rich-text :nodes="oneManage.title"></rich-text>
+				<rich-text :nodes="oneManage.time"></rich-text>
 				<view class="font-forty">
-					{{item.title}}
-				</view>
-				<view class="font-twenty-eight gray">
-				<u-icon name="clock"></u-icon>	{{item.time}}
+					<u-parse :html="oneManage.text"></u-parse>
 				</view>
-		<!-- 	</view> -->
-			<view class="font-thirty-two black" style="margin: 30rpx 0;">
-				<rich-text :nodes="item.text"></rich-text>
 			</view>
 		</view>
+		<!-- 	</view> -->
+		</view>
 	</view>
 </template>
 
@@ -88,17 +82,19 @@
 		data() {
 			return {
 				list:[],
+				oneManage:{},
 				name:'',
 				lunbo:[]
 			}
 		},
 		onLoad() {
 			uni.showTabBar();
-			this.getLunBo();  
+			//this.getLunBo();  
 			this.getUserName();
 		},
 		onShow() {
-			this.getnotice();
+			this.getOne();
+			this.getnotice()
 			uni.showTabBar();
 		},
 		methods: {
@@ -121,6 +117,13 @@
 					this.lunbo = res;
 				})
 			},
+			getOne()
+			{
+				service.getOne().then(res=>{
+					this.oneManage= res
+					
+				})
+			},
 			getnotice(){
 				service.getNoticeList().then(res=>{
 					this.list = res
@@ -155,7 +158,18 @@
 		    -webkit-box-orient: vertical;
 		}
 
-	
+	.title{
+		       overflow: hidden;
+		       		text-overflow: ellipsis;
+		       		width: 100%;
+		       		/*将对象作为弹性伸缩盒子模型显示*/
+		       		display: -webkit-box;
+		       		/*限制文本行数*/
+		       		-webkit-line-clamp: 2;
+		       		/*子元素的排列方式*/
+		       		-webkit-box-orient: vertical;
+		       		/*将对象作为弹性伸缩盒子模型显示*/
+	}
 	.swiper {
 		position: absolute;
 		top: 200rpx;

pages/login/login.vue

@@ -95,6 +95,9 @@
 									uni.switchTab({
 										url:'/pages/index/index'
 									})
+									// uni.navigateTo({
+									// 	url:'pages/noLogin/PressureRegulatingBox/PressureRegulatingBox'
+									// })
 									console.log('跳')
 								},2000)
 							

pages/noLogin/buildinglist.vue

@@ -31,12 +31,14 @@
 				list:[],
 				value:'',
 				nameValue:'',
-				civilPower:''
+				civilPower:'',
+				community:''
 			}
 		},
 		onLoad(e) {
 			console.log(e)
 			this.value = e.value
+			this.community=e.community
 			 this.getProjectList();
 			this.getUserName();
 		},
@@ -44,7 +46,7 @@
 			gotoindex(item){
 				console.log(item)
 				uni.navigateTo({
-					url:'/pages/noLogin/unitlist'
+					url:`/pages/noLogin/unitlist?value=${this.value}&community=${item.id}&building=${item.id}&buildingName=${item.name}`
 				})
 			},
 			topage(url){
@@ -53,7 +55,7 @@
 				})
 			},
 			getProjectList() {
-				service.getProjectList({engineType:this.value,name:this.nameValue}).then(res=>{
+				service.getBuildingList({areaId:this.community}).then(res=>{
 					console.log('getProjectType', res)
 					if(res.length == 0){
 						this.$UTILS.showPrompt('暂无项目!')

pages/noLogin/communitylist.vue

@@ -2,9 +2,6 @@
 <template>
 	<view>
 		<image src="/static/icon/background.png" mode="" class="background"></image>
-		<view class="" style="padding-top: 90rpx;">
-			<back></back>
-		</view>
 		<view style="padding-top: 60rpx;">
 			<view style="margin: 20rpx;">
 				<u-search placeholder="请输入小区名称" v-model="nameValue" :action-style="{'font-size':'40rpx'}" @custom="getProjectList()"></u-search>
@@ -43,9 +40,18 @@
 		methods: {
 			gotoindex(item){
 				console.log(item)
-				uni.navigateTo({
-					url:`/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder`
-				})
+				if(this.value==2)
+				{
+					uni.navigateTo({
+						url:`/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?community=${item.id}&communityName=${item.name}`
+					})
+				}else
+				{
+					uni.navigateTo({
+						url:`/pages/noLogin/buildinglist?value=${this.value}&community=${item.id}`
+					})
+				}
+				
 			},
 			topage(url){
 				uni.navigateTo({
@@ -53,7 +59,7 @@
 				})
 			},
 			getProjectList() {
-				service.getProjectList({engineType:this.value,name:this.nameValue}).then(res=>{
+				service.getArea().then(res=>{
 					console.log('getProjectType', res)
 					if(res.length == 0){
 						this.$UTILS.showPrompt('暂无项目!')

pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.vue

@@ -1,206 +1,369 @@
 <template>
 	<view>
-		<u-action-sheet
-						:show="showrepairType"
-						:actions="repairType"
-						title="请选择性别"
-						description="如果选择保密会报错"
-						@close="showrepairType = false"
-						@select="sexSelect()">
-				</u-action-sheet>
-				
-		<u-form
-						labelPosition="left"
-						:model="model1"
-						:rules="rules"
-						ref="uForm">
-							<u-form-item
-											label="接警时间"
-											borderBottom
-											ref="item1"
-										labelWidth="120"
-									>
-										<u-input
-												v-model="form.repairTime"
-												border="none"
-										></u-input>
-									</u-form-item>
-									<u-form-item
-													label="报修人"
-													labelWidth="120"
-													borderBottom
-													ref="item1"
-											>
-												<u-input
-														v-model="form.repairName"
-														border="none"
-												></u-input>
-											</u-form-item>
-									<u-form-item
-													label="联系电话"
-												labelWidth="120"
-													borderBottom
-													ref="item1"
-											>
-												<u-input
-														v-model="form.repairPhone"
-														border="none"
-												></u-input>
-											</u-form-item>
-											<u-form-item
-															label="报修类型"
-															labelWidth="120"
-															borderBottom
-															ref="item1"
-													>
-														<u-input
-																v-model="form.repairType"
-																disabled
-																:actions="actions"
-																@click="showSex = true; hideKeyboard()"
-																borderBottom
-																disabledColor="#ffffff"
-																placeholder="请选择报修类型"
-														></u-input>
-														<u-icon
-																				slot="right"
-																				name="arrow-right"
-																		></u-icon>
-													</u-form-item>
-													<u-form-item
-																	label="报修内容"
-																	labelWidth="120"
-																	borderBottom
-																	ref="item1"
-															>
-																<u-input
-																		v-model="form.repairContent"
-																		type ="textarea"
-																		showWordLimit='255'
-																		border="none"
-																></u-input>
-															</u-form-item>
-															<u-form-item
-																			label="损坏原因"
-																			labelWidth="120"
-																			borderBottom
-																			ref="item1"
-																	>
-																		<u-input
-																				v-model="form.repairContent"
-																				border="none"
-																		></u-input>
-																	</u-form-item>
-																	<u-form-item
-																					label="管线压力"
-																					labelWidth="120"
-																					borderBottom
-																					ref="item1"
-																			>
-																				<u-input
-																						v-model="form.repairContent"
-																						border="none"
-																				></u-input>
-																			</u-form-item>
-																			<u-form-item
-																							label="停气方式"
-																							labelWidth="120"
-																							borderBottom
-																							ref="item1"
-																					>
-																						<u-input
-																								v-model="form.repairContent"
-																								border="none"
-																						></u-input>
-																					</u-form-item>
-																					<u-form-item
-																									label="停气方式"
-																									labelWidth="120"
-																									borderBottom
-																									ref="item1"
-																							>
-																								<u-input
-																										v-model="form.repairContent"
-																										border="none"
-																								></u-input>
-																							</u-form-item>
-<u-form-item
-																									label="使用材料"
-																									labelWidth="120"
-																									borderBottom
-																									ref="item1"
-																							>
-																								<u-input
-																										v-model="form.repairContent"
-																										border="none"
-																								></u-input>
-																						</u-form-item>
-  <u-form-item
-label="维修人"
-labelWidth="120"
-borderBottom
-ref="item1">
-<u-input
-v-model="form.repairContent"
-border="none"
-></u-input>
-  </u-form-item>
-								  <u-form-item
-								  label="完成时间"
-								  labelWidth="120"
-								  borderBottom
-								  ref="item1">
-								  <u-input
-								  v-model="form.repairContent"
-								  border="none"
-								  ></u-input>
-								    </u-form-item>		
-									<u-form-item
-									label="维修照片"
-									labelWidth="120"
-									borderBottom
-									ref="item1">
-									<u-input
-									v-model="form.repairContent"
-									border="none"
-									></u-input>
-									  </u-form-item>
-				
-									  
-				</u-form>
-		
+		<image src="/static/icon/background.png" mode="" class="background"></image>
+		<view class="project-content">
+			<u-form labelPosition="left" :model="form" :rules="rules" ref="form">
+				<u-form-item label="接警时间" borderBottom ref="item1" labelWidth="120">
+					<u-input v-model="form.repairTime" border="none" disabled @click="showtime=true"></u-input>
+					<u-picker v-model="showtime" mode="time" :params="params" @confirm="time()"></u-picker>
+				</u-form-item>
+				<u-form-item label="报修人" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="form.repairName" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="联系电话" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="form.repairPhone" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="报修类型" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="repairTypeLabel" disabled @click=" showrepairType= true;" borderBottom
+						disabledColor="#ffffff" placeholder="请选择报修类型"></u-input>
+					<u-select v-model="showrepairType" :list="typelist.repair_type" label-name="dictLabel"
+						value-name="dictValue" @confirm="repairType()"></u-select>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				<u-form-item label="报修内容" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="form.repairContent" type="textarea" showWordLimit='255' border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="损坏原因" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="causesOfFamageLabel" disabled @click=" causesOfFamageType = true;"
+						borderBottom></u-input>
+					<u-select v-model="causesOfFamageType" :list="typelist.causes_of_damage" label-name="dictLabel" value-name="dictValue" @confirm="causesOfFamage()"></u-select>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				<u-form-item label="管线压力" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="pipelinePressureLabel" disabled @click=" pipelinePressureType= true;"
+						borderBottom></u-input>
+					<u-select v-model="pipelinePressureType" :list="typelist.pipeline_pressure" label-name="dictLabel" value-name="dictValue" @confirm="pipelinePressure()"></u-select>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				<u-form-item label="停气方式" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="form.stopGasMethod" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="使用材料" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="form.usingMaterials" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="维修人" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="form.maintenanceName" border="none"></u-input>
+				</u-form-item>
+				<u-form-item label="完成时间" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="form.maintenanceTime" border="none" disabled @click="showtime2=true"></u-input>
+					<u-picker v-model="showtime2" mode="time" :params="params" @confirm="time2()"></u-picker>
+				</u-form-item>
+				<u-form-item label="维修照片" labelWidth="120" borderBottom ref="item1">
+					<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
+						<image src="/static/icon/chooseimg.png" mode=""
+							style="width: 190rpx; height: 190rpx; margin: 0 12rpx; " @click="choose()"></image>
+						<view v-for="(item,index) in imgymxs" :key="index" style="position: relative;">
+							<view v-if="item.type == 'image'">
+								<image :src="item.url" mode="" style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"
+									@click="showPhoto(index)">
+								</image>
+							</view>
+							<view v-else>
+								<video :src="item" style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
+							</view>
+							<view @click="remove(index)"
+								style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
+								<u-icon name="close" color="#FFFFFF" size="35"></u-icon>
+							</view>
+						</view>
+					</view>
+				</u-form-item>
+				<u-form-item label="备注" labelWidth="120" borderBottom ref="item1">
+					<u-input v-model="form.remarks" border="none" type="textarea"></u-input>
+				</u-form-item>
+
+
+			</u-form>
+			<u-button @click="save()">确认上传</u-button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import service from '@/api/index.js'
 	export default {
+
 		data() {
 			return {
-				
-				form:{},
-				userInfo:{},
-				showrepairType:false,
-				repairType:[{
-				name: '男',
+				params: {
+									year: true,
+									month: true,
+									day: true,
+									hour: true,
+									minute: true,
+									second: false
+								},
+				showtime:false,
+				action: this.$HTTP.webUrl + `/obs`,
+				causesOfFamageType: false,
+				pipelinePressureType: false,
+				repairTypeLabel: null,
+				causesOfFamageLabel: null,
+				pipelinePressureLabel: null,
+				showtime2:false,
+				headers: {
+					MAuthorization: "wxBearer " + uni.getStorageSync('token')
 				},
-				{
-					name: '女',
+				url: [],
+				uploading: false,
+				imgArr: [],
+				imgymxs: [],
+				causesOfDamage:null,
+				progress: 0, //图片或视频上传百分比
+				form: {
 				},
-				{
-					name: '保密',
-				},
-			]
+				userInfo: {},
+				showrepairType: false,
+				community: null,
+				communityName:null,
+				dictlist: ['causes_of_damage', 'pipeline_pressure','repair_type'],
+				typelist: []
 			};
 		},
-	methods: {
-		sexSelect(e) {
-					this.form.repairType = e.name
-					this.$refs.uForm.validateField('userInfo.sex')
-				}
-	}
+		onLoad(e) {
+			uni.setNavigationBarTitle({
+				title: '抢险维修单'
+			});
+			this.getdictsysinfo()
+		},
+		methods: {
+			getdictsysinfo() {
+				let _this = this
+				service.getDictInfoList({
+					type: this.dictlist
+				}).then(res => {
+					_this.typelist = res
+					console.log(res)
+				})
+
+			},
+			time(e)
+			{
+				console.log(`${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`)
+				    
+				this.form.repairTime= `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+			},
+			time2(e)
+			{
+				console.log(`${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`)
+				    
+				this.form.maintenanceTime= `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+			},
+			save() {
+				let _this=this
+				// this.form.unitId=this.unit
+			    this.form.photoList=this.imgArr 
+				service.setemergencyRepair(this.form
+				).then(res => {
+					console.log(res)
+					_this.$UTILS.showPrompt('上报成功！')
+					setTimeout(()=>{
+						console.log('跳')
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					},2000)
+				})
+				
+			},
+			repairType(e) {
+				console.log(e[0])
+				 this.form.repairType = e[0].value
+				this.repairTypeLabel = e[0].label
+			},
+			causesOfFamage(e) {
+				
+				this.causesOfDamage=e[0].value
+				this.form.causesOfDamage = e[0].value
+				console.log(e[0])
+				this.causesOfFamageLabel = e[0].label
+			},
+			pipelinePressure(e) {
+				console.log(e[0])
+				this.form.pipelinePressure = e[0].value
+				this.pipelinePressureLabel = e[0].label
+			},
+			choose() {
+				let _this = this;
+				uni.showActionSheet({
+					title: '上传',
+					itemList: ['图片', '视频'],
+					success: (res) => {
+						// console.log(res)
+						if (res.tapIndex == 0) {
+							this.chooseimage()
+						} else {
+							this.choosevideo()
+						}
+					}
+				})
+			},
+			chooseimage() {
+				console.log('图片')
+				let _this = this;
+				uni.chooseImage({
+					sizeType: ['album', 'camera'],
+					success(resp) {
+						console.log('res--uni.chooseMedia', resp);
+						resp.tempFiles.forEach((item, index) => {
+							const task = uni.uploadFile({
+								url: _this.$HTTP.webUrl + `/obs`,
+								filePath: item.path,
+								name: 'file',
+								formData: {},
+								header: _this.headers,
+								success: res => {
+									// 判断是否json字符串，将其转为json格式
+									let data = _this.$u.test.jsonString(res
+										.data) ? JSON.parse(res.data) : res.data;
+									if (![200, 201, 204].includes(res.statusCode)) {
+										// this.uploadError(index, data);
+										_this.$UTILS.showPrompt('选取失败！')
+									} else {
+										// 上传成功
+										// this.lists[index].response = data;
+										// this.lists[index].progress = 100;
+										// this.lists[index].error = false;
+										// this.$emit('on-success', data, index, this.lists, this
+										// 	.index);
+										if (_this.progress === 100) {
+											// console.log('_this.progress', _this.progress)
+											// console.log('data----', data)
+											// console.log('res--', res)
+											_this.imgymxs.push({
+												url: data.data.url,
+												type: 'image'
+											})
+											_this.imgArr.push(data.data.url)
+											// console.log('imgArr', _this.imgArr)
+											_this.$UTILS.showPrompt('选取成功！')
+										}
+									}
+								},
+								fail: e => {
+									_this.$UTILS.showPrompt('选取失败！')
+									this.uploadError(index, e);
+								},
+								complete: res => {
+									_this.uploading = false;
+									// _this.uploadFile(index + 1);
+									// this.$emit('on-change', res, index, this.lists, this
+									// .index);
+								}
+							});
+							task.onProgressUpdate(res => {
+								// if (res.progress > 0) {
+								// 	this.lists[index].progress = res.progress;
+								// 	this.$emit('on-progress', res, index, this.lists, this.index);
+								// }
+								_this.progress = res.progress;
+								console.log('onProgressUpdate', res)
+								uni.showLoading({
+									title: '选取中'
+								})
+							});
+						})
+					},
+				})
+			},
+			choosevideo() {
+				let _this = this;
+				console.log('视频')
+				uni.chooseVideo({
+					sourceType: ['album', 'camera'],
+					maxDuration: 30,
+					success(resp) {
+						const task = uni.uploadFile({
+							url: _this.$HTTP.webUrl + `/obs`,
+							filePath: resp.tempFilePath,
+							name: 'file',
+							formData: {},
+							header: _this.headers,
+							success: res => {
+								// 判断是否json字符串，将其转为json格式
+								let data = _this.$u.test.jsonString(res
+									.data) ? JSON.parse(res.data) : res.data;
+								if (![200, 201, 204].includes(res.statusCode)) {
+									this.uploadError(index, data);
+								} else {
+									// 上传成功
+									// this.lists[index].response = data;
+									// this.lists[index].progress = 100;
+									// this.lists[index].error = false;
+									// this.$emit('on-success', data, index, this.lists, this
+									// 	.index);	
+									if (_this.progress === 100) {
+										console.log('_this.progress', _this.progress)
+										console.log('data----', data)
+										console.log('res--', res)
+										// _this.imgArr.push(data.data.url)
+										_this.imgymxs.push({
+											url: data.data.url,
+											type: 'video'
+										})
+										_this.imgArr.push(data.data.url)
+										console.log('imgArr', _this.imgArr)
+										_this.$UTILS.showPrompt('选取成功！')
+									}
+								}
+							},
+							fail: e => {
+								_this.$UTILS.showPrompt('选取失败！')
+								this.uploadError(index, e);
+							},
+							complete: res => {
+								uni.hideLoading();
+								_this.uploading = false;
+								// _this.uploadFile(index + 1);
+								// this.$emit('on-change', res, index, this.lists, this
+								// .index);
+							}
+						});
+						task.onProgressUpdate(res => {
+							// if (res.progress > 0) {
+							// 	this.lists[index].progress = res.progress;
+							// 	this.$emit('on-progress', res, index, this.lists, this.index);
+							// }
+							_this.progress = res.progress;
+							console.log('onProgressUpdate', res)
+							uni.showLoading({
+								title: '选取中'
+							})
+						});
+
+					},
+				})
+			},
+			remove(index) {
+				uni.showModal({
+					title: '提示',
+					content: '是否删除该图片或视频？',
+					success: (res) => {
+						if (res.confirm) {
+							this.imgArr.splice(index, 1);
+							this.imgymxs.splice(index, 1);
+							console.log('this.imgarr', this.imgArr)
+						}
+					}
+				})
+			},
+		}
 	}
 </script>
 
 <style lang="scss">
+	.background {
+		z-index: -1;
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		background-size: 100% 100%;
+	}
 
-</style>
+	.project-content {
+		border: 4rpx solid #3857F3;
+		margin: 40rpx 55rpx 0;
+		padding: 30rpx 20rpx;
+		border-radius: 48rpx;
+	}
+</style>

pages/noLogin/typeList.vue

@@ -1,30 +1,33 @@
 <template>
 	<view>
 		<image src="/static/icon/background.png" mode="" class="background"></image>
+		
 		<view class="justify-content" v-if="visable">
+			
 			<view class="align-items" style="position: absolute; top: 125rpx; left: 100rpx; font-size: 12pt;">
 				施工管理平台
-				</view>
-		<view class="align-items" style="position: absolute; top: 140rpx; left: 380rpx; font-size: 8pt;">
-			{{name}} !欢迎你登录本应用
 			</view>
+			<view class="align-items" style="position: absolute; top: 140rpx; left: 380rpx; font-size: 8pt;">
+				{{name}} !欢迎你登录本应用
 			</view>
-			<view style="padding-top: 150rpx;" v-if="!visable">
-				<view style="margin: 20rpx;">
-					<u-search placeholder="请输入搜索内容" v-model="nameValue" :action-style="{'font-size':'40rpx'}" @custom="getProjectList()"></u-search>
-				</view>
-				</view>
-		<view style="padding-top: 300rpx;" >
+		</view>
+		<view style="padding-top: 150rpx;" v-if="!visable">
+			<view style="margin: 20rpx;">
+				<u-search placeholder="请输入搜索内容" v-model="nameValue" :action-style="{'font-size':'40rpx'}"
+					@custom="getProjectList()"></u-search>
+			</view>
+		</view>
+		<view style="padding-top: 300rpx;">
 			<view v-for="(item,index) in list" :key="index">
-				<view class="font-forty-eight "v-if="power.includes(item.value)&&item.visable"
+				<view class="font-forty-eight " v-if="power.includes(item.dictValue)&&item.visable"
 					@click="topage(item)">
-					<image src="/static/icon/background.png" mode="" style="height: 50px; width: 50px;" ></image>
-					{{item.name}}
-					<u-icon name="arrow-right" ></u-icon>
-					</view>
+					<image src="/static/icon/background.png" mode="" style="height: 50px; width: 50px;"></image>
+					{{item.dictLabel}}
+					<u-icon name="arrow-right"></u-icon>
+				</view>
 			</view>
 		</view>
-		
+
 		<!-- <view class="name">
 			姓名：{{name}}
 		</view> -->
@@ -44,41 +47,39 @@
 	export default {
 		data() {
 			return {
-				list:[],
-				name:'',
-				power:'',
-				visable:false,
-				nameValue:''
+				list: [],
+				name: '',
+				power: '',
+				visable: false,
+				nameValue: ''
 			}
 		},
 		onLoad() {
 			this.getProjectType();
 			this.getUserName();
-			
+
 		},
-		onShow()
-		{
-			if(this.visable)
-			{
+		onShow() {
+			this.getProjectType();
+			if (this.visable) {
 				console.log(this.visable)
-			uni.hideTabBar()
-			}else{
+				uni.hideTabBar()
+			} else {
 				console.log(this.visable)
-			uni.showTabBar()
+				uni.showTabBar()
 			}
 		},
 		methods: {
 			getProjectList() {
-				if(''==this.nameValue)
-				{
+				if ('' == this.nameValue) {
 					this.$UTILS.showPrompt('请输入搜索内容!')
 					return
 				}
-					uni.navigateTo({
-						url:'/pages/noLogin/listProject'
-					})
-				
-				
+				uni.navigateTo({
+					url: '/pages/noLogin/listProject'
+				})
+
+
 				// service.getProjectList({engineType:this.value,name:this.nameValue}).then(res=>{
 				// 	console.log('getProjectType', res)
 				// 	if(res.length == 0){
@@ -88,67 +89,93 @@
 				// })
 			},
 			topage(url) {
-			  if(url.value=='002')
-			  {
-				this.list1=[]
-				this.list.forEach(item=>{
-					if(item.value=='002')
+				if (url.dictValue == '1') {
+					this.list1 = []
+					this.list.forEach(item => {
+						if (item.dictValue == '1'||item.dictValue == '0') {
+							item.visable = false
+						} else {
+							item.visable = true
+						}
+
+						this.list1.push(item)
+					})
+					this.list = this.list1
+					console.log(this.list)
+					this.visable = true
+					uni.hideTabBar()
+				} else {
+					if (url.dictValue == '4') {
+						uni.navigateTo({
+							url: `/pages/noLogin/WarningPileList`
+						})
+					} else if(url.dictValue == '0') 
 					{
-						item.visable=false
-					}else
+						uni.navigateTo({
+							url: `/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder`
+						})
+						
+					}
+					else
 					{
-						item.visable=true
+						
+						uni.navigateTo({
+							url: `/pages/noLogin/communitylist?value=${url.dictValue}`
+						})
 					}
-					this.list1.push(item)
-				})
-                this.list=this.list1
-				this.visable=true
-				 uni.hideTabBar()
+
+
 				}
-				uni.navigateTo({
-					url:`/pages/noLogin/communitylist?value=${url.value}`
-				})
 			},
-			back(url)
-			{
-				this.visable=false
-				this.list1=[]
-				this.list.forEach(item=>{
-					if(item.value=='001'||item.value=='002')
-					{
-					item.visable=true	
-					}else
-					{
-					item.visable=false	
+			back(url) {
+				this.visable = false
+				this.list1 = []
+				this.list.forEach(item => {
+					if (item.value == '001' || item.value == '002') {
+						item.visable = true
+					} else {
+						item.visable = false
 					}
 					this.list1.push(item)
 				})
-				this.list=this.list1
+				this.list = this.list1
 				uni.navigateTo({
 					url
 				})
 			},
 			getProjectType() {
-				service.getProjectType({dicType: 'engine_type'}).then(res => {
+				service.getDictInfo({
+					type: 'engine_type'
+				}).then(res => {
 					this.list = res;
-					this.list1=[]
-					this.list.forEach(item=>{
-						if(item.value=='001'||item.value=='002')
-						{
-						item.visable=true	
-						}else
-						{
-						item.visable=false	
-						}
+					this.list1 = []
+					this.list.forEach(item => {
+						item.visable = true
 						this.list1.push(item)
 					})
-					this.list=this.list1
+					this.list1.push({
+						dictLabel: '调压箱管理',
+						dictValue: '2',
+						visable: false
+					})
+					this.list1.push({
+						dictLabel: '庭院网管',
+						dictValue: '3',
+						visable: false
+					})
+					this.list1.push({
+						dictLabel: '警示桩管理',
+						dictValue: '4',
+						visable: false
+					})
+					this.list = this.list1
+					console.log(this.list)
 				})
 			},
-			getUserName(){
-				service.getUserName().then(res=>{
+			getUserName() {
+				service.getUserName().then(res => {
 					this.name = res.name;
-					this.power = res.power;
+					this.power = res.power + '2,3,4';
 				})
 			},
 		},
@@ -163,10 +190,12 @@
 		height: 100%;
 		background-size: 100% 100%;
 	}
-	.name{
+
+	.name {
 		font-size: 40rpx;
 		margin-left: 36rpx;
 	}
+
 	.position {
 		position: absolute;
 		bottom: 100rpx;
@@ -186,4 +215,4 @@
 		background: #3857F3;
 		border-radius: 72rpx;
 	}
-</style>
+</style>

pages/noLogin/unitlist.vue

@@ -31,20 +31,38 @@
 				list:[],
 				value:'',
 				nameValue:'',
-				civilPower:''
+				civilPower:'',
+				community:'',
+				building:''
 			}
 		},
 		onLoad(e) {
 			console.log(e)
 			this.value = e.value
+			this.community = e.community
+			this.building = e.building
+			this.buildingName=e.buildingName
 			 this.getProjectList();
 			this.getUserName();
 		},
 		methods: {
 			gotoindex(item){
 				console.log(item)
-				uni.switchTab({
-					url:`/pages/noLogin/communitylist?value=${item.value}`
+				let url1=null
+				if (this.value==0)
+				{ url1=`/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder?unit=${item.id}`
+					console.log(this.value)
+				}else if(this.value==2)
+				{
+					url1=`/pages/noLogin/PressureRegulatingBox/PressureRegulatingBox?unit=${item.id}&community=${this.community}&building=${this.building}`
+					console.log(this.value)
+				}else if(this.value==3)
+				{
+					url1=`/pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement?unit=${item.id}&building=${this.building}&buildingName=${item.name}&unitName=${item.name}`
+					console.log(this.value)
+				}
+				uni.navigateTo({
+					url:url1
 				})
 			},
 			topage(url){
@@ -53,7 +71,7 @@
 				})
 			},
 			getProjectList() {
-				service.getProjectList({engineType:this.value,name:this.nameValue}).then(res=>{
+				service.getUnitList({buildingId:this.building}).then(res=>{
 					console.log('getProjectType', res)
 					if(res.length == 0){
 						this.$UTILS.showPrompt('暂无项目!')

pages/notice/noticeList.vue

@@ -7,7 +7,7 @@
 			</view>
 		</view>
 		<view class="notice" v-for="(item,index) in list" :key="index" >
-			<view @click="toDetail(`/pages/notice/noticeDetail?title=${item.title}&time=${item.time}&text=${item.text}`)">
+			<view>
 				<view class="justify-content">
 					<view class="font-forty">
 						{{item.title}}

unpackage/dist/dev/mp-weixin/app.json

@@ -1,7 +1,8 @@
 {
   "pages": [
-    "pages/index/index",
     "pages/login/login",
+    "pages/noLogin/PressureRegulatingBox/PressureRegulatingBox",
+    "pages/index/index",
     "pages/noLogin/uploadProject",
     "pages/noLogin/typeList",
     "pages/noLogin/communitylist",
@@ -29,7 +30,10 @@
     "pages/noLogin/My",
     "pages/noLogin/Myphoto",
     "pages/noLogin/home/home",
-    "pages/noLogin/emergencyRepairOrder/emergencyRepairOrder"
+    "pages/noLogin/emergencyRepairOrder/emergencyRepairOrder",
+    "pages/noLogin/WarningPileForm/WarningPileForm",
+    "pages/noLogin/WarningPileList",
+    "pages/noLogin/CourtyardNetworkManagement/CourtyardNetworkManagement"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,6 +1,7 @@
 {
   "navigationStyle": "custom",
   "usingComponents": {
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-parse": "/uview-ui/components/u-parse/u-parse"
   }
 }

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -35,6 +35,18 @@
   display: -webkit-box;
   -webkit-box-orient: vertical;
 }
+.title.data-v-57280228 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+  /*将对象作为弹性伸缩盒子模型显示*/
+  display: -webkit-box;
+  /*限制文本行数*/
+  -webkit-line-clamp: 2;
+  /*子元素的排列方式*/
+  -webkit-box-orient: vertical;
+  /*将对象作为弹性伸缩盒子模型显示*/
+}
 .swiper.data-v-57280228 {
   position: absolute;
   top: 200rpx;

unpackage/dist/dev/mp-weixin/pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.json

@@ -2,10 +2,12 @@
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "u-action-sheet": "/uview-ui/components/u-action-sheet/u-action-sheet",
     "u-form": "/uview-ui/components/u-form/u-form",
     "u-form-item": "/uview-ui/components/u-form-item/u-form-item",
     "u-input": "/uview-ui/components/u-input/u-input",
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
+    "u-picker": "/uview-ui/components/u-picker/u-picker",
+    "u-select": "/uview-ui/components/u-select/u-select",
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-button": "/uview-ui/components/u-button/u-button"
   }
 }