版本修改

.idea/vcs.xml

@@ -3,5 +3,6 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin" vcs="Git" />
   </component>
 </project>

api/common.js

@@ -104,7 +104,6 @@ export default {
 	getExamineArea(data) {
 		return utils.requestEn(`/mobile/area/getExamineArea`, data)
 	},
-
 	//列表
 	getOtherList(data) {
 		return utils.requestEn(`/mobile/order/getOtherList`, data)
@@ -134,14 +133,12 @@ export default {
 		return utils.requestEn(`/mobile/area/getAreaSum`, data)
 	},
 	//获取职工
-	getWorker(data) {
-		return utils.requestEn(`/mobile/area/getWorker`, data)
-	},
-
+	// getWorker(data) {
+	// 	return utils.requestEn(`/mobile/area/getWorker`, data)
+	// },
 	getById(data) {
 		return utils.requestEn(`/mobile/order/getById`, data)
 	},
-
 	getOrderList(data) {
 		return utils.requestEn(`/mobile/order/getList`, data)
 	},
@@ -164,7 +161,7 @@ export default {
 		return utils.requestEn(`/mobile/building/getBuilding`, data)
 	},
 	getArea(data) {
-		return utils.requestEn(`/mobile/area/getArea`,data)
+		return utils.requestEn(`/mobile/area/getArea`, data)
 	},
 	getDictInfoList(data) {
 		return utils.requestEn(`/mobile/sysInfo/dictlist`, data, 'POST')
@@ -190,11 +187,11 @@ export default {
 	getOne() {
 		return utils.requestEn(`/mobile/explain/getOne`)
 	},
-	getWorker() {
-		return utils.requestEn(`/mobile/user/getWorker`)
+	getWorker(data) {
+		return utils.requestEn(`/mobile/user/getWorker`, data)
 	},
 	getSearch(data) {
-		return utils.requestEn(`/mobile/sysInfo/search`,data,'POST')
+		return utils.requestEn(`/mobile/sysInfo/search`, data, 'POST')
 	},
 	//庭院网管控制器
 	getcourtyardNetworkManagement(data) {
@@ -213,7 +210,7 @@ export default {
 		return utils.requestEn(`/mobile/warningPile/${data}`)
 	},
 	patrolRecord(data) {
-		return utils.requestEn(`/mobile/patrolRecord`,data,'POST')
+		return utils.requestEn(`/mobile/patrolRecord`, data, 'POST')
 	},
 	//警示桩控制器
 	getpatrolRecord(data) {
@@ -225,5 +222,4 @@ export default {
 	getregulatorBoxList(data) {
 		return utils.requestEn(`/mobile/regulatorBoxList/list`, data)
 	},
-	
 }

common/http.js

@@ -1,7 +1,7 @@
 // 配置信息
 export default {
 	// webUrl: 'http://127.0.0.1:8080',
-	// webUrl: 'https://www.cczdsz.cn/prod-api/',
+	 webUrl: 'https://www.cczdsz.cn/prod-api/',
 	// webUrl: 'http://124.221.101.24:8082',
-	webUrl: 'http://192.168.4.20:8081',
+	//webUrl: 'http://192.168.4.20:8080',
 }

pages.json

@@ -274,14 +274,14 @@
 				"text": "工作",
 				"iconPath": "static/icon/work.png",
 				"selectedIconPath": "static/icon/work-on.png"
+			},
+			{
+				"pagePath": "pages/noLogin/listProject",
+				"text": "历史",
+				"iconPath": "static/icon/lishijilu.png",
+				"selectedIconPath": "static/icon/lishijilu-on.png"
 			}
 			// {
-			// 	"pagePath": "pages/chart/chart",
-			// 	"text": "统计图",
-			// 	"iconPath": "static/icon/chart.png",
-			// 	"selectedIconPath": "static/icon/chart.png"
-			// },
-			// {
 			// 	"pagePath": "pages/chart/chartAll",
 			// 	"text": "统计",
 			// 	"iconPath": "static/icon/chart.png", 

pages/noLogin/WarningPileList.vue

@@ -61,7 +61,7 @@
 		methods: {
 			getWorker()
 			{
-				service.getWorker().then(res => {
+				service.getWorker({type:'1',name:''}).then(res => {
 					this.workList=res
 				})
 			},

pages/noLogin/emergencyRepairOrder/emergencyRepairOrder.vue

@@ -65,18 +65,20 @@
 				</u-form-item>
 				<u-form-item label="使用材料" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="form.usingMaterials" borderBottom :disabled="type==1"
-						placeholder="请输入使用材料"></u-input>
+						placeholder="请输入使用材料" ></u-input>
 				</u-form-item>
 				<u-form-item label="维修人" labelWidth="150" borderBottom ref="item1">
 					<u-input v-model="form.maintenanceName" borderBottom disabled
 						placeholder="请输入维修人" @click="workerModel=true&&type!=1"></u-input>
 					<!-- 	<u-select v-model="workerModel" :list="workerList" label-name="name"
 							value-name="id" @confirm="Worker()" :value="form.maintenanceName"></u-select> -->
-							<u-popup v-model="workerModel" style=
-							 "height: 50% "mode="bottom">
-										<view>
-											<u-checkbox-group width="200px"  @change="checkboxGroupChange">
-			<u-checkbox :customStyle="{marginBottom: '8px'}"
+							<u-popup v-model="workerModel" style= "height: 200px ;padding: 40rpx 36rpx;"mode="bottom">
+								<view style="color: #00aaff;margin-left: 10px;">维修人</view>
+							<u-search placeholder="请输入维修人名称" v-model="namevalue"  :action-style="{'font-size':'40rpx'}" :show-action="false" @search="getWorker()"></u-search>
+							<scroll-view class="scroll-view" scroll-y="true" :scroll-top="scrollTop" style= "padding: 20rpx 36rpx; height: 200px; overflow-y:scroll;"  >
+								
+											<u-checkbox-group width="200px"  @change="checkboxGroupChange" style="margin: 0 0 40rpx 0;">
+			<u-checkbox :customStyle="{marginBottom: '20px'}"
 				@change="checkboxChange" 
 				v-model="item.checked" 
 				v-for="(item, index) in workerList" :key="item.id" 
@@ -85,10 +87,11 @@
 			>{{item.name}}
 			</u-checkbox>
 		</u-checkbox-group>
-		<view style="display: flex;flex-direction: column;">
-		<u-button @click="workerCancel()">取消</u-button>
-		<u-button@click="workerButton()">确认</u-button>
-		</view>
+	
+		</scroll-view>
+		<view style="overflow: hidden;margin: 40rpx 0 0 0; padding: 40rpx 36rpx;">
+		<u-button @click="workerCancel()" style="width: 46%; float: left;background: #eae9e9;">取消</u-button>
+		<u-button@click="workerButton()" type="primary" style="width: 46%; float: right;background: #0f59ca !important; color: #fff;">确认</u-button>
 		</view>
 									</u-popup>
 						<u-icon slot="right" name="arrow-right"></u-icon>
@@ -186,7 +189,8 @@
 				WorkerList:[],
 				WorkerName:null,
 				userIdList:[],
-				maintenanceName:null
+				maintenanceName:null,
+				namevalue:''
 				
 			};
 		},
@@ -309,7 +313,7 @@
 			},
 			getWorker()
 			{
-				service.getWorker().then(res=>{
+				service.getWorker({type:'0',name:this.namevalue}).then(res=>{
 					console.log(res)
 					this.workerList=res
 				})
@@ -554,6 +558,14 @@
 	}
 </script>
 <style lang="scss">
+	.scroll-view {
+		white-space: nowrap;
+		height: 200px;
+		width: 100%;
+	}
+		.u-form-right__content__slot{
+			display: flex;
+		}
 	.background {
 		z-index: -1;
 		position: fixed;

pages/noLogin/listProject.vue

@@ -67,6 +67,7 @@
 		onPullDownRefresh()
 		{
 			console.log('下拉刷新')
+			this.getvalueproject()
 		},
 		methods: {
 			getReachBottom()

pages/noLogin/typeList.vue

@@ -4,7 +4,7 @@
 		<image src="https://zdsz.obs.cn-south-1.myhuaweicloud.com/file/0e1e285e104144caa274659b3429284c.png" mode="" class="gongzuobj"></image>
 		<view class="justify-content" v-if="visable">
 			<view class="align-items" style="position: absolute; top: 110rpx; left: 50rpx;">
-				<u-icon name="arrow-left" @click="backview()"></u-icon>
+				<u-icon name="arrow-left" @click="backview()" style="color: #fff; font-size: 36rpx;margin: 0 40rpx 0 0;"></u-icon>
 				<image src="/static/icon/sgglpt.png" mode="" class="header-title" style="width: 300rpx;height: 36rpx;"></image>
 			</view>
 			<view class="align-items" style="position: absolute;top: 100px;left: 150px;font-size: 36rpx;color: #fff;">
@@ -14,8 +14,8 @@
 		<view style="padding-top: 170rpx;" v-if="!visable">
 			<view style="display: flex;align-items: flex-end;width: 100%;text-align:right;position: fixed;">
 				<!-- <u-search placeholder="请输入搜索内容" v-model="nameValue"  :show-action="false" :action-style="{'font-size':'40rpx'}" @search="getProjectList()"></u-search> -->
-				<view style="width: 100%;" @click="getProjectList()">历史</view>
-				<u-icon name="arrow-right"></u-icon>
+				<!-- <view style="width: 100%;" @click="getProjectList()">历史</view>
+				<u-icon name="arrow-right"></u-icon> -->
 			</view>
 		</view>
 		<view style="padding-top: 300rpx;">
@@ -148,7 +148,9 @@
 			backview()
 			{
 				this.getProjectType()
+				
 				this.visable=false
+				uni.showTabBar()
 			},
 			back(url) {
 				this.visable = false
@@ -178,8 +180,10 @@
 						if(item.dictValue==0)
 						{
 							item.image='../../static/icon/qxwx.png'
-						}else{
+						}else if(item.dictValue==1){
 							item.image='../../static/icon/xxdy.png'
+						}else{
+							item.image='../../static/icon/kggs.png'
 						}
 						this.list1.push(item)
 					})