From 72977cc7a1e8ba76b6e2adbbd8eedb6d2efd5557 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Tue, 08 Mar 2022 15:37:59 +0800
Subject: [PATCH] +人员查询样式修改,我参与加取消弹窗

---
 pages/grabOrders/grabOrdersZAXC/inPage/page0.vue   |    5 
 static/personnelCountImg/jfd.png                   |    0 
 static/personnelCountImg/xxy.png                   |    0 
 static/style/app.scss                              |   15 ++
 pages/grabOrders/grabOrdersZAFFPX/feedback.vue     |   10 
 static/personnelCountImg/jfd1.png                  |    0 
 pages/grabOrders/grabOrdersZAXC/grabOrders.vue     |   23 +++
 pages/grabOrders/grabOrdersZAYWXC/feedback.vue     |   14 -
 pages/grabOrders/personnelCount/personnelCount.vue |  187 ++++++++++++++++++++++--------
 static/personnelCountImg/xf1.png                   |    0 
 pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue   |   17 ++
 static/personnelCountImg/badw.png                  |    0 
 static/personnelCountImg/badw1.png                 |    0 
 static/personnelCountImg/xxy1.png                  |    0 
 pages/grabOrders/grabOrdersZAXC/feedback.vue       |    9 
 pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue |    5 
 static/personnelCountImg/xf.png                    |    0 
 static/personnelCountImg/zabw.png                  |    0 
 pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue   |   23 +++
 pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue |    5 
 static/personnelCountImg/wyh1.png                  |    0 
 static/personnelCountImg/wyh.png                   |    0 
 static/personnelCountImg/zabw1.png                 |    0 
 23 files changed, 233 insertions(+), 80 deletions(-)

diff --git a/pages/grabOrders/grabOrdersZAFFPX/feedback.vue b/pages/grabOrders/grabOrdersZAFFPX/feedback.vue
index 0f96489..d870565 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/feedback.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/feedback.vue
@@ -181,8 +181,8 @@
 					tpurl: imgs,
 					spurl: video,
 					hdid: this.data.id,
-					serid: '',
-					// serid: uni.getStorageSync("ids") || that.$store.state.puserID
+					seridList: '',
+					serid: uni.getStorageSync("ids") || that.$store.state.puserID
 					// result: this.content,
 				};
 				// 传入选定的完成人员
@@ -194,12 +194,12 @@
 				}
 				// console.log(chouse);
 				for (let ck in chouse) {
-					dataList.serid += chouse[ck];
+					dataList.seridList += chouse[ck];
 					if (ck != chouse.length - 1) {
-						dataList.serid += ',';
+						dataList.seridList += ',';
 					}
 				}
-				// console.log(dataList.serid);
+				// console.log(dataList.seridList);
 				// return
 				wx.showLoading({
 					title: "提交中...",
diff --git a/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue b/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
index c1af3ee..05a2b46 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/grabOrders.vue
@@ -29,6 +29,12 @@
 				打开模态框
             </u-button>-->
 		</view>
+		<view>
+			<u-modal v-model="showPopup1" :content="appdetitle1" :show-cancel-button="true" @confirm="outits"></u-modal>
+			<!-- <u-button @click="open">
+				打开模态框
+		    </u-button>-->
+		</view>
 	</view>
 </template>
 <script>
@@ -60,8 +66,11 @@
 				overdata: [],
 				showPopup: false,
 				appdetitle: "",
+				showPopup1: false,
+				appdetitle1: "",
 				popupData: {},
 				useHeight: "100%",
+				overUrl: '',
 			};
 		},
 		onBackPress(e) {
@@ -125,9 +134,19 @@
 			//取消任务
 			outOrders(d) {
 				let that = this;
+				this.overUrl = this.$store.state.piAPI +
+					`taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`;
+				// 是否取消
+				console.log(d)
+				this.appdetitle1 = "是否取消" + (d.iscation == 1 ? "该活动:" : "参与:") + d.name;
+				this.showPopup1 = true;
+
+			},
+			//取消任务弹窗回调
+			outits() {
+				let that = this;
 				uni.request({
-					url: this.$store.state.piAPI +
-						`taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`,
+					url: this.overUrl,
 					method: "get",
 					// data: d,
 					header: {
diff --git a/pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue b/pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue
index f7fc88c..4819937 100644
--- a/pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue
+++ b/pages/grabOrders/grabOrdersZAFFPX/inPage/page0.vue
@@ -82,9 +82,12 @@
 				this.$emit("getOrders", b);
 			},
 			outOrders(val) {
+				// console.log(val)
 				let b = {
 					rid: val.id,
-					serid: this.$store.state.puserID
+					serid: this.$store.state.puserID,
+					name: val.rname,
+					iscation: val.iscation,
 				};
 				this.$emit("outOrders", b);
 			}
diff --git a/pages/grabOrders/grabOrdersZAXC/feedback.vue b/pages/grabOrders/grabOrdersZAXC/feedback.vue
index 853586b..59c0065 100644
--- a/pages/grabOrders/grabOrdersZAXC/feedback.vue
+++ b/pages/grabOrders/grabOrdersZAXC/feedback.vue
@@ -189,8 +189,8 @@
 					tpurl: imgs,
 					spurl: video,
 					hdid: this.data.id,
-					serid: '',
-					// serid: uni.getStorageSync("ids") || that.$store.state.puserID
+					seridList: '',
+					serid: uni.getStorageSync("ids") || that.$store.state.puserID
 					// result: this.content,
 				};
 				// 传入选定的完成人员
@@ -202,11 +202,12 @@
 				}
 				// console.log(chouse);
 				for (let ck in chouse) {
-					dataList.serid += chouse[ck];
+					dataList.seridList += chouse[ck];
 					if (ck != chouse.length - 1) {
-						dataList.serid += ',';
+						dataList.seridList += ',';
 					}
 				}
+				// console.log(dataList.seridList);
 				wx.showLoading({
 					title: "提交中...",
 					mask: true
diff --git a/pages/grabOrders/grabOrdersZAXC/grabOrders.vue b/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
index 825ce48..c48502b 100644
--- a/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAXC/grabOrders.vue
@@ -33,6 +33,12 @@
 				打开模态框
             </u-button>-->
 		</view>
+		<view>
+			<u-modal v-model="showPopup1" :content="appdetitle1" :show-cancel-button="true" @confirm="outits"></u-modal>
+			<!-- <u-button @click="open">
+				打开模态框
+		    </u-button>-->
+		</view>
 	</view>
 </template>
 <script>
@@ -66,6 +72,9 @@
 				appdetitle: "",
 				popupData: {},
 				useHeight: "100%",
+				showPopup1: false,
+				appdetitle1: "",
+				overUrl: '',
 			};
 		},
 		onBackPress(e) {
@@ -122,9 +131,19 @@
 			//取消任务
 			outOrders(d) {
 				let that = this;
+				this.overUrl = this.$store.state.piAPI +
+					`taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`;
+				// 是否取消
+				console.log(d)
+				this.appdetitle1 = "是否取消" + (d.iscation == 1 ? "该活动:" : "参与:") + d.name;
+				this.showPopup1 = true;
+			
+			},
+			//取消任务弹窗回调
+			outits() {
+				let that = this;
 				uni.request({
-					url: this.$store.state.piAPI +
-						`taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`,
+					url: this.overUrl,
 					method: "get",
 					// data: d,
 					header: {
diff --git a/pages/grabOrders/grabOrdersZAXC/inPage/page0.vue b/pages/grabOrders/grabOrdersZAXC/inPage/page0.vue
index c4c694f..252ee35 100644
--- a/pages/grabOrders/grabOrdersZAXC/inPage/page0.vue
+++ b/pages/grabOrders/grabOrdersZAXC/inPage/page0.vue
@@ -77,9 +77,12 @@
 				this.$emit("getOrders", b);
 			},
 			outOrders(val) {
+				// console.log(val)
 				let b = {
 					rid: val.id,
-					serid: this.$store.state.puserID
+					serid: this.$store.state.puserID,
+					name: val.rname,
+					iscation: val.iscation,
 				};
 				this.$emit("outOrders", b);
 			}
diff --git a/pages/grabOrders/grabOrdersZAYWXC/feedback.vue b/pages/grabOrders/grabOrdersZAYWXC/feedback.vue
index e1aa71c..6ea437f 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/feedback.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/feedback.vue
@@ -181,8 +181,8 @@
 					tpurl: imgs,
 					spurl: video,
 					hdid: this.data.id,
-					serid: '',
-					// serid: uni.getStorageSync("ids") || that.$store.state.puserID
+					seridList: '',
+					serid: uni.getStorageSync("ids") || that.$store.state.puserID
 					// result: this.content,
 				};
 				// 传入选定的完成人员
@@ -194,16 +194,12 @@
 				}
 				// console.log(chouse);
 				for (let ck in chouse) {
-					dataList.serid += chouse[ck];
+					dataList.seridList += chouse[ck];
 					if (ck != chouse.length - 1) {
-						dataList.serid += ',';
+						dataList.seridList += ',';
 					}
 				}
-				wx.showLoading({
-					title: "提交中...",
-					mask: true
-				})
-				// console.log(dataList);
+				// console.log(dataList.seridList);
 				wx.request({
 					url: this.$store.state.piAPI + 'taskfk/save', //仅为示例,并非真实接口地址。
 					data: dataList,
diff --git a/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue b/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
index bf3d75a..e7d0d16 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/grabOrders.vue
@@ -68,6 +68,9 @@
 				appdetitle: "",
 				popupData: {},
 				useHeight: "100%",
+				showPopup1: false,
+				appdetitle1: "",
+				overUrl: '',
 			};
 		},
 		onBackPress(e) {
@@ -127,9 +130,19 @@
 			//取消任务
 			outOrders(d) {
 				let that = this;
+				this.overUrl = this.$store.state.piAPI +
+					`taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`;
+				// 是否取消
+				console.log(d)
+				this.appdetitle1 = "是否取消" + (d.iscation == 1 ? "该活动:" : "参与:") + d.name;
+				this.showPopup1 = true;
+
+			},
+			//取消任务弹窗回调
+			outits() {
+				let that = this;
 				uni.request({
-					url: this.$store.state.piAPI +
-						`taskqd/cancelTask?rid=${d.rid}&serid=${d.serid}&name=${that.$store.state.puserName}`,
+					url: this.overUrl,
 					method: "get",
 					// data: d,
 					header: {
diff --git a/pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue b/pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue
index f43d592..2fdb072 100644
--- a/pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue
+++ b/pages/grabOrders/grabOrdersZAYWXC/inPage/page0.vue
@@ -77,9 +77,12 @@
 				this.$emit("getOrders", b);
 			},
 			outOrders(val) {
+				// console.log(val)
 				let b = {
 					rid: val.id,
-					serid: this.$store.state.puserID
+					serid: this.$store.state.puserID,
+					name: val.rname,
+					iscation: val.iscation,
 				};
 				this.$emit("outOrders", b);
 			}
diff --git a/pages/grabOrders/personnelCount/personnelCount.vue b/pages/grabOrders/personnelCount/personnelCount.vue
index b7c69a7..ef0486c 100644
--- a/pages/grabOrders/personnelCount/personnelCount.vue
+++ b/pages/grabOrders/personnelCount/personnelCount.vue
@@ -3,45 +3,59 @@
 		<view class="m-top">
 		</view>
 		<view class="bomBut">
-			<view style="width: 400rpx;padding-left: 30rpx;">
-				<u-tabs :list="list" :is-scroll="false"></u-tabs>
+			<view class="bomButin">
+				<u-grid :col="3" v-for="(item,index) in listLength" :key="index">
+					<u-grid-item @click="openSee(index * 3 +0)"
+						:custom-style="list[index * 3 +0].active? activeStyle:''"
+						:class="[list[index * 3 +0].active?'activeStyles':'']">
+						<view class="grid-text">
+							{{list[index * 3 +0].num}}人
+						</view>
+						<!-- <u-badge :count="list[index * 3 +0].num" :offset="[20, 20]"></u-badge> -->
+						<u-image v-show="list[index * 3 +0].active" width="24px" height="24px"
+							:src="list[index * 3 +0].imgSrc1"></u-image>
+						<u-image v-show="!list[index * 3 +0].active" width="24px" height="24px"
+							:src="list[index * 3 +0].imgSrc"></u-image>
+						<!-- <u-icon name="photo" :size="46"></u-icon> -->
+						<view class="grid-text">{{list[index * 3 +0].name}}</view>
+					</u-grid-item>
+					<u-grid-item @click="openSee(index * 3 +1)"
+						:custom-style="list[index * 3 +1].active? activeStyle:''"
+						:class="[list[index * 3 +1].active?'activeStyles':'']" v-if="list[index * 3 +1]">
+						<view class="grid-text">
+							{{list[index * 3 +1].num}}人
+						</view>
+						<!-- <u-badge :count="list[index * 3 +1].num" :offset="[21, 21]"></u-badge> -->
+						<u-image v-show="list[index * 3 +1].active" width="24px" height="24px"
+							:src="list[index * 3 +1].imgSrc1"></u-image>
+						<u-image v-show="!list[index * 3 +1].active" width="24px" height="24px"
+							:src="list[index * 3 +1].imgSrc"></u-image>
+						<!-- <u-icon name="photo" :size="46"></u-icon> -->
+						<view class="grid-text">{{list[index * 3 +1].name}}</view>
+					</u-grid-item>
+					<u-grid-item @click="openSee(index * 3 +2)"
+						:custom-style="list[index * 3 +2].active? activeStyle:''"
+						:class="[list[index * 3 +2].active?'activeStyles':'']" v-if="list[index * 3 +2]">
+						<view class="grid-text">
+							{{list[index * 3 +2].num}}人
+						</view>
+						<!-- <u-badge :count="list[index * 3 +2].num" :offset="[22, 22]"></u-badge> -->
+						<u-image v-show="list[index * 3 +2].active" width="24px" height="24px"
+							:src="list[index * 3 +2].imgSrc1"></u-image>
+						<u-image v-show="!list[index * 3 +2].active" width="24px" height="24px"
+							:src="list[index * 3 +2].imgSrc"></u-image>
+						<!-- <u-icon name="photo" :size="46"></u-icon> -->
+						<view class="grid-text">{{list[index * 3 +2].name}}</view>
+					</u-grid-item>
+
+				</u-grid>
 			</view>
-			<u-row gutter="16">
-				<u-col span="7">
-					<view class="bom-text">当前积分</view>
-					<view class="bom-int">{{dqjf}}</view>
-				</u-col>
-				<u-col span="5">
-					<view class="bom-text">累计积分</view>
-					<view class="bom-int">{{ljjf}}</view>
-				</u-col>
-			</u-row>
 		</view>
 
 		<view class="bomList">
-			<view class="">
-				<u-dropdown border-bottom="true">
-					<u-dropdown-item v-model="value1" @change="change" title="收支类型" :options="options1"></u-dropdown-item>
-				</u-dropdown>
-			</view>
-
 			<scroll-view id="articleBox" :style="{ height: swiperHeight + 'px' }" class="article-content" scroll-y
 				style="width: 100%; margin-top: 15rpx;">
-				<view v-for="i in data" class="advisory-model" @click="goDetail(i)">
-					<view class="advisory-left">
-						<view class="advisory-title-top">
-							<view class="advisory-title">{{i.access}}</view>
-						</view>
-						<view class="advisory-title-down">
-							<view class="advisory-title-time">{{i.time}}</view>
-						</view>
-					</view>
-					<view class="advisory-right">
-						<view v-if="i.type =='2'" class="advisory-title-integral">- {{i.integral}}</view>
-						<view v-if="i.type =='1'" class="advisory-title-integraladd">+{{i.integral}}</view>
-					</view>
-					<u-line class="advisory-line" color="#ebebeb" />
-				</view>
+				4543
 			</scroll-view>
 		</view>
 	</view>
@@ -51,15 +65,56 @@
 	export default {
 		data() {
 			return {
-				dqjf:"暂无",
-				ljjf:"暂无",
+				dqjf: "暂无",
+				ljjf: "暂无",
 				list: [{
-					name: '积分明细'
+					name: '治保会队伍',
+					num: 32,
+					active: true,
+					imgSrc: '/static/personnelCountImg/wyh.png',
+					imgSrc1: '/static/personnelCountImg/wyh1.png',
 				}, {
-					name: ''
+					name: '内保干部队伍',
+					num: 49,
+					active: false,
+					imgSrc: '/static/personnelCountImg/zabw.png',
+					imgSrc1: '/static/personnelCountImg/zabw1.png',
 				}, {
-					name: '',
+					name: '治安巡防队伍',
+					num: 36,
+					active: false,
+					imgSrc: '/static/personnelCountImg/xf.png',
+					imgSrc1: '/static/personnelCountImg/xf1.png',
+				}, {
+					name: '信息员队伍',
+					num: 30,
+					active: false,
+					imgSrc: '/static/personnelCountImg/xxy.png',
+					imgSrc1: '/static/personnelCountImg/xxy1.png',
+				}, {
+					name: '保安员队伍',
+					num: 15995,
+					active: false,
+					imgSrc: '/static/personnelCountImg/badw.png',
+					imgSrc1: '/static/personnelCountImg/badw1.png',
+				}, {
+					name: '警务辅助队伍',
+					num: 15,
+					active: false,
+					imgSrc: '/static/personnelCountImg/jfd.png',
+					imgSrc1: '/static/personnelCountImg/jfd1.png',
+				}, {
+					name: '志愿者',
+					num: 1,
+					active: false,
+					imgSrc: '/static/personnelCountImg/wyh.png',
+					imgSrc1: '/static/personnelCountImg/wyh1.png',
 				}],
+				activeStyle: {
+					backgroundColor: '#103289',
+					colot: "#fff",
+					borderRadius: '5px',
+				},
 				options1: [{
 						label: '全部',
 						value: 1,
@@ -78,15 +133,28 @@
 				swiperHeight: 0
 			}
 		},
+		computed: {
+			listLength() {
+				return Math.ceil(this.list.length / 3);
+			},
+		},
 		methods: {
+			openSee(val) {
+				console.log(this.list[val].name)
+				for (let k in this.list) {
+					this.list[k].active = false;
+				}
+				this.list[val].active = true;
+			},
 			onLoad() {
 				this.getData(1);
 			},
-			getData(e){
+			getData(e) {
 				var that = this;
 				uni.request({
-					url:that.$store.state.piAPI + '/integral/selectCount?uid='+this.$store.state.puserID+"&type="+e,
-					method:'POST',
+					url: that.$store.state.piAPI + '/integral/selectCount?uid=' + this.$store.state.puserID +
+						"&type=" + e,
+					method: 'POST',
 					success(res) {
 						that.dqjf = res.data.data.sjf;
 						that.ljjf = res.data.data.zjf.integral;
@@ -95,16 +163,16 @@
 				});
 			},
 			goDetail() {
-				
+
 			},
-			change(e){
+			change(e) {
 				this.getData(e);
 			},
 			onReady() {
 				let that = this;
 				uni.getSystemInfo({
 					success(e) {
-						console.log(e);
+						// console.log(e);
 						let {
 							windowWidth,
 							windowHeight,
@@ -114,6 +182,7 @@
 						query
 							.select('#articleBox')
 							.boundingClientRect(data => {
+								// console.log(safeArea.bottom - data.top - 50)
 								that.swiperHeight = (safeArea.bottom - data.top - 50);
 							})
 							.exec();
@@ -124,27 +193,35 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.advisory-big {
 		width: 100%;
-		height: 100vh;
+		height: 100%;
+		/*  #ifdef  APP-PLUS  */
+		height: 100vh !important;
+		/*  #endif  */
 		background-color: #f7f7f7;
 	}
 
 	.bomBut {
 		width: 93%;
 		margin: 0 auto;
-		height: 7.5rem;
+		height: auto;
 		z-index: 999;
 		border-radius: 10px;
 		margin-top: -2.5rem;
 		background-color: #fff;
+
+		.bomButin {
+			border-radius: 10px;
+		}
 	}
 
 	.bomList {
 		width: 93%;
 		margin: 0 auto;
-		height: 30rem;
+		/* height: 30rem; */
+		height: auto;
 		z-index: 999;
 		border-radius: 10px;
 		margin-top: 1rem;
@@ -250,12 +327,18 @@
 		top: 70%;
 		position: relative;
 	}
-	
-	.advisory-title-integraladd{
+
+	.advisory-title-integraladd {
 		color: #00aaff;
 	}
-	
-	.advisory-title-integral{
+
+	.advisory-title-integral {
 		color: #ff0000;
 	}
+
+	.activeStyles {
+		.grid-text {
+			color: #fff;
+		}
+	}
 </style>
diff --git a/static/personnelCountImg/badw.png b/static/personnelCountImg/badw.png
new file mode 100644
index 0000000..23a96a6
--- /dev/null
+++ b/static/personnelCountImg/badw.png
Binary files differ
diff --git a/static/personnelCountImg/badw1.png b/static/personnelCountImg/badw1.png
new file mode 100644
index 0000000..b232b0b
--- /dev/null
+++ b/static/personnelCountImg/badw1.png
Binary files differ
diff --git a/static/personnelCountImg/jfd.png b/static/personnelCountImg/jfd.png
new file mode 100644
index 0000000..19ff08a
--- /dev/null
+++ b/static/personnelCountImg/jfd.png
Binary files differ
diff --git a/static/personnelCountImg/jfd1.png b/static/personnelCountImg/jfd1.png
new file mode 100644
index 0000000..8d6b1da
--- /dev/null
+++ b/static/personnelCountImg/jfd1.png
Binary files differ
diff --git a/static/personnelCountImg/wyh.png b/static/personnelCountImg/wyh.png
new file mode 100644
index 0000000..d64e2cf
--- /dev/null
+++ b/static/personnelCountImg/wyh.png
Binary files differ
diff --git a/static/personnelCountImg/wyh1.png b/static/personnelCountImg/wyh1.png
new file mode 100644
index 0000000..5084d3b
--- /dev/null
+++ b/static/personnelCountImg/wyh1.png
Binary files differ
diff --git a/static/personnelCountImg/xf.png b/static/personnelCountImg/xf.png
new file mode 100644
index 0000000..4dbdf41
--- /dev/null
+++ b/static/personnelCountImg/xf.png
Binary files differ
diff --git a/static/personnelCountImg/xf1.png b/static/personnelCountImg/xf1.png
new file mode 100644
index 0000000..8054fe6
--- /dev/null
+++ b/static/personnelCountImg/xf1.png
Binary files differ
diff --git a/static/personnelCountImg/xxy.png b/static/personnelCountImg/xxy.png
new file mode 100644
index 0000000..34dee47
--- /dev/null
+++ b/static/personnelCountImg/xxy.png
Binary files differ
diff --git a/static/personnelCountImg/xxy1.png b/static/personnelCountImg/xxy1.png
new file mode 100644
index 0000000..6d484ac
--- /dev/null
+++ b/static/personnelCountImg/xxy1.png
Binary files differ
diff --git a/static/personnelCountImg/zabw.png b/static/personnelCountImg/zabw.png
new file mode 100644
index 0000000..1aed730
--- /dev/null
+++ b/static/personnelCountImg/zabw.png
Binary files differ
diff --git a/static/personnelCountImg/zabw1.png b/static/personnelCountImg/zabw1.png
new file mode 100644
index 0000000..acc2dcf
--- /dev/null
+++ b/static/personnelCountImg/zabw1.png
Binary files differ
diff --git a/static/style/app.scss b/static/style/app.scss
index 90302be..16facec 100644
--- a/static/style/app.scss
+++ b/static/style/app.scss
@@ -93,4 +93,17 @@
 				.fren-main-but{
 					width: 100%;
 				}
-			}
\ No newline at end of file
+			}
+		.bomButin {	
+			.u-grid,
+			.u-grid-item {
+				border-radius: 10px;
+			}
+			.u-border-bottom:after,
+			.u-border-left:after,
+			.u-border-right:after,
+			.u-border-top-bottom:after,
+			.u-border-top:after,
+			.u-border:after {
+				border: 0px solid transparent !important;
+			}}
\ No newline at end of file

--
Gitblit v1.9.3