Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev
This commit is contained in:
		
						commit
						29db0c4024
					
				| @ -7,30 +7,36 @@ import dictRoutes from './dict'; | |||||||
| export default [ | export default [ | ||||||
|   { |   { | ||||||
|     path: '/sub-government-affairs-service/resource', |     path: '/sub-government-affairs-service/resource', | ||||||
|     name: 'resource', |     name: 'resourceManagement', | ||||||
|     component: Layout, |     component: Layout, | ||||||
|     redirect: '/sub-government-affairs-service/grid', |     redirect: '/sub-government-affairs-service/grid', | ||||||
|     meta: { title: '土地资源管理', icon: 'icon-test' }, |     meta: { title: '土地资源管理', icon: 'icon-test' }, | ||||||
|     children: [ |     children: [ | ||||||
|       { |       { | ||||||
|         redirect: '/sub-government-affairs-service/grid', |         redirect: '/sub-government-affairs-service/add-grid', | ||||||
|         path: '/sub-government-affairs-service/grid', |         path: '/sub-government-affairs-service/grid', | ||||||
|         component: () => import('@/views/resource/grid/index.vue'), |         // component: () => import('@/views/resource/grid/index.vue'),
 | ||||||
|         name: 'grid', |         name: 'grid', | ||||||
|         meta: { title: '网格化管理', icon: 'Memo' }, |         meta: { title: '网格化管理', icon: 'Memo' }, | ||||||
|         children: [ |         children: [ | ||||||
|           { |           { | ||||||
|             path: '/sub-government-affairs-service/grid', |             path: '/sub-government-affairs-service/add-grid', | ||||||
|             component: () => import('@/views/resource/grid/index.vue'), |             component: () => import('@/views/resource/grid/index.vue'), | ||||||
|             name: 'grid1', |             name: 'add', | ||||||
|             meta: { title: '新增网格', icon: '' }, |             meta: { title: '新增网格', icon: '' }, | ||||||
|           }, |           }, | ||||||
|           // {
 |           { | ||||||
|           //   path: '/sub-government-affairs-service/grid',
 |             path: '/sub-government-affairs-service/add--grid-member', | ||||||
|           //   component: () => import('@/views/resource/grid/index.vue'),
 |             component: () => import('@/views/resource/grid/AddGridMember.vue'), | ||||||
|           //   name: 'grid2',
 |             name: 'member', | ||||||
|           //   meta: { title: '网格化地图', icon: '' },
 |             meta: { title: '新增网格员', icon: '' }, | ||||||
|           // },
 |           }, | ||||||
|  |           { | ||||||
|  |             path: '/sub-government-affairs-service/grid--management', | ||||||
|  |             component: () => import('@/views/resource/grid/GridManagement.vue'), | ||||||
|  |             name: 'management', | ||||||
|  |             meta: { title: '网格化管理', icon: '' }, | ||||||
|  |           }, | ||||||
|         ], |         ], | ||||||
|       }, |       }, | ||||||
|       ...annualplanRouters, |       ...annualplanRouters, | ||||||
|  | |||||||
| @ -28,13 +28,34 @@ getApplyList().then((res) => { | |||||||
|   products.value = res.data; |   products.value = res.data; | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
|  | const applyData = [ | ||||||
|  |   { id: 1, name: '耿马绿色蔬菜', imageUrl: 'images/brand/11.png' }, | ||||||
|  |   { id: 2, name: '云南高山茶', imageUrl: 'images/brand/12.png' }, | ||||||
|  |   { id: 3, name: '新疆大枣', imageUrl: 'images/brand/13.png' }, | ||||||
|  |   { id: 4, name: '东北大米', imageUrl: 'images/brand/14.png' }, | ||||||
|  |   { id: 5, name: '山东苹果', imageUrl: 'images/brand/15.png' }, | ||||||
|  |   { id: 6, name: '四川泡菜', imageUrl: 'images/brand/16.png' }, | ||||||
|  |   { id: 7, name: '江苏阳澄湖大闸蟹', imageUrl: 'images/brand/11.png' }, | ||||||
|  |   { id: 8, name: '海南椰子', imageUrl: 'images/brand/12.png' }, | ||||||
|  |   { id: 9, name: '广东早茶', imageUrl: 'images/brand/13.png' }, | ||||||
|  |   { id: 10, name: '北京烤鸭', imageUrl: 'images/brand/14.png' }, | ||||||
|  |   { id: 11, name: '西藏青稞酒', imageUrl: 'images/brand/15.png' }, | ||||||
|  |   { id: 12, name: '青海牦牛肉', imageUrl: 'images/brand/16.png' }, | ||||||
|  | ]; | ||||||
|  | 
 | ||||||
| function gotoApplication(id) { | function gotoApplication(id) { | ||||||
|   router.push(`/sub-operation-service/brand/apply/${id}`); |   router.push(`/sub-operation-service/brand/apply/${id}`); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | // TODO: 对接口需要删除这个方法 | ||||||
|  | function data() { | ||||||
|  |   products.value = applyData; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| // 组件挂载时获取数据 | // 组件挂载时获取数据 | ||||||
| onMounted(() => { | onMounted(() => { | ||||||
|   getApplyList; |   // getApplyList; | ||||||
|  |   data(); | ||||||
| }); | }); | ||||||
| </script> | </script> | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user