From 9ab0087dacaab15263e038b157962d78ffef3d76 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Fri, 29 Nov 2024 14:23:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BD=99=E5=9B=9B=E7=A7=8D=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E3=80=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E3=80=81=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/auditPagesApi/index.js | 142 +++++++- src/assets/styles/public.scss | 2 +- .../auditPages/assetsManagement/email.vue | 97 +++--- .../auditPages/assetsManagement/index.vue | 6 +- .../assetsManagement/mobileApplication.vue | 102 +++--- .../assetsManagement/officialAccount.vue | 108 +++--- .../auditPages/assetsManagement/program.vue | 120 +++---- src/views/auditPages/unitManagement/index.vue | 2 +- src/views/components/assetsType/index_v1.vue | 271 ++++++++++----- src/views/components/assetsType/index_v2.vue | 325 +++++++++++++++++- src/views/components/assetsType/index_v3.vue | 292 +++++++++++++++- src/views/components/assetsType/index_v4.vue | 254 +++++++++++++- 13 files changed, 1371 insertions(+), 352 deletions(-) diff --git a/.env.development b/.env.development index 9a569a1..1047545 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 太仓资产管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.109:9115' +VUE_APP_BASE_API = 'http://192.168.0.105:9115' # VUE_APP_BASE_API = 'http://39.101.188.84:9115' # 路由懒加载 diff --git a/src/api/auditPagesApi/index.js b/src/api/auditPagesApi/index.js index 15589a0..0968fc9 100644 --- a/src/api/auditPagesApi/index.js +++ b/src/api/auditPagesApi/index.js @@ -83,4 +83,144 @@ export function deleteAssetInfo(id) { method: 'delete', }) -} \ No newline at end of file +} + +// 小程序资产 + +// 分页查询 +export function miniProgramsList(params){ + return request({ + url: '/tc/miniPrograms', + method: 'get', + params + }) +} + +// 新增/修改 资产列表 +export function assetMiniPrograms(method,data) { + return request({ + url: '/tc/miniPrograms', + method: method, + data + }) +} + +// 查询详情 +export function miniProgramsInfo(id) { + return request({ + url: '/tc/miniPrograms/' + id, + method: 'get', + }) +} +// 删除 +export function deleteMiniPrograms(id) { + return request({ + url: '/tc/miniPrograms/delete/' + id, + method: 'delete', + }) +} + +// 公众号资产 + +// 分页查询 +export function assetOfficialAccountList(params){ + return request({ + url: '/tc/assetOfficialAccount', + method: 'get', + params + }) +} + +// 新增/修改 资产列表 +export function assetOfficialAccount(method,data) { + return request({ + url: '/tc/assetOfficialAccount', + method: method, + data + }) +} + +// 查询详情 +export function assetOfficialAccountInfo(id) { + return request({ + url: '/tc/assetOfficialAccount/' + id, + method: 'get', + }) +} +// 删除 +export function deleteAssetOfficialAccount(id) { + return request({ + url: '/tc/assetOfficialAccount/delete/' + id, + method: 'delete', + }) +} + +// 电子邮件资产 + +// 分页查询 +export function assetEmailList(params){ + return request({ + url: '/tc/assetEmail', + method: 'get', + params + }) +} + +// 新增/修改 资产列表 +export function assetEmail(method,data) { + return request({ + url: '/tc/assetEmail', + method: method, + data + }) +} + +// 查询详情 +export function assetEmailInfo(id) { + return request({ + url: '/tc/assetEmail/' + id, + method: 'get', + }) +} +// 删除 +export function deleteAssetEmail(id) { + return request({ + url: '/tc/assetEmail/delete/' + id, + method: 'delete', + }) +} + +// 移动应用程序资产 + +// 分页查询 +export function assetAppList(params){ + return request({ + url: '/tc/assetApp', + method: 'get', + params + }) +} + +// 新增/修改 资产列表 +export function assetApp(method,data) { + return request({ + url: '/tc/assetApp', + method: method, + data + }) +} + +// 查询详情 +export function assetAppInfo(id) { + return request({ + url: '/tc/assetApp/' + id, + method: 'get', + }) +} +// 删除 +export function deleteAssetApp(id) { + return request({ + url: '/tc/assetApp/delete/' + id, + method: 'delete', + }) +} diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 53700df..8f2c2ed 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -426,7 +426,7 @@ overflow-y: scroll; .assets-info-top { - height: 100%; + height: calc(100% - 20px); .top-title-box { font-weight: 700; diff --git a/src/views/auditPages/assetsManagement/email.vue b/src/views/auditPages/assetsManagement/email.vue index ea5b9fc..d682bfd 100644 --- a/src/views/auditPages/assetsManagement/email.vue +++ b/src/views/auditPages/assetsManagement/email.vue @@ -5,27 +5,20 @@
查询条件
- - - + + + - - - - - - + + + - + + + + 重置 + 查询 + + - +
@@ -100,34 +99,21 @@
- - - - - + + + - + @@ -195,23 +181,21 @@ import myPagination from "@/views/components/Pagination/index.vue" // import myDialog from "@/views/components/myDialog/index.vue" import { getToken } from "@/utils/auth"; -import { assetUnit, deleteAssetInfo } from "@/api/auditPagesApi/index"; +import { assetEmailList, deleteAssetEmail } from "@/api/auditPagesApi/index"; export default { dicts: ['zc_xtzt','zc_xtlx'], components:{myPagination}, data() { return { formInline:{ - xtmc:"", - xtlx:"", - time:[], + dzyxhz:"", + dwmc:"", startTime:"", endTime:"", - dwmc:"", - xtzt:"", current:1, size:10, }, + time:[], total:0, tableData:[], loading:false, @@ -221,7 +205,7 @@ export default { // 是否显示弹出层（用户导入） open: false, // 弹出层标题（用户导入） - title: "资产导入", + title: "电子邮件资产导入", // 是否禁用上传 isUploading: false, // 是否更新已经存在的用户数据 @@ -229,7 +213,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import" + url: process.env.VUE_APP_BASE_API + "/tc/assetEmail/importData" }, } }, @@ -245,7 +229,7 @@ export default { // 获取列表 getList(){ this.loading = true; - assetUnit('get',this.formInline).then(res=>{ + assetEmailList(this.formInline).then(res=>{ this.loading = false; this.total = res.data.total; this.tableData = res.data.records; @@ -254,16 +238,17 @@ export default { // 重置 resetQuery(){ this.resetForm("queryForm"); + this.time = []; this.handleQuery(); }, // 查询 handleQuery(){ this.formInline.current = 1; - if(this.formInline.time) { - this.formInline.startTime = this.formInline.time[0] - this.formInline.endTime = this.formInline.time[1] + if(this.time) { + this.formInline.startTime = this.time[0] + this.formInline.endTime = this.time[1] } - this.formInline.time = []; + this.getList(); }, // 页码获取 @@ -278,14 +263,14 @@ export default { }, // 导出 handleExport(){ - this.download('/tc/assetCurrent/export', { + this.download('/tc/assetEmail/export', { ...this.formInline - }, `资产${new Date().getTime()}.xlsx`) + }, `电子邮件资产${new Date().getTime()}.xlsx`) }, /** 下载模板操作 */ importTemplate() { - this.download('/tc/assetCurrent/importTemplate', { - }, `资产导入模板${new Date().getTime()}.xlsx`) + this.download('/tc/assetEmail/importTemplate', { + }, `电子邮件资产导入模板${new Date().getTime()}.xlsx`) }, // 文件上传中处理 handleFileUploadProgress(event, file, fileList) { @@ -327,7 +312,7 @@ export default { } else if(id == 3) { const userIds = row.id; this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() { - return deleteAssetInfo(userIds); + return deleteAssetEmail(userIds); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue index 4ec0b9b..e00fe06 100644 --- a/src/views/auditPages/assetsManagement/index.vue +++ b/src/views/auditPages/assetsManagement/index.vue @@ -221,7 +221,7 @@ export default { // 是否显示弹出层（用户导入） open: false, // 弹出层标题（用户导入） - title: "资产导入", + title: "web资产导入", // 是否禁用上传 isUploading: false, // 是否更新已经存在的用户数据 @@ -280,12 +280,12 @@ export default { handleExport(){ this.download('/tc/assetCurrent/export', { ...this.formInline - }, `资产${new Date().getTime()}.xlsx`) + }, `web资产${new Date().getTime()}.xlsx`) }, /** 下载模板操作 */ importTemplate() { this.download('/tc/assetCurrent/importTemplate', { - }, `资产导入模板${new Date().getTime()}.xlsx`) + }, `web资产导入模板${new Date().getTime()}.xlsx`) }, // 文件上传中处理 handleFileUploadProgress(event, file, fileList) { diff --git a/src/views/auditPages/assetsManagement/mobileApplication.vue b/src/views/auditPages/assetsManagement/mobileApplication.vue index e9d6913..48986fc 100644 --- a/src/views/auditPages/assetsManagement/mobileApplication.vue +++ b/src/views/auditPages/assetsManagement/mobileApplication.vue @@ -5,27 +5,20 @@
查询条件
- - - + + + - - - - - - + + + - + + + + 重置 + 查询 + + - +
@@ -100,34 +99,24 @@
- - + + + - + + --> - + @@ -195,23 +184,21 @@ import myPagination from "@/views/components/Pagination/index.vue" // import myDialog from "@/views/components/myDialog/index.vue" import { getToken } from "@/utils/auth"; -import { assetUnit, deleteAssetInfo } from "@/api/auditPagesApi/index"; +import { assetAppList, deleteAssetApp } from "@/api/auditPagesApi/index"; export default { dicts: ['zc_xtzt','zc_xtlx'], components:{myPagination}, data() { return { formInline:{ - xtmc:"", - xtlx:"", - time:[], + dwmc:"", + yymc:"", startTime:"", endTime:"", - dwmc:"", - xtzt:"", current:1, size:10, }, + time:[], total:0, tableData:[], loading:false, @@ -221,7 +208,7 @@ export default { // 是否显示弹出层（用户导入） open: false, // 弹出层标题（用户导入） - title: "资产导入", + title: "移动应用程序资产导入", // 是否禁用上传 isUploading: false, // 是否更新已经存在的用户数据 @@ -229,7 +216,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import" + url: process.env.VUE_APP_BASE_API + "/tc/assetApp/importData" }, } }, @@ -245,7 +232,7 @@ export default { // 获取列表 getList(){ this.loading = true; - assetUnit('get',this.formInline).then(res=>{ + assetAppList(this.formInline).then(res=>{ this.loading = false; this.total = res.data.total; this.tableData = res.data.records; @@ -254,16 +241,17 @@ export default { // 重置 resetQuery(){ this.resetForm("queryForm"); + this.time = []; this.handleQuery(); }, // 查询 handleQuery(){ this.formInline.current = 1; - if(this.formInline.time) { - this.formInline.startTime = this.formInline.time[0] - this.formInline.endTime = this.formInline.time[1] + if(this.time) { + this.formInline.startTime = this.time[0] + this.formInline.endTime = this.time[1] } - this.formInline.time = []; + this.getList(); }, // 页码获取 @@ -278,14 +266,14 @@ export default { }, // 导出 handleExport(){ - this.download('/tc/assetCurrent/export', { + this.download('/tc/assetApp/export', { ...this.formInline - }, `资产${new Date().getTime()}.xlsx`) + }, `移动应用程序资产${new Date().getTime()}.xlsx`) }, /** 下载模板操作 */ importTemplate() { - this.download('/tc/assetCurrent/importTemplate', { - }, `资产导入模板${new Date().getTime()}.xlsx`) + this.download('/tc/assetApp/importTemplate', { + }, `移动应用程序资产导入模板${new Date().getTime()}.xlsx`) }, // 文件上传中处理 handleFileUploadProgress(event, file, fileList) { @@ -327,7 +315,7 @@ export default { } else if(id == 3) { const userIds = row.id; this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() { - return deleteAssetInfo(userIds); + return deleteAssetApp(userIds); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/src/views/auditPages/assetsManagement/officialAccount.vue b/src/views/auditPages/assetsManagement/officialAccount.vue index 35ebd70..17fedc7 100644 --- a/src/views/auditPages/assetsManagement/officialAccount.vue +++ b/src/views/auditPages/assetsManagement/officialAccount.vue @@ -5,27 +5,20 @@
查询条件
- - - + + + - - - - - - + + + - + + + + 重置 + 查询 + + - +
@@ -100,34 +99,30 @@
- - - - - - - + + + - + @@ -195,23 +190,21 @@ import myPagination from "@/views/components/Pagination/index.vue" // import myDialog from "@/views/components/myDialog/index.vue" import { getToken } from "@/utils/auth"; -import { assetUnit, deleteAssetInfo } from "@/api/auditPagesApi/index"; +import { assetOfficialAccountList, deleteAssetOfficialAccount } from "@/api/auditPagesApi/index"; export default { dicts: ['zc_xtzt','zc_xtlx'], components:{myPagination}, data() { return { formInline:{ - xtmc:"", - xtlx:"", - time:[], + gzhmc:"", + dwmc:"", startTime:"", endTime:"", - dwmc:"", - xtzt:"", current:1, size:10, }, + time:[], total:0, tableData:[], loading:false, @@ -221,7 +214,7 @@ export default { // 是否显示弹出层（用户导入） open: false, // 弹出层标题（用户导入） - title: "资产导入", + title: "公众号资产导入", // 是否禁用上传 isUploading: false, // 是否更新已经存在的用户数据 @@ -229,7 +222,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import" + url: process.env.VUE_APP_BASE_API + "/tc/assetOfficialAccount/importData" }, } }, @@ -245,7 +238,7 @@ export default { // 获取列表 getList(){ this.loading = true; - assetUnit('get',this.formInline).then(res=>{ + assetOfficialAccountList(this.formInline).then(res=>{ this.loading = false; this.total = res.data.total; this.tableData = res.data.records; @@ -254,16 +247,17 @@ export default { // 重置 resetQuery(){ this.resetForm("queryForm"); + this.time = []; this.handleQuery(); }, // 查询 handleQuery(){ this.formInline.current = 1; - if(this.formInline.time) { - this.formInline.startTime = this.formInline.time[0] - this.formInline.endTime = this.formInline.time[1] + if(this.time) { + this.formInline.startTime = this.time[0] + this.formInline.endTime = this.time[1] } - this.formInline.time = []; + this.getList(); }, // 页码获取 @@ -278,14 +272,14 @@ export default { }, // 导出 handleExport(){ - this.download('/tc/assetCurrent/export', { + this.download('/tc/assetOfficialAccount/export', { ...this.formInline - }, `资产${new Date().getTime()}.xlsx`) + }, `公众号资产${new Date().getTime()}.xlsx`) }, /** 下载模板操作 */ importTemplate() { - this.download('/tc/assetCurrent/importTemplate', { - }, `资产导入模板${new Date().getTime()}.xlsx`) + this.download('/tc/assetOfficialAccount/importTemplate', { + }, `公众号资产导入模板${new Date().getTime()}.xlsx`) }, // 文件上传中处理 handleFileUploadProgress(event, file, fileList) { @@ -327,7 +321,7 @@ export default { } else if(id == 3) { const userIds = row.id; this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() { - return deleteAssetInfo(userIds); + return deleteAssetOfficialAccount(userIds); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/src/views/auditPages/assetsManagement/program.vue b/src/views/auditPages/assetsManagement/program.vue index 5be5e2a..b7fe655 100644 --- a/src/views/auditPages/assetsManagement/program.vue +++ b/src/views/auditPages/assetsManagement/program.vue @@ -3,29 +3,22 @@
查询条件
- + - - - + + + - - - - - - + + + - + - - - - - + + + 重置 + 查询 + +
@@ -100,34 +94,34 @@
- - - - - + + - - + + + @@ -195,23 +189,21 @@ import myPagination from "@/views/components/Pagination/index.vue" // import myDialog from "@/views/components/myDialog/index.vue" import { getToken } from "@/utils/auth"; -import { assetUnit, deleteAssetInfo } from "@/api/auditPagesApi/index"; +import { miniProgramsList, deleteMiniPrograms } from "@/api/auditPagesApi/index"; export default { - dicts: ['zc_xtzt','zc_xtlx'], + dicts: ['gzh_state'], components:{myPagination}, data() { return { formInline:{ - xtmc:"", - xtlx:"", - time:[], + dwmc:"", + xcxmc:"", startTime:"", endTime:"", - dwmc:"", - xtzt:"", current:1, size:10, }, + time:[], total:0, tableData:[], loading:false, @@ -221,7 +213,7 @@ export default { // 是否显示弹出层（用户导入） open: false, // 弹出层标题（用户导入） - title: "资产导入", + title: "小程序资产导入", // 是否禁用上传 isUploading: false, // 是否更新已经存在的用户数据 @@ -229,7 +221,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import" + url: process.env.VUE_APP_BASE_API + "/tc/miniPrograms/importData" }, } }, @@ -245,7 +237,7 @@ export default { // 获取列表 getList(){ this.loading = true; - assetUnit('get',this.formInline).then(res=>{ + miniProgramsList(this.formInline).then(res=>{ this.loading = false; this.total = res.data.total; this.tableData = res.data.records; @@ -254,16 +246,16 @@ export default { // 重置 resetQuery(){ this.resetForm("queryForm"); + this.time = []; this.handleQuery(); }, // 查询 handleQuery(){ this.formInline.current = 1; - if(this.formInline.time) { - this.formInline.startTime = this.formInline.time[0] - this.formInline.endTime = this.formInline.time[1] + if(this.time) { + this.formInline.startTime = this.time[0] + this.formInline.endTime = this.time[1] } - this.formInline.time = []; this.getList(); }, // 页码获取 @@ -278,14 +270,14 @@ export default { }, // 导出 handleExport(){ - this.download('/tc/assetCurrent/export', { + this.download('/tc/miniPrograms/export', { ...this.formInline - }, `资产${new Date().getTime()}.xlsx`) + }, `小程序资产${new Date().getTime()}.xlsx`) }, /** 下载模板操作 */ importTemplate() { - this.download('/tc/assetCurrent/importTemplate', { - }, `资产导入模板${new Date().getTime()}.xlsx`) + this.download('/tc/miniPrograms/importTemplate', { + }, `小程序资产导入模板${new Date().getTime()}.xlsx`) }, // 文件上传中处理 handleFileUploadProgress(event, file, fileList) { @@ -327,7 +319,7 @@ export default { } else if(id == 3) { const userIds = row.id; this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() { - return deleteAssetInfo(userIds); + return deleteMiniPrograms(userIds); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/src/views/auditPages/unitManagement/index.vue b/src/views/auditPages/unitManagement/index.vue index 66c76bf..de769fd 100644 --- a/src/views/auditPages/unitManagement/index.vue +++ b/src/views/auditPages/unitManagement/index.vue @@ -134,7 +134,7 @@ - + - - + + - - + + - - + + - + - - + + + + - - - - - - - - + + + @@ -67,31 +69,39 @@ - + - - - - + + + - - - - + + + - - - - + + + - + - - + + - + - - + + + + - + + + - - - - - - + + + - - + + + - - - - - - + + - - + + + + - - - - - + + + + - - + + - - - - - + + - - + + + + + + + + + + + 取消 + 保存 +
\ No newline at end of file diff --git a/src/views/components/assetsType/index_v2.vue b/src/views/components/assetsType/index_v2.vue index 0c9c39d..3f94268 100644 --- a/src/views/components/assetsType/index_v2.vue +++ b/src/views/components/assetsType/index_v2.vue @@ -1,19 +1,332 @@ + - + \ No newline at end of file diff --git a/src/views/components/assetsType/index_v3.vue b/src/views/components/assetsType/index_v3.vue index 0c9c39d..d993bb4 100644 --- a/src/views/components/assetsType/index_v3.vue +++ b/src/views/components/assetsType/index_v3.vue @@ -1,19 +1,299 @@ + - + \ No newline at end of file diff --git a/src/views/components/assetsType/index_v4.vue b/src/views/components/assetsType/index_v4.vue index 0c9c39d..a67cd38 100644 --- a/src/views/components/assetsType/index_v4.vue +++ b/src/views/components/assetsType/index_v4.vue @@ -1,19 +1,261 @@ + - + \ No newline at end of file