diff --git a/src/components/scExport/index.vue b/src/components/scExport/index.vue index 6bbcf6b..e2810d6 100644 --- a/src/components/scExport/index.vue +++ b/src/components/scExport/index.vue @@ -4,19 +4,24 @@ title="" trigger="click" content="" - width="280" - :visible="exportVisible" + width="300" + v-bind="$attrs" + :visible="show" > @@ -26,15 +31,15 @@ export default { name: "index", props:{ size:{ type: String, default: "small" }, + show:{type:Boolean, default: false}, + type:{type: String, default: ""} + }, + watch:{ + }, data(){ return{ - exportVisible:false, - info:{ - name:"", - status:"", - rate:0, - } + list:[{},{},{}], } }, mounted() { @@ -44,17 +49,27 @@ export default { methods:{ getWsResult(res){ if(res.data && (res.data.type == 6 || res.data.type == 7 || res.data.type == 8)){ - if(res.data.status == 0){ - this.exportVisible = true; + let item = { + type:res.data.type, + type_desc:res.data.type_desc, + msg:res.data.msg, + status:res.data.status, + rate:res.data.rate, } - this.info = res.data; + if(res.data.type == 6){ + this.list[0] = item; + } + if(res.data.type == 7){ + this.list[1] = item; + } + if(res.data.type == 8){ + this.list[2] = item; + } + this.$emit('updateShow',item); if(res.data.status==1){ - this.exportVisible = false; - this.info = {}; this.down(res.data); } } - }, down(item){ const link = document.createElement('a'); @@ -65,10 +80,6 @@ export default { document.body.removeChild(link); }, exportClick(){ - if(this.exportVisible){ - this.exportVisible = false; - return - } this.$emit('exportData'); }, } @@ -80,8 +91,8 @@ export default { font-size: 12px; display: flex;align-items: center;justify-content: space-around; margin-bottom: 6px; - .name{width: 60%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;} - .status{width: 40%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;} + .name{width: 50%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;} + .status{width: 50%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;} .finish{ display: flex;align-items: center;justify-content: flex-end;color: var(--el-color-success); .icon{width: 14px;height: 14px;margin-right: 4px;} diff --git a/src/components/scUpload/uploadImg.vue b/src/components/scUpload/uploadImg.vue index d97b334..c54b7c5 100644 --- a/src/components/scUpload/uploadImg.vue +++ b/src/components/scUpload/uploadImg.vue @@ -96,7 +96,8 @@ export default { }, // 上传成功 handleAvatarSuccess(file){ - this.imageUrl = file.data.base_url+file.data.filename; + // file.data.base_url + this.imageUrl = this.oss.host+'/'+file.data.filename; this.$emit('parentParams',this.imageUrl); }, // 上传失败 diff --git a/src/components/scUpload/uploadListImg.vue b/src/components/scUpload/uploadListImg.vue index 8f68d6c..1ba8b13 100644 --- a/src/components/scUpload/uploadListImg.vue +++ b/src/components/scUpload/uploadListImg.vue @@ -101,7 +101,8 @@ export default { }, // 上传成功 handleAvatarSuccess(file){ - let imageUrl = file.data.base_url+file.data.filename; + // file.data.base_url + let imageUrl = this.oss.host+'/'+file.data.filename; this.imageList.push(imageUrl) this.$emit('parentParams',this.imageList); }, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index e4b58a9..fec75df 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -36,7 +36,7 @@ -
指纹登录
+
passKey登录
xwcloud.com 版权所有 © 2023 diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue index 15769da..1b7c4bb 100644 --- a/src/views/setting/company/index.vue +++ b/src/views/setting/company/index.vue @@ -6,7 +6,7 @@ 批量导入
- +
@@ -80,6 +80,7 @@ export default { column: [], }, selection: [], + exportShow:false, searchShow:false, searchList:[ {name:'开通日期',type:'date',code:'activation_date'}, @@ -222,6 +223,12 @@ export default { delete row.$switch_yx; }, 500); }, + // 下载导出 + exportChangeShow(e){ + if(e.type == 6){ + this.exportShow = e.status==0?true:false + } + }, async exportData() { const res = await this.$API.system.company.export.post(this.params); if(res.code == 200){ diff --git a/src/views/setting/log/index.vue b/src/views/setting/log/index.vue index bcafc3a..a8650f3 100644 --- a/src/views/setting/log/index.vue +++ b/src/views/setting/log/index.vue @@ -7,7 +7,7 @@
查询 重置 - +
@@ -25,7 +25,6 @@ import info from './info' export default { - name: 'log', components: { info, }, @@ -42,12 +41,13 @@ apiObj: this.$API.system.log.list, column:[] }, + exportShow:false, searchList:[ {name:'操作日期',type:'date',code:'created_at'}, {name:'操作功能',type:'multiple',code:'type', data:[], placeholder:"请选择功能",show:true}, {name:'关键字',type:'text',code:['remark','ip','location','creator_name'],keyword:true,show:true}, ], - params: {} + params: {}, } }, methods: { @@ -72,6 +72,12 @@ }) } }, + // 下载导出 + exportChangeShow(e){ + if(e.type == 8){ + this.exportShow = e.status==0?true:false + } + }, async exportData() { const res = await this.$API.system.log.export.post(this.params); if(res.code == 200){ diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue index 9e71854..a36be9f 100644 --- a/src/views/setting/user/index.vue +++ b/src/views/setting/user/index.vue @@ -20,7 +20,7 @@
- +
@@ -105,7 +105,7 @@ column:[] }, selection: [], - + exportShow:false, searchShow:false, searchList:[ {name:'创建日期',type:'date',code:'activation_date'}, @@ -278,6 +278,12 @@ delete row.$switch_yx; }, 500); }, + // 下载导出 + exportChangeShow(e){ + if(e.type == 7){ + this.exportShow = e.status==0?true:false + } + }, async exportData() { const res = await this.$API.system.user.export.post(); if(res.code == 200){