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 9a79280..de769fd 100644 --- a/src/views/auditPages/unitManagement/index.vue +++ b/src/views/auditPages/unitManagement/index.vue @@ -133,6 +133,16 @@ + + + + + + + @@ -494,6 +504,48 @@ export default { } return { options: pcas , + optionsTwo:[ + { + value:"100", + label:"政务", + children:[ + { + value:"101", + label:"党委机关", + },{ + value:"102", + label:"政府机关", + },{ + value:"200", + label:"事业单位", + },{ + value:"202", + label:"大型国企", + }, + ], + }, + { + value:"10", + label:"民营企业", + children:[ + { + value:"203", + label:"重点民企", + },{ + value:"204", + label:"一般民企" + } + ], + }, + { + value:"20", + label:"个人", + }, + { + value:"30", + label:"社会团体" + } + ], props:{ value:'value', label:"value", @@ -528,6 +580,9 @@ export default { nickName: [ { required: true, message: '请输入单位名称', trigger: 'blur' }, ], + zzjg: [ + { required: true, message: '请选择组织机构', trigger: 'change' }, + ], }, disabled:false, loading:false, @@ -553,6 +608,10 @@ export default { } }, methods:{ + // handleChange(value){ + // console.log(value); + // }, + // 获取详情 getInfo(id){ this.loading = true; lookUnit(id).then(res=>{ @@ -564,6 +623,10 @@ export default { } else if(res.data.ssqyprovince) { this.$set(this.ruleForm, 'ssqy', [res.data.ssqyprovince]) } + if(this.ruleForm.ancestors) { + let deptId = this.ruleForm.ancestors.split(','); + this.$set(this.ruleForm, 'zzjg', deptId) + } this.loading = false; }) }, @@ -604,6 +667,11 @@ export default { this.ruleForm.ssqycity = this.ruleForm.ssqy[1] this.ruleForm.ssqycounty = this.ruleForm.ssqy[2] } + if(this.ruleForm.zzjg.length == 2) { + this.ruleForm.deptId = Number(this.ruleForm.zzjg[1]) + } else { + this.ruleForm.deptId = Number(this.ruleForm.zzjg[0]) + } this.loading = true; if(this.$route.query.pageType == 'change') { postUnit('put',this.ruleForm).then(res=>{ diff --git a/src/views/components/assetsType/index.vue b/src/views/components/assetsType/index.vue index 221e13a..7c84b2d 100644 --- a/src/views/components/assetsType/index.vue +++ b/src/views/components/assetsType/index.vue @@ -455,7 +455,7 @@ - + {{ isMore ? '收起' : '更多' }} @@ -3027,7 +3027,11 @@ export default { if(this.ruleForm.glIpList.length == 0) { this.ruleForm.glIpList.push({key:""}) } + + this.ruleForm.xttz ? this.xttz = this.ruleForm.xttz.split(',') : []; + + let chepingUnit = this.ruleForm.gylxxList.filter((item) => item.type == 1) let yjgysUnit = this.ruleForm.gylxxList.filter((item) => item.type == 2) let jfywUnit = this.ruleForm.gylxxList.filter((item) => item.type == 3) @@ -3051,9 +3055,9 @@ export default { this.wlsb = wlsb.length > 0 ? wlsb : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 2}] this.aqsb = aqsb.length > 0 ? aqsb : [{sblx:"",pp:"",ipType:"",sbIP:"",czxx:"",czxxbb:"",yjxh:"",yjxlh:"",yjbbxx:"",yjyt:"",yjbswz:"",type: 3}] this.ruleForm.xtfhqkFcg ? this.xtfhqkFcg = this.ruleForm.xtfhqkFcg.split(',') : []; - this.ruleForm.xtfhqkFcg ? this.xtfhqkFxl = this.ruleForm.xtfhqkFxl.split(',') : []; - this.ruleForm.xtfhqkFcg ? this.xtfhqkFzd = this.ruleForm.xtfhqkFzd.split(',') : []; - this.ruleForm.xtfhqkFcg ? this.xtfhqkFls = this.ruleForm.xtfhqkFls.split(',') : []; + this.ruleForm.xtfhqkFxl ? this.xtfhqkFxl = this.ruleForm.xtfhqkFxl.split(',') : []; + this.ruleForm.xtfhqkFzd ? this.xtfhqkFzd = this.ruleForm.xtfhqkFzd.split(',') : []; + this.ruleForm.xtfhqkFls ? this.xtfhqkFls = this.ruleForm.xtfhqkFls.split(',') : []; if(this.ruleForm.sheng && this.ruleForm.shi && this.ruleForm.qu) { diff --git a/src/views/components/assetsType/index_v1.vue b/src/views/components/assetsType/index_v1.vue index 8b3ee81..9fe6b17 100644 --- a/src/views/components/assetsType/index_v1.vue +++ b/src/views/components/assetsType/index_v1.vue @@ -9,57 +9,59 @@ - - + + - - + + - - + + - + - - + + + + - - - - - - - - + + + @@ -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 diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index d877ec7..9ae651d 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -512,6 +512,8 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.queryParams.deptId = undefined; + this.$refs.tree.setCurrentKey(null); this.handleQuery(); }, /** 新增按钮操作 */ diff --git a/vue.config.js b/vue.config.js index 45eac87..b553e8e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,8 +18,8 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/", - // publicPath: process.env.NODE_ENV === "production" ? "./" : "/", + // publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/", + publicPath: process.env.NODE_ENV === "production" ? "./" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）