@@ -21,7 +18,6 @@ import { ref, computed, onMounted, watch } from "vue";
import dayjs from "dayjs";
import BasicSearch from "@/components/BasicSearch/index.vue";
import { DateSetting } from "@/utils/enumeration";
-import fishSearch from "@/components/fishSearch/index.vue";
import { useShuJuTianBaoStore } from "@/store/modules/shuJuTianBao";
interface Props {
@@ -44,8 +40,6 @@ const initSearchData = {
hbrvcd: "all",
stcd: null,
rstcd: null,
- ftp: null,
- direction: null,
strdt: [
dayjs().subtract(1, "month").startOf("month").format("YYYY-MM-DD"),
dayjs().endOf("day").format("YYYY-MM-DD"),
@@ -99,14 +93,6 @@ const handleReset = () => {
emit("reset", initSearchData);
};
-watch(
- () => initSearchData.ftp,
- (newVal) => {
- localTypeDate.value = newVal || "";
- },
- { immediate: true }
-);
-
onMounted(() => {
emit("search-finish", initSearchData);
shuJuTianBaoStore.getFpssOption("", "");
diff --git a/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue b/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
index 313bdb4..577e6e4 100644
--- a/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
+++ b/frontend/src/views/shuJuTianBao/shengPiJiLu/index.vue
@@ -15,7 +15,6 @@
:columns="columns"
:list-url="queryPageList"
:search-params="computedSearchParams"
- :scroll-y="650"
:enable-row-selection="true"
@selection-change="handleSelectionChange"
>
@@ -36,8 +35,8 @@
{{ handName(record.bizType, yeWuType) }}
+ {{ handName(record.status, shenStatus) }}
+ -->
@@ -234,7 +233,7 @@ import {
batchApproveByApprovalId,
batchReject,
} from "@/api/shengPiJiLu";
-import { Tag, message, Modal } from "ant-design-vue";
+import { Tag, Tooltip, message, Modal } from "ant-design-vue";
import BasicTable from "@/components/BasicTable/index.vue";
import GuoYuSheShiShuJuTianBaoSearch from "./shengPiJiLuSearch.vue";
import ApprovalLogSearch from "./approvalLogSearch.vue";
@@ -276,14 +275,12 @@ let columns = ref([
// 返回 span 标签，title 属性用于悬停显示全称
return h(
- "span",
+ Tooltip,
{
- title: str,
- style: {
- cursor: "default",
- },
+ title: str, // Tooltip 显示的全部内容
+ placement: "topLeft", // 可选：提示框位置
},
- displayText
+ () => h("span", displayText)
);
},
},
@@ -930,11 +927,8 @@ const handleBatchDelete = () => {
selectedRows.value.forEach((item: any) => {
ids.push(item.id);
});
- const params = {
- ids: ids,
- };
try {
- let res: any = await batchRemoveDraft(params);
+ let res: any = await batchRemoveDraft(ids);
if (res && res?.code == 0) {
message.success("删除成功");
tableRef.value?.clearSelection();
@@ -1006,12 +1000,6 @@ const handleBatchRejectCancel = () => {
batchRejectForm.value.rejectReason = "";
};
-// 搜索相关数据
-const searchData = ref
({
- hbrvcd: "all",
- status: "",
-});
-
// 搜索相关弹框
const paramsTab = ref({
sort: [
@@ -1038,6 +1026,10 @@ const computedSearchParams = computed(() => ({
height: 100%;
background-color: #ffffff;
padding: 20px;
+ display: flex;
+ flex-direction: column;
+ box-sizing: border-box;
+ overflow: hidden;
}
.approval-log-modal-content {
diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index 8a83ad0..f2a5538 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -1014,11 +1014,10 @@ onMounted(() => {
z-index: 900;
pointer-events: all;
width: 100%;
- height: calc(100vh - 120px);
+ height: calc(100vh - 110px);
overflow: auto;
background-color: rgba(255, 255, 255, 1);
border: none;
- border-radius: 3px;
padding: 5px 20px 0px;
box-sizing: border-box;
}
diff --git a/frontend/src/views/system/record/index.vue b/frontend/src/views/system/record/index.vue
index aa4134a..e21042a 100644
--- a/frontend/src/views/system/record/index.vue
+++ b/frontend/src/views/system/record/index.vue
@@ -283,11 +283,10 @@ function handleClose() {
pointer-events: all;
padding: 20px;
width: 100%;
- height: calc(100vh - 130px);
+ height: calc(100vh - 110px);
overflow: auto;
background-color: rgba(255, 255, 255, 1);
border: none;
- border-radius: 3px;
box-sizing: border-box;
}
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index 69cdaf9..8139ff0 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -647,7 +647,6 @@ onMounted(() => {
position: relative;
z-index: 900;
pointer-events: all;
- padding-right: 10px;
}
:deep(.el-tree-node__content) {
@@ -665,11 +664,10 @@ onMounted(() => {
.conductproject-bg-box {
padding: 20px;
width: 100%;
- height: calc(100vh - 130px);
+ height: calc(100vh - 110px);
overflow: auto;
background-color: rgba(255, 255, 255, 1);
border: none;
- border-radius: 3px;
box-sizing: border-box;
}
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 4c0bcaa..34cb042 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -2,6 +2,7 @@ import { UserConfig, ConfigEnv, loadEnv } from 'vite';
import vue from '@vitejs/plugin-vue';
import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';
import path from 'path';
+import cesium from 'vite-plugin-cesium';
export default ({ mode }: ConfigEnv): UserConfig => {
// 获取 .env 环境配置文件
@@ -10,6 +11,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
return {
plugins: [
vue(),
+ cesium(),
createSvgIconsPlugin({
// 指定需要缓存的图标文件夹
iconDirs: [path.resolve(process.cwd(), 'src/assets/icons')],
@@ -33,7 +35,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
},
'/geoserver': {
- // target: 'https://211.99.26.225:18085', // 地图-线上API地址
+ target: 'https://211.99.26.225:18085', // 地图-线上API地址
// target: 'http://172.16.31.112:8093', // 地图-本地API地址
changeOrigin: true,
secure: false,
@@ -42,6 +44,16 @@ export default ({ mode }: ConfigEnv): UserConfig => {
'/process': {
target: 'http://localhost:5174',
changeOrigin: true
+ },
+ '/api/dec-lygk-base-server': {
+ target: 'https://211.99.26.225:12122',
+ changeOrigin: true,
+ secure: false,
+ rewrite: path =>
+ path.replace(
+ new RegExp('^/api/dec-lygk-base-server'),
+ '/api/dec-lygk-base-server'
+ )
}
}
},
@@ -58,6 +70,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
// 将 element-plus, lodash 等大型库单独拆分
if (id.includes('element-plus')) return 'element-plus';
if (id.includes('lodash')) return 'lodash';
+ if (id.includes('cesium')) return 'cesium';
// 其他 node_modules 归为 vendor
return 'vendor';
}