1

pages/login.vue

@@ -53,8 +53,8 @@
 				register: false,
 				globalConfig: getApp().globalData.config,
 				loginForm: {
-					username: "",
-					password: "",
+					username: "admin",
+					password: "admin123",
 					code: "",
 					uuid: '',
 					type: 'app'

pages/statistics/statistics.vue

@@ -1,215 +1,247 @@
 <template>
-	<scroll-view>
-		<view class="view-bg">
-			<text class="title-txt">工程用料统计</text>
-			<view>
-				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
-					<view class="uni-list-cell-left">
-						行政区
-					</view>
-					<view class="uni-list-cell-db">
-						<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
-							@click="pickerShow('xzq')">
-							<span style="color: darkgray;">请选择行政区</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+	<view v-if="isLeader==false">
+
+
+		<scroll-view>
+			<view class="view-bg">
+				<text class="title-txt">工程用料统计</text>
+				<view>
+					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-list-cell-left">
+							行政区
 						</view>
-						<view v-else style="margin-top: 10;" @click="pickerShow('xzq')">
-							<span style="color: black;">{{XZQValue.dictLabel}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						<view class="uni-list-cell-db">
+							<view v-if="this.isEmpty(this.XZQValue.dictValue)" style="margin-top: 10;"
+								@click="pickerShow('xzq')">
+								<span style="color: darkgray;">请选择行政区</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else style="margin-top: 10;" @click="pickerShow('xzq')">
+								<span style="color: black;">{{XZQValue.dictLabel}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
-					</view>
 
 
-				</view>
-				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
-					<view class="uni-list-cell-left">
-						小区
 					</view>
-					<view class="uni-list-cell-db">
-						<view v-if="this.isEmpty(this.XQValue.id)" style="margin-top: 10;" @click="pickerShow('xq')">
-							<span style="color: darkgray;">请选择小区</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-list-cell-left">
+							小区
 						</view>
-						<view v-else style="margin-top: 10;" @click="pickerShow('xq')">
-							<span style="color: black;">{{XQValue.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						<view class="uni-list-cell-db">
+							<view v-if="this.isEmpty(this.XQValue.id)" style="margin-top: 10;"
+								@click="pickerShow('xq')">
+								<span style="color: darkgray;">请选择小区</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else style="margin-top: 10;" @click="pickerShow('xq')">
+								<span style="color: black;">{{XQValue.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
 					</view>
-				</view>
-				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
-					<view class="uni-list-cell-left">
-						材料
-					</view>
-					<view class="uni-list-cell-db">
-						<view v-if="this.isEmpty(this.materialValue.name)" style="margin-top: 10;"
-							@click="pickerShow('cz')">
-							<span style="color: darkgray;">请选择材料</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-list-cell-left">
+							材料
 						</view>
-						<view v-else style="display: flex;align-items: center; justify-content: flex-end;">
-							<view style="margin-top: 10; " @click="pickerShow('cz')">
-								<span style="color: black;">{{materialValue.name}}</span>
-								<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
+						<view class="uni-list-cell-db">
+							<view v-if="this.isEmpty(this.materialValue.name)" style="margin-top: 10;"
+								@click="pickerShow('cz')">
+								<span style="color: darkgray;">请选择材料</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else style="display: flex;align-items: center; justify-content: flex-end;">
+								<view style="margin-top: 10; " @click="pickerShow('cz')">
+									<span style="color: black;">{{materialValue.name}}</span>
+									<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
+								</view>
+								<uni-icons type="clear" size="24" color="#999"
+									style="margin-left:20rpx ;margin-right: -20rpx;"
+									@click="clearMaterialInfo"></uni-icons>
 							</view>
-							<uni-icons type="clear" size="24" color="#999"
-								style="margin-left:20rpx ;margin-right: -20rpx;" @click="clearMaterialInfo"></uni-icons>
 						</view>
 					</view>
-				</view>
-				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
-					<view class="uni-list-cell-left">
-						规格
-					</view>
-					<view class="uni-list-cell-db">
-						<view v-if="this.isEmpty(this.specificationValue.name)" style="margin-top: 10;"
-							@click="pickerShow('gg')">
-							<span style="color: darkgray;">请选择规格</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-list-cell-left">
+							规格
 						</view>
-						<view v-else style="display: flex;align-items: center; justify-content: flex-end;">
-							<view style="margin-top: 10;" @click="pickerShow('gg')">
-								<span style="color: black;">{{specificationValue.name}}</span>
-								<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
+						<view class="uni-list-cell-db">
+							<view v-if="this.isEmpty(this.specificationValue.name)" style="margin-top: 10;"
+								@click="pickerShow('gg')">
+								<span style="color: darkgray;">请选择规格</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else style="display: flex;align-items: center; justify-content: flex-end;">
+								<view style="margin-top: 10;" @click="pickerShow('gg')">
+									<span style="color: black;">{{specificationValue.name}}</span>
+									<!-- <image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image> -->
+								</view>
+								<uni-icons type="clear" size="24" color="#999"
+									style="margin-left:20rpx ;margin-right: -20rpx;"
+									@click="clearSpecificationInfo"></uni-icons>
 							</view>
-							<uni-icons type="clear" size="24" color="#999"
-								style="margin-left:20rpx ;margin-right: -20rpx;"
-								@click="clearSpecificationInfo"></uni-icons>
 						</view>
 					</view>
-				</view>
 
-			</view>
+				</view>
 
 
-			<view class="table">
-				<view class="felx-row">
-					<view class="h-tr" style="flex: 1">名称</view>
-					<view class="h-tr" style="flex: 1;align-items: center;">预计用量</view>
-					<view class="h-tr" style="flex: 1">实际用量</view>
+				<view class="table">
+					<view class="felx-row">
+						<view class="h-tr" style="flex: 1">名称</view>
+						<view class="h-tr" style="flex: 1;align-items: center;">预计用量</view>
+						<view class="h-tr" style="flex: 1">实际用量</view>
+					</view>
+				</view>
+				<view class="felx-row" v-for="(item, index) in materialUsageList" :key="index">
+					<view class="h-td" style="flex: 1">{{ item.materialQuality }}</view>
+					<view class="h-td" style="flex: 1">{{ item.estimatedSize }}</view>
+					<view class="h-td" style="flex: 1">{{ item.realitySize }}</view>
 				</view>
-			</view>
-			<view class="felx-row" v-for="(item, index) in materialUsageList" :key="index">
-				<view class="h-td" style="flex: 1">{{ item.materialQuality }}</view>
-				<view class="h-td" style="flex: 1">{{ item.estimatedSize }}</view>
-				<view class="h-td" style="flex: 1">{{ item.realitySize }}</view>
-			</view>
 
 
-		</view>
+			</view>
 
-		<view class="view-bg" style="margin-bottom: 40rpx;">
-			<text class="title-txt">工程进度统计</text>
-			<view>
-				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
-					<view class="uni-list-cell-left">
-						行政区
-					</view>
-					<view class="uni-list-cell-db">
-						<view v-if="this.isEmpty(this.XZQValue2.dictValue)" style="margin-top: 10;"
-							@click="pickerShow('xzq2')">
-							<span style="color: darkgray;">请选择行政区</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+			<view class="view-bg" style="margin-bottom: 40rpx;">
+				<text class="title-txt">工程进度统计</text>
+				<view>
+					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-list-cell-left">
+							行政区
 						</view>
-						<view v-else style="margin-top: 10;" @click="pickerShow('xzq2')">
-							<span style="color: black;">{{XZQValue2.dictLabel}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+						<view class="uni-list-cell-db">
+							<view v-if="this.isEmpty(this.XZQValue2.dictValue)" style="margin-top: 10;"
+								@click="pickerShow('xzq2')">
+								<span style="color: darkgray;">请选择行政区</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else style="margin-top: 10;" @click="pickerShow('xzq2')">
+								<span style="color: black;">{{XZQValue2.dictLabel}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
-					</view>
 
 
-				</view>
-				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
-					<view class="uni-list-cell-left"> 小区</view>
-					<view class="uni-list-cell-db">
-						<view v-if="this.isEmpty(this.XQValue2.id)" style="margin-top: 10;" @click="pickerShow('xq2')">
-							<span style="color: darkgray;">请选择小区</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-						<view v-else style="margin-top: 10;" @click="pickerShow('xq2')">
-							<span style="color: black;">{{XQValue2.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
 					</view>
-
-				</view>
-				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
-					<view class="uni-list-cell-left">楼栋</view>
-					<view class="uni-list-cell-db">
-						<view v-if="this.isEmpty(this.LDValue2.id)" style="margin-top: 10;" @click="pickerShow('ld2')">
-							<span style="color: darkgray;">请选择楼栋</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
-						</view>
-						<view style="margin-top: 10;" @click="pickerShow('ld2')">
-							<span style="color: black;">{{LDValue2.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-list-cell-left"> 小区</view>
+						<view class="uni-list-cell-db">
+							<view v-if="this.isEmpty(this.XQValue2.id)" style="margin-top: 10;"
+								@click="pickerShow('xq2')">
+								<span style="color: darkgray;">请选择小区</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else style="margin-top: 10;" @click="pickerShow('xq2')">
+								<span style="color: black;">{{XQValue2.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
-					</view>
 
-				</view>
-				<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
-					<view class="uni-list-cell-left">单元</view>
-					<view class="uni-list-cell-db">
-						<view v-if="this.isEmpty(this.DYValue2.id)" style="margin-top: 10;" @click="pickerShow('dy2')">
-							<span style="color: darkgray;">请选择单元</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+					</view>
+					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-list-cell-left">楼栋</view>
+						<view class="uni-list-cell-db">
+							<view v-if="this.isEmpty(this.LDValue2.id)" style="margin-top: 10;"
+								@click="pickerShow('ld2')">
+								<span style="color: darkgray;">请选择楼栋</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view style="margin-top: 10;" @click="pickerShow('ld2')">
+								<span style="color: black;">{{LDValue2.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
-						<view v-else style="margin-top: 10;" @click="pickerShow('dy2')">
-							<span style="color: black;">{{DYValue2.name}}</span>
-							<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+
+					</view>
+					<view class="uni-list-cell" style="border-bottom: 1px solid #f8f8f8;">
+						<view class="uni-list-cell-left">单元</view>
+						<view class="uni-list-cell-db">
+							<view v-if="this.isEmpty(this.DYValue2.id)" style="margin-top: 10;"
+								@click="pickerShow('dy2')">
+								<span style="color: darkgray;">请选择单元</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
+							<view v-else style="margin-top: 10;" @click="pickerShow('dy2')">
+								<span style="color: black;">{{DYValue2.name}}</span>
+								<image :src="loadImgSrc('icon_right.png')" class="to-right-icon"></image>
+							</view>
 						</view>
+
 					</view>
 
 				</view>
-
-			</view>
-			<image :src="loadImgSrc('lou-img-bg.png')" style="width: 110%;
+				<image :src="loadImgSrc('lou-img-bg.png')" style="width: 110%;
     height: 121px;
     position: absolute;
     bottom: 15px;
     left: -5px;
     z-index: 1;
 "></image>
-			<scroll-view :scroll-x="true" class="view_bg_build" v-if="roomList.length > 0">
-				<view class="HuaDongBiao">
-					<view class="NeiRong" v-for="(item,index) in roomList" :key="index">
-						<view class="Fang" v-for="(item2, index2) in roomList[index]" :key="index2">
-							<view v-if="item2.roomStatus=='施工中'" class="ShiGongZhong">{{ item2.roomName }}</view>
-							<view v-else-if="item2.roomStatus=='未施工'" class="WeiShiGong">{{ item2.roomName }}</view>
-							<view v-else class="JunGong">{{ item2.roomName }}</view>
+				<scroll-view :scroll-x="true" class="view_bg_build" v-if="roomList.length > 0">
+					<view class="HuaDongBiao">
+						<view class="NeiRong" v-for="(item,index) in roomList" :key="index">
+							<view class="Fang" v-for="(item2, index2) in roomList[index]" :key="index2">
+								<view v-if="item2.roomStatus=='施工中'" class="ShiGongZhong">{{ item2.roomName }}</view>
+								<view v-else-if="item2.roomStatus=='未施工'" class="WeiShiGong">{{ item2.roomName }}</view>
+								<view v-else class="JunGong">{{ item2.roomName }}</view>
+							</view>
 						</view>
 					</view>
-				</view>
-				<view
-					style="width: 48rpx;height: 63rpx;background: #C7EAFF; position:relative; left: 50%; transform: translateX(-50%); bottom: -10rpx;">
-				</view>
+					<view
+						style="width: 48rpx;height: 63rpx;background: #C7EAFF; position:relative; left: 50%; transform: translateX(-50%); bottom: -10rpx;">
+					</view>
 
-			</scroll-view>
-			<view v-if="roomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
-			<view style="align-items: center; margin-top: 20rpx;">
-				<view style="display: flex;align-items: center;justify-content:center">
-					<image class="block-iv" :src="loadImgSrc('ic_legend.png')"></image>
-					<text style="margin-right: 20px;margin-left: 5px;">图例: </text>
-					<div class="block-iv" style="background-color: #80d9ae;"></div>
-					<text style="margin-right: 20px;margin-left: 5px;">竣工</text>
-					<div class="block-iv" style="background-color: #5bd3ff;"></div>
-					<text style="margin-right: 20px;margin-left: 5px;">施工中</text>
-					<div class="block-iv" style="background-color: #ffc881;"></div>
-					<text style="margin-right: 20px;margin-left: 5px;">未施工</text>
-				</view>
+				</scroll-view>
+				<view v-if="roomList.length == 0" style="padding:50rpx;text-align: center;">暂无数据</view>
+				<view style="align-items: center; margin-top: 20rpx;">
+					<view style="display: flex;align-items: center;justify-content:center">
+						<image class="block-iv" :src="loadImgSrc('ic_legend.png')"></image>
+						<text style="margin-right: 20px;margin-left: 5px;">图例: </text>
+						<div class="block-iv" style="background-color: #80d9ae;"></div>
+						<text style="margin-right: 20px;margin-left: 5px;">竣工</text>
+						<div class="block-iv" style="background-color: #5bd3ff;"></div>
+						<text style="margin-right: 20px;margin-left: 5px;">施工中</text>
+						<div class="block-iv" style="background-color: #ffc881;"></div>
+						<text style="margin-right: 20px;margin-left: 5px;">未施工</text>
+					</view>
 
+				</view>
 			</view>
-		</view>
 
-		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
-			subtitleKey="id" v-model="name"></SelectPicker>
+			<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
+				subtitleKey="id" v-model="name"></SelectPicker>
+
+			<SelectPicker :list="dictOptions" @change="changeSelect" v-if="openDict" @close="closeDict"
+				titleKey="dictLabel" subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
+		</scroll-view>
+	</view>
+	<view v-else-if="isLeader">
+		<view class="container">
+			<cc-pullScroolView class="pullScrollView" ref="pullScroll" :pullDown="pullDown" :isDownLoading="true">
+				<view class="notice" v-for="(item,index) in list" :key="index">
+					<view class="justify-content" @click="goDetails(item)">
+						<view class="font-forty">
+							{{item.noticeTitle}}
+						</view>
+						<view class="font-twenty-eight gray">
+							{{item.createTime}}
+						</view>
+					</view>
+
+
+				</view>
+			</cc-pullScroolView>
 
-		<SelectPicker :list="dictOptions" @change="changeSelect" v-if="openDict" @close="closeDict" titleKey="dictLabel"
-			subtitleKey="dictValue" v-model="dictLabel"></SelectPicker>
-	</scroll-view>
+		</view>
+	</view>
 </template>
 
 <script>
 	import SelectPicker from '../../components/selectPicker/select_picker.vue'
+	import CCBProjectList from '../../uni_modules/cc-pullScroolView/components/cc-pullScroolView/cc-pullScroolView.vue';
+	import {
+		getNoticeList,
+	} from '@/api/common'
 	import {
 		getDicts
 	} from "@/api/system/dict/data";
@@ -226,10 +258,17 @@
 
 	export default {
 		components: {
-			SelectPicker
+			SelectPicker,
+			CCBProjectList,
+
 		},
 		data() {
 			return {
+				isLeader: true,
+				list: [],
+				pageSize: 10, // 条数
+				totalNum: '',
+				pageNum: 1, // 页数
 				villageIndex: 0,
 				specificationIndex: 0,
 				materialIndex: 0,
@@ -268,6 +307,27 @@
 			}
 		},
 		created() {},
+		onLoad() {
+
+			if (this.isLeader) {
+				this.getList()
+			}
+		},
+
+		// 上拉加载
+		onReachBottom() {
+			// 数据全部加载完
+
+			if (this.pageNum * 10 >= this.totalNum) {
+
+			} else {
+				// 显示加载中
+				this.$refs.pullScroll.showUpLoading();
+				this.pageNum++;
+				this.requestData();
+			}
+
+		},
 		methods: {
 			isEmpty(str) {
 				return (!str || 0 === str.length);
@@ -397,7 +457,7 @@
 					this.LDValue = ''; //重置楼栋数据
 					this.DYValue = ''; //重置单元数据
 					this.FJValue = ''; //重置房间数据
-			
+
 					this.queryMaterialsUsedList();
 				} else if (this.type == 'ld') {
 					this.LDValue = item;
@@ -473,7 +533,7 @@
 					this.$modal.msg('请选择小区')
 					return;
 				}
-	
+
 				let param = {
 					enginCycle: this.projectValue.dictValue, //工程周期
 					areaId: this.XQValue.id,
@@ -517,6 +577,62 @@
 			clearSpecificationInfo() {
 				this.specificationValue = '';
 				this.queryMaterialsUsedList();
+			},
+
+			// 下拉刷新
+			pullDown(pullScroll) {
+
+				this.pageNum = 1;
+				setTimeout(() => {
+					this.requestData(pullScroll);
+				}, 1000);
+
+			},
+			getList() {
+				let myThis = this;
+				this.$nextTick(() => {
+
+					myThis.$refs.pullScroll.refresh();
+
+				});
+			},
+			requestData() {
+
+				uni.showLoading()
+				getNoticeList('1', this.pageNum, this.pageSize).then(res => {
+
+					this.totalNum = res.total
+
+					if (res.code == '200') {
+						uni.hideLoading()
+						if (res.rows.length !== 0) {
+							//首次加载10条数据，后进行拼接
+							if (this.pageNum == 1) {
+								this.list = [];
+								this.list = res.rows
+							} else {
+								this.list = this.list.concat(res.rows)
+							}
+
+							// 如果是最后一页
+							if (this.pageNum * 10 >= this.totalNum) {
+								this.$refs.pullScroll.finish();
+
+							} else {
+
+								// 不是最后一页
+								this.$refs.pullScroll.success();
+							}
+
+						} else {
+							this.$modal.msg("暂无数据")
+						}
+					} else {
+						this.$modal.msg(res.msg + "")
+					}
+
+				})
+
 			}
 		}
 	}
@@ -742,4 +858,27 @@
 		background-color: #80d9ae;
 		color: #000;
 	}
+
+	.container {
+		display: flex;
+		margin-left: 10px;
+		width: 100%;
+		margin-top: 10px;
+		margin-right: 10px;
+		justify-content: space-between;
+	}
+
+	.notice {
+		margin: 20rpx;
+		width: 100%;
+		padding: 20rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 8rpx 17rpx 0rpx rgba(0, 0, 0, 0.04);
+		border-radius: 10rpx;
+	}
+
+	.text {
+		border-left: 15rpx solid #3857F3;
+		padding-left: 20rpx;
+	}
 </style>