719

src/api/projectAudit.js

@@ -3,11 +3,11 @@ import request from "./index";
 /* *********都市项目申报********** */
 
 // 列表
-export function GetDsxmList(pageNum, pageSize) {
+export function GetDsxmList(form,pageNum, pageSize) {
   return request({
     url: '/dsxmsb/list',
     params: {
-      pageNum, pageSize
+      ...form,pageNum, pageSize
     },
     method: "get"
   })
@@ -68,3 +68,54 @@ export function GetDsjsList(current, pageSize) {
     }
   })
 }
+
+/* *********高标准农田遴选********** */
+
+//遴选方案保存
+export function PostGbntSave(params) {
+  return request({
+    url: '/gbnt/gbnt_plan',
+    method: 'post',
+    data: { ...params }
+  })
+}
+
+/* *********高标准农田备选库********** */
+
+//列表
+export function GetGbntList(form,pageSize,page_num) {
+  return request({
+    // url: `/gbnt/gbnt_plan?bhgdAreaMuMax=${form.area_max || ""}&bhgdAreaMuMin=${form.area_min|| ""}&pageSize=${pageSize}&page_num=${page_num}&planName=${form.keyword|| ""}&town=${form.villages|| ""}`,
+    url: '/gbnt/gbnt_plan',
+    params: {
+      ...form,pageSize,page_num
+    },
+    method: 'get',
+
+  })
+}
+
+//删除
+export function DeleteGbnt(id) {
+  return request({
+    url: `/gbnt/gbnt_plan?planID=${id}`,
+    method: 'delete',
+  })
+}
+
+//预览
+export function GetGbntGeo(id) {
+  return request({
+    url: `/gbnt/gbnt_plan_geo?planID=${id}`,
+    method: 'get',
+  })
+}
+
+//导出
+export function GetGbntExp(id) {
+  return request({
+    url: `/gbnt/get_gbnt_list_export?planID=${id}`,
+    method: 'get',
+  })
+}
+

src/views/tdlzsp/landTransferApp/Detail.vue

@@ -45,7 +45,7 @@
 
     function close() {
         router.push({
-            name: 'IntAttractInvPlot'
+            name: 'LandTransferApp'
         })
     }
 </script>

src/views/xmfzsb/farmlandAlternative/Index.vue

@@ -15,7 +15,7 @@
 				</div>
 				<div>
 					<el-button type="primary" class="btn-default">查询</el-button>
-					<el-button class="btn-default">导出清单和shape</el-button>
+					<el-button class="btn-default" @click="exportList(scope.row.id)">导出清单和shape</el-button>
 				</div>
 			</div>
 		</header>
@@ -34,7 +34,7 @@
 				<el-table-column fixed="right" label="操作" min-width="130">
 					<template #default="scope">
 						<el-button link type="primary" @click="toDetail()">预览</el-button>
-						<el-popconfirm title="确认删除此条？" @confirm="toDelete()">
+						<el-popconfirm title="确认删除此条？" @confirm="toDelete(scope.row)">
 							<template #reference>
 								<el-button link type="danger">删除</el-button>
 							</template>
@@ -44,14 +44,17 @@
 			</el-table>
 			<Pagination :total="tableTotal" :page-size="pageSize" :current-page="currentPage" @pageChange="pagi_changePage" />
 		</main>
+		<DrawMap v-model="drawPosShow" :showOnly="true" @drawComplete="resData => handleDrawComplete(resData)" />
 	</div>
 </template>
 
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref, onMounted } from 'vue'
 import Pagination from '../../../components/Pagination.vue';
 import { select_test, auditStateArr } from '../../../utils/data/select-data'
 import { useRouter } from "vue-router";
+import { GetGbntList,DeleteGbnt,GetGbntGeo,GetGbntExp } from '../../../api/projectAudit'
+// import DrawMap from "./DrawMap.vue";
 
 const pageSize = ref(10)
 const tableTotal = ref(0)
@@ -71,27 +74,34 @@ const formInline = reactive({
 
 const tableData = reactive({
 	value: [
-		{ projectName: '高标准农田2023年备选地块1', villages: 'xxx镇', protectionOfCultivatedLand: '12312', permanentArea: '12312', numberOfEntities: '2', numberOfPlots: '4', remarks: 'XX', holdTime: '2023-04-18' },
-		{ projectName: '高标准农田2023年备选地块2', villages: 'xxx镇', protectionOfCultivatedLand: '12312', permanentArea: '12312', numberOfEntities: '2', numberOfPlots: '4', remarks: 'XX', holdTime: '2023-04-18' },
-		{ projectName: '高标准农田2023年备选地块3', villages: 'xxx镇', protectionOfCultivatedLand: '12312', permanentArea: '12312', numberOfEntities: '2', numberOfPlots: '4', remarks: 'XX', holdTime: '2023-04-18' },
-		{ projectName: '高标准农田2023年备选地块4', villages: 'xxx镇', protectionOfCultivatedLand: '12312', permanentArea: '12312', numberOfEntities: '2', numberOfPlots: '4', remarks: 'XX', holdTime: '2023-04-18' },
-		{ projectName: '高标准农田2023年备选地块5', villages: 'xxx镇', protectionOfCultivatedLand: '12312', permanentArea: '12312', numberOfEntities: '2', numberOfPlots: '4', remarks: 'XX', holdTime: '2023-04-18' },
-		{ projectName: '高标准农田2023年备选地块6', villages: 'xxx镇', protectionOfCultivatedLand: '12312', permanentArea: '12312', numberOfEntities: '2', numberOfPlots: '4', remarks: 'XX', holdTime: '2023-04-18' },
 	]
 })
 const router = useRouter()
 
 
 function toDetail(row) {
-	router.push({
-
-	})
+	// router.push({
+	// })
+	drawPosShow.value = true
 }
 
+const drawPosShow = ref(false)
 
+onMounted(() => {
+	GetGbntList(formInline,currentPage.value,pageSize.value).then(res => {
+		console.log(res);
+		tableData.value = res.data.list
+		tableTotal.value = res.data.total
+	})
+})
 
 function toDelete() {
-
+	DeleteGbnt(row.id).then(res => {
+		if(res.code==200&&res.msg==='删除成功') {
+			ElMessage({type: 'success', message: '删除成功'})
+			toList()
+		}
+	})
 }
 
 function toSave() {
@@ -102,4 +112,4 @@ function toSave() {
 
 <style lang="scss" scoped>
 
-</style>
+</style>

src/views/xmfzsb/farmlandSelection/Index.vue

@@ -54,8 +54,8 @@
 				</el-form-item>
 			</el-form>
 			<div style="text-align: center;margin-right:15px;">
-				<el-button type="primary">提交</el-button>
-				<el-button type="primary">保存</el-button>
+				<el-button type="primary" @click="submitGbnt()">提交</el-button>
+				<el-button type="primary" @click="saveGbnt()">保存</el-button>
 			</div>
 		</el-card>
 		<el-card v-show="panelShow.currentLayer" class="panel box3">
@@ -105,6 +105,7 @@ import CityGis from "../../../utils/map/CityGis.Bridge"
 import { myBridge } from "@/utils/map/map"
 import { locateCM, changeBaseMap, addLayer } from '@/utils/map/AddLayer'
 import { nydxz, gbzntxz, gbzntgh, sqhd, gdbhkj } from '@/utils/data/layersInfo'
+import { PostGbntSave } from '../../../api/projectAudit'
 
 const form = reactive({
 	name: '',
@@ -185,6 +186,19 @@ function handleLayerOpacity(val,item) {
 	addLayer(item, item.visible, (item.opacity/100).toFixed(2))
 }
 
+function submitGbnt() {
+
+}
+
+function saveGbnt(params) {
+	PostGbntSave(...form).then(res => {
+		if(res.code==200&&res.msg==='新增成功') {
+			ElMessage({type:'success', message: '新增成功'})
+			close()
+		}
+	})
+}
+
 </script>
 
 <style lang='scss' scoped>
@@ -356,4 +370,4 @@ function handleLayerOpacity(val,item) {
 		background-size: cover;
 	}
 }
-</style>
+</style>

src/views/xmfzsb/projectDeclare/Index.vue

@@ -248,7 +248,7 @@ onMounted(() => {
 })
 
 function getList() {
-  GetDsxmList(currentPage.value, pageSize.value).then(res => {
+  GetDsxmList(formInline,currentPage.value, pageSize.value).then(res => {
     tableData.value = res.data.list
     tableTotal.value = res.data.total
     stateFilterArr.value.forEach(i => {
@@ -371,7 +371,7 @@ function handleReply(row) {
   .detail-main {
     position: relative;
   }
-  
+
   .stamp {
     position: absolute;
     width: 136px;
@@ -398,7 +398,7 @@ function handleReply(row) {
     }
 
   }
-  
+
 }
 .spd-info{
   padding:3px 0;
@@ -433,4 +433,4 @@ function handleReply(row) {
     padding-bottom: 10px;
   }
 }
-</style>
+</style>