diff --git a/.env.production b/.env.production index 97cacc7..5294d66 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,5 @@ VUE_APP_TITLE = 苏州工业园区工业上楼管理系统 ENV = 'production' # 苏州工业园区工业上楼管理系统/生产环境 -VUE_APP_BASE_API = 'http://39.101.188.84:7071' +# VUE_APP_BASE_API = 'http://39.101.188.84:7071' +VUE_APP_BASE_API = '' diff --git a/src/App.vue b/src/App.vue index 67a2a96..9e9eb47 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,8 +15,8 @@ export default { components: { ThemePicker }, mounted() { autofit.init({ - dh: 1030, // 设计稿的高度 - dw: 1950, // 设计稿的宽度 + dh: 850, // 设计稿的高度 + dw: 1900, // 设计稿的宽度 el: "body", // 渲染的DOM元素 resize: true // 是否监听resize事件 }) diff --git a/src/api/ManageApi/index.js b/src/api/ManageApi/index.js index 09440a1..590af52 100644 --- a/src/api/ManageApi/index.js +++ b/src/api/ManageApi/index.js @@ -8,7 +8,7 @@ export function getBasicInformationPage(params) { params }) } -//标签管理 查询所有数据 +//产业标签 查询所有数据 export function getCybqInformationPage(params) { return request({ url:'/gysl/Cybq/page', @@ -16,6 +16,13 @@ export function getCybqInformationPage(params) { params }) } +//产业标签 通过主键查询单条数据 +export function getSpanById(id) { + return request({ + url: `/gysl/Cybq/${id}`, + method: "get", + }); +} // 通过主键查询单条所有数据（企业端） export function getBasicInformationById(id) { @@ -672,18 +679,20 @@ export function allinformation(params){ } // //投资主体 -export function investall() { +export function investall(params) { return request({ url: '/gysl/zwStats/investors', - method: 'get' + method: 'get', + params }) } // 功能区 -export function fungong(){ +export function fungong(params){ return request({ url:'/gysl/zwStats/ribbon', - method:'get' + method:'get', + params }) } diff --git a/src/api/manageApitwo/index.js b/src/api/manageApitwo/index.js index b1b74b5..9a129ef 100644 --- a/src/api/manageApitwo/index.js +++ b/src/api/manageApitwo/index.js @@ -36,3 +36,23 @@ export function deletespan(idList) { }, }); } + + +// 月度进展信息修改 +export function updateProjectProgress(data) { + return request({ + url: "/gysl/projectProgress/edit", + method: "put", + data, + }); +} +// 月度进展信息删除 +export function deletemonth(idList) { + return request({ + url: "/gysl/projectProgress/delete", + method: "delete", + params: { + idList: idList.join(","), // 将数组转换为逗号分隔的字符串 + }, + }); +} diff --git a/src/assets/images/icon-tz@2x.png b/src/assets/images/icon-tz@2x.png new file mode 100644 index 0000000..a948ee4 Binary files /dev/null and b/src/assets/images/icon-tz@2x.png differ diff --git a/src/assets/images/退出登录.png b/src/assets/images/退出登录.png new file mode 100644 index 0000000..28f67a2 Binary files /dev/null and b/src/assets/images/退出登录.png differ diff --git a/public/config/suzhou.json b/src/assets/json/suzhou.json similarity index 100% rename from public/config/suzhou.json rename to src/assets/json/suzhou.json diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index a1759f9..28a029c 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -84,7 +84,7 @@ overflow: hidden !important; text-overflow: ellipsis !important; white-space: nowrap !important; - border-radius: 0.25rem; + // border-radius: 0.25rem; height: 45px; line-height: 45px; } @@ -102,8 +102,8 @@ } & .is-active > .el-submenu__title { - background-color: #2b62f1 !important; - color: white !important; + background-color: rgb(227, 236, 254); + // color: white !important; } & .nest-menu .el-submenu > .el-submenu__title, diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index d7fc18d..2f23b93 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -2,21 +2,27 @@ - {{ item.meta.title }} - {{ item.meta.title }} - + + {{ item.meta.title }} + + / {{ crumbs }} @@ -84,8 +69,13 @@ export default { color: black; } + img { + width: 1.5rem; + height: 1.6rem; + } + .el-dropdown-link i { - font-size: 2rem; + font-size: 1rem; /* 增大图标的大小 */ } } diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 0dfade0..97286fb 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -45,10 +45,11 @@ export default { diff --git a/src/views/compilation/handbook/index_BACKUP_177.vue b/src/views/compilation/handbook/index_BACKUP_177.vue new file mode 100644 index 0000000..054fda7 --- /dev/null +++ b/src/views/compilation/handbook/index_BACKUP_177.vue @@ -0,0 +1,1414 @@ + \ No newline at end of file diff --git a/src/views/components/analysis/daiban.vue b/src/views/components/analysis/daiban.vue index 57466c1..e4776a7 100644 --- a/src/views/components/analysis/daiban.vue +++ b/src/views/components/analysis/daiban.vue @@ -7,17 +7,15 @@ @@ -31,7 +29,7 @@ import { checkPermi, checkRole } from "@/utils/permission"; export default { name: "TableContent", - dicts: ["xzfl"], + dicts: ["xzfl", 'tbzt'], data() { return { // 遮罩层 @@ -86,16 +84,16 @@ export default { /** 查询项目列表 */ getList() { this.loading = true; - + // 处理日期范围参数 const params = { ...this.queryParams, begainTime: this.queryParams.dateRange ? this.queryParams.dateRange[0] : undefined, endTime: this.queryParams.dateRange ? this.queryParams.dateRange[1] : undefined }; - + // console.log('【查询参数】', params); - + getBasicInformationPage(params).then((response) => { this.postList = response.data.records; this.total = response.data.total; @@ -114,7 +112,7 @@ export default { /** 详情按钮操作 */ getInfo(row, type) { - this.$store.commit("SET_CRUMBS", this.$route.meta.title + "详情"); + this.$store.commit("SET_CRUMBS", "项目详情"); const id = row.id || this.ids[0]; this.$router.push({ path: `/manage-info/${id}`, query: { action: type } }); }, diff --git a/src/views/components/analysis/function.vue b/src/views/components/analysis/function.vue index 8491425..96aaba8 100644 --- a/src/views/components/analysis/function.vue +++ b/src/views/components/analysis/function.vue @@ -1,16 +1,24 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/components/analysis/map.vue b/src/views/components/analysis/map.vue index 511074e..7ae46ce 100644 --- a/src/views/components/analysis/map.vue +++ b/src/views/components/analysis/map.vue @@ -33,6 +33,7 @@
+
@@ -67,7 +68,11 @@ import ProjectList from '@/views/components/analysis/projectList.vue' import { getBasicInformationPage } from "@/api/ManageApi/index"; import { debounce } from 'lodash'; -// 自定义指令，点击外部关闭弹窗 +import suzhouData from '@/assets/json/suzhou.json' + + +// 自定义指令 +// 点击外部关闭弹窗 const clickOutside = { bind(el, binding, vnode) { el.clickOutsideEvent = function (event) { @@ -92,6 +97,8 @@ export default { data() { const basePathUrl = window.basePathUrl || ""; return { + markerIcon: require('@/assets/images/detailsicon/icon-定位@2x.png'), + projectMarker: null, isCollapsed: false, searchBox: '', searchList: [], @@ -138,11 +145,11 @@ export default { show: true } ], - center: { lat: 31.3456, lng: 120.5957 }, + center: { lat: 31.3356, lng: 120.7157 }, zoom: 11, minZoom: 10, maxZoom: 20, - zoomControl: true, + // zoomControl: true, chinaCRS: 'GCJ02' }, map: null @@ -166,27 +173,23 @@ export default { this.map.on('load', this.onMapLoad); }, - // 地图加载完成后的回调 onMapLoad() { - // console.log('地图加载完成'); this.addSuzhouIndustrialParkLayer(); }, - // 添加苏州园区高亮区域 + // 园区 async addSuzhouIndustrialParkLayer() { try { - const response = await fetch('/config/suzhou.json'); - const geoJsonData = await response.json(); + const geoJsonData = suzhouData; // 直接使用导入的数据 const graphicLayer = new mars2d.layer.GraphicLayer({ name: "苏州园区高亮区域", zIndex: 10 }); this.map.addLayer(graphicLayer); - // 3. 添加GeoJSON数据 const polygon = mars2d.Util.geoJsonToGraphics(geoJsonData, { style: { fill: true, fillColor: "#2B62F1", - fillOpacity: 0.3, + fillOpacity: 0.3, stroke: true, color: "#2B62F1", opacity: 0.8, @@ -195,14 +198,9 @@ export default { tooltip: "苏州工业园区" }); graphicLayer.addGraphic(polygon); - - } catch (error) {} - }, - - handleClear() { - this.showLocationIcon = false; - this.searchList = []; - this.hasSearched = false; + } catch (error) { + console.error('加载苏州园区数据失败:', error); + } }, toggleCollapse() { this.isCollapsed = !this.isCollapsed; @@ -212,6 +210,7 @@ export default { this.searchList = []; this.hasSearched = false; this.showLocationIcon = false; + this.showLocationIcon = false; return; } this.debouncedSearch(); @@ -234,18 +233,23 @@ export default { this.hasSearched = true; if (response && response.code === 200 && response.data) { this.searchList = response.data.records; + if (this.searchList.length === 0) { + this.$message.warning('查无此项目'); + } } else { this.searchList = []; + this.$message.warning('查无此项目'); } }) .catch(error => { console.error('搜索失败:', error); this.hasSearched = true; this.searchList = []; + this.$message.error('搜索失败，请重试'); }); }, centerMap(item) { - if (!item.jsdd) { + if (!item.longitude || !item.latitude) { this.$message.warning('该项目未落图！'); return; } @@ -267,56 +271,61 @@ export default { this.map.flyTo([lat, lng], 17); } - this.showLocationIcon = true; - this.setRandomIconPosition(); - this.showDialog(); + // 坐标定位 + this.map.flyTo([item.latitude, item.longitude], 17); + + // 标记 + this.addProjectMarker(item); }, - showDialog() { - if (this.selectedProject.name) { - this.dialogVisible = true; - } else { - this.$message.warning('请选择一个项目'); + handleClear() { + this.showLocationIcon = false; + this.searchList = []; + this.hasSearched = false; + this.searchBox = ''; + this.dialogVisible = false; + // 移除标记 + if (this.projectMarker) { + this.map.removeLayer(this.projectMarker); + this.projectMarker = null; + } + this.map.setView(this.mapOptions.center, this.mapOptions.zoom); + }, + addProjectMarker(item) { + if (this.projectMarker) { + this.map.removeLayer(this.projectMarker); } + + this.projectMarker = new mars2d.graphic.Marker({ + latlng: [item.latitude, item.longitude], + style: { + image: this.markerIcon, + width: 32, + height: 44, + anchor: [16, 44] + }, + interactive: true, + cursor: 'pointer' + }); + + // 点击图标 + this.projectMarker.on(mars2d.EventType.click, (event) => { + this.selectedProject = { ...item }; + this.dialogVisible = true; + }); + + this.map.addLayer(this.projectMarker); + }, + showDialog() { + this.dialogVisible = true; }, closeDialog() { this.dialogVisible = false; }, - setRandomIconPosition() { - // 计算最大可随机范围 - const maxTop = 105; - const maxLeft = 110; - - const randomTop = Math.floor(Math.random() * maxTop); - const randomLeft = Math.floor(Math.random() * maxLeft); - - this.iconPosition = { - position: 'absolute', - top: `${randomTop}px`, - left: `${randomLeft}px`, - cursor: 'pointer' - }; - } } } \ No newline at end of file diff --git a/src/views/components/analysis/messagecompany.vue b/src/views/components/analysis/messagecompany.vue index 21a0d84..66c7a65 100644 --- a/src/views/components/analysis/messagecompany.vue +++ b/src/views/components/analysis/messagecompany.vue @@ -1,8 +1,8 @@ - \ No newline at end of file diff --git a/src/views/evalute/configtable/index.vue b/src/views/evalute/configtable/index.vue index 10d9c16..a0c53b3 100644 --- a/src/views/evalute/configtable/index.vue +++ b/src/views/evalute/configtable/index.vue @@ -11,8 +11,8 @@ - 查询 - 重置 + 查询 + 重置 @@ -36,8 +36,8 @@ @@ -114,7 +114,7 @@ export default { getProjectEvaluationPage(this.queryParams).then(response => { if (response && response.data && response.data.records !== undefined && response.data.total !== undefined) { this.postList = response.data.records; - this.total = response.data.total; + this.total = response.data.total; } else { this.postList = []; this.total = 0; @@ -190,8 +190,9 @@ export default { }, // 删除按钮操作 handleDelete(row) { - const postIds = row.id || this.ids; // 使用 id 字段 - this.$modal.confirm('是否确认删除项目评价配置编号为"' + postIds + '"的数据项？').then(() => { + const postIds = row.id || this.ids; + const pjys = row.pjys; // 获取 pjys 字段的内容 + this.$modal.confirm(`是否确认删除"${pjys}"的数据项？`).then(() => { return deleteProjectEvaluation(postIds); }).then(() => { this.getList(); diff --git a/src/views/evalute/evalist/index.vue b/src/views/evalute/evalist/index.vue index 3247fa0..836f994 100644 --- a/src/views/evalute/evalist/index.vue +++ b/src/views/evalute/evalist/index.vue @@ -30,7 +30,7 @@ - + @@ -38,8 +38,8 @@ - 查询 - 重置 + 查询 + 重置 @@ -49,7 +49,7 @@
- + + \ No newline at end of file diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue index 237020a..37b850e 100644 --- a/src/views/manage-info/index.vue +++ b/src/views/manage-info/index.vue @@ -1,27 +1,28 @@ + + + \ No newline at end of file diff --git a/src/views/models/badlist/index.vue b/src/views/models/badlist/index.vue index 7641169..34fa2d7 100644 --- a/src/views/models/badlist/index.vue +++ b/src/views/models/badlist/index.vue @@ -41,9 +41,9 @@ - 查询 - 重置 + 重置 @@ -52,7 +52,7 @@
- + - + @@ -126,11 +126,6 @@ export default { 2: '待审核', 3: '审核通过' }, - xzflMap: { - 1: '已建', - 2: '在建', - 3: '拟建' - }, // 查询参数 queryParams: { current: 1, @@ -194,7 +189,7 @@ export default { }, /** 详情按钮操作 */ getAdd(row, type) { - this.$store.commit("SET_CRUMBS", this.$route.meta.title + "新增"); + this.$store.commit("SET_CRUMBS", "项目详情"); const id = row.id || this.ids[0]; this.$router.push({ path: `/manage-add/${id}`, query: { action: type } }); }, diff --git a/src/views/models/manages/index.vue b/src/views/models/manages/index.vue index 3ee8e30..af411c7 100644 --- a/src/views/models/manages/index.vue +++ b/src/views/models/manages/index.vue @@ -19,9 +19,9 @@ - 查询 - 重置 + 重置 @@ -41,9 +41,9 @@
{{ element.name }}
- 删除要素 - 编辑要素 新增指标 @@ -59,9 +59,9 @@ diff --git a/src/views/orientedtwo/bqspan/index.vue b/src/views/orientedtwo/bqspan/index.vue index cdbb64b..73b1c8c 100644 --- a/src/views/orientedtwo/bqspan/index.vue +++ b/src/views/orientedtwo/bqspan/index.vue @@ -34,9 +34,8 @@ - 查询 - 重置 + 查询 + 重置 @@ -57,9 +56,9 @@ - + @@ -99,12 +98,12 @@ - {{ detailData.yhlx }} + {{ detailData.bqzbm }} - {{ detailData.bqzs }} + {{ detailData.state }} @@ -112,12 +111,12 @@ - {{ detailData.bqzt }} + {{ detailData.bqzs }} - {{ detailData.bqzs }} + {{ detailData.yhlx }} @@ -130,7 +129,7 @@ - {{ detailData.bqzs }} + {{ detailData.bqbjdw }} @@ -143,12 +142,10 @@ - {{ detailData.bqzs }} + {{ detailData.sjlymc }} - - 关闭 @@ -158,7 +155,7 @@ + + + \ No newline at end of file diff --git a/src/views/tongjifenxi/index.vue b/src/views/tongjifenxi/index.vue index 1198dc8..253c5cd 100644 --- a/src/views/tongjifenxi/index.vue +++ b/src/views/tongjifenxi/index.vue @@ -26,10 +26,14 @@
{{ item.name }}
-
现状分类：{{ xzflMap[item.xzfl] }}
+
+ 现状分类： +
总投资额：{{ item.ztze }}
填报时间：{{ item.updateTime }}
-
状态：{{ statusMap[item.status] }}
+
+ 状态： +
@@ -62,6 +66,7 @@ import { getBasicInformationPage } from "@/api/ManageApi/index"; export default { name: "Pc2FbEcharts", + dicts:['xzfl','tbzt'], components: { AllArea2, Message2, @@ -98,7 +103,7 @@ export default { methods: { /** 详情按钮操作 */ getInfo(row, type) { - this.$store.commit("SET_CRUMBS", this.$route.meta.title + "详情"); + this.$store.commit("SET_CRUMBS", "项目详情"); const id = row.id || this.ids[0]; this.$router.push({ path: `/manage-info/${id}`, query: { action: type } }); }, diff --git a/src/views/tool/build/index.vue b/src/views/tool/build/index.vue index 2bd298b..248e48b 100644 --- a/src/views/tool/build/index.vue +++ b/src/views/tool/build/index.vue @@ -410,7 +410,7 @@ export default { } .left-scrollbar .el-scrollbar__wrap { box-sizing: border-box; - overflow-x: hidden !important; + overflow: hidden !important; margin-bottom: 0 !important; } .center-tabs{ @@ -483,7 +483,7 @@ export default { } .left-scrollbar .el-scrollbar__view{ - overflow-x: hidden; + overflow: hidden; } .el-rate{ diff --git a/vue.config.js b/vue.config.js index 167a45c..7664020 100644 --- a/vue.config.js +++ b/vue.config.js @@ -27,7 +27,7 @@ module.exports = { // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。 // 例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/demo/Gyyq-Upstairs" : "/", + publicPath: process.env.NODE_ENV === "production" ? "" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） @@ -46,8 +46,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: `http://192.168.0.106:7071/`, - target: `http://39.101.188.84:7071/`, + // target: `http://192.168.0.110:7071/`, + // target: `http://39.101.188.84:7071/`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''