Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

非粮化专题接口
2024-08-04 11:24:29 +08:00 · 2024-08-04 11:24:22 +08:00
8 changed files with 81 additions and 113 deletions
--- a/src/api/degraining/index.ts
+++ b/src/api/degraining/index.ts
@ -0,0 +1,51 @@
+import { defHttp } from '@/utils/http/axios';
+enum Api {
+  // 非法采矿接收办理
+  LoadCaiKuangTaskList = '/api/DroneCaseInfoSatellite/LoadCaiKuangTaskList',
+  // 添加收藏
+  AddCaiKuangTaskFavorite = '/api/DroneCaseInfoSatellite/AddCaiKuangTaskFavorite',
+  // 取消收藏
+  DeleteCaiKuangTaskCase = '/api/DroneCaseInfoSatellite/DeleteCaiKuangTaskCase',
+  // 非法采矿图斑列表
+  LoadCaseInfoWpxfTuBanList = '/api/DroneCaseInfoSatellite/LoadCaseInfoWpxfTuBanList',
+  // 非法采矿填报审核第一层
+  LoadReportCaseCount = '/api/DroneCaseInfoSatellite/LoadReportCaseCount',
+  // 非法采矿填报审核第二层
+  LoadTaskDetailList = '/api/DroneCaseInfoSatellite/LoadTaskDetailList',
+  // 非法采矿整改审核第一层
+  LoadReformCaseCount = '/api/DroneCaseInfoSatellite/LoadReformCaseCount',
+  // 非法采矿整改审核第二层
+  LoadTaskIllegalDetailList = '/api/DroneCaseInfoSatellite/LoadTaskIllegalDetailList',
+  // 案件详情
+  GetCaseInfoById = '/api/DroneCaseInfoSatellite/GetCaseInfoById',
+}
+export function LoadCaiKuangTaskList(params) {
+  return defHttp.get({ url: Api.LoadCaiKuangTaskList, params });
+}
+export function AddCaiKuangTaskFavorite(params?: { taskId: string; favoriteUserId: string }) {
+  return defHttp.post({ url: Api.AddCaiKuangTaskFavorite, params });
+}
+export function DeleteCaiKuangTaskCase(params: string) {
+  return defHttp.post({ url: Api.DeleteCaiKuangTaskCase, data: params });
+}
+export function LoadCaseInfoWpxfTuBanList(params) {
+  return defHttp.get({
+    url: Api.LoadCaseInfoWpxfTuBanList,
+    params,
+  });
+}
+export function LoadReportCaseCount(params) {
+  return defHttp.get({ url: Api.LoadReportCaseCount, params });
+}
+export function LoadTaskDetailList(params) {
+  return defHttp.get({ url: Api.LoadTaskDetailList, params });
+}
+export function LoadTaskIllegalDetailList(params) {
+  return defHttp.get({ url: Api.LoadTaskIllegalDetailList, params });
+}
+export function LoadReformCaseCount(params) {
+  return defHttp.get({ url: Api.LoadReformCaseCount, params });
+}
+export function GetCaseInfoById(params?: { id: string }) {
+  return defHttp.get({ url: Api.GetCaseInfoById, params });
+}
--- a/src/views/demo/degraining/auditinfo/MapList/index.vue
+++ b/src/views/demo/degraining/auditinfo/MapList/index.vue
@ -191,7 +191,8 @@
  import { onMounted, ref, defineEmits, computed, h, watch } from 'vue';
  import { StarOutlined,StarFilled } from '@ant-design/icons-vue';
  import Icon from '@/components/Icon/Icon.vue';
-  import { getLoadTaskDetailList, updateSupervise, addTaskFavorite, deleteTaskCase } from '@/api/tiankongdi/index';
+  import {  updateSupervise } from '@/api/tiankongdi/index';
+  import { LoadTaskDetailList, AddCaiKuangTaskFavorite, DeleteCaiKuangTaskCase } from '@/api/degraining/index'
  import { flowStore } from '@/store/modules/flow';
  import { getDetail } from '@/api/sys/WFSchemeInfo';
  import { Audit } from '@/views/demo/workflow/task/process/page';
@ -266,7 +267,7 @@
  }
  async function getTaskList() {
    console.log(params.value);
-    const data = await getLoadTaskDetailList(params.value);
+    const data = await LoadTaskDetailList(params.value);
    dataList.value = data.items;
    total.value = data.total;
  }
@ -387,7 +388,7 @@
    handoffShow.value = true
  }
  const cancelCollectItem = (item) => {
-    deleteTaskCase(item.Fid).then(res => {
+    DeleteCaiKuangTaskCase(item.Fid).then(res => {
      message.success('取消收藏成功')
      getTaskList();
    })
@ -402,7 +403,7 @@
      taskId: item.taskeid,
      favoriteUserId: userInfo.id
    }
-    addTaskFavorite(params).then(res => {
+    AddCaiKuangTaskFavorite(params).then(res => {
      message.success('收藏成功')
      getTaskList();
    })
--- a/src/views/demo/degraining/auditinfo/index.vue
+++ b/src/views/demo/degraining/auditinfo/index.vue
@ -41,7 +41,7 @@
  import { MapboxConfig, MapboxDefaultStyle } from '@/components/MapboxMaps/src/config.ts';
  import AuditProgress from './AuditProgress/index.vue';
  import MapList from './MapList/index.vue';
-  import { getLoadTaskCount } from '@/api/tiankongdi/index';
+  import { LoadReportCaseCount } from '@/api/degraining/index'
  import { getGeom, getConfig } from '@/api/sys/layerManagement';
  import { getDetail } from '@/api/sys/WFSchemeInfo';
  import { useMessage } from '@/hooks/web/useMessage';
@ -92,7 +92,7 @@
    showParent.value = true;
  }
  async function getCountList() {
-    const data = await getLoadTaskCount({
+    const data = await LoadReportCaseCount({
      year: year.value,
      tubanlaiyuan: patchSource.value,
      picihao: batch.value,
--- a/src/views/demo/degraining/curbspotcity/MapList/index.vue
+++ b/src/views/demo/degraining/curbspotcity/MapList/index.vue
@ -1,16 +1,5 @@
 <template>
  <div class="map-list-content">
-    <!-- <div class="top-radio-button-div">
-      <a-radio-group 
-        v-model:value="props.infoScreenData.landType"
-        @change="(e) => emits('mapListScreenChange',e.target.value,'landType')"
-        button-style="solid"
-        style="width:100%">
-        <a-radio-button :value="0" class="radio-item">农用地</a-radio-button>
-        <a-radio-button :value="1" class="radio-item">建设用地</a-radio-button>
-        <a-radio-button :value="2" class="radio-item">推堆土</a-radio-button>
-      </a-radio-group>
-    </div> -->
    <div class="screen-div">
      <div class="screen-item" style="margin-right:20px;margin-bottom:12px;">
        <div class="screen-item-label">年份</div>
@ -42,16 +31,6 @@
          @change="(value) => emits('mapListScreenChange',value,'batch')"
        />
      </div>
-      <!-- <div class="screen-item" style="margin-right:15px;margin-bottom:12px;">
-        <div class="screen-item-label">标注</div>
-        <a-select
-          allowClear
-          style="width:130px;"
-          v-model:value="props.infoScreenData.markType"
-          :options="markTypeOptions"
-          @change="(value) => emits('mapListScreenChange',value,'markType')"
-        />
-      </div> -->
      <div class="screen-item" style="margin-right: 13px;">
        <div class="screen-item-label">乡镇</div>
        <a-select
@ -94,8 +73,6 @@
    </div>
    <div class="sift-div">
      <div class="layout-div">
-        <!-- <RollbackOutlined  class="back-button" @click="emits('closeShowInfo', false)"/> -->
-        <!-- <div class="interval-div"></div> -->
        <div class="sift-item" @click="dataListSort('area')">
          <div class="sift-label">总面积</div>
          <div class="sift-icon">
@ -131,16 +108,6 @@
                  :options="mapStatusOptions"></a-checkbox-group>
                </div>
            </div>
-            <!-- <div style="display:flex;">
-              <div>是否超期：</div>
-              <div>
-                <a-checkbox-group 
-                v-model:value="props.infoScreenData.isOverdue"
-                @change="(value) => emits('mapListScreenChange',value,'isOverdue')"
-                style="width: 100%" 
-                :options="isOverdueOptions"></a-checkbox-group>
-              </div>
-            </div> -->
            <div style="display:flex;align-items: center;margin-top: 4px;">
              <div>图斑面积：</div>
              <div style="display:flex;">
@ -217,7 +184,6 @@
            </div>
          </div>
          <div class="info-layout-div">
-            <!-- <span class="info-time">{{item.createdate}}</span> -->
            <div>
              <img src="@/assets/images/tiankongdi/collect-active.png" class="img-box"   @click="collectItem(item)"  v-if="item.fid"/>
              <img src="@/assets/images/tiankongdi/collect.png" class="img-box"   @click="collectItem(item)"  v-else/>
@ -236,20 +202,6 @@
        show-quick-jumper
        @change="changePage" />
    </div>
-    <a-modal
-      style="width:100vw;top:0px;left:0px;margin:0px;padding:0px;"
-      wrap-class-name="full-modal"
-      v-model:open="showInfoOpen"
-      title="详情"
-      :footer="null"
-      :maskClosable="true"
-      :destroyOnClose="true"
-      @cancel="showInfoOpen = false"
-    >
-      <div class="modal-content">
-        <ShowInfoModal :showInfoData="showInfoData"/>
-      </div>
-    </a-modal>
    <a-modal
      width="100%"
      wrap-class-name="full-modal"
@ -285,23 +237,18 @@

 <script setup lang="ts">
 import { ref, onMounted, defineEmits, defineProps, computed, h, watch } from "vue"
-import { StarOutlined, StarFilled, SearchOutlined, RollbackOutlined } from '@ant-design/icons-vue';
+import { SearchOutlined } from '@ant-design/icons-vue';
 import Icon from '@/components/Icon/Icon.vue';
-import { addCaseFavorite,addTaskFavorite,getCaseInfoById, deleteFavoriteCase,deleteTaskCase,getLoadStreet, getLoadDroneCaseInfoDetail } from '@/api/tiankongdi/index.ts';
+import {getLoadStreet } from '@/api/tiankongdi/index.ts';
+import { LoadCaiKuangTaskList, AddCaiKuangTaskFavorite, DeleteCaiKuangTaskCase } from '@/api/degraining/index.ts';
 import { 
  batchOptions,
  yearOptions,
-  mapTypeOptions,
-  illegalTypeOptions,
-  measureOptions,
  mapStatusOptions,
-  markTypeOptions,
  patchSourceOptions,
-  isOverdueOptions,
 } from '@/utils/global'
 import { useUserStore } from '@/store/modules/user.ts'
 import { message } from "ant-design-vue";
-import ShowInfoModal from './ShowInfoModal/index.vue'
 import { flowStore } from '@/store/modules/flow';
 import { getDetail } from '@/api/sys/WFSchemeInfo';
 import { Audit } from '@/views/demo/workflow/task/process/page';
@ -331,18 +278,6 @@ const props = defineProps([
  "infoDataList"
 ])
 const order = ref(0) // 0: 不排序 1: 升序 2: 降序
-const landType = ref(0)
-const orderMark = () => {
-  switch(order.value){
-    case 0:
-      return '-'
-    case 1:
-      return '↑'
-    case 2:
-      return '↓'
-  }
-}
-const showInfoOpen = ref(false)
 const showDataId = ref()
 const nextShowDataId = ref()
 const prevShowDataId = ref()
@ -369,7 +304,6 @@ const openCollect = computed(() => {
  if(props.infoScreenData.type === '') return false
  return true
 })
-const showInfoData = ref()
 const streetsAreaOptions =  ref([
  { label: '全部', value: '' },
 ])
@ -397,7 +331,6 @@ const changePage = (page, pageSize) => {
  emits('changeInfoPage',page,pageSize)
 }
 const querysBtn = ()=>{
-  emits('getInfoList')
  emits('changeInfoPage',1,props.pageSize)

 }
@ -413,14 +346,14 @@ const collectItem = (item) => {
    taskId: item.taskid,
    favoriteUserId: userInfo.id
  }
-  addTaskFavorite(params).then(res => {
+  AddCaiKuangTaskFavorite(params).then(res => {
    console.log(res)
    message.success('收藏成功')
    emits('getInfoList')
  })
 }
 const cancelCollectItem = (item) => {
-  deleteTaskCase(item.fid).then(res => {
+  DeleteCaiKuangTaskCase(item.fid).then(res => {
    message.success('取消收藏成功')
    emits('getInfoList')
  })
@ -450,15 +383,6 @@ const dataListSort = (type) => {
  emits('infoDataListSort', type, order.value)
 }

-
-
-
-const showInfo = (item) => {
-  getCaseInfoById({id:item.id}).then(res => {
-    showInfoData.value = res
-    showInfoOpen.value = true
-  })
-}
 async function goAudit(record) {
  showDataId.value = record.id
  let data = await getDetail({ code: record.processcode });
@ -476,7 +400,7 @@ const prevData = async () => {
      message.warning('已经是第一条数据了')
      return
    }
-    getLoadDroneCaseInfoDetail(getParams({page: props.pageNo - 1})).then(async res => {
+    LoadCaiKuangTaskList(getParams({page: props.pageNo - 1})).then(async res => {
      emits('changeInfoDataList',res.items,res.total,props.pageNo - 1)
      handoffShow.value = false
      let record = res.items[res.items.length -1]
@ -511,7 +435,7 @@ const nextData = async () => {
      message.warning('已经是最后一条数据了')
      return
    }
-    getLoadDroneCaseInfoDetail(getParams({page: props.pageNo + 1})).then(async res => {
+    LoadCaiKuangTaskList(getParams({page: props.pageNo + 1})).then(async res => {
      emits('changeInfoDataList',res.items,res.total,props.pageNo + 1)
      handoffShow.value = false
      let record = res.items[0]
--- a/src/views/demo/degraining/curbspotcity/index.vue
+++ b/src/views/demo/degraining/curbspotcity/index.vue
@ -25,7 +25,6 @@
        />
      </a-spin>
    </div>
-    <!-- <div id="showMap" class="map"></div> -->
    <MapboxMap
      :mapConfig="mapConfig"
      @handlerDrawComplete="handlerDrawComplete"
@ -42,10 +41,9 @@
  import MapList from './MapList/index.vue';
  import {
    getLoadDroneCaseInfoCount,
-    getLoadDroneCaseInfoDetail,
    getLoadParents,
  } from '@/api/tiankongdi/index.ts';
-  import { batchOptions, yearOptions } from '@/views/utils/global';
+  import { LoadCaiKuangTaskList } from '@/api/degraining/index.ts';
  import { getChildrenTree } from '@/api/demo/system';
  import { getGeom, getConfig } from '@/api/sys/layerManagement';
  import dayjs from 'dayjs';
@ -325,13 +323,6 @@
  onMounted(() => {
    mapboxgl.accessToken = MapboxConfig.ACCESS_TOKEN;
    // map = initMap();
-    getLoadDroneCaseInfoCount()
-      .then((res) => {
-        dataList.value = res;
-      })
-      .catch((err) => {
-        console.log(err);
-      });
  });
  onUnmounted(() => {
    map && map.remove();
@ -351,7 +342,7 @@
  };
  const getInfoList = () => {
    spinning.value = true;
-    return getLoadDroneCaseInfoDetail(getParams())
+    return LoadCaiKuangTaskList(getParams())
      .then((res) => {
        total.value = res.total;
        infoDataList.value = res.items;
@ -424,7 +415,7 @@
        break;
    }
    spinning.value = true;
-    getLoadDroneCaseInfoDetail(getParams())
+    LoadCaiKuangTaskList(getParams())
      .then((res) => {
        total.value = res.total;
        infoDataList.value = res.items;
--- a/src/views/demo/degraining/illegaltreatment/MapList/index.vue
+++ b/src/views/demo/degraining/illegaltreatment/MapList/index.vue
@ -192,7 +192,8 @@
  import { onMounted, ref, defineEmits, computed, h, watch } from 'vue';
  import { StarOutlined,StarFilled } from '@ant-design/icons-vue';
  import Icon from '@/components/Icon/Icon.vue';
-  import { getLoadTaskIllegalDetailList, updateSupervise, addTaskFavorite, deleteTaskCase } from '@/api/tiankongdi/index';
+  import { updateSupervise, } from '@/api/tiankongdi/index';
+  import { AddCaiKuangTaskFavorite, DeleteCaiKuangTaskCase, LoadTaskIllegalDetailList } from '@/api/degraining/index'
  import { flowStore } from '@/store/modules/flow';
  import { getDetail } from '@/api/sys/WFSchemeInfo';
  import { Audit } from '@/views/demo/workflow/task/process/page';
@ -268,7 +269,7 @@
  }
  async function getTaskList() {
    console.log(params.value);
-    const data = await getLoadTaskIllegalDetailList(params.value);
+    const data = await LoadTaskIllegalDetailList(params.value);
    dataList.value = data.items;
    total.value = data.total;
  }
@ -389,7 +390,7 @@
    handoffShow.value = true
  }
  const cancelCollectItem = (item) => {
-    deleteTaskCase(item.Fid).then(res => {
+    DeleteCaiKuangTaskCase(item.Fid).then(res => {
      message.success('取消收藏成功')
      getTaskList();
    })
@ -404,7 +405,7 @@
      taskId: item.taskeid,
      favoriteUserId: userInfo.id
    }
-    addTaskFavorite(params).then(res => {
+    AddCaiKuangTaskFavorite(params).then(res => {
      message.success('收藏成功')
      getTaskList();
    })
--- a/src/views/demo/degraining/illegaltreatment/index.vue
+++ b/src/views/demo/degraining/illegaltreatment/index.vue
@ -41,7 +41,7 @@
  import { MapboxConfig, MapboxDefaultStyle } from '@/components/MapboxMaps/src/config.ts';
  import AuditProgress from './AuditProgress/index.vue';
  import MapList from './MapList/index.vue';
-  import { getLoadTaskCount } from '@/api/tiankongdi/index';
+  import { LoadReformCaseCount } from '@/api/degraining/index'
  import { getGeom,getConfig } from '@/api/sys/layerManagement';
  import { getDetail } from '@/api/sys/WFSchemeInfo';
  import { useMessage } from '@/hooks/web/useMessage';
@ -92,7 +92,7 @@
    showParent.value = true;
  }
  async function getCountList() {
-    const data = await getLoadTaskCount({
+    const data = await LoadReformCaseCount({
      year: year.value,
      tubanlaiyuan: patchSource.value,
      picihao: batch.value,
--- a/src/views/demo/degraining/patchsummary/index.vue
+++ b/src/views/demo/degraining/patchsummary/index.vue
@ -60,13 +60,13 @@
 <script lang="ts" setup>
  import { ref, reactive, onMounted } from 'vue';
  import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { loadCaseInfoTuBanList } from '@/api/demo/system';
+  import { LoadCaseInfoWpxfTuBanList } from '@/api/degraining/index.ts'
  import { PermissionBtn } from '@/components/PermissionBtn/index';
  import { columns, searchFormSchema } from './patchsummary.data';
  import { getAppEnvConfig } from '@/utils/env';
  import axios from 'axios';
  import ShowInfoModal from '@/views/demo/degraining/curbspotcity/MapList/ShowInfoModal/index.vue';
-  import { getCaseInfoById } from '@/api/tiankongdi/index';
+  import { GetCaseInfoById } from '@/api/degraining/index';
  import { dataProcessingCount } from '@/views/demo/tiankongdi/util';
  import { BasicForm, useForm } from '@/components/Form';
  import { PageWrapper } from '@/components/Page';
@ -134,10 +134,10 @@
    let url = '';
    let fileName = '';
    if (exportType == 'excel') {
-      url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExportCaseInfoTuBanList';
+      url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSatellite/ExportCaseInfoWpxfTuBanList';
      fileName = '图斑汇总统计报表' + new Date().getTime() + '.xls';
    } else if (exportType == 'shp') {
-      url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExportCaseInfoShapefile';
+      url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSatellite/ExportCaseInfoWpxfShapefile';
      fileName = '图斑汇总矢量数据' + new Date().getTime() + '.zip';
    }
    axios({
@ -171,7 +171,7 @@
    }
  }
  function viewAccount(record) {
-    getCaseInfoById({ id: record.Id }).then((res) => {
+    GetCaseInfoById({ id: record.Id }).then((res) => {
      showInfoData.value = res;
      showInfoOpen.value = true;
    });
@ -191,7 +191,7 @@
  }
  function getTableData() {
    setLoading(true);
-    loadCaseInfoTuBanList(searchParams.value).then((res) => {
+    LoadCaseInfoWpxfTuBanList(searchParams.value).then((res) => {
      tableData.value = res.items;
      tablePaginationRight.value.total = res.total;
      setTableData(tableData.value);
Author	SHA1	Message	Date
Zhufu	515caff518	Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua	2024-08-04 11:24:29 +08:00
Zhufu	f2b0ef8177	非粮化专题接口	2024-08-04 11:24:22 +08:00