解决分页url带参数问题/创建用户增加队列 (6dc8a4d3) · Commits · SUMMER2020 / students / proj-2002251

escheduler-ui/.env

+1 −1

Original line number	Diff line number	Diff line

		# 后端接口地址
		API_BASE = http://192.168.220.154:12345
		API_BASE = http://192.168.220.247:12345

		# 本地开发如需ip访问项目把"#"号去掉
		#DEV_HOST = 192.168.xx.xx

escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue

+28 −23

Original line number	Diff line number	Diff line
		@@ -9,9 +9,9 @@
		</template>
		<template slot="content">
		<template v-if="datasourcesList.length">
		<m-list :datasources-list="datasourcesList" :page-no="pageNo" :page-size="pageSize"></m-list>
		<m-list :datasources-list="datasourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
		<div class="page-box">
		<x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
		<x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
		</div>
		</template>
		<template v-if="!datasourcesList.length">
		@@ -23,11 +23,13 @@
		</m-list-construction>
		</template>
		<script>
		import _ from 'lodash'
		import { mapActions } from 'vuex'
		import mList from './_source/list'
		import mSpin from '@/module/components/spin/spin'
		import mNoData from '@/module/components/noData/noData'
		import mCreateDataSource from './_source/createDataSource'
		import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
		import mConditions from '@/module/components/conditions/conditions'
		import mListConstruction from '@/module/components/listConstruction/listConstruction'

		@@ -37,18 +39,21 @@
		return {
		// loading
		isLoading: true,
		// Total number of articles
		total: 20,
		// data sources(List)
		datasourcesList: [],
		searchParams: {
		// Number of pages per page
		pageSize: 10,
		// Number of pages
		pageNo: 1,
		// Total number of articles
		total: 20,
		// Search value
		searchVal: '',
		// data sources(List)
		datasourcesList: []
		searchVal: ''
		}
		}
		},
		mixins: [listUrlParamHandle],
		props: {},
		methods: {
		...mapActions('datasource', ['getDatasourcesListP']),
		@@ -67,7 +72,7 @@
		return h(mCreateDataSource, {
		on: {
		onUpdate () {
		self._getDatasourcesListP('false')
		self._debounceGET('false')
		modal.remove()
		},
		close () {
		@@ -85,27 +90,22 @@
		* page
		*/
		_page (val) {
		this.pageNo = val
		this._getDatasourcesListP()
		this.searchParams.pageNo = val
		},
		/**
		* conditions event
		*/
		_onConditions (o) {
		this.searchVal = o.searchVal
		this.pageNo = 1
		this._getDatasourcesListP('false')
		this.searchParams = _.assign(this.searchParams, o)
		this.searchParams.pageNo = 1
		},
		/**
		* get data(List)
		*/
		_getDatasourcesListP (flag) {
		_getList (flag) {
		this.isLoading = !flag
		this.getDatasourcesListP({
		pageSize: this.pageSize,
		pageNo: this.pageNo,
		searchVal: this.searchVal
		}).then(res => {
		this.getDatasourcesListP(this.searchParams).then(res => {
		this.datasourcesList = []
		this.datasourcesList = res.totalList
		this.total = res.total
		this.isLoading = false
		@@ -114,9 +114,14 @@
		})
		}
		},
		watch: {},
		watch: {
		// router
		'$route' (a) {
		// url no params get instance list
		this.searchParams.pageNo = _.isEmpty(a.query) ? 1 : a.query.pageNo
		}
		},
		created () {
		this._getDatasourcesListP()
		},
		mounted () {
		},

escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue

+1 −5

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@
		import store from '@/conf/home/store'
		import mConditions from './_source/conditions'
		import mSpin from '@/module/components/spin/spin'
		import { setUrlParams } from '@/module/util/routerUtil'
		import mNoData from '@/module/components/noData/noData'
		import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
		import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
		@@ -61,13 +60,10 @@
		methods: {
		_onQuery (o) {
		this.searchParams = _.assign(this.searchParams, o)
		setUrlParams(this.searchParams)
		this._debounceGET()
		this.searchParams.pageNo = 1
		},
		_page (val) {
		this.searchParams.pageNo = val
		setUrlParams(this.searchParams)
		this._debounceGET()
		},
		/**
		* get list data

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue

+0 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@
		import mList from './_source/list'
		import mSpin from '@/module/components/spin/spin'
		import localStore from '@/module/util/localStorage'
		import { setUrlParams } from '@/module/util/routerUtil'
		import mNoData from '@/module/components/noData/noData'
		import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
		import mConditions from '@/module/components/conditions/conditions'
		@@ -62,8 +61,6 @@
		*/
		_page (val) {
		this.searchParams.pageNo = val
		setUrlParams(this.searchParams)
		this._debounceGET()
		},
		/**
		* conditions
		@@ -71,8 +68,6 @@
		_onConditions (o) {
		this.searchParams.searchVal = o.searchVal
		this.searchParams.pageNo = 1
		setUrlParams(this.searchParams)
		this._debounceGET()
		},
		/**
		* get data list

escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue

+3 −0

Original line number	Diff line number	Diff line
		@@ -162,3 +162,6 @@
		components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
		}
		</script>

		<style lang="scss" rel="stylesheet/scss">
		</style>