zouling 4 сар өмнө
parent
commit
c51e09454b
100 өөрчлөгдсөн 1560 нэмэгдсэн , 270 устгасан
  1. 2 2
      property_ui/api/system/user.js
  2. 40 0
      property_ui/api/work/car.js
  3. 389 0
      property_ui/car/components/car/list.vue
  4. 2 2
      property_ui/car/pages/carcheck.vue
  5. 6 6
      property_ui/car/pages/carku.vue
  6. 8 8
      property_ui/car/pages/illegalParking.vue
  7. 3 3
      property_ui/car/pages/illegalcheck.vue
  8. 5 5
      property_ui/car/pages/illegalrecord.vue
  9. 6 6
      property_ui/car/pages/index.vue
  10. 0 0
      property_ui/car/static/car/car.png
  11. 0 0
      property_ui/car/static/car/cara.png
  12. 0 0
      property_ui/car/static/car/carb.png
  13. 0 0
      property_ui/car/static/car/carbg.png
  14. 0 0
      property_ui/car/static/car/carc.png
  15. 0 0
      property_ui/car/static/car/card.png
  16. 0 0
      property_ui/car/static/car/carico.png
  17. 0 0
      property_ui/car/static/car/del.png
  18. 0 0
      property_ui/car/static/car/icoa.png
  19. 0 0
      property_ui/car/static/car/icob.png
  20. 0 0
      property_ui/car/static/car/line.png
  21. 0 0
      property_ui/car/static/car/reset.png
  22. 0 0
      property_ui/car/static/car/search.png
  23. 0 0
      property_ui/car/static/car/up.png
  24. 2 2
      property_ui/config.js
  25. 2 2
      property_ui/health/components/box/list.vue
  26. 5 5
      property_ui/health/pages/health/index.vue
  27. 12 12
      property_ui/manage/components/car/list.vue
  28. 1 1
      property_ui/manage/pages/community/newsadd.vue
  29. 1 1
      property_ui/manage/pages/community/newsadddj.vue
  30. 1 1
      property_ui/manage/pages/community/newsaddsq.vue
  31. 1 1
      property_ui/manage/pages/community/newsaddvideo.vue
  32. 3 3
      property_ui/manage/pages/community/readcount.vue
  33. 4 4
      property_ui/manage/pages/community/readlist.vue
  34. 5 5
      property_ui/manage/pages/community/sqmoney.vue
  35. 13 7
      property_ui/manage/pages/community/sqmoneyadd.vue
  36. 107 91
      property_ui/pages.json
  37. 10 10
      property_ui/pages/index.vue
  38. 10 10
      property_ui/pages/index/index.vue
  39. 8 1
      property_ui/pages/mine/index.vue
  40. 433 0
      property_ui/people/components/car/list.vue
  41. 6 6
      property_ui/people/pages/people/comeadd.vue
  42. 5 5
      property_ui/people/pages/people/comegl.vue
  43. 7 7
      property_ui/people/pages/people/index.vue
  44. 8 8
      property_ui/people/pages/people/staff.vue
  45. 6 6
      property_ui/people/pages/people/staffadd.vue
  46. 0 0
      property_ui/people/static/people/aphoto.png
  47. 0 0
      property_ui/people/static/people/check.png
  48. BIN
      property_ui/people/static/people/eye.png
  49. 0 0
      property_ui/people/static/people/gzlx.png
  50. 0 0
      property_ui/people/static/people/hicoa.png
  51. 0 0
      property_ui/people/static/people/hicob.png
  52. 0 0
      property_ui/people/static/people/icon_ky_enter.png
  53. 0 0
      property_ui/people/static/people/icon_ky_jmda_yz.png
  54. 0 0
      property_ui/people/static/people/icon_ky_jmda_zh.png
  55. 0 0
      property_ui/people/static/people/icon_tjfk_xbxz_normal.png
  56. 0 0
      property_ui/people/static/people/icon_tjfk_xbxz_selected.png
  57. 0 0
      property_ui/people/static/people/man.png
  58. 0 0
      property_ui/people/static/people/mphone.png
  59. 0 0
      property_ui/people/static/people/ncheck.png
  60. BIN
      property_ui/people/static/people/neye.png
  61. 0 0
      property_ui/people/static/people/pdel.png
  62. 0 0
      property_ui/people/static/people/pic_jkda_btzs.png
  63. 0 0
      property_ui/people/static/people/pic_jkda_ez.png
  64. 0 0
      property_ui/people/static/people/pic_jkda_ne.png
  65. 0 0
      property_ui/people/static/people/pic_jkda_pp.png
  66. 0 0
      property_ui/people/static/people/pic_jkda_qz.png
  67. 0 0
      property_ui/people/static/people/pic_jkda_zf.png
  68. 0 0
      property_ui/people/static/people/rimg.png
  69. BIN
      property_ui/people/static/people/sfz.png
  70. 0 0
      property_ui/people/static/people/woman.png
  71. 399 0
      property_ui/service/components/car/list.vue
  72. 5 5
      property_ui/service/components/popup/popup.vue
  73. 5 5
      property_ui/service/pages/service/complaint.vue
  74. 2 2
      property_ui/service/pages/service/complaintdetail.vue
  75. 10 10
      property_ui/service/pages/service/patrol.vue
  76. 5 5
      property_ui/service/pages/service/patroladd.vue
  77. 2 2
      property_ui/service/pages/service/patroldetail.vue
  78. 6 6
      property_ui/service/pages/service/patrolrecord.vue
  79. 4 4
      property_ui/service/pages/service/patrolset.vue
  80. 5 5
      property_ui/service/pages/service/warranty.vue
  81. 6 6
      property_ui/service/pages/service/warrantydetail.vue
  82. 0 0
      property_ui/service/static/service/add.png
  83. 0 0
      property_ui/service/static/service/addpho.png
  84. 0 0
      property_ui/service/static/service/bxbg.png
  85. 0 0
      property_ui/service/static/service/day.png
  86. 0 0
      property_ui/service/static/service/del.png
  87. 0 0
      property_ui/service/static/service/head.png
  88. 0 0
      property_ui/service/static/service/headbg.png
  89. 0 0
      property_ui/service/static/service/home.png
  90. 0 0
      property_ui/service/static/service/linea.png
  91. 0 0
      property_ui/service/static/service/lineb.png
  92. 0 0
      property_ui/service/static/service/linec.png
  93. 0 0
      property_ui/service/static/service/pbg.png
  94. 0 0
      property_ui/service/static/service/phone.png
  95. 0 0
      property_ui/service/static/service/photo.png
  96. 0 0
      property_ui/service/static/service/plbg.png
  97. 0 0
      property_ui/service/static/service/rdel.png
  98. 0 0
      property_ui/service/static/service/type.png
  99. 0 0
      property_ui/service/static/service/voice.png
  100. BIN
      property_ui/static/images/mine/mtabj.png

+ 2 - 2
property_ui/api/system/user.js

@@ -9,7 +9,7 @@ export function updateUserPwd(oldPassword, newPassword) {
   }
   }
   return request({
   return request({
     url: '/system/user/profile/updatePwd',
     url: '/system/user/profile/updatePwd',
-    method: 'put',
+    method: 'post',
     data: data
     data: data
   })
   })
 }
 }
@@ -26,7 +26,7 @@ export function getUserProfile() {
 export function updateUserProfile(data) {
 export function updateUserProfile(data) {
   return request({
   return request({
     url: '/system/user/profile',
     url: '/system/user/profile',
-    method: 'put',
+    method: 'post',
     data: data
     data: data
   })
   })
 }
 }

+ 40 - 0
property_ui/api/work/car.js

@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+// 违章停车登记-新增
+export function illegalParkingAdd(data) {
+  return request({
+    url: '/wuYe/illegalParking',
+    method: 'post',
+    data: data
+  })
+}
+// 违章停车登记-修改
+export function illegalParkingPut(data) {
+  return request({
+    url: '/wuYe/illegalParking/put',
+    method: 'post',
+    data: data
+  })
+}
+// 违章停车登记-删除
+export function illegalParkingDel(data) {
+  return request({
+    url: '/wuYe/illegalParking/delete/'+data,
+    method: 'get',
+  })
+}
+// 违章停车登记-列表
+export function illegalParkingList(data) {
+  return request({
+    url: '/wuYe/illegalParking/list',
+    method: 'get',
+    data: data
+  })
+}
+// 违章停车登记-详情
+export function illegalParkingDet(data) {
+  return request({
+    url: '/wuYe/illegalParking/'+data,
+    method: 'get',
+  })
+}

+ 389 - 0
property_ui/car/components/car/list.vue

@@ -0,0 +1,389 @@
+<template>
+<view>
+	<!-- 第一种样式  人员管理-->
+	<block v-if="datainfo.length>0">
+		<!-- 车辆管控 -->
+		<block v-if="type=='car'">
+			<view class="carlist" v-for="(ite,idx) in datainfo" :key="idx">
+				<view class="ctop flexc">
+					<image :src="cara" class="imgs" v-if="ite.type==1"></image>
+					<image :src="carb" class="imgs" v-if="ite.type==2"></image>
+					<view class="tit">皖A IC520</view>
+					<view class="btn btna">新能源</view>
+					<view class="btn btnb">小型车</view>
+					<view class="flex1"></view>
+					<view class="txt ca" v-if="ite.type==1">小区车辆</view>
+					<view class="txt cb" v-if="ite.type==2">外来车辆</view>
+				</view>
+				<view class="clists">
+					<view class="clist"><view class="tit">车库名称</view>地下停车场</view>
+					<view class="clist"><view class="tit">进入时间</view>2024-11-27 16:27:48</view>
+					<block v-if="topval=='sl'">
+						<view class="clist"><view class="tit">驶离时间</view>2024-11-27 16:27:48</view>
+						<view class="clist"><view class="tit">停车时长</view>3小时19分钟</view>
+					</block>
+					<view class="clist"><view class="tit">{{ite.type==1?'门户号 ':'来访门户'}}</view>8#303</view>
+					<view class="clist"><view class="tit">手机号码</view>13656788668</view>
+				</view>
+			</view>
+		</block>
+		<!-- 车辆违规 -->
+		<block v-if="type=='carpark'">
+			<view class="carlist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail">
+				<view class="ctop flexc">
+					<image :src="cara" class="imgs" v-if="ite.type==1"></image>
+					<image :src="carb" class="imgs" v-if="ite.type==2"></image>
+					<view class="tit">皖A IC520</view>
+					<view class="num" :class="ite.heiflag?'coff':''">(本年度2次)</view>
+					<view class="flex1"></view>
+					<view class="txt ca" v-if="ite.type==1">小区车辆</view>
+					<view class="txt cb" v-if="ite.type==2">外来车辆</view>
+				</view>
+				<view class="clists">
+					<view class="clist"><view class="tit">关联房号</view>12#1403</view>
+					<view class="clist"><view class="tit">手机号码</view>13656788668</view>
+					<view class="clist"><view class="tit">登记时间</view>2024-11-27 17:30:55</view>
+					<view class="clist"><view class="tit">违停拍照</view>
+						<view class="imgas">
+							<image :src="cara" @click="getPreview(idx,cara)"></image>
+							<image :src="cara"></image>
+							<image :src="cara"></image>
+							<image :src="cara"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		
+		<view class="shax">{{wtdt}}</view>
+	</block>
+	
+	<!-- 无数据 -->
+	<view class="nodata" v-else>
+		<image :src="noiconpimg"></image>
+		<view>
+			暂无数据
+		</view>
+	</view>
+</view>
+</template>
+
+<script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import config from '@/config'
+	export default{
+		props:{
+			datainfo: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			wtdt:{
+				type:String,
+				default () {
+					return ''
+				}
+			},
+			type:{
+				type:String,
+				default () {
+					return 0
+				}
+			},
+			topval:{
+				type:String,
+				default () {
+					return ''
+				}
+			}
+		},
+		data(){
+			return{
+				noiconpimg:require("@/static/nodata.png"),
+				car:require("@/car/static/car/car.png"),
+				cara:require("@/car/static/car/cara.png"),
+				carb:require("@/car/static/car/carb.png"),
+				hicoa:require("@/people/static/people/hicoa.png"),
+				hicob:require("@/people/static/people/hicob.png"),
+				man:require("@/people/static/people/man.png"),
+				woman:require("@/people/static/people/woman.png"),
+				rimg:require("@/people/static/people/rimg.png"),
+				pdel:require("@/people/static/people/pdel.png"),
+				gzlx:require("@/people/static/people/gzlx.png"),
+				mphone:require("@/people/static/people/mphone.png"),
+				sfz:require("@/people/static/people/sfz.png"),
+				eye:require("@/people/static/people/eye.png"),
+				neye:require("@/people/static/people/neye.png"),
+				time:require("@/work/static/manage/time.png"),
+				house:require("@/work/static/manage/house.png"),
+				housea:require("@/work/static/manage/housea.png"),
+				home:require("@/service/static/service/home.png"),
+				upimg:require("@/static/images/home/up.png"),
+				star:require('@/manage/static/community/star.png'),
+				stara:require('@/manage/static/community/stara.png'),
+				baseUrl:config.baseUrl,
+				delBtnWidth:66,//左滑默认宽度
+			}
+		},
+		mounted() {
+			
+		},
+		methods:{
+			checkPermi, checkRole,
+			getDetail(e){
+				this.$emit('getDetail',e)
+			},
+			getAddFn(e){
+				this.$emit('getAddFn',e)
+			},
+			getReadlist(e){
+				this.$emit('getReadlist',e)
+			},
+			getZhan(idx){
+				// var obj=JSON.parse(JSON.stringify(this.datainfo))[idx]
+				// obj.zhanflag=!obj.zhanflag;
+				// this.datainfo.splice(idx,1,obj);
+				this.datainfo[idx].zhanflag=!this.datainfo[idx].zhanflag
+			},
+			getHideFn(idx){
+				this.datainfo[idx].hideflag=!this.datainfo[idx].hideflag
+			},
+			getPreview(idx,arr) {
+				var newArr=[];
+				arr.forEach(ite=>{
+					var ds=this.baseUrl+ite
+					newArr.push(ds)
+				})
+				uni.previewImage({
+					urls: newArr,
+					current:idx,
+					success: function(data) {},
+					fail: function(err) {}
+				});
+			},
+			//开始触摸滑动
+			drawStart(e) {
+				// console.log("开始触发");
+				var touch = e.touches[0];
+				this.startX = touch.clientX;
+			},
+			//触摸滑动
+			drawMove(e) {
+				// console.log("滑动");
+				for (var index in this.datainfo) {
+					// this.csListArrl[index].right=0
+					this.$set(this.datainfo[index],'right',0);
+				}
+				var idx=e.currentTarget.dataset.idx
+				var touch = e.touches[0];
+				var item = this.datainfo[idx];
+				var disX = this.startX - touch.clientX;
+				if (disX >= 20) {
+				        if (disX > this.delBtnWidth) {
+					    disX = this.delBtnWidth;
+				        }
+						// this.csListArrl[idx].right=disX
+				        this.$set(this.datainfo[idx],'right',disX);
+				} else {
+					// this.csListArrl[idx].right=0
+					this.$set(this.datainfo[idx],'right',0);
+				}
+			},
+			//触摸滑动结束
+			drawEnd(e) {
+				// console.log("滑动结束");
+				var idx=e.currentTarget.dataset.idx
+				var item = this.datainfo[idx];
+				if (item.right >= this.delBtnWidth / 2) {
+					// this.datainfo[idx].right=this.delBtnWidth
+					this.$set(this.datainfo[idx],'right',this.delBtnWidth);
+				} else {
+					this.datainfo[idx].right=0
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.flex{display: flex;}
+.flexc{display: flex;align-items: center;}
+.mb10{margin-bottom: 20rpx;}
+.carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
+	.ctop{border-bottom: 2rpx solid #E5E5E5;padding:26rpx 24rpx;
+		.imgs{width: 40rpx;height: 42rpx;margin-right: 30rpx;}
+		.tit{font-size: 32rpx;color: #272727;font-weight: bold;margin-right: 14rpx;}
+		.txt{font-weight: 500;font-size: 26rpx;
+			&.ca{color: #3565ED;}
+			&.cb{color: #FE5A0E;}	
+			&.cc{color: #28C529;}	
+		}
+		.txta{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+		.num{font-size: 24rpx;color: #AAAAAA;}
+	}
+	.btn{height: 34rpx;border-radius: 18rpx;display: flex;align-items: center;justify-content: center;padding: 0 10rpx;font-size: 22rpx;margin-right: 24rpx;
+		&.btna{border: 2rpx solid #06C770;color: #06C770;}
+		&.btnb{border: 2rpx solid #3565ED;color: #3565ED;}
+		&.btnc{border: 2rpx solid #FE5A0E;color: #FE5A0E;}
+		&.btnbga{border: 1px solid #0156FE;color: #3565ED;background: #DFEAFF;height: 36rpx;}
+		&.btnbgb{border: 1px solid #C1C1C1;color: #666666;background: #F1F1F1;height: 36rpx;}
+		&.btnbgc{border: 1px solid #FE5A0E;color:#FE5A0E;background:#FFEEE6;height: 36rpx;}
+	}
+	.clists{padding: 24rpx 24rpx 8rpx;
+		.clist{font-weight: 500;margin-bottom: 16rpx;
+font-size: 26rpx;color: #272727;display: flex;line-height: 34rpx;
+			.tit{font-size: 26rpx;color: #AAAAAA;flex: 0 0 auto;margin-right: 16rpx;min-width: 108rpx;text-align-last: justify;}
+			.imgas{display: flex;align-items: center;flex-wrap: wrap;
+				image{width: 142rpx;height: 142rpx;margin-right: 30rpx;margin-top: 8rpx;}
+			}	
+		}
+		.w50{
+			.clist{width: 50%;}
+		}
+	}
+}
+// 人员
+.peolist{
+	.ctop{padding: 24rpx 24rpx 22rpx;}
+	.imgs{margin-right: 16rpx !important;}
+	.tit{font-size: 28rpx !important;}
+	.plists{padding: 30rpx 24rpx 6rpx;
+		.plist{background: linear-gradient(-90deg, #F2F5FF 0%, #FBFDFF 100%);border-radius: 20rpx;border: 2rpx solid #E6E6E6;margin-bottom: 24rpx;padding: 18rpx 26rpx 4rpx;
+		.head{width: 96rpx;height: 98rpx;margin-right: 32rpx;flex: 0 0 auto;}
+		.ptit{font-weight: bold;font-size: 30rpx;color: #272727;display: flex;align-items: center;margin-bottom: 14rpx;}	
+		.ptxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 14rpx;min-width: 176rpx;}
+		}
+	}
+	.upimg{width: 26rpx;height: 22rpx;display: block;transform: rotate(180deg);transition: all 0.3s;margin: 0 auto 18rpx;
+		&.act{transform: rotate(0deg);}
+	}
+}
+// 物业费
+.mlistl{width: 40%;display: flex;flex-direction: column;align-items: center;flex: 0 0 auto;
+	.mltit{font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 18rpx;}
+	.mltxt{font-weight: bold;font-size: 32rpx;color: #0156FE;}
+}
+.houselist{
+	.clists{padding-bottom: 2rpx !important;}
+	.clist{margin-bottom: 22rpx !important;}
+}
+// 巡更地点
+.patlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;padding: 0 24rpx 30rpx;
+	.pattop{padding:22rpx 30rpx;margin-bottom: 2rpx;
+		.imgs{width: 28rpx;height: 28rpx;margin-right: 12rpx;}
+		.tit{font-size: 30rpx;color: #272727;font-weight: bold;margin-right: 14rpx;}
+		.txt{font-weight: 500;font-size:24rpx;
+			&.ca{color: #3565ED;}
+			&.cb{color: #FE5A0E;}	
+			&.cc{color: #28C529;}	
+			&.cd{color: #FF6969;}	
+		}
+	}
+	.patlistr{background: #EFF4FF;border-radius: 20rpx;padding: 20rpx 32rpx;
+		.clist{font-weight: 500;font-size: 26rpx;color: #272727;display: flex;line-height: 50rpx;
+			.tit{font-size: 26rpx;flex: 0 0 auto;min-width: 108rpx;text-align-last: justify;font-weight: bold;}
+		}
+	}
+	.patbtns{display: flex;justify-content: flex-end;align-items: center;flex-wrap: wrap;
+		view{min-width: 156rpx;height: 52rpx;font-weight: 500;font-size: 26rpx;background: #FFFFFF;border-radius: 20rpx;box-sizing: border-box;display: flex;align-items: center;justify-content: center;padding: 0 10rpx;margin-left: 24rpx;margin-top: 24rpx;
+		&.btna{border: 2rpx solid #0256FD;color: #0256FD;}
+		&.btnb{background: #0256FD;color: #ffffff;}
+		
+}
+	}
+}
+// 报修
+.walists{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;    position: relative;
+	.watop{
+		padding: 0 36rpx 8rpx 38rpx;
+		.watit{padding: 24rpx 0;margin-bottom: 4rpx;display: flex;
+			.tit{font-weight: bold;font-size: 28rpx;color: #272727;flex: 1;
+				.cir{width: 14rpx;margin-left: 8rpx;margin-bottom: 10rpx;height: 14rpx;display: inline-block;background: #FF6969;border-radius: 8rpx;}
+			}
+			.txt{font-weight: bold;font-size: 26rpx;flex: 0 0 auto;
+			}
+		}
+	}
+	.walist{display: flex;font-weight: 500;font-size: 24rpx;color: #666666;margin-bottom: 16rpx;
+		.tit{min-width: 100rpx;text-align-last: justify}
+	}
+	.wabtn{display: flex;align-items: center;justify-content: space-between;border-top: 2rpx solid #E5E5E5;height: 80rpx;padding: 0 38rpx;
+		view{font-weight: 500;font-size: 24rpx;color: #666666;}
+		image{width: 16rpx;height: 28rpx;}
+	}
+}
+// 维修人员
+.stafflist{width: 344rpx;min-height: 256rpx;background: #FFFFFF;border-radius: 20rpx;margin:0 12rpx 24rpx 12rpx;padding-bottom: 20rpx;box-sizing: border-box;
+	// &:nth-of-type(2n){margin-right: 0;}
+	.statop{border-bottom: 2rpx solid #E5E5E5;display: flex;padding: 24rpx 24rpx 22rpx;
+		.head{width: 80rpx;height: 82rpx;margin-right: 24rpx;flex: 0 0 auto;}
+		.stadel{width: 30rpx;height: 30rpx;flex: 0 0 auto;margin-left: 12rpx;}
+		.statit{font-weight: bold;font-size: 30rpx;color: #272727;margin-bottom: 4rpx;}
+		.statxt{font-weight: 500;font-size: 26rpx;
+			.cir{width: 10rpx;height: 10rpx;border-radius: 50%;margin-right: 14rpx;display: inline-block;
+				&.bga{background: #06C770;}
+				&.bgb{background: #FF6969;}
+			}
+		}
+	}
+	.stalist{font-weight: 500;font-size: 26rpx;color: #272727;display: flex;align-items: center;padding: 20rpx 24rpx 0;
+		.imgs{width: 24rpx;height: 30rpx;margin-right: 22rpx;flex: 0 0 auto;display: flex;align-items: center;justify-content: center;
+			.gzlximg{width: 24rpx;height: 28rpx;}
+			.mphone{width: 18rpx;height: 30rpx;}
+			.sfz{width: 20rpx;height: 18rpx;}
+		}
+		.eyes{width: 34rpx;height: 34rpx;
+			.eye{width: 22rpx;height: 15rpx;}
+			.neye{width: 24rpx;height: 24rpx;}
+		}
+	}
+}
+.watopcom{background-color: #ffffff;border-radius: 20rpx;position: relative;z-index: 1;padding-bottom: 30rpx !important;
+	.watopcoma{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 24rpx;}
+	.watopcomb{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+	
+}
+//资讯
+.newlists{
+	background: #FFFFFF;padding: 22rpx 24rpx;margin-bottom: 24rpx;
+	border-radius: 20rpx;
+	.tit{font-size: 32rpx;font-weight: bold;color: #272727;line-height: 48rpx;margin-bottom:16rpx;}
+	.txt{font-size: 24rpx;color: #666666;line-height: 36rpx;margin-bottom: 32rpx;}
+	.stabox{
+		.time{font-weight: 500;font-size: 24rpx;color: #AAAAAA;line-height: 36rpx;}
+		.btns{font-weight: 500;font-size: 22rpx;color: #666666;line-height: 36rpx;min-width: 100rpx;box-sizing: border-box;margin-left: 20rpx;
+		.imga{width: 24rpx;height: 22rpx;margin-right: 8rpx;}
+		.imgb{width: 24rpx;height: 18rpx;margin-right: 10rpx;}
+		}
+		
+	}
+}
+// 视频
+.videolists{
+	background: #FFFFFF;margin-bottom: 24rpx;border-radius: 20rpx;
+	.titbox{padding-top: 16rpx;padding-right: 38rpx;}
+	.videos{width: 260rpx;height: 180rpx;}
+	.tit{font-weight: bold;font-size: 14px;color: #272727;text-align: left;margin-bottom: 10rpx;}
+	.num{font-weight: 500;font-size: 20rpx;color: #666666;min-width: 68rpx;padding: 0 8rpx;box-sizing: border-box;
+height: 28rpx;background: #E6E6E6;border-radius: 14rpx;line-height: 28rpx;text-align: center;}
+	.time{font-weight: 500;font-size: 24rpx;color: #AAAAAA;margin-top: 44rpx;}
+
+}
+
+// 名单
+.readlist{background: #FFFFFF;border-radius: 20rpx;border: 2rpx solid #E6E6E6;margin-bottom: 24rpx;padding: 24rpx;display: flex;align-items: center;box-sizing: border-box;
+	.head{width: 96rpx;height: 96rpx;margin-right: 28rpx;flex: 0 0 auto;}
+	.tit{font-weight: bold;font-size: 30rpx;color: #272727;margin-bottom: 12rpx;}
+	.time{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;
+		text{margin-right: 12rpx;display: inline-block;}
+	}
+}
+.spdel{width: 164rpx;background: #EA2D2D;font-weight: bold;font-size: 26rpx;color: #FFFFFF;display: flex;align-items: center;justify-content: center;position: absolute;right: -146rpx;top: 0;bottom: 0;padding-left: 14rpx;}
+
+// 无数据
+.nodata{display: flex;flex-direction: column;align-items: center;
+	image{width: 440rpx;height: 440rpx;}
+	view{font-size: 30rpx;color: #666666;font-weight: bold;}
+}
+</style>

+ 2 - 2
property_ui/work/pages/car/carcheck.vue → property_ui/car/pages/carcheck.vue

@@ -37,8 +37,8 @@
 		components:{},
 		components:{},
 		data(){
 		data(){
 			return{
 			return{
-				line:require('@/work/static/car/line.png'),
-				car:require('@/work/static/car/carico.png'),
+				line:require('@/car/static/car/line.png'),
+				car:require('@/car/static/car/carico.png'),
 				baseUrl:config.baseUrl,
 				baseUrl:config.baseUrl,
 				datainfo:{
 				datainfo:{
 					realName:'',
 					realName:'',

+ 6 - 6
property_ui/work/pages/car/carku.vue → property_ui/car/pages/carku.vue

@@ -26,12 +26,12 @@
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				up:require('@/work/static/car/up.png'),
-				car:require('@/work/static/car/car.png'),
-				cara:require('@/work/static/car/cara.png'),
-				carb:require('@/work/static/car/carb.png'),
-				search:require('@/work/static/car/search.png'),
+				reset:require('@/car/static/car/reset.png'),
+				up:require('@/car/static/car/up.png'),
+				car:require('@/car/static/car/car.png'),
+				cara:require('@/car/static/car/cara.png'),
+				carb:require('@/car/static/car/carb.png'),
+				search:require('@/car/static/car/search.png'),
 				list:[{tit:'皖A IC520',type:1}],
 				list:[{tit:'皖A IC520',type:1}],
 				pageSize: 10,
 				pageSize: 10,
 				pageNum: 1,
 				pageNum: 1,

+ 8 - 8
property_ui/work/pages/car/illegalParking.vue → property_ui/car/pages/illegalParking.vue

@@ -41,12 +41,12 @@
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				up:require('@/work/static/car/up.png'),
-				car:require('@/work/static/car/car.png'),
-				cara:require('@/work/static/car/cara.png'),
-				carb:require('@/work/static/car/carb.png'),
-				search:require('@/work/static/car/search.png'),
+				reset:require('@/car/static/car/reset.png'),
+				up:require('@/car/static/car/up.png'),
+				car:require('@/car/static/car/car.png'),
+				cara:require('@/car/static/car/cara.png'),
+				carb:require('@/car/static/car/carb.png'),
+				search:require('@/car/static/car/search.png'),
 				cxrq:"",
 				cxrq:"",
 				text:'',
 				text:'',
 				list:[{tit:'皖A IC520',type:1,heiflag:false},{tit:'晋E KD783',type:2,heiflag:true},],
 				list:[{tit:'皖A IC520',type:1,heiflag:false},{tit:'晋E KD783',type:2,heiflag:true},],
@@ -71,10 +71,10 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getCheck(){
 			getCheck(){
-				this.$tab.navigateTo("/work/pages/car/illegalcheck")
+				this.$tab.navigateTo("/car/pages/carillegalcheck")
 			},
 			},
 			getDetail(){
 			getDetail(){
-				this.$tab.navigateTo("/work/pages/car/illegalrecord")
+				this.$tab.navigateTo("/car/pages/carillegalrecord")
 			},
 			},
 			getTabtop(val){
 			getTabtop(val){
 				this.ttopval=val
 				this.ttopval=val

+ 3 - 3
property_ui/work/pages/car/illegalcheck.vue → property_ui/car/pages/illegalcheck.vue

@@ -43,9 +43,9 @@
 		components:{},
 		components:{},
 		data(){
 		data(){
 			return{
 			return{
-				line:require('@/work/static/car/line.png'),
-				car:require('@/work/static/car/carico.png'),
-				del:require('@/work/static/car/del.png'),
+				line:require('@/car/static/car/line.png'),
+				car:require('@/car/static/car/carico.png'),
+				del:require('@/car/static/car/del.png'),
 				baseUrl:config.baseUrl,
 				baseUrl:config.baseUrl,
 				datainfo:{
 				datainfo:{
 					realName:'',
 					realName:'',

+ 5 - 5
property_ui/work/pages/car/illegalrecord.vue → property_ui/car/pages/illegalrecord.vue

@@ -69,11 +69,11 @@
 		components:{},
 		components:{},
 		data(){
 		data(){
 			return{
 			return{
-				line:require('@/work/static/car/line.png'),
-				carc:require('@/work/static/car/carc.png'),
-				card:require('@/work/static/car/card.png'),
-				icoa:require('@/work/static/car/icoa.png'),
-				icob:require('@/work/static/car/icob.png'),
+				line:require('@/car/static/car/line.png'),
+				carc:require('@/car/static/car/carc.png'),
+				card:require('@/car/static/car/card.png'),
+				icoa:require('@/car/static/car/icoa.png'),
+				icob:require('@/car/static/car/icob.png'),
 				baseUrl:config.baseUrl,
 				baseUrl:config.baseUrl,
 				datainfo:{
 				datainfo:{
 					type:1,heiflag:true
 					type:1,heiflag:true

+ 6 - 6
property_ui/work/pages/car/index.vue → property_ui/car/pages/index.vue

@@ -40,12 +40,12 @@
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				up:require('@/work/static/car/up.png'),
-				car:require('@/work/static/car/car.png'),
-				cara:require('@/work/static/car/cara.png'),
-				carb:require('@/work/static/car/carb.png'),
-				search:require('@/work/static/car/search.png'),
+				reset:require('@/car/static/car/reset.png'),
+				up:require('@/car/static/car/up.png'),
+				car:require('@/car/static/car/car.png'),
+				cara:require('@/car/static/car/cara.png'),
+				carb:require('@/car/static/car/carb.png'),
+				search:require('@/car/static/car/search.png'),
 				cxrq:"",
 				cxrq:"",
 				text:'',
 				text:'',
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],

+ 0 - 0
property_ui/work/static/car/car.png → property_ui/car/static/car/car.png


+ 0 - 0
property_ui/work/static/car/cara.png → property_ui/car/static/car/cara.png


+ 0 - 0
property_ui/work/static/car/carb.png → property_ui/car/static/car/carb.png


+ 0 - 0
property_ui/work/static/car/carbg.png → property_ui/car/static/car/carbg.png


+ 0 - 0
property_ui/work/static/car/carc.png → property_ui/car/static/car/carc.png


+ 0 - 0
property_ui/work/static/car/card.png → property_ui/car/static/car/card.png


+ 0 - 0
property_ui/work/static/car/carico.png → property_ui/car/static/car/carico.png


+ 0 - 0
property_ui/work/static/car/del.png → property_ui/car/static/car/del.png


+ 0 - 0
property_ui/work/static/car/icoa.png → property_ui/car/static/car/icoa.png


+ 0 - 0
property_ui/work/static/car/icob.png → property_ui/car/static/car/icob.png


+ 0 - 0
property_ui/work/static/car/line.png → property_ui/car/static/car/line.png


+ 0 - 0
property_ui/work/static/car/reset.png → property_ui/car/static/car/reset.png


+ 0 - 0
property_ui/work/static/car/search.png → property_ui/car/static/car/search.png


+ 0 - 0
property_ui/work/static/car/up.png → property_ui/car/static/car/up.png


+ 2 - 2
property_ui/config.js

@@ -1,8 +1,8 @@
 // 应用全局配置
 // 应用全局配置
 module.exports = {
 module.exports = {
-  baseUrl: 'https://vue.ruoyi.vip/prod-api',
+  // baseUrl: 'https://vue.ruoyi.vip/prod-api',
   // baseUrl: 'http://47.99.82.249:5010/prod-api',
   // baseUrl: 'http://47.99.82.249:5010/prod-api',
-  // baseUrl: 'http://192.168.101.245:8065',
+  baseUrl: 'http://192.168.101.245:8065',
   // baseUrlimg: 'http://114.99.127.243:2001',
   // baseUrlimg: 'http://114.99.127.243:2001',
   // 应用信息
   // 应用信息
   appInfo: {
   appInfo: {

+ 2 - 2
property_ui/health/components/box/list.vue

@@ -98,8 +98,8 @@
 				noiconpimg:require("@/static/nodata.png"),
 				noiconpimg:require("@/static/nodata.png"),
 				hicoa:require("@/health/static/health/hicoa.png"),
 				hicoa:require("@/health/static/health/hicoa.png"),
 				hicob:require("@/health/static/health/hicob.png"),
 				hicob:require("@/health/static/health/hicob.png"),
-				man:require("@/work/static/people/man.png"),
-				woman:require("@/work/static/people/woman.png"),
+				man:require("@/people/static/people/man.png"),
+				woman:require("@/people/static/people/woman.png"),
 				upimg:require("@/static/images/home/up.png"),
 				upimg:require("@/static/images/home/up.png"),
 				
 				
 				baseUrl:config.baseUrl,
 				baseUrl:config.baseUrl,

+ 5 - 5
property_ui/health/pages/health/index.vue

@@ -35,11 +35,11 @@
 		components:{boxList},
 		components:{boxList},
 		data(){
 		data(){
 			return{
 			return{
-				// reset:require('@/work/static/car/reset.png'),
-				// up:require('@/work/static/car/up.png'),
-				// car:require('@/work/static/car/car.png'),
-				// cara:require('@/work/static/car/cara.png'),
-				// carb:require('@/work/static/car/carb.png'),
+				// reset:require('@/car/static/car/reset.png'),
+				// up:require('@/car/static/car/up.png'),
+				// car:require('@/car/static/car/car.png'),
+				// cara:require('@/car/static/car/cara.png'),
+				// carb:require('@/car/static/car/carb.png'),
 				search:require('@/health/static/health/search.png'),
 				search:require('@/health/static/health/search.png'),
 				sfxx:"",
 				sfxx:"",
 				text:'',
 				text:'',

+ 12 - 12
property_ui/manage/components/car/list.vue

@@ -426,21 +426,21 @@
 		data(){
 		data(){
 			return{
 			return{
 				noiconpimg:require("@/static/nodata.png"),
 				noiconpimg:require("@/static/nodata.png"),
-				car:require("@/work/static/car/car.png"),
-				cara:require("@/work/static/car/cara.png"),
-				carb:require("@/work/static/car/carb.png"),
-				hicoa:require("@/work/static/people/hicoa.png"),
-				hicob:require("@/work/static/people/hicob.png"),
-				man:require("@/work/static/people/man.png"),
-				woman:require("@/work/static/people/woman.png"),
-				rimg:require("@/work/static/people/rimg.png"),
-				pdel:require("@/work/static/people/pdel.png"),
-				gzlx:require("@/work/static/people/gzlx.png"),
-				mphone:require("@/work/static/people/mphone.png"),
+				car:require("@/car/static/car/car.png"),
+				cara:require("@/car/static/car/cara.png"),
+				carb:require("@/car/static/car/carb.png"),
+				hicoa:require("@/people/static/people/hicoa.png"),
+				hicob:require("@/people/static/people/hicob.png"),
+				man:require("@/people/static/people/man.png"),
+				woman:require("@/people/static/people/woman.png"),
+				rimg:require("@/people/static/people/rimg.png"),
+				pdel:require("@/people/static/people/pdel.png"),
+				gzlx:require("@/people/static/people/gzlx.png"),
+				mphone:require("@/people/static/people/mphone.png"),
 				time:require("@/work/static/manage/time.png"),
 				time:require("@/work/static/manage/time.png"),
 				house:require("@/work/static/manage/house.png"),
 				house:require("@/work/static/manage/house.png"),
 				housea:require("@/work/static/manage/housea.png"),
 				housea:require("@/work/static/manage/housea.png"),
-				home:require("@/work/static/service/home.png"),
+				home:require("@/service/static/service/home.png"),
 				upimg:require("@/static/images/home/up.png"),
 				upimg:require("@/static/images/home/up.png"),
 				star:require('@/manage/static/community/star.png'),
 				star:require('@/manage/static/community/star.png'),
 				stara:require('@/manage/static/community/stara.png'),
 				stara:require('@/manage/static/community/stara.png'),

+ 1 - 1
property_ui/manage/pages/community/newsadd.vue

@@ -45,7 +45,7 @@
 		components: {editorBox},
 		components: {editorBox},
 		data() {
 		data() {
 			return {
 			return {
-				rimg: require('@/work/static/people/rimg.png'),
+				rimg: require('@/people/static/people/rimg.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				datainfo: {
 				datainfo: {

+ 1 - 1
property_ui/manage/pages/community/newsadddj.vue

@@ -45,7 +45,7 @@
 		components: {editorBox},
 		components: {editorBox},
 		data() {
 		data() {
 			return {
 			return {
-				rimg: require('@/work/static/people/rimg.png'),
+				rimg: require('@/people/static/people/rimg.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				datainfo: {
 				datainfo: {

+ 1 - 1
property_ui/manage/pages/community/newsaddsq.vue

@@ -45,7 +45,7 @@
 		components: {editorBox},
 		components: {editorBox},
 		data() {
 		data() {
 			return {
 			return {
-				rimg: require('@/work/static/people/rimg.png'),
+				rimg: require('@/people/static/people/rimg.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				datainfo: {
 				datainfo: {

+ 1 - 1
property_ui/manage/pages/community/newsaddvideo.vue

@@ -45,7 +45,7 @@
 		data() {
 		data() {
 			return {
 			return {
 				video: require('@/manage/static/community/video.png'),
 				video: require('@/manage/static/community/video.png'),
-				del: require('@/work/static/car/del.png'),
+				del: require('@/car/static/car/del.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				datainfo: {
 				datainfo: {

+ 3 - 3
property_ui/manage/pages/community/readcount.vue

@@ -49,8 +49,8 @@
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				search:require('@/work/static/car/search.png'),
+				reset:require('@/car/static/car/reset.png'),
+				search:require('@/car/static/car/search.png'),
 				up:require('@/manage/static/community/up.png'),
 				up:require('@/manage/static/community/up.png'),
 				upa:require('@/manage/static/community/upa.png'),
 				upa:require('@/manage/static/community/upa.png'),
 				down:require('@/manage/static/community/down.png'),
 				down:require('@/manage/static/community/down.png'),
@@ -80,7 +80,7 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getDetail(){
 			getDetail(){
-				this.$tab.navigateTo("/work/pages/service/complaintdetail")
+				this.$tab.navigateTo("/service/pages/service/complaintdetail")
 			},
 			},
 			getTabtop(val){
 			getTabtop(val){
 				this.ttopval=val
 				this.ttopval=val

+ 4 - 4
property_ui/manage/pages/community/readlist.vue

@@ -39,9 +39,9 @@
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				search:require('@/work/static/car/search.png'),
-				up:require('@/work/static/car/up.png'),
+				reset:require('@/car/static/car/reset.png'),
+				search:require('@/car/static/car/search.png'),
+				up:require('@/car/static/car/up.png'),
 				cxrq:"",
 				cxrq:"",
 				text:'',
 				text:'',
 				list:[{tit:'皖A IC520',type:1,right:0},{tit:'晋E KD783',type:2,right:0},],
 				list:[{tit:'皖A IC520',type:1,right:0},{tit:'晋E KD783',type:2,right:0},],
@@ -66,7 +66,7 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getDetail(){
 			getDetail(){
-				this.$tab.navigateTo("/work/pages/service/complaintdetail")
+				this.$tab.navigateTo("/service/pages/service/complaintdetail")
 			},
 			},
 			getTabtop(val){
 			getTabtop(val){
 				this.ttopval=val
 				this.ttopval=val

+ 5 - 5
property_ui/manage/pages/community/sqmoney.vue

@@ -83,11 +83,11 @@
 			return{
 			return{
 				// column1,
 				// column1,
 				allimg:require('@/manage/static/community/all.png'),
 				allimg:require('@/manage/static/community/all.png'),
-				// up:require('@/work/static/car/up.png'),
-				// car:require('@/work/static/car/car.png'),
-				// cara:require('@/work/static/car/cara.png'),
-				// carb:require('@/work/static/car/carb.png'),
-				search:require('@/work/static/car/search.png'),
+				// up:require('@/car/static/car/up.png'),
+				// car:require('@/car/static/car/car.png'),
+				// cara:require('@/car/static/car/cara.png'),
+				// carb:require('@/car/static/car/carb.png'),
+				search:require('@/car/static/car/search.png'),
 				tabscheight:0,//减去的部
 				tabscheight:0,//减去的部
 				sfxx:"",
 				sfxx:"",
 				text:'',
 				text:'',

+ 13 - 7
property_ui/manage/pages/community/sqmoneyadd.vue

@@ -17,13 +17,19 @@
 			<view class="cbox" style="flex: 1;">
 			<view class="cbox" style="flex: 1;">
 				<view class="chmain">
 				<view class="chmain">
 					<uni-forms-item label-width='0' name="realName">
 					<uni-forms-item label-width='0' name="realName">
-						<uni-easyinput type="textarea" autoHeight v-model="datainfo.realName" disabled :inputBorder='false' placeholder="车牌号" />
+						<uni-easyinput type="textarea" autoHeight v-model="datainfo.realName" disabled :inputBorder='false' placeholder="资产名称" />
 					</uni-forms-item>
 					</uni-forms-item>
 					<uni-forms-item label-width='0' name="realName">
 					<uni-forms-item label-width='0' name="realName">
-						<uni-easyinput type="textarea" autoHeight v-model="datainfo.realName" disabled :inputBorder='false' placeholder="用途" />
+						<uni-easyinput type="textarea" autoHeight v-model="datainfo.realName" disabled :inputBorder='false' placeholder="购买时间" />
 					</uni-forms-item>
 					</uni-forms-item>
 					<uni-forms-item label-width='0' name="realName">
 					<uni-forms-item label-width='0' name="realName">
-						<uni-easyinput type="textarea" autoHeight v-model="datainfo.realName" disabled :inputBorder='false' placeholder="状态" />
+						<uni-easyinput type="textarea" autoHeight v-model="datainfo.realName" disabled :inputBorder='false' placeholder="用途描述" />
+					</uni-forms-item>
+					<uni-forms-item label-width='0' name="realName">
+						<uni-easyinput type="textarea" autoHeight v-model="datainfo.realName" disabled :inputBorder='false' placeholder="资产状态" />
+					</uni-forms-item>
+					<uni-forms-item label-width='0' name="realName">
+						<uni-easyinput type="textarea" autoHeight v-model="datainfo.realName" disabled :inputBorder='false' placeholder="备注信息" />
 					</uni-forms-item>
 					</uni-forms-item>
 					<view class="imgs">
 					<view class="imgs">
 						<view class="img" @click="getPreview">
 						<view class="img" @click="getPreview">
@@ -53,10 +59,10 @@
 		components: {editorBox},
 		components: {editorBox},
 		data() {
 		data() {
 			return {
 			return {
-				rimg: require('@/work/static/people/rimg.png'),
-				photo:require("@/work/static/service/photo.png"),
-				car:require('@/work/static/car/carico.png'),
-				del:require('@/work/static/service/rdel.png'),
+				rimg: require('@/people/static/people/rimg.png'),
+				photo:require("@/service/static/service/photo.png"),
+				car:require('@/car/static/car/carico.png'),
+				del:require('@/service/static/service/rdel.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				datainfo: {
 				datainfo: {

+ 107 - 91
property_ui/pages.json

@@ -103,331 +103,347 @@
   	{
   	{
   		"root": "work",
   		"root": "work",
 		"pages": [
 		"pages": [
+			
 			{
 			{
-				"path": "pages/car/index",
+				"path": "pages/manage/money",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "车辆管控",
+					"navigationBarTitleText": "物业费管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/car/carku",
+				"path": "pages/manage/moneydetail",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "车库管理",
+					"navigationBarTitleText": "物业费管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/car/carcheck",
+				"path": "pages/manage/moneybill",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "外来车辆登记",
+					"navigationBarTitleText": "历史账单",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/car/illegalParking",
+				"path": "pages/manage/house",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "违停管理",
+					"navigationBarTitleText": "房屋管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/car/illegalcheck",
+				"path": "pages/manage/houseadd",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "违停登记",
+					"navigationBarTitleText": "添加房屋",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
-			},
+			}
+		]
+  	},
+	{"root": "manage",
+		"pages": [
 			{
 			{
-				"path": "pages/car/illegalrecord",
+				"path": "pages/community/newsdj",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "违停记录",
+					"navigationBarTitleText": "党建资讯",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/people/index",
+				"path": "pages/community/newssq",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "人员管理",
+					"navigationBarTitleText": "社区资讯",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/people/comegl",
+				"path": "pages/community/newsyg",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "来访管理",
+					"navigationBarTitleText": "员工培训",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/people/comeadd",
+				"path": "pages/community/newsadd",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "添加访客",
+					"navigationBarTitleText": "发布图文",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/people/staff",
+				"path": "pages/community/newsaddvideo",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "维修人员管理",
+					"navigationBarTitleText": "发布视频",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/people/staffadd",
+				"path": "pages/community/newsaddsq",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "添加维修人员",
+					"navigationBarTitleText": "发布",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/manage/money",
+				"path": "pages/community/newsadddj",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "物业费管理",
+					"navigationBarTitleText": "发布",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/manage/moneydetail",
+				"path": "pages/community/readlist",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "物业费管理",
+					"navigationBarTitleText": "已读名单",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/manage/moneybill",
+				"path": "pages/community/readcount",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "历史账单",
+					"navigationBarTitleText": "阅读统计",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/manage/house",
+				"path": "pages/community/sqmoney",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "房屋管理",
+					"navigationBarTitleText": "社区资产",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/manage/houseadd",
+				"path": "pages/community/sqmoneyadd",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "添加房屋",
+					"navigationBarTitleText": "录入资产",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
-			},
+			}
+		]
+	},
+	{
+		"root": "people",
+		"pages": [
 			{
 			{
-				"path": "pages/service/patrol",
+				"path": "pages/people/index",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "今日巡更",
-					"navigationStyle": "custom",
+					"navigationBarTitleText": "人员管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/service/patroldetail",
+				"path": "pages/people/comegl",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "巡更详情",
+					"navigationBarTitleText": "来访管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/service/patroladd",
+				"path": "pages/people/comeadd",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "巡更信息",
+					"navigationBarTitleText": "添加访客",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/service/patrolrecord",
+				"path": "pages/people/staff",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "巡更记录",
+					"navigationBarTitleText": "员工管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/service/patrolset",
+				"path": "pages/people/staffadd",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "巡更点设置",
+					"navigationBarTitleText": "添加员工",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
-			},
+			}
+		]
+	},
+	{
+		"root": "service",
+		"pages": [
 			{
 			{
-				"path": "pages/service/warranty",
+				"path": "pages/service/patrol",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "报修管理",
+					"navigationBarTitleText": "今日巡更",
+					"navigationStyle": "custom",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/service/warrantydetail",
+				"path": "pages/service/patroldetail",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "报修详情",
-					"navigationStyle": "custom"
-					// "h5":{
-					// 	"titleNView":false
-					// }
+					"navigationBarTitleText": "巡更详情",
+					"h5":{
+						"titleNView":false
+					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/service/complaint",
+				"path": "pages/service/patroladd",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "投诉建议",
+					"navigationBarTitleText": "巡更信息",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/service/complaintdetail",
+				"path": "pages/service/patrolrecord",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "投诉建议",
+					"navigationBarTitleText": "巡更记录",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
-			}
-		]
-  	},
-	{"root": "manage",
-		"pages": [
+			},
 			{
 			{
-				"path": "pages/community/newsdj",
+				"path": "pages/service/patrolset",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "党建资讯",
+					"navigationBarTitleText": "巡更点设置",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/newssq",
+				"path": "pages/service/warranty",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "社区资讯",
+					"navigationBarTitleText": "报修管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/newsyg",
+				"path": "pages/service/warrantydetail",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "员工培训",
-					"h5":{
-						"titleNView":false
-					}
+					"navigationBarTitleText": "报修详情",
+					"navigationStyle": "custom"
+					// "h5":{
+					// 	"titleNView":false
+					// }
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/newsadd",
+				"path": "pages/service/complaint",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "发布图文",
+					"navigationBarTitleText": "投诉建议",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/newsaddvideo",
+				"path": "pages/service/complaintdetail",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "发布视频",
+					"navigationBarTitleText": "投诉建议",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
-			},
+			}
+		]
+	},
+	{
+		"root": "car",
+		"pages": [
 			{
 			{
-				"path": "pages/community/newsaddsq",
+				"path": "pages/index",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "发布",
+					"navigationBarTitleText": "车辆管控",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/newsadddj",
+				"path": "pages/carku",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "发布",
+					"navigationBarTitleText": "车库管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/readlist",
+				"path": "pages/carcheck",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "已读名单",
+					"navigationBarTitleText": "外来车辆登记",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/readcount",
+				"path": "pages/illegalParking",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "阅读统计",
+					"navigationBarTitleText": "违停管理",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/sqmoney",
+				"path": "pages/illegalcheck",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "社区资产",
+					"navigationBarTitleText": "违停登记",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
 				}
 				}
 			},
 			},
 			{
 			{
-				"path": "pages/community/sqmoneyadd",
+				"path": "pages/illegalrecord",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "录入资产",
+					"navigationBarTitleText": "违停记录",
 					"h5":{
 					"h5":{
 						"titleNView":false
 						"titleNView":false
 					}
 					}
@@ -463,11 +479,11 @@
   "preloadRule":{
   "preloadRule":{
 	"pages/index/index": {
 	"pages/index/index": {
 		"network": "all",
 		"network": "all",
-		"packages": ["work","health","manage"]
+		"packages": ["work","health","manage","people","service","car"]
 	}, 
 	}, 
 	"pages/login": {
 	"pages/login": {
 	 	"network": "all",
 	 	"network": "all",
-	 	"packages": ["work","health","manage"]
+	 	"packages": ["work","health","manage","people","service","car"]
 	}
 	}
   },
   },
   "globalStyle": {
   "globalStyle": {

+ 10 - 10
property_ui/pages/index.vue

@@ -268,40 +268,40 @@ import notice from '@/components/swiper/notice.vue'
 			this.zhanflag=!this.zhanflag
 			this.zhanflag=!this.zhanflag
 		},
 		},
 		getCarFn(){//车辆管控
 		getCarFn(){//车辆管控
-			this.$tab.navigateTo(`/work/pages/car/index`) 
+			this.$tab.navigateTo(`/car/pages/carindex`) 
 		},
 		},
 		getCarKuFn(){//车库管理
 		getCarKuFn(){//车库管理
-			this.$tab.navigateTo(`/work/pages/car/carku`) 
+			this.$tab.navigateTo(`/car/pages/carcarku`) 
 		},
 		},
 		getCarCheckFn(){//外来车辆登记
 		getCarCheckFn(){//外来车辆登记
-			this.$tab.navigateTo(`/work/pages/car/carcheck`) 
+			this.$tab.navigateTo(`/car/pages/carcarcheck`) 
 		},
 		},
 		getillegalParkFn(){//违停管理
 		getillegalParkFn(){//违停管理
-			this.$tab.navigateTo(`/work/pages/car/illegalParking`) 
+			this.$tab.navigateTo(`/car/pages/carillegalParking`) 
 		},
 		},
 		getPeopleFn(){//人员管理
 		getPeopleFn(){//人员管理
-			this.$tab.navigateTo(`/work/pages/people/index`) 
+			this.$tab.navigateTo(`/people/pages/people/index`) 
 		},
 		},
 		getComeglFn(){//来访管理
 		getComeglFn(){//来访管理
-			this.$tab.navigateTo(`/work/pages/people/comegl`) 
+			this.$tab.navigateTo(`/people/pages/people/comegl`) 
 		},
 		},
 		getMoneyFn(){//物业费管理
 		getMoneyFn(){//物业费管理
 			this.$tab.navigateTo(`/work/pages/manage/money`) 
 			this.$tab.navigateTo(`/work/pages/manage/money`) 
 		},
 		},
 		getPatrolFn(){//今日巡更
 		getPatrolFn(){//今日巡更
-			this.$tab.navigateTo(`/work/pages/service/patrol`) 
+			this.$tab.navigateTo(`/service/pages/service/patrol`) 
 		},
 		},
 		getWarrantyFn(){//报修管理
 		getWarrantyFn(){//报修管理
-			this.$tab.navigateTo(`/work/pages/service/warranty`) 
+			this.$tab.navigateTo(`/service/pages/service/warranty`) 
 		},
 		},
 		getStaffFn(){//维修人员管理
 		getStaffFn(){//维修人员管理
-			this.$tab.navigateTo(`/work/pages/people/staff`)
+			this.$tab.navigateTo(`/people/pages/people/staff`)
 		},
 		},
 		getHouseFn(){//房屋管理
 		getHouseFn(){//房屋管理
 			this.$tab.navigateTo(`/work/pages/manage/house`)
 			this.$tab.navigateTo(`/work/pages/manage/house`)
 		},
 		},
 		getComplaintFn(){//投诉建议
 		getComplaintFn(){//投诉建议
-			this.$tab.navigateTo(`/work/pages/service/complaint`)
+			this.$tab.navigateTo(`/service/pages/service/complaint`)
 		},
 		},
 		getNewsdjFn(){//党建资讯
 		getNewsdjFn(){//党建资讯
 			this.$tab.navigateTo(`/manage/pages/community/newsdj`)
 			this.$tab.navigateTo(`/manage/pages/community/newsdj`)

+ 10 - 10
property_ui/pages/index/index.vue

@@ -268,40 +268,40 @@ import notice from '@/components/swiper/notice.vue'
 			this.zhanflag=!this.zhanflag
 			this.zhanflag=!this.zhanflag
 		},
 		},
 		getCarFn(){//车辆管控
 		getCarFn(){//车辆管控
-			this.$tab.navigateTo(`/work/pages/car/index`) 
+			this.$tab.navigateTo(`/car/pages/carindex`) 
 		},
 		},
 		getCarKuFn(){//车库管理
 		getCarKuFn(){//车库管理
-			this.$tab.navigateTo(`/work/pages/car/carku`) 
+			this.$tab.navigateTo(`/car/pages/carcarku`) 
 		},
 		},
 		getCarCheckFn(){//外来车辆登记
 		getCarCheckFn(){//外来车辆登记
-			this.$tab.navigateTo(`/work/pages/car/carcheck`) 
+			this.$tab.navigateTo(`/car/pages/carcarcheck`) 
 		},
 		},
 		getillegalParkFn(){//违停管理
 		getillegalParkFn(){//违停管理
-			this.$tab.navigateTo(`/work/pages/car/illegalParking`) 
+			this.$tab.navigateTo(`/car/pages/carillegalParking`) 
 		},
 		},
 		getPeopleFn(){//人员管理
 		getPeopleFn(){//人员管理
-			this.$tab.navigateTo(`/work/pages/people/index`) 
+			this.$tab.navigateTo(`/people/pages/people/index`) 
 		},
 		},
 		getComeglFn(){//来访管理
 		getComeglFn(){//来访管理
-			this.$tab.navigateTo(`/work/pages/people/comegl`) 
+			this.$tab.navigateTo(`/people/pages/people/comegl`) 
 		},
 		},
 		getMoneyFn(){//物业费管理
 		getMoneyFn(){//物业费管理
 			this.$tab.navigateTo(`/work/pages/manage/money`) 
 			this.$tab.navigateTo(`/work/pages/manage/money`) 
 		},
 		},
 		getPatrolFn(){//今日巡更
 		getPatrolFn(){//今日巡更
-			this.$tab.navigateTo(`/work/pages/service/patrol`) 
+			this.$tab.navigateTo(`/service/pages/service/patrol`) 
 		},
 		},
 		getWarrantyFn(){//报修管理
 		getWarrantyFn(){//报修管理
-			this.$tab.navigateTo(`/work/pages/service/warranty`) 
+			this.$tab.navigateTo(`/service/pages/service/warranty`) 
 		},
 		},
 		getStaffFn(){//维修人员管理
 		getStaffFn(){//维修人员管理
-			this.$tab.navigateTo(`/work/pages/people/staff`)
+			this.$tab.navigateTo(`/people/pages/people/staff`)
 		},
 		},
 		getHouseFn(){//房屋管理
 		getHouseFn(){//房屋管理
 			this.$tab.navigateTo(`/work/pages/manage/house`)
 			this.$tab.navigateTo(`/work/pages/manage/house`)
 		},
 		},
 		getComplaintFn(){//投诉建议
 		getComplaintFn(){//投诉建议
-			this.$tab.navigateTo(`/work/pages/service/complaint`)
+			this.$tab.navigateTo(`/service/pages/service/complaint`)
 		},
 		},
 		getNewsdjFn(){//党建资讯
 		getNewsdjFn(){//党建资讯
 			this.$tab.navigateTo(`/manage/pages/community/newsdj`)
 			this.$tab.navigateTo(`/manage/pages/community/newsdj`)

+ 8 - 1
property_ui/pages/mine/index.vue

@@ -79,6 +79,13 @@
 					<view class="tit flex1">修改密码</view>
 					<view class="tit flex1">修改密码</view>
 					<image :src="rimg" class="rimg"></image>
 					<image :src="rimg" class="rimg"></image>
 				</view>
 				</view>
+				<view class="flexc mine_list" @click="handleUpassword">
+					<view class="limg">
+						<image :src="listimgj" class="imga"></image>
+					</view>
+					<view class="tit flex1">黑名单设置</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
 				<!-- <view class="flexc mine_list" @click="handleToSetting">
 				<!-- <view class="flexc mine_list" @click="handleToSetting">
 					<view class="limg">
 					<view class="limg">
 						<image :src="listimgg" class="imga"></image>
 						<image :src="listimgg" class="imga"></image>
@@ -140,7 +147,7 @@
 				listimgg: require('@/static/images/mine/mtabg.png'),
 				listimgg: require('@/static/images/mine/mtabg.png'),
 				listimgh: require('@/static/images/mine/mtabh.png'),
 				listimgh: require('@/static/images/mine/mtabh.png'),
 				listimgi: require('@/static/images/mine/mtabi.png'),
 				listimgi: require('@/static/images/mine/mtabi.png'),
-				// listimgj: require('@/static/images/mine/minej.png'),
+				listimgj: require('@/static/images/mine/mtabj.png'),
 				// listimgk: require('@/static/images/mine/minek.png'),
 				// listimgk: require('@/static/images/mine/minek.png'),
 				// listimgl: require('@/static/images/mine/minel.png'),
 				// listimgl: require('@/static/images/mine/minel.png'),
 				// listimgm: require('@/static/images/mine/minem.png'),
 				// listimgm: require('@/static/images/mine/minem.png'),

+ 433 - 0
property_ui/people/components/car/list.vue

@@ -0,0 +1,433 @@
+<template>
+<view>
+	<!-- 第一种样式  人员管理-->
+	<block v-if="datainfo.length>0">
+		<!-- 人员管理 -->
+		<block v-if="type=='people'">
+			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail">
+				<view class="ctop flexc">
+					<image :src="hicoa" class="imgs" v-if="ite.type==1"></image>
+					<image :src="hicob" class="imgs" v-if="ite.type==2"></image>
+					<view class="tit">一号楼3单元1101</view>
+					<view class="flex1"></view>
+					<view class="txt ca" v-if="ite.type==1">业主</view>
+					<view class="txt cb" v-if="ite.type==2">租户</view>
+				</view>
+				<view class="plists">
+					<view class="plist flexc">
+						<image :src="man" class="head" v-if="ite.sex==0"></image>
+						<image :src="woman" class="head" v-else></image>
+						<view class="flex1">
+							<view class="ptit">张伟<view class="btn btnc ml10" v-if="ite.hzflag">户主</view></view>
+							<view class="ptxt">身份证号 | 41072719880603022X</view>
+							<view class="flexc">
+								<view class="ptxt">性别 | {{ite.sex==0?'男':'女'}}</view>
+								<view class="ptxt">年龄 | 36岁</view>
+							</view>
+						</view>
+					</view>
+					<view class="plist flexc" v-if="ite.zhanflag">
+						<image :src="man" class="head" v-if="ite.sex==0"></image>
+						<image :src="woman" class="head" v-else></image>
+						<view class="flex1">
+							<view class="ptit">张伟<view class="btn btnc ml10" v-if="ite.hzflag">户主</view></view>
+							<view class="ptxt">身份证号 | 41072719880603022X</view>
+							<view class="flexc">
+								<view class="ptxt">性别 | {{ite.sex==0?'男':'女'}}</view>
+								<view class="ptxt">年龄 | 36岁</view>
+							</view>
+						</view>
+					</view>
+					<image :src="upimg" :class="ite.zhanflag?'act':''" class="upimg" @click="getZhan(idx)"></image>
+				</view>
+			</view>
+		</block>
+		<!-- 维修人员管理 -->
+		<view v-if="type=='staff'" class="flecw">
+			<view class="stafflist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail">
+				<view class="statop">
+					<image class="head" :src="man" v-if="ite.sex==0"></image>
+					<image class="head" :src="woman" v-else></image>
+					<view class="flex1">
+						<view class="statit">张伟</view>
+						<view class="statxt flexc co06" v-if="ite.hzflag"><text class="cir bga"></text>空闲中</view>
+						<view class="statxt flexc cof6" v-else><text class="cir bgb"></text>指派中</view>
+					</view>
+					<image :src="pdel" class="stadel"></image>
+				</view>
+				<view class="stalist">
+					<view class="imgs"><image :src="gzlx" class="gzlximg"></image></view>电梯维修
+					<view class="flex1"></view>
+					<view class="flexcc eyes" @click="getHideFn(idx)">
+						<image :src="neye" class="neye" v-if="ite.hideflag"></image>
+						<image :src="eye" class="eye" v-else></image>
+					</view>
+				</view>
+				<view class="stalist">
+					<view class="imgs"><image :src="mphone" class="mphone"></image></view>158****0088
+				</view>
+				<view class="stalist">
+					<view class="imgs"><image :src="sfz" class="sfz"></image></view>341235********002X
+				</view>
+			</view>
+		</view>
+		<!-- 来访管理 -->
+		<block v-if="type=='comepeo'">
+			<view class="carlist peolist" v-for="(ite,idx) in datainfo" :key="idx">
+				<view class="ctop flexc">
+					<image :src="hicoa" class="imgs"></image>
+					<!-- <image :src="hicob" class="imgs" v-if="ite.type==2"></image> -->
+					<view class="tit">幸福小区12#301</view>
+					<view class="btn btnbga">预约</view>
+					<view class="btn btnbgb">已来访</view>
+					<view class="btn btnbgc">待来访</view>
+					<view class="flex1"></view>
+					<view class="txt cc" v-if="ite.type==1">驾车</view>
+				</view>
+				<view class="clists">
+					<view class="clist"><view class="tit">预约时间</view>2024-11-25  10:00:00</view>
+					<view class="clist"><view class="tit">来访时间</view>2024-11-27 16:27:48</view>
+					<view class="w50 flexc">
+						<view class="clist"><view class="tit">访客姓名</view>刘女士</view>
+						<view class="clist"><view class="tit">来访人数</view>1人</view>
+					</view>
+					<view class="w50 flexc">
+						<view class="clist"><view class="tit">来访事由</view>亲友</view>
+						<view class="clist"><view class="tit">车牌号码</view>皖A 86KY2</view>
+					</view>
+					<view class="clist"><view class="tit">手机号码</view>13656788668</view>
+				</view>
+			</view>
+		</block>
+		<view class="shax">{{wtdt}}</view>
+	</block>
+	
+	<!-- 无数据 -->
+	<view class="nodata" v-else>
+		<image :src="noiconpimg"></image>
+		<view>
+			暂无数据
+		</view>
+	</view>
+</view>
+</template>
+
+<script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import config from '@/config'
+	export default{
+		props:{
+			datainfo: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			wtdt:{
+				type:String,
+				default () {
+					return ''
+				}
+			},
+			type:{
+				type:String,
+				default () {
+					return 0
+				}
+			},
+			topval:{
+				type:String,
+				default () {
+					return ''
+				}
+			}
+		},
+		data(){
+			return{
+				noiconpimg:require("@/static/nodata.png"),
+				car:require("@/car/static/car/car.png"),
+				cara:require("@/car/static/car/cara.png"),
+				carb:require("@/car/static/car/carb.png"),
+				hicoa:require("@/people/static/people/hicoa.png"),
+				hicob:require("@/people/static/people/hicob.png"),
+				man:require("@/people/static/people/man.png"),
+				woman:require("@/people/static/people/woman.png"),
+				rimg:require("@/people/static/people/rimg.png"),
+				pdel:require("@/people/static/people/pdel.png"),
+				gzlx:require("@/people/static/people/gzlx.png"),
+				mphone:require("@/people/static/people/mphone.png"),
+				sfz:require("@/people/static/people/sfz.png"),
+				eye:require("@/people/static/people/eye.png"),
+				neye:require("@/people/static/people/neye.png"),
+				time:require("@/work/static/manage/time.png"),
+				house:require("@/work/static/manage/house.png"),
+				housea:require("@/work/static/manage/housea.png"),
+				home:require("@/service/static/service/home.png"),
+				upimg:require("@/static/images/home/up.png"),
+				star:require('@/manage/static/community/star.png'),
+				stara:require('@/manage/static/community/stara.png'),
+				baseUrl:config.baseUrl,
+				delBtnWidth:66,//左滑默认宽度
+			}
+		},
+		mounted() {
+			
+		},
+		methods:{
+			checkPermi, checkRole,
+			getDetail(e){
+				this.$emit('getDetail',e)
+			},
+			getAddFn(e){
+				this.$emit('getAddFn',e)
+			},
+			getReadlist(e){
+				this.$emit('getReadlist',e)
+			},
+			getZhan(idx){
+				// var obj=JSON.parse(JSON.stringify(this.datainfo))[idx]
+				// obj.zhanflag=!obj.zhanflag;
+				// this.datainfo.splice(idx,1,obj);
+				this.datainfo[idx].zhanflag=!this.datainfo[idx].zhanflag
+			},
+			getHideFn(idx){
+				this.datainfo[idx].hideflag=!this.datainfo[idx].hideflag
+			},
+			getPreview(idx,arr) {
+				var newArr=[];
+				arr.forEach(ite=>{
+					var ds=this.baseUrl+ite
+					newArr.push(ds)
+				})
+				uni.previewImage({
+					urls: newArr,
+					current:idx,
+					success: function(data) {},
+					fail: function(err) {}
+				});
+			},
+			//开始触摸滑动
+			drawStart(e) {
+				// console.log("开始触发");
+				var touch = e.touches[0];
+				this.startX = touch.clientX;
+			},
+			//触摸滑动
+			drawMove(e) {
+				// console.log("滑动");
+				for (var index in this.datainfo) {
+					// this.csListArrl[index].right=0
+					this.$set(this.datainfo[index],'right',0);
+				}
+				var idx=e.currentTarget.dataset.idx
+				var touch = e.touches[0];
+				var item = this.datainfo[idx];
+				var disX = this.startX - touch.clientX;
+				if (disX >= 20) {
+				        if (disX > this.delBtnWidth) {
+					    disX = this.delBtnWidth;
+				        }
+						// this.csListArrl[idx].right=disX
+				        this.$set(this.datainfo[idx],'right',disX);
+				} else {
+					// this.csListArrl[idx].right=0
+					this.$set(this.datainfo[idx],'right',0);
+				}
+			},
+			//触摸滑动结束
+			drawEnd(e) {
+				// console.log("滑动结束");
+				var idx=e.currentTarget.dataset.idx
+				var item = this.datainfo[idx];
+				if (item.right >= this.delBtnWidth / 2) {
+					// this.datainfo[idx].right=this.delBtnWidth
+					this.$set(this.datainfo[idx],'right',this.delBtnWidth);
+				} else {
+					this.datainfo[idx].right=0
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.flex{display: flex;}
+.flexc{display: flex;align-items: center;}
+.mb10{margin-bottom: 20rpx;}
+.carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
+	.ctop{border-bottom: 2rpx solid #E5E5E5;padding:26rpx 24rpx;
+		.imgs{width: 40rpx;height: 42rpx;margin-right: 30rpx;}
+		.tit{font-size: 32rpx;color: #272727;font-weight: bold;margin-right: 14rpx;}
+		.txt{font-weight: 500;font-size: 26rpx;
+			&.ca{color: #3565ED;}
+			&.cb{color: #FE5A0E;}	
+			&.cc{color: #28C529;}	
+		}
+		.txta{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+		.num{font-size: 24rpx;color: #AAAAAA;}
+	}
+	.btn{height: 34rpx;border-radius: 18rpx;display: flex;align-items: center;justify-content: center;padding: 0 10rpx;font-size: 22rpx;margin-right: 24rpx;
+		&.btna{border: 2rpx solid #06C770;color: #06C770;}
+		&.btnb{border: 2rpx solid #3565ED;color: #3565ED;}
+		&.btnc{border: 2rpx solid #FE5A0E;color: #FE5A0E;}
+		&.btnbga{border: 1px solid #0156FE;color: #3565ED;background: #DFEAFF;height: 36rpx;}
+		&.btnbgb{border: 1px solid #C1C1C1;color: #666666;background: #F1F1F1;height: 36rpx;}
+		&.btnbgc{border: 1px solid #FE5A0E;color:#FE5A0E;background:#FFEEE6;height: 36rpx;}
+	}
+	.clists{padding: 24rpx 24rpx 8rpx;
+		.clist{font-weight: 500;margin-bottom: 16rpx;
+font-size: 26rpx;color: #272727;display: flex;line-height: 34rpx;
+			.tit{font-size: 26rpx;color: #AAAAAA;flex: 0 0 auto;margin-right: 16rpx;min-width: 108rpx;text-align-last: justify;}
+			.imgas{display: flex;align-items: center;flex-wrap: wrap;
+				image{width: 142rpx;height: 142rpx;margin-right: 30rpx;margin-top: 8rpx;}
+			}	
+		}
+		.w50{
+			.clist{width: 50%;}
+		}
+	}
+}
+// 人员
+.peolist{
+	.ctop{padding: 24rpx 24rpx 22rpx;}
+	.imgs{margin-right: 16rpx !important;}
+	.tit{font-size: 28rpx !important;}
+	.plists{padding: 30rpx 24rpx 6rpx;
+		.plist{background: linear-gradient(-90deg, #F2F5FF 0%, #FBFDFF 100%);border-radius: 20rpx;border: 2rpx solid #E6E6E6;margin-bottom: 24rpx;padding: 18rpx 26rpx 4rpx;
+		.head{width: 96rpx;height: 98rpx;margin-right: 32rpx;flex: 0 0 auto;}
+		.ptit{font-weight: bold;font-size: 30rpx;color: #272727;display: flex;align-items: center;margin-bottom: 14rpx;}	
+		.ptxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 14rpx;min-width: 176rpx;}
+		}
+	}
+	.upimg{width: 26rpx;height: 22rpx;display: block;transform: rotate(180deg);transition: all 0.3s;margin: 0 auto 18rpx;
+		&.act{transform: rotate(0deg);}
+	}
+}
+// 物业费
+.mlistl{width: 40%;display: flex;flex-direction: column;align-items: center;flex: 0 0 auto;
+	.mltit{font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 18rpx;}
+	.mltxt{font-weight: bold;font-size: 32rpx;color: #0156FE;}
+}
+.houselist{
+	.clists{padding-bottom: 2rpx !important;}
+	.clist{margin-bottom: 22rpx !important;}
+}
+// 巡更地点
+.patlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;padding: 0 24rpx 30rpx;
+	.pattop{padding:22rpx 30rpx;margin-bottom: 2rpx;
+		.imgs{width: 28rpx;height: 28rpx;margin-right: 12rpx;}
+		.tit{font-size: 30rpx;color: #272727;font-weight: bold;margin-right: 14rpx;}
+		.txt{font-weight: 500;font-size:24rpx;
+			&.ca{color: #3565ED;}
+			&.cb{color: #FE5A0E;}	
+			&.cc{color: #28C529;}	
+			&.cd{color: #FF6969;}	
+		}
+	}
+	.patlistr{background: #EFF4FF;border-radius: 20rpx;padding: 20rpx 32rpx;
+		.clist{font-weight: 500;font-size: 26rpx;color: #272727;display: flex;line-height: 50rpx;
+			.tit{font-size: 26rpx;flex: 0 0 auto;min-width: 108rpx;text-align-last: justify;font-weight: bold;}
+		}
+	}
+	.patbtns{display: flex;justify-content: flex-end;align-items: center;flex-wrap: wrap;
+		view{min-width: 156rpx;height: 52rpx;font-weight: 500;font-size: 26rpx;background: #FFFFFF;border-radius: 20rpx;box-sizing: border-box;display: flex;align-items: center;justify-content: center;padding: 0 10rpx;margin-left: 24rpx;margin-top: 24rpx;
+		&.btna{border: 2rpx solid #0256FD;color: #0256FD;}
+		&.btnb{background: #0256FD;color: #ffffff;}
+		
+}
+	}
+}
+// 报修
+.walists{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;    position: relative;
+	.watop{
+		padding: 0 36rpx 8rpx 38rpx;
+		.watit{padding: 24rpx 0;margin-bottom: 4rpx;display: flex;
+			.tit{font-weight: bold;font-size: 28rpx;color: #272727;flex: 1;
+				.cir{width: 14rpx;margin-left: 8rpx;margin-bottom: 10rpx;height: 14rpx;display: inline-block;background: #FF6969;border-radius: 8rpx;}
+			}
+			.txt{font-weight: bold;font-size: 26rpx;flex: 0 0 auto;
+			}
+		}
+	}
+	.walist{display: flex;font-weight: 500;font-size: 24rpx;color: #666666;margin-bottom: 16rpx;
+		.tit{min-width: 100rpx;text-align-last: justify}
+	}
+	.wabtn{display: flex;align-items: center;justify-content: space-between;border-top: 2rpx solid #E5E5E5;height: 80rpx;padding: 0 38rpx;
+		view{font-weight: 500;font-size: 24rpx;color: #666666;}
+		image{width: 16rpx;height: 28rpx;}
+	}
+}
+// 维修人员
+.stafflist{width: 344rpx;min-height: 256rpx;background: #FFFFFF;border-radius: 20rpx;margin:0 12rpx 24rpx 12rpx;padding-bottom: 20rpx;box-sizing: border-box;
+	// &:nth-of-type(2n){margin-right: 0;}
+	.statop{border-bottom: 2rpx solid #E5E5E5;display: flex;padding: 24rpx 24rpx 22rpx;
+		.head{width: 80rpx;height: 82rpx;margin-right: 24rpx;flex: 0 0 auto;}
+		.stadel{width: 30rpx;height: 30rpx;flex: 0 0 auto;margin-left: 12rpx;}
+		.statit{font-weight: bold;font-size: 30rpx;color: #272727;margin-bottom: 4rpx;}
+		.statxt{font-weight: 500;font-size: 26rpx;
+			.cir{width: 10rpx;height: 10rpx;border-radius: 50%;margin-right: 14rpx;display: inline-block;
+				&.bga{background: #06C770;}
+				&.bgb{background: #FF6969;}
+			}
+		}
+	}
+	.stalist{font-weight: 500;font-size: 26rpx;color: #272727;display: flex;align-items: center;padding: 20rpx 24rpx 0;
+		.imgs{width: 24rpx;height: 30rpx;margin-right: 22rpx;flex: 0 0 auto;display: flex;align-items: center;justify-content: center;
+			.gzlximg{width: 24rpx;height: 28rpx;}
+			.mphone{width: 18rpx;height: 30rpx;}
+			.sfz{width: 20rpx;height: 18rpx;}
+		}
+		.eyes{width: 34rpx;height: 34rpx;
+			.eye{width: 22rpx;height: 15rpx;}
+			.neye{width: 24rpx;height: 24rpx;}
+		}
+	}
+}
+.watopcom{background-color: #ffffff;border-radius: 20rpx;position: relative;z-index: 1;padding-bottom: 30rpx !important;
+	.watopcoma{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 24rpx;}
+	.watopcomb{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+	
+}
+//资讯
+.newlists{
+	background: #FFFFFF;padding: 22rpx 24rpx;margin-bottom: 24rpx;
+	border-radius: 20rpx;
+	.tit{font-size: 32rpx;font-weight: bold;color: #272727;line-height: 48rpx;margin-bottom:16rpx;}
+	.txt{font-size: 24rpx;color: #666666;line-height: 36rpx;margin-bottom: 32rpx;}
+	.stabox{
+		.time{font-weight: 500;font-size: 24rpx;color: #AAAAAA;line-height: 36rpx;}
+		.btns{font-weight: 500;font-size: 22rpx;color: #666666;line-height: 36rpx;min-width: 100rpx;box-sizing: border-box;margin-left: 20rpx;
+		.imga{width: 24rpx;height: 22rpx;margin-right: 8rpx;}
+		.imgb{width: 24rpx;height: 18rpx;margin-right: 10rpx;}
+		}
+		
+	}
+}
+// 视频
+.videolists{
+	background: #FFFFFF;margin-bottom: 24rpx;border-radius: 20rpx;
+	.titbox{padding-top: 16rpx;padding-right: 38rpx;}
+	.videos{width: 260rpx;height: 180rpx;}
+	.tit{font-weight: bold;font-size: 14px;color: #272727;text-align: left;margin-bottom: 10rpx;}
+	.num{font-weight: 500;font-size: 20rpx;color: #666666;min-width: 68rpx;padding: 0 8rpx;box-sizing: border-box;
+height: 28rpx;background: #E6E6E6;border-radius: 14rpx;line-height: 28rpx;text-align: center;}
+	.time{font-weight: 500;font-size: 24rpx;color: #AAAAAA;margin-top: 44rpx;}
+
+}
+
+// 名单
+.readlist{background: #FFFFFF;border-radius: 20rpx;border: 2rpx solid #E6E6E6;margin-bottom: 24rpx;padding: 24rpx;display: flex;align-items: center;box-sizing: border-box;
+	.head{width: 96rpx;height: 96rpx;margin-right: 28rpx;flex: 0 0 auto;}
+	.tit{font-weight: bold;font-size: 30rpx;color: #272727;margin-bottom: 12rpx;}
+	.time{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;
+		text{margin-right: 12rpx;display: inline-block;}
+	}
+}
+.spdel{width: 164rpx;background: #EA2D2D;font-weight: bold;font-size: 26rpx;color: #FFFFFF;display: flex;align-items: center;justify-content: center;position: absolute;right: -146rpx;top: 0;bottom: 0;padding-left: 14rpx;}
+
+// 无数据
+.nodata{display: flex;flex-direction: column;align-items: center;
+	image{width: 440rpx;height: 440rpx;}
+	view{font-size: 30rpx;color: #666666;font-weight: bold;}
+}
+</style>

+ 6 - 6
property_ui/work/pages/people/comeadd.vue → property_ui/people/pages/people/comeadd.vue

@@ -92,12 +92,12 @@
 		components: {},
 		components: {},
 		data() {
 		data() {
 			return {
 			return {
-				line: require('@/work/static/car/line.png'),
-				car: require('@/work/static/car/carico.png'),
-				rimg: require('@/work/static/people/rimg.png'),
-				aphoto: require('@/work/static/people/aphoto.png'),
-				check: require('@/work/static/people/check.png'),
-				ncheck: require('@/work/static/people/ncheck.png'),
+				line: require('@/car/static/car/line.png'),
+				car: require('@/car/static/car/carico.png'),
+				rimg: require('@/people/static/people/rimg.png'),
+				aphoto: require('@/people/static/people/aphoto.png'),
+				check: require('@/people/static/people/check.png'),
+				ncheck: require('@/people/static/people/ncheck.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				datainfo: {
 				datainfo: {

+ 5 - 5
property_ui/work/pages/people/comegl.vue → property_ui/people/pages/people/comegl.vue

@@ -32,15 +32,15 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import carList from "@/work/components/car/list.vue"
+	import carList from "@/people/components/car/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				search:require('@/work/static/car/search.png'),
-				up:require('@/work/static/car/up.png'),
+				reset:require('@/car/static/car/reset.png'),
+				search:require('@/car/static/car/search.png'),
+				up:require('@/car/static/car/up.png'),
 				cxrq:"",
 				cxrq:"",
 				text:'',
 				text:'',
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
@@ -65,7 +65,7 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getAddFn(){
 			getAddFn(){
-				this.$tab.navigateTo("/work/pages/people/comeadd")
+				this.$tab.navigateTo("/people/pages/people/comeadd")
 			},
 			},
 			getTabtop(val){
 			getTabtop(val){
 				this.ttopval=val
 				this.ttopval=val

+ 7 - 7
property_ui/work/pages/people/index.vue → property_ui/people/pages/people/index.vue

@@ -28,18 +28,18 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import carList from "@/work/components/car/list.vue"
+	import carList from "@/people/components/car/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				up:require('@/work/static/car/up.png'),
-				car:require('@/work/static/car/car.png'),
-				cara:require('@/work/static/car/cara.png'),
-				carb:require('@/work/static/car/carb.png'),
-				search:require('@/work/static/car/search.png'),
+				reset:require('@/car/static/car/reset.png'),
+				up:require('@/car/static/car/up.png'),
+				car:require('@/car/static/car/car.png'),
+				cara:require('@/car/static/car/cara.png'),
+				carb:require('@/car/static/car/carb.png'),
+				search:require('@/car/static/car/search.png'),
 				sfxx:"",
 				sfxx:"",
 				text:'',
 				text:'',
 				jclxlist:[{dictLabel:'党员',dictValue:'0'}],
 				jclxlist:[{dictLabel:'党员',dictValue:'0'}],

+ 8 - 8
property_ui/work/pages/people/staff.vue → property_ui/people/pages/people/staff.vue

@@ -29,18 +29,18 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import carList from "@/work/components/car/list.vue"
+	import carList from "@/people/components/car/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				up:require('@/work/static/car/up.png'),
-				car:require('@/work/static/car/car.png'),
-				cara:require('@/work/static/car/cara.png'),
-				carb:require('@/work/static/car/carb.png'),
-				search:require('@/work/static/car/search.png'),
+				reset:require('@/car/static/car/reset.png'),
+				up:require('@/car/static/car/up.png'),
+				car:require('@/car/static/car/car.png'),
+				cara:require('@/car/static/car/cara.png'),
+				carb:require('@/car/static/car/carb.png'),
+				search:require('@/car/static/car/search.png'),
 				sfxx:"",
 				sfxx:"",
 				text:'',
 				text:'',
 				jclxlist:[{dictLabel:'党员',dictValue:'0'}],
 				jclxlist:[{dictLabel:'党员',dictValue:'0'}],
@@ -64,7 +64,7 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getAddFn(){
 			getAddFn(){
-				this.$tab.navigateTo("/work/pages/people/staffadd")
+				this.$tab.navigateTo("/people/pages/people/staffadd")
 			},
 			},
 			getTabtop(val){
 			getTabtop(val){
 				this.ttopval=val
 				this.ttopval=val

+ 6 - 6
property_ui/work/pages/people/staffadd.vue → property_ui/people/pages/people/staffadd.vue

@@ -58,12 +58,12 @@
 		components: {},
 		components: {},
 		data() {
 		data() {
 			return {
 			return {
-				line: require('@/work/static/car/line.png'),
-				car: require('@/work/static/car/carico.png'),
-				rimg: require('@/work/static/people/rimg.png'),
-				aphoto: require('@/work/static/people/aphoto.png'),
-				check: require('@/work/static/people/check.png'),
-				ncheck: require('@/work/static/people/ncheck.png'),
+				line: require('@/car/static/car/line.png'),
+				car: require('@/car/static/car/carico.png'),
+				rimg: require('@/people/static/people/rimg.png'),
+				aphoto: require('@/people/static/people/aphoto.png'),
+				check: require('@/people/static/people/check.png'),
+				ncheck: require('@/people/static/people/ncheck.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				datainfo: {
 				datainfo: {

+ 0 - 0
property_ui/work/static/people/aphoto.png → property_ui/people/static/people/aphoto.png


+ 0 - 0
property_ui/work/static/people/check.png → property_ui/people/static/people/check.png


BIN
property_ui/people/static/people/eye.png


+ 0 - 0
property_ui/work/static/people/gzlx.png → property_ui/people/static/people/gzlx.png


+ 0 - 0
property_ui/work/static/people/hicoa.png → property_ui/people/static/people/hicoa.png


+ 0 - 0
property_ui/work/static/people/hicob.png → property_ui/people/static/people/hicob.png


+ 0 - 0
property_ui/work/static/people/icon_ky_enter.png → property_ui/people/static/people/icon_ky_enter.png


+ 0 - 0
property_ui/work/static/people/icon_ky_jmda_yz.png → property_ui/people/static/people/icon_ky_jmda_yz.png


+ 0 - 0
property_ui/work/static/people/icon_ky_jmda_zh.png → property_ui/people/static/people/icon_ky_jmda_zh.png


+ 0 - 0
property_ui/work/static/people/icon_tjfk_xbxz_normal.png → property_ui/people/static/people/icon_tjfk_xbxz_normal.png


+ 0 - 0
property_ui/work/static/people/icon_tjfk_xbxz_selected.png → property_ui/people/static/people/icon_tjfk_xbxz_selected.png


+ 0 - 0
property_ui/work/static/people/man.png → property_ui/people/static/people/man.png


+ 0 - 0
property_ui/work/static/people/mphone.png → property_ui/people/static/people/mphone.png


+ 0 - 0
property_ui/work/static/people/ncheck.png → property_ui/people/static/people/ncheck.png


BIN
property_ui/people/static/people/neye.png


+ 0 - 0
property_ui/work/static/people/pdel.png → property_ui/people/static/people/pdel.png


+ 0 - 0
property_ui/work/static/people/pic_jkda_btzs.png → property_ui/people/static/people/pic_jkda_btzs.png


+ 0 - 0
property_ui/work/static/people/pic_jkda_ez.png → property_ui/people/static/people/pic_jkda_ez.png


+ 0 - 0
property_ui/work/static/people/pic_jkda_ne.png → property_ui/people/static/people/pic_jkda_ne.png


+ 0 - 0
property_ui/work/static/people/pic_jkda_pp.png → property_ui/people/static/people/pic_jkda_pp.png


+ 0 - 0
property_ui/work/static/people/pic_jkda_qz.png → property_ui/people/static/people/pic_jkda_qz.png


+ 0 - 0
property_ui/work/static/people/pic_jkda_zf.png → property_ui/people/static/people/pic_jkda_zf.png


+ 0 - 0
property_ui/work/static/people/rimg.png → property_ui/people/static/people/rimg.png


BIN
property_ui/people/static/people/sfz.png


+ 0 - 0
property_ui/work/static/people/woman.png → property_ui/people/static/people/woman.png


+ 399 - 0
property_ui/service/components/car/list.vue

@@ -0,0 +1,399 @@
+<template>
+<view>
+	<!-- 第一种样式  人员管理-->
+	<block v-if="datainfo.length>0">
+		<!-- 巡更地点patrol -->
+		<block v-if="type=='patrol'">
+			<view class="patlist" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail">
+				<view class="pattop flexc">
+					<image :src="home" class="imgs"></image>
+					<view class="tit">幸福小区1栋2单元电梯间</view>
+					<view class="flex1"></view>
+					<view class="txt cd" v-if="ite.type==1">未巡更</view>
+					<view class="txt cc" v-if="ite.type==2">已巡更</view>
+				</view>
+				<view class="patlistr">
+					<view class="clist"><view class="tit">巡检类型</view>:设备维修</view>
+					<view class="clist"><view class="tit">巡检时间</view>:2024-11-27 10:00</view>
+					<view class="clist"><view class="tit">巡检人</view>:刘兵琦</view>
+				</view>
+				<view class="patbtns">
+					<view class="btna" @click.stop="getDetail">查看</view>
+					<view  class="btnb" @click.stop="getAddFn">去巡更</view>
+				</view>
+			</view>
+		</block>
+		<!-- 报修管理 -->
+		<block v-if="type=='warranty'">
+			<view class="walists" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail">
+				<view class="watop ">
+					<view class="watit">
+						<view class="tit">一号楼3单元12楼楼梯间灯不亮</view>
+						<view class="txt co01" v-if="ite.type==1">待分派</view>
+						<view class="txt coa" v-if="ite.type==3">已完成</view>
+						<view class="txt co28" v-if="ite.type==2">处理中</view>
+					</view>
+					<view class="walist"><view class="tit">小区名称</view>:幸福小区</view>
+					<view class="walist"><view class="tit">报修门户</view>:3号楼1单元406</view>
+					<view class="walist"><view class="tit">报修时间</view>:2024-11-14 17:16:31</view>
+					<view class="walist" v-if="ite.type==3"><view class="tit" >完成时间</view>:2024-11-14 18:16:31</view>
+				</view>
+				<view class="wabtn">
+					<view>查看详情</view>
+					<image :src="rimg"></image>
+				</view>
+			</view>
+		</block>
+		<!-- 投诉建议 -->
+		<block v-if="type=='complaint'">
+			<view class="walists" v-for="(ite,idx) in datainfo" :key="idx" @click="getDetail"
+				:data-idx="idx"
+				@touchstart="drawStart" @touchmove="drawMove" @touchend="drawEnd" :style="'right:'+ite.right+'px'"
+			>
+				<view class="watop watopcom">
+					<view class="watit">
+						<view class="tit">小区电梯老化</view>
+						<view class="txt co01" v-if="ite.type==1">待回复</view>
+						<view class="txt coa" v-if="ite.type==2">已回复</view>
+					</view>
+					<view class="watopcoma overtwo">小区电梯时常发生问题,请物业派维修人员进行安全检 查,若无法排除问题,建议更换小区的电梯设备,避…</view>
+					<view class="watopcomb">2024-11-18 08:16:54</view>
+				</view>
+				<!--  -->
+				<view class="spdel" v-if="ite.right>0" @click.stop="getDelFn()">删除</view>
+			</view>
+			<!-- checkPermi(['system:menuFood:remove'])&& -->
+			
+		</block>
+		<view class="shax">{{wtdt}}</view>
+	</block>
+	
+	<!-- 无数据 -->
+	<view class="nodata" v-else>
+		<image :src="noiconpimg"></image>
+		<view>
+			暂无数据
+		</view>
+	</view>
+</view>
+</template>
+
+<script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import config from '@/config'
+	export default{
+		props:{
+			datainfo: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			wtdt:{
+				type:String,
+				default () {
+					return ''
+				}
+			},
+			type:{
+				type:String,
+				default () {
+					return 0
+				}
+			},
+			topval:{
+				type:String,
+				default () {
+					return ''
+				}
+			}
+		},
+		data(){
+			return{
+				noiconpimg:require("@/static/nodata.png"),
+				car:require("@/car/static/car/car.png"),
+				cara:require("@/car/static/car/cara.png"),
+				carb:require("@/car/static/car/carb.png"),
+				hicoa:require("@/people/static/people/hicoa.png"),
+				hicob:require("@/people/static/people/hicob.png"),
+				man:require("@/people/static/people/man.png"),
+				woman:require("@/people/static/people/woman.png"),
+				rimg:require("@/people/static/people/rimg.png"),
+				pdel:require("@/people/static/people/pdel.png"),
+				gzlx:require("@/people/static/people/gzlx.png"),
+				mphone:require("@/people/static/people/mphone.png"),
+				sfz:require("@/people/static/people/sfz.png"),
+				eye:require("@/people/static/people/eye.png"),
+				neye:require("@/people/static/people/neye.png"),
+				time:require("@/work/static/manage/time.png"),
+				house:require("@/work/static/manage/house.png"),
+				housea:require("@/work/static/manage/housea.png"),
+				home:require("@/service/static/service/home.png"),
+				upimg:require("@/static/images/home/up.png"),
+				star:require('@/manage/static/community/star.png'),
+				stara:require('@/manage/static/community/stara.png'),
+				baseUrl:config.baseUrl,
+				delBtnWidth:66,//左滑默认宽度
+			}
+		},
+		mounted() {
+			
+		},
+		methods:{
+			checkPermi, checkRole,
+			getDetail(e){
+				this.$emit('getDetail',e)
+			},
+			getAddFn(e){
+				this.$emit('getAddFn',e)
+			},
+			getReadlist(e){
+				this.$emit('getReadlist',e)
+			},
+			getZhan(idx){
+				// var obj=JSON.parse(JSON.stringify(this.datainfo))[idx]
+				// obj.zhanflag=!obj.zhanflag;
+				// this.datainfo.splice(idx,1,obj);
+				this.datainfo[idx].zhanflag=!this.datainfo[idx].zhanflag
+			},
+			getHideFn(idx){
+				this.datainfo[idx].hideflag=!this.datainfo[idx].hideflag
+			},
+			getPreview(idx,arr) {
+				var newArr=[];
+				arr.forEach(ite=>{
+					var ds=this.baseUrl+ite
+					newArr.push(ds)
+				})
+				uni.previewImage({
+					urls: newArr,
+					current:idx,
+					success: function(data) {},
+					fail: function(err) {}
+				});
+			},
+			//开始触摸滑动
+			drawStart(e) {
+				// console.log("开始触发");
+				var touch = e.touches[0];
+				this.startX = touch.clientX;
+			},
+			//触摸滑动
+			drawMove(e) {
+				// console.log("滑动");
+				for (var index in this.datainfo) {
+					// this.csListArrl[index].right=0
+					this.$set(this.datainfo[index],'right',0);
+				}
+				var idx=e.currentTarget.dataset.idx
+				var touch = e.touches[0];
+				var item = this.datainfo[idx];
+				var disX = this.startX - touch.clientX;
+				if (disX >= 20) {
+				        if (disX > this.delBtnWidth) {
+					    disX = this.delBtnWidth;
+				        }
+						// this.csListArrl[idx].right=disX
+				        this.$set(this.datainfo[idx],'right',disX);
+				} else {
+					// this.csListArrl[idx].right=0
+					this.$set(this.datainfo[idx],'right',0);
+				}
+			},
+			//触摸滑动结束
+			drawEnd(e) {
+				// console.log("滑动结束");
+				var idx=e.currentTarget.dataset.idx
+				var item = this.datainfo[idx];
+				if (item.right >= this.delBtnWidth / 2) {
+					// this.datainfo[idx].right=this.delBtnWidth
+					this.$set(this.datainfo[idx],'right',this.delBtnWidth);
+				} else {
+					this.datainfo[idx].right=0
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.flex{display: flex;}
+.flexc{display: flex;align-items: center;}
+.mb10{margin-bottom: 20rpx;}
+.carlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;
+	.ctop{border-bottom: 2rpx solid #E5E5E5;padding:26rpx 24rpx;
+		.imgs{width: 40rpx;height: 42rpx;margin-right: 30rpx;}
+		.tit{font-size: 32rpx;color: #272727;font-weight: bold;margin-right: 14rpx;}
+		.txt{font-weight: 500;font-size: 26rpx;
+			&.ca{color: #3565ED;}
+			&.cb{color: #FE5A0E;}	
+			&.cc{color: #28C529;}	
+		}
+		.txta{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+		.num{font-size: 24rpx;color: #AAAAAA;}
+	}
+	.btn{height: 34rpx;border-radius: 18rpx;display: flex;align-items: center;justify-content: center;padding: 0 10rpx;font-size: 22rpx;margin-right: 24rpx;
+		&.btna{border: 2rpx solid #06C770;color: #06C770;}
+		&.btnb{border: 2rpx solid #3565ED;color: #3565ED;}
+		&.btnc{border: 2rpx solid #FE5A0E;color: #FE5A0E;}
+		&.btnbga{border: 1px solid #0156FE;color: #3565ED;background: #DFEAFF;height: 36rpx;}
+		&.btnbgb{border: 1px solid #C1C1C1;color: #666666;background: #F1F1F1;height: 36rpx;}
+		&.btnbgc{border: 1px solid #FE5A0E;color:#FE5A0E;background:#FFEEE6;height: 36rpx;}
+	}
+	.clists{padding: 24rpx 24rpx 8rpx;
+		.clist{font-weight: 500;margin-bottom: 16rpx;
+font-size: 26rpx;color: #272727;display: flex;line-height: 34rpx;
+			.tit{font-size: 26rpx;color: #AAAAAA;flex: 0 0 auto;margin-right: 16rpx;min-width: 108rpx;text-align-last: justify;}
+			.imgas{display: flex;align-items: center;flex-wrap: wrap;
+				image{width: 142rpx;height: 142rpx;margin-right: 30rpx;margin-top: 8rpx;}
+			}	
+		}
+		.w50{
+			.clist{width: 50%;}
+		}
+	}
+}
+// 人员
+.peolist{
+	.ctop{padding: 24rpx 24rpx 22rpx;}
+	.imgs{margin-right: 16rpx !important;}
+	.tit{font-size: 28rpx !important;}
+	.plists{padding: 30rpx 24rpx 6rpx;
+		.plist{background: linear-gradient(-90deg, #F2F5FF 0%, #FBFDFF 100%);border-radius: 20rpx;border: 2rpx solid #E6E6E6;margin-bottom: 24rpx;padding: 18rpx 26rpx 4rpx;
+		.head{width: 96rpx;height: 98rpx;margin-right: 32rpx;flex: 0 0 auto;}
+		.ptit{font-weight: bold;font-size: 30rpx;color: #272727;display: flex;align-items: center;margin-bottom: 14rpx;}	
+		.ptxt{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 14rpx;min-width: 176rpx;}
+		}
+	}
+	.upimg{width: 26rpx;height: 22rpx;display: block;transform: rotate(180deg);transition: all 0.3s;margin: 0 auto 18rpx;
+		&.act{transform: rotate(0deg);}
+	}
+}
+// 物业费
+.mlistl{width: 40%;display: flex;flex-direction: column;align-items: center;flex: 0 0 auto;
+	.mltit{font-weight: 500;font-size: 26rpx;color: #666666;margin-bottom: 18rpx;}
+	.mltxt{font-weight: bold;font-size: 32rpx;color: #0156FE;}
+}
+.houselist{
+	.clists{padding-bottom: 2rpx !important;}
+	.clist{margin-bottom: 22rpx !important;}
+}
+// 巡更地点
+.patlist{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;padding: 0 24rpx 30rpx;
+	.pattop{padding:22rpx 30rpx;margin-bottom: 2rpx;
+		.imgs{width: 28rpx;height: 28rpx;margin-right: 12rpx;}
+		.tit{font-size: 30rpx;color: #272727;font-weight: bold;margin-right: 14rpx;}
+		.txt{font-weight: 500;font-size:24rpx;
+			&.ca{color: #3565ED;}
+			&.cb{color: #FE5A0E;}	
+			&.cc{color: #28C529;}	
+			&.cd{color: #FF6969;}	
+		}
+	}
+	.patlistr{background: #EFF4FF;border-radius: 20rpx;padding: 20rpx 32rpx;
+		.clist{font-weight: 500;font-size: 26rpx;color: #272727;display: flex;line-height: 50rpx;
+			.tit{font-size: 26rpx;flex: 0 0 auto;min-width: 108rpx;text-align-last: justify;font-weight: bold;}
+		}
+	}
+	.patbtns{display: flex;justify-content: flex-end;align-items: center;flex-wrap: wrap;
+		view{min-width: 156rpx;height: 52rpx;font-weight: 500;font-size: 26rpx;background: #FFFFFF;border-radius: 20rpx;box-sizing: border-box;display: flex;align-items: center;justify-content: center;padding: 0 10rpx;margin-left: 24rpx;margin-top: 24rpx;
+		&.btna{border: 2rpx solid #0256FD;color: #0256FD;}
+		&.btnb{background: #0256FD;color: #ffffff;}
+		
+}
+	}
+}
+// 报修
+.walists{background: #FFFFFF;border-radius: 20rpx;margin-bottom: 24rpx;    position: relative;
+	.watop{
+		padding: 0 36rpx 8rpx 38rpx;
+		.watit{padding: 24rpx 0;margin-bottom: 4rpx;display: flex;
+			.tit{font-weight: bold;font-size: 28rpx;color: #272727;flex: 1;
+				.cir{width: 14rpx;margin-left: 8rpx;margin-bottom: 10rpx;height: 14rpx;display: inline-block;background: #FF6969;border-radius: 8rpx;}
+			}
+			.txt{font-weight: bold;font-size: 26rpx;flex: 0 0 auto;
+			}
+		}
+	}
+	.walist{display: flex;font-weight: 500;font-size: 24rpx;color: #666666;margin-bottom: 16rpx;
+		.tit{min-width: 100rpx;text-align-last: justify}
+	}
+	.wabtn{display: flex;align-items: center;justify-content: space-between;border-top: 2rpx solid #E5E5E5;height: 80rpx;padding: 0 38rpx;
+		view{font-weight: 500;font-size: 24rpx;color: #666666;}
+		image{width: 16rpx;height: 28rpx;}
+	}
+}
+// 维修人员
+.stafflist{width: 344rpx;min-height: 256rpx;background: #FFFFFF;border-radius: 20rpx;margin:0 12rpx 24rpx 12rpx;padding-bottom: 20rpx;box-sizing: border-box;
+	// &:nth-of-type(2n){margin-right: 0;}
+	.statop{border-bottom: 2rpx solid #E5E5E5;display: flex;padding: 24rpx 24rpx 22rpx;
+		.head{width: 80rpx;height: 82rpx;margin-right: 24rpx;flex: 0 0 auto;}
+		.stadel{width: 30rpx;height: 30rpx;flex: 0 0 auto;margin-left: 12rpx;}
+		.statit{font-weight: bold;font-size: 30rpx;color: #272727;margin-bottom: 4rpx;}
+		.statxt{font-weight: 500;font-size: 26rpx;
+			.cir{width: 10rpx;height: 10rpx;border-radius: 50%;margin-right: 14rpx;display: inline-block;
+				&.bga{background: #06C770;}
+				&.bgb{background: #FF6969;}
+			}
+		}
+	}
+	.stalist{font-weight: 500;font-size: 26rpx;color: #272727;display: flex;align-items: center;padding: 20rpx 24rpx 0;
+		.imgs{width: 24rpx;height: 30rpx;margin-right: 22rpx;flex: 0 0 auto;display: flex;align-items: center;justify-content: center;
+			.gzlximg{width: 24rpx;height: 28rpx;}
+			.mphone{width: 18rpx;height: 30rpx;}
+			.sfz{width: 20rpx;height: 18rpx;}
+		}
+		.eyes{width: 34rpx;height: 34rpx;
+			.eye{width: 22rpx;height: 15rpx;}
+			.neye{width: 24rpx;height: 24rpx;}
+		}
+	}
+}
+.watopcom{background-color: #ffffff;border-radius: 20rpx;position: relative;z-index: 1;padding-bottom: 30rpx !important;
+	.watopcoma{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;margin-bottom: 24rpx;}
+	.watopcomb{font-weight: 500;font-size: 24rpx;color: #AAAAAA;}
+	
+}
+//资讯
+.newlists{
+	background: #FFFFFF;padding: 22rpx 24rpx;margin-bottom: 24rpx;
+	border-radius: 20rpx;
+	.tit{font-size: 32rpx;font-weight: bold;color: #272727;line-height: 48rpx;margin-bottom:16rpx;}
+	.txt{font-size: 24rpx;color: #666666;line-height: 36rpx;margin-bottom: 32rpx;}
+	.stabox{
+		.time{font-weight: 500;font-size: 24rpx;color: #AAAAAA;line-height: 36rpx;}
+		.btns{font-weight: 500;font-size: 22rpx;color: #666666;line-height: 36rpx;min-width: 100rpx;box-sizing: border-box;margin-left: 20rpx;
+		.imga{width: 24rpx;height: 22rpx;margin-right: 8rpx;}
+		.imgb{width: 24rpx;height: 18rpx;margin-right: 10rpx;}
+		}
+		
+	}
+}
+// 视频
+.videolists{
+	background: #FFFFFF;margin-bottom: 24rpx;border-radius: 20rpx;
+	.titbox{padding-top: 16rpx;padding-right: 38rpx;}
+	.videos{width: 260rpx;height: 180rpx;}
+	.tit{font-weight: bold;font-size: 14px;color: #272727;text-align: left;margin-bottom: 10rpx;}
+	.num{font-weight: 500;font-size: 20rpx;color: #666666;min-width: 68rpx;padding: 0 8rpx;box-sizing: border-box;
+height: 28rpx;background: #E6E6E6;border-radius: 14rpx;line-height: 28rpx;text-align: center;}
+	.time{font-weight: 500;font-size: 24rpx;color: #AAAAAA;margin-top: 44rpx;}
+
+}
+
+// 名单
+.readlist{background: #FFFFFF;border-radius: 20rpx;border: 2rpx solid #E6E6E6;margin-bottom: 24rpx;padding: 24rpx;display: flex;align-items: center;box-sizing: border-box;
+	.head{width: 96rpx;height: 96rpx;margin-right: 28rpx;flex: 0 0 auto;}
+	.tit{font-weight: bold;font-size: 30rpx;color: #272727;margin-bottom: 12rpx;}
+	.time{font-weight: 500;font-size: 26rpx;color: #666666;line-height: 36rpx;
+		text{margin-right: 12rpx;display: inline-block;}
+	}
+}
+.spdel{width: 164rpx;background: #EA2D2D;font-weight: bold;font-size: 26rpx;color: #FFFFFF;display: flex;align-items: center;justify-content: center;position: absolute;right: -146rpx;top: 0;bottom: 0;padding-left: 14rpx;}
+
+// 无数据
+.nodata{display: flex;flex-direction: column;align-items: center;
+	image{width: 440rpx;height: 440rpx;}
+	view{font-size: 30rpx;color: #666666;font-weight: bold;}
+}
+</style>

+ 5 - 5
property_ui/work/components/popup/popup.vue → property_ui/service/components/popup/popup.vue

@@ -165,11 +165,11 @@
 				
 				
 				baseUrl:config.baseUrl,
 				baseUrl:config.baseUrl,
 				closeimg:require("@/work/static/close.png"),
 				closeimg:require("@/work/static/close.png"),
-				rimg: require('@/work/static/people/rimg.png'),
-				headbg: require('@/work/static/service/headbg.png'),
-				addpho: require('@/work/static/service/addpho.png'),
-				rdelimg: require('@/work/static/service/rdel.png'),
-				voice: require('@/work/static/service/voice.png'),
+				rimg: require('@/people/static/people/rimg.png'),
+				headbg: require('@/service/static/service/headbg.png'),
+				addpho: require('@/service/static/service/addpho.png'),
+				rdelimg: require('@/service/static/service/rdel.png'),
+				voice: require('@/service/static/service/voice.png'),
 				syqxidx:'',
 				syqxidx:'',
 				datainfo:{
 				datainfo:{
 					iszc:""
 					iszc:""

+ 5 - 5
property_ui/work/pages/service/complaint.vue → property_ui/service/pages/service/complaint.vue

@@ -30,15 +30,15 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import carList from "@/work/components/car/list.vue"
+	import carList from "@/service/components/car/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				search:require('@/work/static/car/search.png'),
-				up:require('@/work/static/car/up.png'),
+				reset:require('@/car/static/car/reset.png'),
+				search:require('@/car/static/car/search.png'),
+				up:require('@/car/static/car/up.png'),
 				cxrq:"",
 				cxrq:"",
 				text:'',
 				text:'',
 				list:[{tit:'皖A IC520',type:1,right:0},{tit:'晋E KD783',type:2,right:0},],
 				list:[{tit:'皖A IC520',type:1,right:0},{tit:'晋E KD783',type:2,right:0},],
@@ -63,7 +63,7 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getDetail(){
 			getDetail(){
-				this.$tab.navigateTo("/work/pages/service/complaintdetail")
+				this.$tab.navigateTo("/service/pages/service/complaintdetail")
 			},
 			},
 			getTabtop(val){
 			getTabtop(val){
 				this.ttopval=val
 				this.ttopval=val

+ 2 - 2
property_ui/work/pages/service/complaintdetail.vue → property_ui/service/pages/service/complaintdetail.vue

@@ -25,13 +25,13 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import popUp from "@/work/components/popup/popup.vue"
+	import popUp from "@/service/components/popup/popup.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{popUp},
 		components:{popUp},
 		data(){
 		data(){
 			return{
 			return{
-				mbg:require('@/work/static/service/bxbg.png'),
+				mbg:require('@/service/static/service/bxbg.png'),
 				baseUrl:config.baseUrl,
 				baseUrl:config.baseUrl,
 				type:'',
 				type:'',
 			}
 			}

+ 10 - 10
property_ui/work/pages/service/patrol.vue → property_ui/service/pages/service/patrol.vue

@@ -64,18 +64,18 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import carList from "@/work/components/car/list.vue"
+	import carList from "@/service/components/car/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
 				backgroundColor: "transparent",
 				backgroundColor: "transparent",
-				pbg:require("@/work/static/service/pbg.png"),
-				plbg:require("@/work/static/service/plbg.png"),
-				linea:require("@/work/static/service/linea.png"),
-				lineb:require("@/work/static/service/lineb.png"),
-				linec:require("@/work/static/service/linec.png"),
+				pbg:require("@/service/static/service/pbg.png"),
+				plbg:require("@/service/static/service/plbg.png"),
+				linea:require("@/service/static/service/linea.png"),
+				lineb:require("@/service/static/service/lineb.png"),
+				linec:require("@/service/static/service/linec.png"),
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
 				pageSize: 10,
 				pageSize: 10,
 				pageNum: 1,
 				pageNum: 1,
@@ -110,16 +110,16 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getDetail(){
 			getDetail(){
-				this.$tab.navigateTo("/work/pages/service/patroldetail")
+				this.$tab.navigateTo("/service/pages/service/patroldetail")
 			},
 			},
 			getRecordFn(){
 			getRecordFn(){
-				this.$tab.navigateTo("/work/pages/service/patrolrecord")
+				this.$tab.navigateTo("/service/pages/service/patrolrecord")
 			},
 			},
 			getSetFn(){
 			getSetFn(){
-				this.$tab.navigateTo("/work/pages/service/patrolset")
+				this.$tab.navigateTo("/service/pages/service/patrolset")
 			},
 			},
 			getAddFn(){
 			getAddFn(){
-				this.$tab.navigateTo("/work/pages/service/patroladd")
+				this.$tab.navigateTo("/service/pages/service/patroladd")
 			},
 			},
 			getBackFn(){
 			getBackFn(){
 				uni.navigateBack({
 				uni.navigateBack({

+ 5 - 5
property_ui/work/pages/service/patroladd.vue → property_ui/service/pages/service/patroladd.vue

@@ -76,11 +76,11 @@
 		components: {},
 		components: {},
 		data() {
 		data() {
 			return {
 			return {
-				voice: require('@/work/static/service/voice.png'),
-				home:require("@/work/static/service/home.png"),
-				photo:require("@/work/static/service/photo.png"),
-				del:require('@/work/static/car/del.png'),
-				rimg: require('@/work/static/people/rimg.png'),
+				voice: require('@/service/static/service/voice.png'),
+				home:require("@/service/static/service/home.png"),
+				photo:require("@/service/static/service/photo.png"),
+				del:require('@/car/static/car/del.png'),
+				rimg: require('@/people/static/people/rimg.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				datainfo: {
 				datainfo: {

+ 2 - 2
property_ui/work/pages/service/patroldetail.vue → property_ui/service/pages/service/patroldetail.vue

@@ -57,8 +57,8 @@
 		components:{},
 		components:{},
 		data(){
 		data(){
 			return{
 			return{
-				line:require('@/work/static/car/line.png'),
-				home:require("@/work/static/service/home.png"),
+				line:require('@/car/static/car/line.png'),
+				home:require("@/service/static/service/home.png"),
 				baseUrl:config.baseUrl,
 				baseUrl:config.baseUrl,
 				datainfo:{
 				datainfo:{
 					type:1,heiflag:true
 					type:1,heiflag:true

+ 6 - 6
property_ui/work/pages/service/patrolrecord.vue → property_ui/service/pages/service/patrolrecord.vue

@@ -23,15 +23,15 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import carList from "@/work/components/car/list.vue"
+	import carList from "@/service/components/car/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				up:require('@/work/static/car/up.png'),
-				day:require('@/work/static/service/day.png'),
+				reset:require('@/car/static/car/reset.png'),
+				up:require('@/car/static/car/up.png'),
+				day:require('@/service/static/service/day.png'),
 				cxrq:"",
 				cxrq:"",
 				text:'',
 				text:'',
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
@@ -54,10 +54,10 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getDetail(){
 			getDetail(){
-				this.$tab.navigateTo("/work/pages/service/patroldetail")
+				this.$tab.navigateTo("/service/pages/service/patroldetail")
 			},
 			},
 			getAddFn(){
 			getAddFn(){
-				this.$tab.navigateTo("/work/pages/service/patroladd")
+				this.$tab.navigateTo("/service/pages/service/patroladd")
 			},
 			},
 			getTabtop(val){
 			getTabtop(val){
 				this.ttopval=val
 				this.ttopval=val

+ 4 - 4
property_ui/work/pages/service/patrolset.vue → property_ui/service/pages/service/patrolset.vue

@@ -63,10 +63,10 @@
 		components: {},
 		components: {},
 		data() {
 		data() {
 			return {
 			return {
-				car: require('@/work/static/car/carico.png'),
-				rimg: require('@/work/static/people/rimg.png'),
-				addimg: require('@/work/static/service/add.png'),
-				delimg: require('@/work/static/service/del.png'),
+				car: require('@/car/static/car/carico.png'),
+				rimg: require('@/people/static/people/rimg.png'),
+				addimg: require('@/service/static/service/add.png'),
+				delimg: require('@/service/static/service/del.png'),
 				baseUrl: config.baseUrl,
 				baseUrl: config.baseUrl,
 				checkflag:true,
 				checkflag:true,
 				tabval:0,
 				tabval:0,

+ 5 - 5
property_ui/work/pages/service/warranty.vue → property_ui/service/pages/service/warranty.vue

@@ -30,15 +30,15 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import carList from "@/work/components/car/list.vue"
+	import carList from "@/service/components/car/list.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{carList},
 		components:{carList},
 		data(){
 		data(){
 			return{
 			return{
-				reset:require('@/work/static/car/reset.png'),
-				search:require('@/work/static/car/search.png'),
-				up:require('@/work/static/car/up.png'),
+				reset:require('@/car/static/car/reset.png'),
+				search:require('@/car/static/car/search.png'),
+				up:require('@/car/static/car/up.png'),
 				cxrq:"",
 				cxrq:"",
 				text:'',
 				text:'',
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
 				list:[{tit:'皖A IC520',type:1},{tit:'晋E KD783',type:2},],
@@ -63,7 +63,7 @@
 		methods:{
 		methods:{
 			checkPermi, checkRole,
 			checkPermi, checkRole,
 			getDetail(){
 			getDetail(){
-				this.$tab.navigateTo("/work/pages/service/warrantydetail")
+				this.$tab.navigateTo("/service/pages/service/warrantydetail")
 			},
 			},
 			getTabtop(val){
 			getTabtop(val){
 				this.ttopval=val
 				this.ttopval=val

+ 6 - 6
property_ui/work/pages/service/warrantydetail.vue → property_ui/service/pages/service/warrantydetail.vue

@@ -82,17 +82,17 @@
 <script>
 <script>
 	import config from '@/config'
 	import config from '@/config'
 	const baseUrl = config.baseUrl
 	const baseUrl = config.baseUrl
-	import popUp from "@/work/components/popup/popup.vue"
+	import popUp from "@/service/components/popup/popup.vue"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	export default{
 	export default{
 		components:{popUp},
 		components:{popUp},
 		data(){
 		data(){
 			return{
 			return{
-				line:require('@/work/static/car/line.png'),
-				mbg:require('@/work/static/service/bxbg.png'),
-				typeimg:require('@/work/static/service/type.png'),
-				head:require('@/work/static/service/head.png'),
-				phone:require('@/work/static/service/phone.png'),
+				line:require('@/car/static/car/line.png'),
+				mbg:require('@/service/static/service/bxbg.png'),
+				typeimg:require('@/service/static/service/type.png'),
+				head:require('@/service/static/service/head.png'),
+				phone:require('@/service/static/service/phone.png'),
 				nvaHeight:44,
 				nvaHeight:44,
 				backgroundColor: "transparent",
 				backgroundColor: "transparent",
 				baseUrl:config.baseUrl,
 				baseUrl:config.baseUrl,

+ 0 - 0
property_ui/work/static/service/add.png → property_ui/service/static/service/add.png


+ 0 - 0
property_ui/work/static/service/addpho.png → property_ui/service/static/service/addpho.png


+ 0 - 0
property_ui/work/static/service/bxbg.png → property_ui/service/static/service/bxbg.png


+ 0 - 0
property_ui/work/static/service/day.png → property_ui/service/static/service/day.png


+ 0 - 0
property_ui/work/static/service/del.png → property_ui/service/static/service/del.png


+ 0 - 0
property_ui/work/static/service/head.png → property_ui/service/static/service/head.png


+ 0 - 0
property_ui/work/static/service/headbg.png → property_ui/service/static/service/headbg.png


+ 0 - 0
property_ui/work/static/service/home.png → property_ui/service/static/service/home.png


+ 0 - 0
property_ui/work/static/service/linea.png → property_ui/service/static/service/linea.png


+ 0 - 0
property_ui/work/static/service/lineb.png → property_ui/service/static/service/lineb.png


+ 0 - 0
property_ui/work/static/service/linec.png → property_ui/service/static/service/linec.png


+ 0 - 0
property_ui/work/static/service/pbg.png → property_ui/service/static/service/pbg.png


+ 0 - 0
property_ui/work/static/service/phone.png → property_ui/service/static/service/phone.png


+ 0 - 0
property_ui/work/static/service/photo.png → property_ui/service/static/service/photo.png


+ 0 - 0
property_ui/work/static/service/plbg.png → property_ui/service/static/service/plbg.png


+ 0 - 0
property_ui/work/static/service/rdel.png → property_ui/service/static/service/rdel.png


+ 0 - 0
property_ui/work/static/service/type.png → property_ui/service/static/service/type.png


+ 0 - 0
property_ui/work/static/service/voice.png → property_ui/service/static/service/voice.png


BIN
property_ui/static/images/mine/mtabj.png


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно