diff --git a/src/api/ManageApi/index.js b/src/api/ManageApi/index.js index 6d04b30..562f5d6 100644 --- a/src/api/ManageApi/index.js +++ b/src/api/ManageApi/index.js @@ -192,9 +192,7 @@ export function addCatalog(data) { return request({ url: '/gysl/ml/add', method: 'post', - data: { - ml: data // 同样包装在ml对象中 - } + data : data }); } @@ -203,7 +201,9 @@ export function deleteCatalog(idList) { return request({ url: `/gysl/ml/delete`, method: 'delete', - params: { idList } + params: { + idList: idList.join(',') // 将数组转换为逗号分隔的字符串 + } }); } @@ -212,18 +212,16 @@ export function editCatalog(data) { return request({ url: '/gysl/ml/edit', method: 'post', - data: { - ml: data // 按照接口要求，将数据包装在ml对象中 - } + data }); } // 查询所有目录 -export function getAllCatalogs(params) { +export function getAllCatalogs(query) { return request({ url: '/gysl/ml/page', method: 'get', - params + params:query }); } @@ -242,7 +240,7 @@ export function deleteXmzsk(idList) { return request({ url: '/gysl/xmzsk/delete', method: 'delete', - params: { + params: { idList: idList.join(',') // 将数组转换为逗号分隔的字符串 } }); @@ -496,8 +494,8 @@ export function updatexmqt(data) { data }) } -//根据项目id查询信息// 根据项目id查询信息 -export function getOtherInfoByxmid(query) { +//根据项目id查询信息 +export function getOtherInfoByxmId(query) { return request({ url: '/gysl/projectOtherInfo/searchId', method: 'get', @@ -553,7 +551,6 @@ export function getxmmmbById(id) { //单片材料管理 //新增数据 -// 新增数据 export function addClgl(data) { return request({ url: '/gysl/dpclgl/add', @@ -680,14 +677,15 @@ export function getpicturelist(id){ }) } -// 细分产业管理 + +// 细分产业管理 // 新增数据 export function addXfcygl(data) { return request({ url: '/gysl/xfcygl/add', method: 'post', - data + data:data }); } @@ -696,7 +694,9 @@ export function deleteXfcygl(idList) { return request({ url: '/gysl/xfcygl/delete', method: 'delete', - params: { idList } + params: { + idList: idList.join(',') // 将数组转换为逗号分隔的字符串 + } }); } @@ -705,16 +705,16 @@ export function updateXfcygl(data) { return request({ url: '/gysl/xfcygl/edit', method: 'put', - data + data:data }); } // 分页查询所有数据 -export function getXfcyglPage(params) { +export function getXfcyglPage(query) { return request({ url: '/gysl/xfcygl/page', method: 'get', - params + params:query }); } @@ -727,4 +727,12 @@ export function getMessageCount() { }) } -//月度进展信息 \ No newline at end of file +//智能提醒 +// 已读智能提醒 +export function markSmartReminderAsRead(id) { + return request({ + url: `/gysl/jSmartReminders/isRead/${id}`, + method: 'get' + }); +} + diff --git a/src/views/components/ProjectDetails/Projectgift.vue b/src/views/components/ProjectDetails/Projectgift.vue index 35e337d..a0a416a 100644 --- a/src/views/components/ProjectDetails/Projectgift.vue +++ b/src/views/components/ProjectDetails/Projectgift.vue @@ -223,10 +223,6 @@ export default { this.$message.error(response.msg || '获取数据失败'); } }) - .catch(error => { - this.$message.error('请求失败'); - console.error(error); - }); }, // 删除项目 diff --git a/src/views/components/ProjectDetails/Projectpicture.vue b/src/views/components/ProjectDetails/Projectpicture.vue index 066b878..bff3d44 100644 --- a/src/views/components/ProjectDetails/Projectpicture.vue +++ b/src/views/components/ProjectDetails/Projectpicture.vue @@ -15,7 +15,7 @@
-
+
diff --git a/src/views/components/analysis/messagecompany.vue b/src/views/components/analysis/messagecompany.vue index abff330..7b70b5b 100644 --- a/src/views/components/analysis/messagecompany.vue +++ b/src/views/components/analysis/messagecompany.vue @@ -44,7 +44,14 @@ export default { return index === 0 ? require('@/assets/images/new@2x.png') : require('@/assets/images/other.png'); }, formatDate(dateString) { + if (!dateString) { + // dateString 为空或 undefined，返回空字符串 + return ''; + } const date = new Date(dateString); + if (isNaN(date.getTime())) { + return ''; + } const year = date.getFullYear(); const month = String(date.getMonth() + 1).padStart(2, '0'); const day = String(date.getDate()).padStart(2, '0'); diff --git a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue index 8ac0712..3af8043 100644 --- a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue +++ b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue @@ -7,14 +7,14 @@ label-width="200"> - + - ~ - - - + @@ -393,14 +406,21 @@ export default { border: 1px solid #eee; } -.tablebtntwo { - margin: 1rem 0; +.tablehead { display: flex; justify-content: space-between; + align-items: center; } -.tablebtn { +.headbtn { display: flex; - gap: .5rem; +} + +.tablebtntwo { + margin-top: 1rem; + margin-bottom: 1rem; + width: 100%; + display: flex; + justify-content: space-between; } \ No newline at end of file diff --git a/src/views/orientedtwo/content/index2.vue b/src/views/orientedtwo/content/index2.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/orientedtwo/subdivide/index.vue b/src/views/orientedtwo/subdivide/index.vue index e0700cb..e11286b 100644 --- a/src/views/orientedtwo/subdivide/index.vue +++ b/src/views/orientedtwo/subdivide/index.vue @@ -1,20 +1,22 @@ @@ -392,5 +436,8 @@ export default { .tablebtntwo { margin-top: 1rem; margin-bottom: 1rem; + width: 100%; + display: flex; + justify-content: space-between; } \ No newline at end of file diff --git a/src/views/tool/1.vue b/src/views/tool/1.vue new file mode 100644 index 0000000..5c4a541 --- /dev/null +++ b/src/views/tool/1.vue @@ -0,0 +1,47 @@ +upload: { + open: false, + isUploading: false, + headers: { Authorization: "Bearer " + getToken() }, + url: process.env.VUE_APP_BASE_API + "/gysl/ml/importMl" + } + + /** 导出按钮操作 */ + handleExport() { + console.log('【导出参数】', JSON.stringify(this.queryParams, null, 2)); + this.$modal.confirm('确认导出所有数据?').then(() => { + return exportCatalog(this.queryParams); + }).then(response => { + this.download(response.msg); + }).catch(error => { + console.error('导出失败:', error); + }); + }, + + /** 导入按钮操作 */ + handleImport() { + this.upload.open = true; + }, + + /** 下载模板操作 */ + importTemplate() { + this.download("/gysl/ml/importTemplate", {}, `目录导入模板_${new Date().getTime()}.xlsx`); + }, + + // 文件上传中处理 + handleFileUploadProgress(event, file, fileList) { + this.upload.isUploading = true; + }, + + // 文件上传成功处理 + handleFileSuccess(response, file, fileList) { + this.upload.open = false; + this.upload.isUploading = false; + this.$refs.upload.clearFiles(); + this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true }); + this.getList(); + }, + + // 提交上传文件 + submitFileForm() { + this.$refs.upload.submit(); + } \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 8ba683e..e29cda3 100644 --- a/vue.config.js +++ b/vue.config.js @@ -37,7 +37,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.112:7071/`, + // target: `http://192.168.0.112:7071/`, + target: `http://39.101.188.84:7071/`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''