修改数据精算业务数据分析

portal-manager-ui/admin/src/views/dataActuary/business/basecontent/index.vue

@@ -78,7 +78,7 @@
 				</a-col>
 				<a-col :span="20">
 					<div class="table_title">排队业务分布情况</div>
-					<a-table :row-key="record => record.key" :dataSource="lineUp" :columns="lineUpColumns" :pagination="false" :scroll="{ x: 1400, y: 0 }"/>
+					<a-table :row-key="(record,index) => index" :dataSource="lineUp" :columns="lineUpColumns" :pagination="false" :scroll="{ x: 1400, y: 0 }"/>
 				</a-col>
 			</a-row>
 		</a-card>
@@ -110,7 +110,7 @@
 				</a-col>
 				<a-col :span="20">
 					<div>预约业务分布情况</div>
-					<a-table :row-key="record => record.id"  :dataSource="appointment" :columns="appointmentColumns" :pagination="false" :scroll="{ x: 1400, y: 0 }"/>
+					<a-table :row-key="(record,index) => index"  :dataSource="appointment" :columns="appointmentColumns" :pagination="false" :scroll="{ x: 1400, y: 0 }"/>
 				</a-col>
 			</a-row>
 		</a-card>
@@ -125,14 +125,14 @@
 					<template #extra>
 						<a-select
 							ref="select"
-							v-model:value="takeNumberTopDate"
+							v-model="takeNumberTopDate"
 							:options="options"
 							style="width: 120px"
 							@change="changeTakeNumberTopDate"
 						>
 						</a-select>
 					</template>
-					<a-table :row-key="record => record.index" :dataSource="takeNumberTop" :columns="takeNumberTopColumns" :pagination="false">
+					<a-table :row-key="(record,index) => index" :dataSource="takeNumberTop" :columns="takeNumberTopColumns" :pagination="false">
 						<span slot="index" slot-scope="text, record, index">
 							{{  index + 1 }}
 						</span>
@@ -153,14 +153,14 @@
 					<template #extra>
 						<a-select
 							ref="select"
-							v-model:value="appointmentTopDate"
+							v-model="appointmentTopDate"
 							:options="options"
 							style="width: 120px"
 							@change="changeAppointmentTopDate"
 						>
 						</a-select>
 					</template>
-					<a-table :row-key="record => record.index" :dataSource="appointmentTop" :columns="appointmentTopColumns" :pagination="false">
+					<a-table :row-key="(record,index) => index" :dataSource="appointmentTop" :columns="appointmentTopColumns" :pagination="false">
 						<span slot="index" slot-scope="text, record, index">
 							{{  index + 1 }}
 						</span>
@@ -183,14 +183,14 @@
 					<template #extra>
 						<a-select
 							ref="select"
-							v-model:value="takeNumberLessDate"
+							v-model="takeNumberLessDate"
 							:options="options"
 							style="width: 120px"
 							@change="changeTakeNumberLessDate"
 						>
 						</a-select>
 					</template>
-					<a-table :row-key="record => record.index" :dataSource="takeNumberLess" :columns="takeNumberLessColumns" :pagination="false">
+					<a-table :row-key="(record,index) => index" :dataSource="takeNumberLess" :columns="takeNumberLessColumns" :pagination="false">
 						<span slot="index" slot-scope="text, record, index">
 							{{  index + 1 }}
 						</span>
@@ -211,14 +211,14 @@
 					<template #extra>
 						<a-select
 							ref="select"
-							v-model:value="appointmentLessDate"
+							v-model="appointmentLessDate"
 							:options="options"
 							style="width: 120px"
 							@change="changeAppointmentLessDate"
 						>
 						</a-select>
 					</template>
-					<a-table :row-key="record => record.index" :dataSource="appointmentLess" :columns="appointmentLessColumns" :pagination="false">
+					<a-table :row-key="(record,index) => index" :dataSource="appointmentLess" :columns="appointmentLessColumns" :pagination="false">
 						<span slot="index" slot-scope="text, record, index">
 							{{  index + 1 }}
 						</span>
@@ -422,7 +422,7 @@ import moment from "moment"
 						key:'index',
 						title: '排名',
 						dataIndex: 'index',
-						scopedSlots: { customRender: 'index' },
+						// scopedSlots: { customRender: 'index' },
 					},
 					{
 						key:'businessName',
@@ -433,16 +433,20 @@ import moment from "moment"
 						key:'number',
 						title: '办理数量',
 						dataIndex: 'nums',
-						scopedSlots: { customRender: 'nums' },
+						// scopedSlots: { customRender: 'nums' },
 					},
 				],
 				takeNumberTopDate: '0',
 				appointmentTopDate: '0',
 				takeNumberLessDate: '0',
 				appointmentLessDate: '0',
+				siteid:localStorage.getItem("siteId")
 			}
 		},
 		mounted(){
+			this.$bus.$on("changeSite", () => {
+				this.siteid = localStorage.getItem("siteId")
+			});
 			this.getAllData()
 			this.getTakeLineData()
 			this.getAppointmentData()
@@ -451,11 +455,22 @@ import moment from "moment"
 			this.getTakeNumberLess()
 			this.getAppointmentLess()
 		},
+		watch:{
+			siteid(){
+				this.getAllData()
+				this.getTakeLineData()
+				this.getAppointmentData()
+				this.getTakeNumberTop()
+				this.getAppointmentTop()
+				this.getTakeNumberLess()
+				this.getAppointmentLess()
+			}
+		},
 		methods:{
 			//获取全部基本数据
 			async getAllData() {
 				this.nowDate= moment(new Date()).format('YYYY-MM-DD h:mm:ss')
-				const res = await getAllInfo()
+				const res = await getAllInfo({siteid:this.siteid})
 				if(res.code == 1){
 					this.situation= res.data
 					this.firstPie= {
@@ -474,7 +489,7 @@ import moment from "moment"
 			},
 			// 排队取号
 			async getTakeLineData() {
-				const res = await getBusinessInfo()
+				const res = await getBusinessInfo({siteid:this.siteid})
 				if(res.code == 1){
 					let arr= res.data.info
 					let newArr= []
@@ -503,7 +518,7 @@ import moment from "moment"
 			},
 			// 预约情况
 			async getAppointmentData() {
-				const res = await getWyInfo()
+				const res = await getWyInfo({siteid:this.siteid})
 				if(res.code == 1){
 					let arr= res.data.info
 					let newArr= []
@@ -535,7 +550,7 @@ import moment from "moment"
 				if(val== undefined){
 					val = 0
 				}
-				const res = getTopBusiness({selected: val,sort: 'DESC'})
+				const res = await getTopBusiness({selected: val,sort: 'DESC',siteid:this.siteid})
 				if(res.code == 1) {
 					this.takeNumberTop= res.data
 				}
@@ -545,7 +560,7 @@ import moment from "moment"
 				if(val== undefined){
 					val = 0
 				}
-				const res = getTopBusiness({selected: val,sort: 'ASC'})
+				const res = await getTopBusiness({selected: val,sort: 'ASC',siteid:this.siteid})
 				if(res.code == 1) {
 					this.takeNumberLess= res.data
 				}
@@ -555,7 +570,7 @@ import moment from "moment"
 				if(val== undefined){
 					val = 0
 				}
-				const res = getTopWy({selected: val,sort: 'DESC'})
+				const res = await getTopWy({selected: val,sort: 'DESC',siteid:this.siteid})
 				if(res.code == 1) {
 					this.appointmentTop= res.data
 				}
@@ -565,7 +580,7 @@ import moment from "moment"
 				if(val== undefined){
 					val = 0
 				}
-				const res = getTopWy({selected: val,sort: 'ASC'})
+				const res = await getTopWy({selected: val,sort: 'ASC',siteid:this.siteid})
 				if(res.code == 1) {
 					this.appointmentLess= res.data
 				}

portal-manager-ui/admin/src/views/dataActuary/business/index.vue

@@ -40,13 +40,13 @@ export default {
 		businessName: '',
 		dataSource: [],
         sourceList:[],
-		dataList: [],
+		// dataList: [],
 		btnShow: false,
 	  }
 	  
 	},
     mounted() {
-		this.getList()
+		// this.getList()
 	},
    created(){
    },
@@ -69,15 +69,15 @@ export default {
 			this.btnShow= false
 			this.businessName= ''
 		},
-		async getList(){
-			await axios.get('http://192.168.0.98:8090/inter/statistic/busList',{params: {siteid: 1}}).then((res)=>{
-				if(res && res.status==200){
-					res.data.data.forEach(item=>{
-						this.dataList.push(item.name)
-					})
-				}
-			})
-		},
+		// async getList(){
+		// 	await axios.get('http://192.168.0.98:8090/inter/statistic/busList',{params: {siteid: 1}}).then((res)=>{
+		// 		if(res && res.status==200){
+		// 			res.data.data.forEach(item=>{
+		// 				this.dataList.push(item.name)
+		// 			})
+		// 		}
+		// 	})
+		// },
 		onSearch: _.debounce(function(val){
 			this.dataSource= []
             userSiteBus({siteid: localStorage.getItem('siteId'),bus_name:val}).then(res => {