地雷库名称接口

src/api/modules/base/land.js

@@ -29,7 +29,7 @@ export default {
             return httpApi({
                 url: '/api/blade-land/landTypeInfo/remove',
                 method: 'post',
-                params: form,
+                data: form,
             }, msg)
         },
 }

src/views/base/agree.vue

@@ -30,7 +30,7 @@
                 <HcIcon name="add" />
                 <span>新增</span>
             </el-button>
-            <el-button size="large" type="danger" hc-btn @click="batchClick">
+            <el-button size="large" type="danger" hc-btn :disabled="tableCheckedKeys.length < 1" @click="batchClick">
                 <HcIcon name="delete-bin" />
                 <span>删除</span>
             </el-button>

src/views/base/land.vue

@@ -3,65 +3,67 @@
         <template #left>
             <div class="hc-layout-tree-box">
                 <el-scrollbar>
-                    <HcTreeData @nodeTap="treeNodeTap"/>
+                    <HcTreeData @nodeTap="treeNodeTap" />
                 </el-scrollbar>
             </div>
         </template>
         <HcCard>
             <template #header>
                 <div class="w-36">
-                    <el-select v-model="searchForm.projectType" block clearable placeholder="请选择区域" size="large">
-                        <el-option label="选项1" value="选项1"/>
-                        <el-option label="选项2" value="选项2"/>
+                    <el-select v-model="searchForm.landNature" block clearable placeholder="请选择土地性质" size="large">
+                        <el-option v-for="item in natureType" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
                     </el-select>
                 </div>
                 <div class="w-52 ml-2">
-                    <el-input v-model="searchForm.queryValue" clearable placeholder="请输入名称进行查询" size="large"/>
+                    <el-input v-model="searchForm.name" clearable placeholder="请输入名称进行查询" size="large" />
                 </div>
                 <div class="ml-4">
-                    <el-button type="primary" @click="searchClick" size="large">
-                        <HcIcon name="search-2"/>
+                    <el-button type="primary" size="large" @click="searchClick">
+                        <HcIcon name="search-2" />
                         <span>搜索</span>
                     </el-button>
                 </div>
             </template>
             <template #extra>
                 <el-button size="large" type="primary" hc-btn @click="addRowClick">
-                    <HcIcon name="add"/>
+                    <HcIcon name="add" />
                     <span>新增</span>
                 </el-button>
-                <el-button size="large" type="danger" hc-btn>
-                    <HcIcon name="delete-bin"/>
+                <el-button size="large" type="danger" hc-btn :disabled="tableCheckedKeys.length < 1" @click="batchClick">
+                    <HcIcon name="delete-bin" />
                     <span>删除</span>
                 </el-button>
             </template>
-            <HcTable :column="tableColumn" :datas="tableData" :loading="tableLoading" isCheck @selection-change="tableSelectionChange">
-                <template #action="{row,index}">
-                    <el-button size="small" type="primary" @click="editRowClick(row)">编辑</el-button>
-                    <el-button size="small" type="danger">删除</el-button>
+            <HcTable ref="tableListRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableSelectionChange">
+                <template #action="{ row, index }">
+                    <el-button size="small" type="primary" @click="editRowClick(row)">
+                        编辑
+                    </el-button>
+                    <el-button size="small" type="danger" @click="delClickRow(row)">
+                        删除
+                    </el-button>
                 </template>
             </HcTable>
             <template #action>
-                <HcPages :pages="searchForm" @change="pageChange"/>
+                <HcPages :pages="searchForm" @change="pageChange" />
             </template>
         </HcCard>
-        <!--新增/编辑-->
-        <HcDialog isToBody bgColor="white" :show="rowModal" :title="formModel.id?'编辑':'新增'" widths="30rem" @save="rowModalSave" @close="rowModalClose">
+        <!-- 新增/编辑 -->
+        <HcDialog is-to-body bg-color="white" :show="rowModal" :title="formModel.id ? '编辑' : '新增'" widths="30rem" :loading="submitLoading" @save="rowModalSave" @close="rowModalClose">
             <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" size="large">
-                <el-form-item label="名称：" prop="key1">
-                    <el-input v-model="formModel.key1"/>
+                <el-form-item label="名称：" prop="name">
+                    <el-input v-model="formModel.name" />
                 </el-form-item>
                 <el-form-item label="土地性质：">
-                    <el-select block v-model="formModel.key2">
-                        <el-option label="选项1" value="选项1"/>
-                        <el-option label="选项2" value="选项2"/>
+                    <el-select v-model="formModel.landNature" block>
+                        <el-option v-for="item in natureType" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="政府补偿标准：" prop="key3">
-                    <el-input v-model="formModel.key3"/>
+                <el-form-item label="政府补偿标准：" prop="governmentStand">
+                    <el-input v-model="formModel.governmentStand" />
                 </el-form-item>
-                <el-form-item label="两方协议补偿标准：" prop="key4">
-                    <el-input v-model="formModel.key4"/>
+                <el-form-item label="两方协议补偿标准：" prop="agreementStand">
+                    <el-input v-model="formModel.agreementStand" />
                 </el-form-item>
             </el-form>
         </HcDialog>
@@ -69,27 +71,58 @@
 </template>
 
 <script setup>
-import {ref} from "vue";
+import { onActivated, onMounted, ref } from 'vue'
+import landApi from '~api/base/land.js'
+import { arrToId, formValidate, getArrValue, getObjValue } from 'js-fast-way'
+import { useAppStore } from '~src/store'
+import { getDictInfo } from '~api/other'
+import { delMessageV2 } from '~com/message/index.js'
 
-//树节点被点击
-const treeNodeTap = ({node, data}) => {
 
+const useAppState = useAppStore()
+const projectId = ref(useAppState.getProjectId)
+
+onMounted(()=>{
+    getTableData()
+    getNatureType()
+})
+//获取土地性质
+
+const natureType = ref([])
+//获取区域
+const getNatureType = async ()=>{
+    const { error, code, data } = await getDictInfo('land_nature')
+    if (!error && code === 200) {
+        natureType.value = getArrValue(data)
+        natureType.value.forEach((ele)=>{
+            ele.dictKey = parseInt(ele.dictKey)
+        })
+       
+    } else {
+        natureType.value = []
+    }
+}
+
+//树节点被点击
+const treeNodeTap = ({ node, data }) => {
+    searchForm.value.areaId = data.id
+    getTableData()
 }
 
 //搜索表单
 const searchForm = ref({
-    projectType: null, queryValue: null, startTime: null, endTime: null,
-    current: 1, size: 20, total: 0
+    landNature: null, name: null, startTime: null, endTime: null,
+    current: 1, size: 20, total: 0,
 })
 
 //搜索
 const searchClick = () => {
-    searchForm.value.current = 1;
+    searchForm.value.current = 1
     getTableData()
 }
 
 //分页被点击
-const pageChange = ({current, size}) => {
+const pageChange = ({ current, size }) => {
     searchForm.value.current = current
     searchForm.value.size = size
     getTableData()
@@ -98,24 +131,36 @@ const pageChange = ({current, size}) => {
 //获取数据
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'key1', name: '名称'},
-    {key: 'key2', name: '政府补偿标准'},
-    {key: 'key3', name: '两方协议补偿标准'},
-    {key: 'action', name: '操作', width: '130', align: 'center'},
+    { key: 'name', name: '名称' },
+    { key: 'governmentStand', name: '政府补偿标准' },
+    { key: 'agreementStand', name: '两方协议补偿标准' },
+    { key: 'action', name: '操作', width: '130', align: 'center' },
 ]
-const tableData = ref([
-    {id: 1, key1: 'xxxx', key2: 'xxxx', key3: '65632'},
-    {id: 2, key1: 'xxxx', key2: 'xxxx', key3: '65632'},
-    {id: 3, key1: 'xxxx', key2: 'xxxx', key3: '65632'},
-    {id: 4, key1: 'xxxx', key2: 'xxxx', key3: '65632'},
-])
-const getTableData = () => {
-
+const tableData = ref([])
+const getTableData = async () => {
+    tableLoading.value = true
+    const { error, code, data } = await landApi.getPage({
+        ...searchForm.value,
+        projectId: projectId.value,
+        type:1,
+    })
+    tableLoading.value = false
+    if (!error && code === 200) {
+        tableData.value = getArrValue(data['records'])
+        searchForm.value.total = data['total'] || 0
+    } else {
+        tableData.value = []
+        searchForm.value.total = 0
+    }
 }
 
-//多选事件
+//多选
+const tableListRef = ref(null)
+const tableCheckedKeys = ref([])
 const tableSelectionChange = (rows) => {
-    console.log(rows)
+    tableCheckedKeys.value = rows.filter((item) => {
+        return (item ?? '') !== ''
+    })
 }
 
 //弹窗
@@ -123,7 +168,7 @@ const rowModal = ref(false)
 const formRef = ref(null)
 const formModel = ref({})
 const formRules = {
-    key1: [{required: true, message: '请输入名称', trigger: 'blur'}],
+    name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
 }
 
 //新增
@@ -137,12 +182,65 @@ const editRowClick = (row) => {
     formModel.value = row
     rowModal.value = true
 }
-
+const submitLoading = ref(false)
 //保存
-const rowModalSave = () => {
+const rowModalSave = async () => {
+    console.log( formModel.value, ' formModel.value')
+    const res = await formValidate(formRef.value)
+    if (res) {
+        submitLoading.value = true
+        const form = formModel.value
+        form.projectId = projectId.value
+        form.areaId = searchForm.value.areaId
+        const { error, code, msg } = await landApi.addOrUpdate(form)
+        //判断状态
+        submitLoading.value = false
+        if (!error && code === 200) {
+            window.$message?.success(msg)
+            rowModal.value = false
+            getTableData()
+            
+        } 
+    }
 
 }
-
+//删除
+const delClickRow = (row)=>{
+    delMessageV2(async (action, instance, done) => {
+        if (action === 'confirm') {
+            instance.confirmButtonLoading = true
+             removeRow([row.id])
+            instance.confirmButtonLoading = false
+            done()
+        } else {
+            done()
+        }
+ })
+}
+const removeRow = async (id)=>{
+    const { error, code } = await landApi.remove( id, false)
+    //判断状态
+    if (!error && code === 200) {
+        window.$message?.success('删除成功')
+        getTableData()
+    } else {
+        window.$message?.error('删除失败')
+    }
+}
+const batchClick = ()=>{
+    const rows = tableCheckedKeys.value
+    const ids = arrToId(rows).split(',')
+    delMessageV2(async (action, instance, done) => {
+        if (action === 'confirm') {
+            instance.confirmButtonLoading = true
+             removeRow(ids)
+            instance.confirmButtonLoading = false
+            done()
+        } else {
+            done()
+        }
+ })
+}
 //关闭弹窗
 const rowModalClose = () => {
     rowModal.value = false

src/views/base/policy.vue

@@ -35,7 +35,7 @@
                 <span>删除</span>
             </el-button>
         </template>
-        <HcTable ref="tableListRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableSelectionChange">
+        <HcTable ref="tableListRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check :disabled="tableCheckedKeys.length < 1" @selection-change="tableSelectionChange">
             <template #action="{ row, index }">
                 <el-button size="small" type="warning" @click="previewPdf(row)">
                     查看附件
@@ -112,7 +112,7 @@ const UploadFileOptions = {
     accept:'application/pdf,.doc,.pdf,.docx,application/msword',
 }
 
-//项目类型
+//区域
 const areaType = ref([])
 //获取区域
 const getAreaType = async ()=>{