diff --git a/sub-government-affairs-service/src/apis/baseInfo.js b/sub-government-affairs-service/src/apis/baseInfo.js index 4ae5e36..2e2500e 100644 --- a/sub-government-affairs-service/src/apis/baseInfo.js +++ b/sub-government-affairs-service/src/apis/baseInfo.js @@ -50,13 +50,6 @@ export function delPlanCrop(params) { // }); // } -export function savePlanStage(data) { - return request('land-resource/baseInfo/stageTypeSave', { - method: 'POST', - data, - }); -} - // export function upPlanStage(data = {}) { // return request('land-resource/baseInfo/planTypeEdit', { // method: 'PUT', @@ -79,3 +72,38 @@ export function savePlanStage(data) { // } // #endregion + +// #region + +export function savePlanStage(data) { + return request('land-resource/baseInfo/stageTypeSave', { + method: 'POST', + data, + }); +} + +/* ------ ------ */ + +/* 获取土壤类型列表 */ +export function getSoilType(params) { + return request('land-resource/baseInfo/soilTypePage', { + method: 'GET', + params, + }); +} +/* 创建土壤类型 */ +export function saveSoilType(data) { + return request('land-resource/baseInfo/soilTypeSave', { + method: 'POST', + data, + }); +} + +/* 编辑土壤类型 */ +export function updateSoilType(data) { + return request('land-resource/baseInfo/soilTypeSave', { + method: 'PUT', + data, + }); +} +// #endregion diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js new file mode 100644 index 0000000..5346cfb --- /dev/null +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/index.js @@ -0,0 +1,3 @@ +import * as redBlack from './redAndBlank'; + +export { redBlack }; diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/redAndBlank.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/redAndBlank.js new file mode 100644 index 0000000..503f164 --- /dev/null +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/redAndBlank.js @@ -0,0 +1 @@ +import request from '@/utils/request'; diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 7448b8e..bccde08 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -3,17 +3,16 @@ * @Author: zenghua.wang * @Date: 2023-06-20 11:48:41 * @LastEditors: zenghua.wang - * @LastEditTime: 2025-03-06 16:11:29 + * @LastEditTime: 2025-03-11 16:51:49 */ import { createRouter, createWebHistory } from 'vue-router'; import Layout from '@/layouts/index.vue'; import resourceRouter from './modules/resource'; import traceRouter from './modules/trace'; -import landsRoutes from './modules/lands'; -import dictRoutes from './modules/dict'; import productOperateMainRoutes from './modules/productOperateMain'; import inputSuppliesRoutes from './modules/inputSupplies'; +import plantingAndBreedingRouter from './modules/plantingAndBreeding'; export const constantRoutes = [ { @@ -45,10 +44,9 @@ export const constantRoutes = [ }, ...resourceRouter, ...traceRouter, - // ...landsRoutes, - // ...dictRoutes, ...productOperateMainRoutes, ...inputSuppliesRoutes, + ...plantingAndBreedingRouter, ]; /** diff --git a/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js b/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js new file mode 100644 index 0000000..0d951d1 --- /dev/null +++ b/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js @@ -0,0 +1,25 @@ +import Layout from '@/layouts/index.vue'; + +export default [ + { + path: '/sub-government-affairs-service/plantingAndBreeding', + name: 'plantingAndBreeding', + component: Layout, + redirect: '/sub-government-affairs-service/breeding-base-information', + meta: { title: '种养植综合管理', icon: 'Document' }, + children: [ + { + path: '/sub-government-affairs-service/environment-monitor', + name: 'environment-monitor', + component: () => import('@/views/plantingAndBreeding/environment/index.vue'), + meta: { title: '环境监测信息', icon: 'Document' }, + }, + // { + // path: '/sub-government-affairs-service/breeding-base-information', + // name: 'breeding-base-information', + // component: () => import('@/views/plantingAndBreeding/base/index.vue'), + // meta: { title: '种养殖基地信息', icon: 'Document' }, + // }, + ], + }, +]; diff --git a/sub-government-affairs-service/src/views/dict/component/soilClassification/index.vue b/sub-government-affairs-service/src/views/dict/component/soilClassification/index.vue index 7fa5fca..67681d2 100644 --- a/sub-government-affairs-service/src/views/dict/component/soilClassification/index.vue +++ b/sub-government-affairs-service/src/views/dict/component/soilClassification/index.vue @@ -4,7 +4,7 @@ ref="crudRef" v-model:page="pageData" v-model:search="condition" - :table-loading="loading" + :table-loading="_loading" :data="data" :option="option" @search-change="handleSearch" @@ -12,24 +12,24 @@ @current-change="handleCurrentChange" @size-change="handleSizeChange" @row-save="handleSave" - @row-update="handleUpdete" + @row-update="handleUpdate" > + + @@ -41,7 +41,7 @@ import useSoilTypeHook from './useSoilTypeHook'; const { crudRef, condition, - loading, + _loading, data, pageData, option, @@ -51,7 +51,7 @@ const { handleSearch, handleSearchReset, handleSave, - handleUpdete, + handleUpdate, } = useSoilTypeHook(); /* --------------- data --------------- */ diff --git a/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js b/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js index f16e863..bc27dd0 100644 --- a/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js +++ b/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js @@ -1,31 +1,17 @@ -import { ref, onMounted } from 'vue'; +import { ref, onMounted, nextTick } from 'vue'; import { CRUD_OPTIONS } from '@/config'; +import { getSoilType, saveSoilType, updateSoilType } from '@/apis/baseInfo'; +import { ElMessage } from 'element-plus'; export default function useSoilTypeHook() { onMounted(getList); const crudRef = ref(); const condition = ref({ - soilType: '', + soilType: null, }); - const data = ref([ - { - code: 'a123456', - soilType: '黑土地', - status: 0, - }, - { - code: 'b258369', - soilType: '黄土地', - status: 1, - }, - { - code: 'c987654', - soilType: '盐碱土地', - status: 0, - }, - ]); - const loading = ref(false); + const data = ref([]); + const _loading = ref(false); const pageData = ref({ currentPage: 1, pageSize: 10, @@ -40,7 +26,7 @@ export default function useSoilTypeHook() { column: [ { label: '编号', - prop: 'code', + prop: 'id', display: false, addDisplay: false, }, @@ -69,7 +55,7 @@ export default function useSoilTypeHook() { display: false, addDisplay: false, render: ({ row }) => { - return row.status === 0 ? '启用' : '禁用'; + return row.status === '1' ? '启用' : '禁用'; }, }, ], @@ -92,34 +78,31 @@ export default function useSoilTypeHook() { event: handleDel, }, ]); - function getList() { + async function getList() { let params = { current: pageData.value.currentPage, - pageSize: pageData.value.pageSize, + size: pageData.value.pageSize, ...condition.value, }; - console.log('get --- ', params); - console.table(data.value); + let res = await getSoilType(params); + if (res.code == 200) { + data.value = res.data.records; + pageData.value.total = res.data.total; + } } - function handleStatusChange(row, index) { - console.log('handleStatusChange --- ', row); - data.value[index].status = data.value[index].status === 0 ? 1 : 0; - console.table(data.value); + async function handleStatusChange(row, index) { + await editSoilType(row, index); } function handleCurrentChange(val) { - console.log('handleCurrentChange --- ', val); pageData.value.currentPage = val; getList(); } function handleSizeChange(val) { - console.log('handleSizeChange --- ', val); pageData.value.currentPage = 1; pageData.value.pageSize = val; getList(); } function handleSearch(val, done) { - console.log('handleSearch --- ', val); - console.log('ccc', condition.value); resetPage(); done(); } @@ -127,22 +110,43 @@ export default function useSoilTypeHook() { resetPage(); } function handleEdit(row, index) { - console.log('handleEdit --- ', row); - console.log('index --- ', index); - crudRef.value.rowEdit(row); + crudRef.value.rowEdit(row, index); } function handleDel(row) { console.log('handleDel --- ', row); } - function handleSave(form, _loading, done) { - console.log('save --- ', form); - _loading(); + async function handleSave(form, loading, done) { + let res = await saveSoilType(form); + if (res.code == 200) { + ElMessage({ + type: 'success', + message: '添加成功', + }); + } + loading(); getList(); } - function handleUpdate(form, _loading, done) { - console.log('update --- ', form); - _loading(); - getList(); + async function handleUpdate(row, index, done, loading) { + await editSoilType(row, index); + loading(); + done(); + } + async function editSoilType(row, index) { + let res = await updateSoilType({ + id: row.id, + soilType: row.soilType, + status: row.status === '0' ? '1' : '0', + }); + if (res.code == 200) { + ElMessage({ + type: 'success', + message: '修改成功', + }); + nextTick(() => { + data.value[index].soilType = row.soilType; + data.value[index].status = row.status === '0' ? '1' : '0'; + }); + } } function resetPage() { pageData.value.currentPage = 1; @@ -152,7 +156,7 @@ export default function useSoilTypeHook() { return { crudRef, condition, - loading, + _loading, data, pageData, option, diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue index 13e0854..d930653 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue @@ -64,12 +64,5 @@ watch( } } } - ::v-deep() { - .is-active { - .el-radio-button__inner { - background-color: rgb(255, 45, 45) !important; - } - } - } } diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/RankType.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/RankType.vue new file mode 100644 index 0000000..7400da9 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/RankType.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/rankCard.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/rankCard.vue index 77f2f63..4674799 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/rankCard.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/rankCard.vue @@ -1,45 +1,62 @@ diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/index.vue index bd13997..74c4fcc 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/index.vue @@ -1,8 +1,8 @@ @@ -72,7 +72,7 @@ const blackData = ref(JSON.parse(JSON.stringify(redData.value))); padding: 40px 0; display: grid; justify-content: center; - grid-template-columns: calc(30%) calc(30%); + grid-template-columns: calc(40%) calc(40%); gap: 40px; } diff --git a/sub-government-affairs-service/src/views/landManage/common/Attrs.vue b/sub-government-affairs-service/src/views/landManage/common/Attrs.vue index cf7d783..16396ab 100644 --- a/sub-government-affairs-service/src/views/landManage/common/Attrs.vue +++ b/sub-government-affairs-service/src/views/landManage/common/Attrs.vue @@ -12,10 +12,10 @@ > -
+
@@ -54,8 +54,8 @@ watch( }, { deep: true, immediate: true } ); -function handleClearAttr(id) { - attrs_.value = attrs_.value.filter((item) => item.id !== id); +function handleClearAttr(uid) { + attrs_.value = attrs_.value.filter((item) => item.uid !== uid); emit('update:attrs', attrs_.value); } async function rowUploadPicture({ file }) { @@ -65,7 +65,7 @@ async function rowUploadPicture({ file }) { if (res.code === 200) { attrs_.value.push({ ...res.data, - id: 'id_' + Date.now(), + uid: 'id_' + Date.now(), }); emit('update:attrs', attrs_.value); } diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue index aeeacbb..90ec6b8 100644 --- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue +++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/common/FileUpload.vue @@ -1,22 +1,21 @@ - + diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue index b08216f..58ef33e 100644 --- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue @@ -7,23 +7,28 @@ :option="option" :data="data" :table-loading="_loading" + :before-open="handleOpenFrom" + :before-close="handleCloseFrom" @current-change="handlePageChange" @size-change="handleSizeChange" @search-change="handleSearch" + @search-reset="handleResetSearch" @row-save="handleRowSave" @row-update="handleExamine" + @cell-click="handleCellClick" > - @@ -44,8 +44,8 @@ watch( }, { deep: true, immediate: true } ); -function handleClearAttr(id) { - attrs_.value = attrs_.value.filter((item) => item.id !== id); +function handleClearAttr(uid) { + attrs_.value = attrs_.value.filter((item) => item.uid !== uid); emit('update:attrs', attrs_.value); } async function rowUploadPicture({ file }) { @@ -55,7 +55,7 @@ async function rowUploadPicture({ file }) { if (res.code === 200) { attrs_.value.push({ ...res.data, - id: 'id_' + Date.now(), + uid: 'id_' + Date.now(), }); emit('update:attrs', attrs_.value); } diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue index 482afdb..faf2f5e 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue @@ -469,7 +469,7 @@ function handleView(obj) { return { name: `产权附件_${i}`, url: v, - id: 'id_' + Date.now(), + uid: 'id_' + Date.now(), }; }); } @@ -478,7 +478,7 @@ function handleView(obj) { return { name: `使用信息附件_${i}`, url: v, - id: 'id_' + Date.now(), + uid: 'id_' + Date.now(), }; }); if (obj.landUrl) { @@ -486,7 +486,7 @@ function handleView(obj) { return { name: `位置附件_${i}`, url: v, - id: 'id_' + Date.now(), + uid: 'id_' + Date.now(), }; }); } diff --git a/sub-government-affairs-service/src/views/plantingAndBreeding/environment/index.vue b/sub-government-affairs-service/src/views/plantingAndBreeding/environment/index.vue new file mode 100644 index 0000000..9969db6 --- /dev/null +++ b/sub-government-affairs-service/src/views/plantingAndBreeding/environment/index.vue @@ -0,0 +1,406 @@ + +