楼栋开发

manifest.json

@@ -123,9 +123,9 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/service" : {
-                    // "target" : "http://192.168.3.108", //请求的目标域名
+                    "target" : "http://192.168.3.108", //请求的目标域名
 
-                    "target" : "http://192.168.4.163", //宋程玉本地
+                    // "target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 }

pages/searchFloor/searchFloor.vue

@@ -8,18 +8,20 @@
 				</checkbox-group>
 			</view>
 			<view class="title">{{name}}</view>
+			<view class="top-right">{{num}}/{{allNum}}</view>
 		</view>
     <view class="search-keyword">
       <scroll-view class="keyword-list-box" scroll-y>
 				<checkbox-group @change="checkboxChange">
 					<view v-for="(row, index) in dataList" :key="index" class="view-box">
-							<checkbox class="top-check1" color="#42b983" :value="row.floor.id + 'parent'" :checked="row.checked" />
+							<checkbox @click="paClick(row)" class="top-check1" color="#42b983" :value="row.floor.id" :checked="row.checked" />
+							<view class="right-ab">{{row.num}}/{{row.children.length}}</view>
 							<uni-collapse ref="collapse" v-model="row.floor.collapseValue">
 								<uni-collapse-item :title="row.floor.floorName + '楼'">
 									<view v-for="(item, index) in row.children" :key="item.id">
 										<view class="keyword-entry">
 											<view class="keyword-text">
-												<checkbox class="top-check2" color="#42b983" :value="item.id" :checked="item.checked" />
+												<checkbox @click="chClick(item)" class="top-check2" color="#42b983" :value="item.id" :checked="item.checked" />
 												<view class="title-2">{{item.dept}}</view>
 											</view>
 										</view>
@@ -64,7 +66,10 @@
 				valueColl:false,
 				allCheck:false,
 				buildIds:[],
-				ids:[]
+				pid:[],
+				cid:[],
+				allNum:0,
+				num:0
       };
     },
     onLoad(options) {
@@ -83,11 +88,12 @@
       // #endif
     },
 		onShow(){
-			this.getBuildings();
+			// this.getBuildings();
 		},
     methods: {
 			// 全选
 			allCheckChange(e){
+				this.num = 0
 				if(e.detail.value.length>0){
 					this.dataList.forEach((item, index)=>{
 						item.checked = true
@@ -97,6 +103,8 @@
 								this.buildIds.push(i)
 							}
 						}
+						item.num = item.children.filter(x=>x.checked).length
+						this.num += item.num 
 					})
 				}else{
 					this.dataList.forEach((item, index)=>{
@@ -107,6 +115,8 @@
 								this.buildIds = []
 							}
 						}
+						item.num = item.children.filter(x=>x.checked).length
+						this.num += item.num 
 					})
 				}
 				// this.buildIds = this.buildIds.filter(v => v.indexOf('parent')==-1);
@@ -121,11 +131,51 @@
 					delta: 1,
 				})
 			},
+			paClick(row){
+				if(row.checked){
+					row.checked = false
+				}else{
+					row.checked = true
+				}
+				for(let item of row.children){
+					if (row.checked) {
+						this.$set(item, 'checked', true)
+					} else {
+						this.$set(item, 'checked', false)
+					}
+				}
+				this.num = 0
+				for (let i of this.dataList) {
+					i.num = i.children.filter(x=>x.checked).length
+					this.num += i.num
+				}	
+				console.log(44545454,this.dataList)	
+			},
+			chClick(row){
+				this.num = 0
+				if(row.checked){
+					row.checked = false
+				}else{
+					row.checked = true
+				}
+				for (let i of this.dataList) {
+					i.num = i.children.filter(x=>x.checked).length
+					this.num += i.num
+				}	
+			},
       // 确认
       confirm() {
-        // const dataList = this.buildIds.filter(v => v.indexOf('parent')==-1);
-        console.log(3333,this.buildIds);
-				if (this.buildIds.length === 0) {
+				let data = uni.getStorageSync("setDepts")
+				let dataList = []
+				this.dataList.forEach(i=>{
+					for(let i of i.children){
+						if(i.checked){
+							dataList.push(i)
+						}
+					}
+				})
+        console.log(3333,dataList);
+				if (dataList.length === 0) {
           this.models = {
             disjunctor: true,
             title: "提示",
@@ -136,74 +186,64 @@
             },
           };
         } else {
-					uni.setStorageSync("setDepts", this.buildIds)
+					let allData = null
+					let data = uni.getStorageSync("setDepts")
+					if(data){
+						data.forEach(i=>{
+							dataList.push(i)
+						})
+						allData = dataList
+					}else{
+						allData = dataList
+					}
+					let newList2 = []
+					let newList3 = []
+					allData.forEach((item) => {
+						if (!newList2.includes(item.id)) {
+							newList2.push(item.id)
+						}
+					})
+					newList2.forEach(i=>{
+						newList3.push(allData.find(x=> x.id == i))
+					})
+					// console.log(555,newList3)
+					uni.setStorageSync("setDepts", newList3)
           uni.navigateTo({
             url: `../setDept/setDept?configName=${this.configName}&id=${this.id}&changedept=${this.changedept}`,
           });
         }
       },
+
 			// 选择楼栋
 			itemClick(item){
-				console.log(3333,item)
+
 			},
 			changeColl(){
 				
 			},
       // 选择楼栋
       checkboxChange: function(e) {
-				// this.buildIds = e.detail.value
-				this.buildIds = []
-				// for (let i of dataList){
-				// 	for(let item of i.children){
-				// 		for(let x of e.detail.value){
-				// 			if(x == item.id){
-				// 				this.buildIds.push(i)
-				// 			}else{
-								
-				// 			}
-				// 		}
-				// 	}
-				// }
-				
-				if(e.detail.value.length>0){
-					this.dataList.forEach((item, index)=>{
-						if(item.children && item.children.length>0){
-							for(let i of item.children){
-								if(e.detail.value.includes(i.id)){
-									this.buildIds.push(i)
-								}
-							}
-						}
-					})
-				}
-				console.log(888,this.buildIds)
-     //    var dataList = this.dataList,
-     //        values = e.detail.value;
-     //    for (let i of dataList) {
-					// for(let item of i.children){
-					// 	if (values.includes(item.id)) {
-					// 	  this.$set(item, 'checked', true)
-					// 	} else {
-					// 	  this.$set(item, 'checked', false)
-					// 	}
-					// }
-     //    }
+
       },
       //获取楼栋列表
       getBuildings() {
+				this.allNum = 0
 				let data = uni.getStorageSync("floorList")
 				data.forEach((item, index)=>{
+					item.num = 0
 					item.floor.collapseValue = []
-					item.floor.id = item.floor.id.toString()
-					item.floor.checked = false
+					item.floor.id = item.floor.id.toString() + 'parent'
+					item.checked = false
+					this.allNum += item.children.length
 					if(item.children && item.children.length>0){
 						for(let i of item.children){
 							i.checked = false
 							i.id = i.id.toString()
+							i.floor.id = i.floor.id.toString() + 'parent'
 						}
 					}
        })
-			 console.log(3232131,data)
+			 console.log(3232131,this.allNum)
        this.dataList = data || [];
       }
     },
@@ -228,6 +268,10 @@
 		align-items: center;
 		justify-content: center;
 		position: relative;
+		.top-right{
+			position: absolute;
+			right: 40rpx;
+		}
 	}
 	.df-all{
 		position: absolute;
@@ -251,6 +295,13 @@
 		top: 20rpx;
 		z-index: 999;
 	}
+	.right-ab{
+		position: absolute;
+		right: 64rpx;
+		top: 28rpx;
+		z-index: 999;
+		color: #303133;
+	}
 	.title{
 		padding: 30rpx;
 		font-size: 32rpx;

pages/setDept/setDept.vue

@@ -2,8 +2,8 @@
   <view class="setDept">
     <view class="page_tab">
       <view class="page_tab_bar active">
+				<view class="dept_title">{{ configName }}</view>
         <view class="tab_dept">
-          {{ configName}}
           <button type="default" size="mini" class="addDept" @click="addDeptClick">
             添加科室
           </button>
@@ -350,10 +350,17 @@
           width: 100%;
           background-color: transparent;
         }
-
+				
+				.dept_title{
+					font-size: 30rpx;
+					width: 220rpx;
+					overflow: hidden;
+					white-space: nowrap; 
+					text-overflow: ellipsis;
+				}
+				
         .tab_dept {
           position: relative;
-
           .addDept {
             white-space: nowrap;
             margin: 0;