修复

.idea/workspace.xml

@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -14,20 +15,17 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="65" column="71" selection-start-line="65" selection-start-column="63" selection-end-line="65" selection-end-column="71" />
-              <folding>
-                <element signature="n#style#0;n#image#0;n#u-upload#0;n#view#0;n#u-form-item#6;n#u--form#0;n#view#0;n#view#0;n#template#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="1980">
+              <caret line="66" selection-start-line="66" selection-end-line="66" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="420">
@@ -36,11 +34,15 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
-              <caret line="85" column="51" lean-forward="true" selection-start-line="85" selection-start-column="12" selection-end-line="85" selection-end-column="51" />
+            <state relative-caret-position="360">
+              <caret line="222" column="61" lean-forward="true" selection-start-line="222" selection-start-column="61" selection-end-line="222" selection-end-column="61" />
+              <folding>
+                <element signature="n#style#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -65,6 +67,7 @@
       <list>
         <option value="$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue" />
         <option value="$PROJECT_DIR$/pages/my/Mydistribution/distributionedit/distributionedit.vue" />
+        <option value="$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue" />
       </list>
     </option>
   </component>
@@ -79,6 +82,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -86,11 +90,6 @@
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
-              <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
-              <item name="node_modules" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="witcabonAPP" type="b2602c69:ProjectViewProjectNode" />
               <item name="witcabonAPP" type="462c0819:PsiDirectoryNode" />
@@ -140,7 +139,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -172,23 +170,21 @@
       <option name="presentableId" value="Default" />
       <updated>1680248385794</updated>
       <workItem from="1680248387431" duration="1978000" />
+      <workItem from="1680571981170" duration="451000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1978000" />
+    <option name="totallyTimeSpent" value="2429000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Favorites" side_tool="true" />
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="调试" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -196,6 +192,10 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Terminal" order="9" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -210,20 +210,17 @@
         <state relative-caret-position="-990" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
+    <entry file="file://$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="85" column="51" lean-forward="true" selection-start-line="85" selection-start-column="12" selection-end-line="85" selection-end-column="51" />
+        <state relative-caret-position="1980">
+          <caret line="66" selection-start-line="66" selection-end-line="66" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue">
+    <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="65" column="71" selection-start-line="65" selection-start-column="63" selection-end-line="65" selection-end-column="71" />
-          <folding>
-            <element signature="n#style#0;n#image#0;n#u-upload#0;n#view#0;n#u-form-item#6;n#u--form#0;n#view#0;n#view#0;n#template#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="330">
+          <caret line="85" column="51" selection-start-line="85" selection-start-column="12" selection-end-line="85" selection-end-column="51" />
         </state>
       </provider>
     </entry>
@@ -234,5 +231,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pages/index/Inspectionrecord/Inspectionrecord.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="222" column="61" lean-forward="true" selection-start-line="222" selection-start-column="61" selection-end-line="222" selection-end-column="61" />
+          <folding>
+            <element signature="n#style#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#view#0;n#view#1;n#view#0;n#template#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

pages/Workorder/Tenantbill/Tenantbill.vue

@@ -45,7 +45,9 @@
 		</t-table> -->
 
 		<view class="u-listdata">
-
+			<view style="padding:10rpx 0 0 30rpx">
+				共有 <span style="color: red">{{totalnumber}}</span>条记录
+			</view>
 
 			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
 				<u-list-item v-for="(item, index) in indexList" :key="index">
@@ -108,6 +110,7 @@
 				format: 'yyyy-mm'
 			})
 			return {
+				totalnumber: 0,
 				setyesno: true,
 				// tableList: [{
 				// 		id: 0,
@@ -169,7 +172,7 @@
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad() {
 			this.getfloor();
-			//	this.loadmore();
+
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
 		onReady() {
@@ -235,7 +238,7 @@
 
 				this.$api.get('/billinfo/paypage', this.dataForm)
 					.then(res => {
-
+						this.totalnumber = res.data.data.total;
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
 							this.dataForm.page = this.dataForm.page + 1;
@@ -252,18 +255,10 @@
 					})
 			},
 
-			loadmore() {
-				// for (let i = 0; i < 30; i++) {
-				// 	this.indexList.push({
-				// 		url: this.urls[uni.$u.random(0, this.urls.length - 1)]
-				// 	})
-				// }
-			},
 
 
-			// edit(item) {
-			// 	console.log('111111111111111111', item)
-			// },
+
+
 			canceltype() {
 				this.showtype = false;
 			},
@@ -272,6 +267,7 @@
 				this.showtype = false;
 				this.mytype = e.value[0].label;
 				this.dataForm.cycle = e.value[0].id;
+				this.indexList = [];
 				this.dataForm.page = 1;
 				this.getalldata();
 			},
@@ -282,6 +278,7 @@
 				this.myday = e.target.value;
 				this.dataForm.cycle = e.target.value;
 				this.dataForm.page = 1;
+				this.indexList = [];
 				this.getalldata();
 			},
 			getDate(type) {
@@ -317,6 +314,7 @@
 							}
 							//  console.log('111111111111111111',allfloor)
 							this.columnData = allfloor;
+							this.indexList = [];
 							this.dataForm.page = 1;
 							this.getalldata();
 						} else {
@@ -347,6 +345,8 @@
 				this.mytitle = e.value[0].orgName + e.value[1].orgName;
 				this.dataForm.buildingId = e.value[0].orgId;
 				this.dataForm.storeyId = e.value[1].orgId;
+					this.indexList = [];
+					this.dataForm.page = 1;
 				this.showfloor = false;
 				this.getalldata();
 			},

pages/Workorder/Tenantbill/companybill/companybill.vue

@@ -69,7 +69,9 @@
 			暂无数据
 		</view>
 			<view class="u-listdata"  v-if="jfnodata==false">
-				
+				<view style="padding:10rpx 0 0 30rpx">
+					共有 <span style="color: red">{{totalnumber}}</span>条记录
+				</view>
 				
 				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
 					<u-list-item v-for="(item, index) in indexList" :key="index">
@@ -116,6 +118,7 @@
 	export default {
 		data() {
 			return {
+				totalnumber:0,
 				jfnodata:false,
 				showtype: false,
 				cdshow: true,
@@ -157,16 +160,16 @@
 			this.fatherparameter = JSON.parse(decodeURIComponent(options.para));
 			
 			let getDictDataList=uni.getStorageSync('getDictDataList');
-
+  console.log('111111111111111111',getDictDataList)
 
 			for(let i=0;i<getDictDataList.length;i++){
 				if(getDictDataList[i].dictType=='PayType'){
-					this.columnstype=getDictDataList[i]
+					this.columnstype=[getDictDataList[i].dataList]
 				}
 
 
 				if(getDictDataList[i].dictType=='PayStatus'){
-					this.payStatusList=getDictDataList[i]
+					this.payStatusList=[getDictDataList[i].dataList]
 				}	
 			}
 
@@ -260,6 +263,7 @@
 			getjfdata(){
 				this.$api.get('/payrecord/page', this.jfpost)
 					.then(res => {
+						this.totalnumber=res.data.data.total;
 						//  console.log('111111111111111111',res.data.data.list)
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);

pages/index/Immediatecollection/Immediatecollection.vue

@@ -35,7 +35,9 @@
 		</view>
 
 		<view class="u-listdata">
-
+			<view style="padding:10rpx 0 0 30rpx">
+				共有 <span style="color: red">{{totalnumber}}</span>条记录
+			</view>
 
 			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
 				<u-list-item v-for="(item, index) in indexList" :key="index">
@@ -106,6 +108,7 @@
 				format: 'yyyy-mm'
 			})
 			return {
+				totalnumber: 0,
 				setyesno: true,
 				indexList: [],
 				dataList: [],
@@ -157,15 +160,15 @@
 		},
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad() {
-let getDictDataList=uni.getStorageSync('getDictDataList');
+			let getDictDataList = uni.getStorageSync('getDictDataList');
 
-			for(let i=0;i<getDictDataList.length;i++){
-				if(getDictDataList[i].dictType=='getDictDataList'){
-					this.columnstypes=getDictDataList[i]
+			for (let i = 0; i < getDictDataList.length; i++) {
+				if (getDictDataList[i].dictType == "ArrearageDay") {
+					this.columnstypes = [getDictDataList[i].dataList]
 				}
 			}
 
-			
+			this.getalldata();
 			//	this.loadmore();
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
@@ -185,10 +188,10 @@ let getDictDataList=uni.getStorageSync('getDictDataList');
 
 		methods: {
 			seedetail(e) {
-				 // console.log('222',e.tenantName)
+				// console.log('222',e.tenantName)
 				// console.log('111111111111111111',faltesdata)
 				uni.navigateTo({
-				 url: `/pages/index/Immediatecollection/Chargedetails/Chargedetails?companyOrgId=${e.tenantName}`
+					url: `/pages/index/Immediatecollection/Chargedetails/Chargedetails?companyOrgId=${e.tenantName}`
 				})
 			},
 			handleClick(e) {
@@ -227,7 +230,7 @@ let getDictDataList=uni.getStorageSync('getDictDataList');
 
 				this.$api.get('/expeditrecord/apppage', this.dataForm)
 					.then(res => {
-
+						this.totalnumber = res.data.data.total;
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
 							this.dataForm.page = this.dataForm.page + 1;
@@ -254,6 +257,7 @@ let getDictDataList=uni.getStorageSync('getDictDataList');
 				this.mytype = e.value[0].label;
 				this.dataForm.billType = e.value[0].id;
 				this.dataForm.page = 1;
+				this.indexList=[];
 				this.getalldata();
 			},
 			confirmtypes(e) {
@@ -262,6 +266,7 @@ let getDictDataList=uni.getStorageSync('getDictDataList');
 				this.mytypes = e.value[0].dictLabel;
 				this.dataForm.arrearDay = e.value[0].dictValue;
 				this.dataForm.page = 1;
+				this.indexList=[];
 				this.getalldata();
 			},
 			canceltypes() {
@@ -275,6 +280,7 @@ let getDictDataList=uni.getStorageSync('getDictDataList');
 				this.myday = e.target.value;
 				this.dataForm.cycle = e.target.value;
 				this.dataForm.page = 1;
+				this.indexList=[];
 				this.getalldata();
 			},
 			getDate(type) {

pages/index/Inspectionrecord/Inspectionrecord.vue

@@ -40,19 +40,17 @@
 				<t-td>{{ item.age }}</t-td>
 				<t-td>{{ item.hobby }}</t-td>
 				  <t-td align="left"> <u-button @click="edit(item)"  size="small" type="primary" :plain="true" text="编辑"></u-button></t-td>
-				
+
 			</t-tr>
 		</t-table> -->
 
 		<view class="u-listdata">
-
+<view style="padding:10rpx 0 0 30rpx">
+	共有 <span style="color: red">{{totalnumber}}</span>条记录
+</view>
 
 			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
 				<u-list-item v-for="(item, index) in indexList" :key="index">
-					<!-- <u-cell :title="`列表长度-${index + 1}`">
-				<u-avatar slot="icon" shape="square" size="35" :src="item.url"
-					customStyle="margin: -3px 5px -3px 0"></u-avatar>
-			</u-cell> -->
 					<view class="companylist" @click="seedetail(item)">
 						<view class="settled" v-if="item.status==1">
 							已结清
@@ -114,6 +112,7 @@
 				format: 'yyyy-mm'
 			})
 			return {
+				totalnumber:0,
 				showtypexunjian: false,
 				setyesno: true,
 				// tableList: [{
@@ -127,7 +126,7 @@
 				// 		name: '李四',
 				// 		age: '21',
 				// 		hobby: '绘画'
-				// 	},				
+				// 	},
 				// ],
 				indexList: [],
 				xjlx: '巡检类型',
@@ -216,11 +215,12 @@
 
 			},
 			scrolltolower() {
-				// this.loadmore()				 
+				// this.loadmore()
 				this.dataForm.page = this.dataForm.page + 1;
 				console.log('111111111111111111', this.dataForm.page)
 				this.$api.get('/billinfo/paypage', this.dataForm)
 					.then(res => {
+							
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
 						} else {
@@ -248,18 +248,19 @@
 				this.showtypexunjian = false;
 			},
 			confirmxunjian(e) {
-			
+
 				this.xjlx = e.value[0].label;
 				// this.dataForm.cycle = e.value[0].id;
 				// this.dataForm.page = 1;
 				// this.getalldata();
-				
+
 				this.showtypexunjian = false;
 			},
 
 			getalldata() {
 				this.$api.get('/billinfo/paypage', this.dataForm)
 					.then(res => {
+						this.totalnumber=res.data.data.total;
 						this.indexList = [];
 						this.indexList = res.data.data.list;
 
@@ -310,7 +311,7 @@
 
 							this.mytitle = res.data.data[0].orgName;
 							this.alldata = res.data.data[0].childrenList;
-							//console.log('111111111111111111',  res.data.data[0].childrenList)			
+							//console.log('111111111111111111',  res.data.data[0].childrenList)
 							this.columns = [
 								res.data.data[0].childrenList,
 								res.data.data[0].childrenList[0].childrenList

pages/index/Withholdingrecord/Withholdingrecord.vue

@@ -28,7 +28,9 @@
 		
 <view class="u-listdata">
 	
-	
+	<view style="padding:10rpx 0 0 30rpx">
+		共有 <span style="color: red">{{totalnumber}}</span>条记录
+	</view>
 	<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
 		<u-list-item v-for="(item, index) in indexList" :key="index">
 		
@@ -66,10 +68,13 @@
 
 
 
-		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'>
-		</u-picker>
+		<u-picker :show="showtype" :columns="columnstype" keyName="dictLabel" @confirm="confirmtype" @cancel='canceltype'></u-picker>
+	
+		
 		<u-picker :show="showfloor" ref="uPicker" :loading="loading" @confirm="confirmfloor" @cancel='cancelfloor'
 			:columns="columns" keyName="orgName" @change="changeHandler"></u-picker>
+			
+			
 		<u-notify ref="uNotify" :show="showdct" message="服务器请求失败"></u-notify>
 	</view>
 </template>
@@ -83,6 +88,7 @@
 		data() {
 			
 			return {
+				totalnumber:0,
 				setyesno: true,
 				indexList: [],
 				dataList: [],
@@ -108,7 +114,8 @@
 				mytype: '全部',
 				showPicker: false,
 				//myday: currentDate,
-				columnstype: [					
+				columnstype: [
+					
 				],
 
 
@@ -119,14 +126,15 @@
 		onLoad() {
 
 			let getDictDataList=uni.getStorageSync('getDictDataList');
+ // console.log('111111111111111111', getDictDataList)
 
 			for(let i=0;i<getDictDataList.length;i++){
 				if(getDictDataList[i].dictType=='PayType'){
-					this.columnstype=getDictDataList[i]
+					this.columnstype=[getDictDataList[i].dataList]
 				}
 			}
 
-			//  console.log('111111111111111111',this.columnstype)
+			
 			this.getfloor();
 			//	this.loadmore();
 		},
@@ -154,7 +162,7 @@
 			scrolltolower() {
 				// this.loadmore()				 
 				this.dataForm.page = this.dataForm.page + 1;
-				console.log('111111111111111111', this.dataForm.page)
+			
 				this.$api.get('/billinfo/paypage', this.dataForm)
 					.then(res => {
 						if (res.data.data.list.length != 0) {
@@ -182,6 +190,7 @@
 			getalldata() {
 				this.$api.get('/payrecord/page', this.dataForm)
 					.then(res => {
+						this.totalnumber=res.data.data.total;
 						this.indexList = [];
 						this.indexList = res.data.data.list;
 

pages/index/Workordertodone/Workordertodone.vue

@@ -8,7 +8,9 @@
 
 		<!-- 待派送 -->
 		<view class="" v-show="cdshow==0">
-			
+			<view style="padding:20rpx 0 0 30rpx">
+				共有 <span style="color: red">{{totalnumber}}</span>条记录
+			</view>	
 					
 			<view class="u-listdata" >
 				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
@@ -37,7 +39,11 @@
 		<!-- 已派送(待维修) -->
 		<view class="" v-show="cdshow==1">		
 		<!-- 	列表 -->
-			<view class="u-listdata" >								
+			<view class="u-listdata" >	
+				<view style="padding:20rpx 0 0 30rpx">
+					共有 <span style="color: red">{{totalnumber}}</span>条记录
+				</view>						
+										
 				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
 					<u-list-item v-for="(item, index) in indexList" :key="index">
 						
@@ -78,6 +84,10 @@
 		<view class="" v-show="cdshow==2">		
 		<!-- 	列表 -->
 			<view class="u-listdata" >
+				<view style="padding:20rpx 0 0 30rpx">
+					共有 <span style="color: red">{{totalnumber}}</span>条记录
+				</view>	
+				
 				<u-list  @scrolltolower="scrolltolower" :pagingEnabled='true'>
 					<u-list-item v-for="(item, index) in indexList" :key="index">
 						
@@ -122,6 +132,7 @@
 	export default {
 		data() {
 			return {
+				totalnumber:0,
 				jfnodata:false,
 				showtype: false,
 				cdshow: 0,
@@ -218,8 +229,8 @@
 			getpaisongdata(){
 				this.$api.get('/repairorder/page', this.dataForm)
 					.then(res => {
-						//  console.log('111111111111111111',res.data.data.list)						 					 
-						//  this.repairTypeList 
+						 this.totalnumber=res.data.data.total;
+					
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);										
 								this.dataForm.page = this.dataForm.page + 1;

pages/index/index.vue

@@ -35,15 +35,15 @@
 				<view class="wait">
 					<view>
 						<view style="font-size: 30rpx;">待指派</view>
-						<view style="text-align: center;">1</view>
+						<view style="text-align: center;">{{workList[1]}}</view>
 					</view>
 					<view>
 						<view style="font-size: 30rpx;">待维修</view>
-						<view style="text-align: center;">1</view>
+						<view style="text-align: center;">{{workList[2]}}</view>
 					</view>
 					<view>
 						<view style="font-size: 30rpx;">已维修</view>
-						<view style="text-align: center;">1</view>
+						<view style="text-align: center;">{{workList[3]}}</view>
 					</view>
 				</view>
 			</view>
@@ -65,19 +65,19 @@
 				<view class="wait">
 					<view>
 						<view style="font-size: 30rpx;">异常总数</view>
-						<view style="text-align: center;">0</view>
+						<view style="text-align: center;">{{deviceArr.AirConditioner}}</view>
 					</view>
 					<view>
 						<view style="font-size: 30rpx;">空调异常</view>
-						<view style="text-align: center;">0</view>
+						<view style="text-align: center;">{{deviceArr.Ammeter}}</view>
 					</view>
 					<view>
 						<view style="font-size: 30rpx;">水表异常</view>
-						<view style="text-align: center;">0</view>
+						<view style="text-align: center;">{{deviceArr.WaterMeter}}</view>
 					</view>
 					<view>
 						<view style="font-size: 30rpx;">电表异常</view>
-						<view style="text-align: center;">0</view>
+						<view style="text-align: center;">{{deviceArr.Relay}}</view>
 					</view>
 				</view>
 			</view>
@@ -95,58 +95,90 @@
 						</view>
 					</view>
 				</view>
-				<view class="type">
-					 <table class="tr" style="width: 100%; border-color: #ccc; border-collapse: collapse;" border="1"
-						cellspacing="0" cellpadding="0">
-						          <tr>
-							            <td>欠费类型</td>
-							            <td>欠费租户数</td>
-							             <td>累计欠费（元)</td>
-							           
-							          </tr>
-						          <tr>
-							            <td>水费</td>
-							            <td>1.00</td>
-							             <td>0.00</td>
-							           
-							          </tr>
-						<tr>
-							   <td>电费</td>
-							   <td>1.00</td>
-							   <td>0.00</td>
-							 
-						</tr>
-						<tr>
-							   <td>物业费</td>
-							   <td>1.00</td>
-							   <td>77796.00</td>
-						</tr>
-						 
-					</table>
-				</view>
+
+
+				<t-table style="background-color: #fff;margin-top: 10rpx;">
+					<t-tr>
+						<t-th>欠费类型</t-th>
+						<t-th>欠费租户数</t-th>
+						<t-th>累计欠费(元)</t-th>
+					</t-tr>
+					<t-tr v-for="item in tableList" :key="item.name">
+						<t-td>{{ item.name }}</t-td>
+						<t-td>{{ item.tenant }}</t-td>
+						<t-td>{{ item.arrears }}</t-td>
+
+
+					</t-tr>
+				</t-table>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import tTable from '@/components/t-table/t-table.vue';
+	import tTh from '@/components/t-table/t-th.vue';
+	import tTr from '@/components/t-table/t-tr.vue';
+	import tTd from '@/components/t-table/t-td.vue';
 	export default {
+		components: {
+			tTable,
+			tTh,
+			tTr,
+			tTd
+		},
 		data() {
 			return {
+				tableList: [
+				],
 				tabbardata: 0,
+				workList: {}, //工单代办
+				deviceArr: {}, //设备异常数据
+			
 
 			}
 		},
 		onLoad() {
 
-
+			this.getalldata();
 		},
 		methods: {
-Immediatecollection(){
-	uni.navigateTo({
-		url: '/pages/index/Immediatecollection/Immediatecollection'
-	})
-},
+			getalldata() {
+				this.$api.get('/home/homedata', {})
+					.then(res => {
+						//console.log('111111111111111111', res.data.data)
+						this.workList = res.data.data.workOrder;
+						this.deviceArr = res.data.data.equip.maps;
+
+					this.tableList=	res.data.data.billPaymentList.map(item => {
+							let json = {};
+							if(item.payType=='Water'){
+								item.payType='水费'
+							}else if(item.payType=='Elec'){
+								item.payType='电费'
+							}else if(item.payType=='PropertyFee'){
+								item.payType='物业费'
+							}
+							
+							json.name = item.payType;
+							json.tenant = item.arrearageNum ;
+							json.arrears = item.arrearageAmount ;
+							return json
+						})
+ 
+
+
+
+
+					})
+
+			},
+			Immediatecollection() {
+				uni.navigateTo({
+					url: '/pages/index/Immediatecollection/Immediatecollection'
+				})
+			},
 			Workordertodone() {
 				uni.navigateTo({
 					url: '/pages/index/Workordertodone/Workordertodone'