WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhaomeijing
2022-05-26 14:55:21 +08:00
parent 9b49a52785 692989131f
commit c58f0ab726
7 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -813,7 +813,7 @@ module.exports = {
TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data',
number: 'No.',
Deadline: 'Deadline',
toBeConfirmed: 'To be confirmed',
toBeConfirmed: 'No rating',
designComplianceReview: 'Confirm design conformance',
preHomeConfirmation: 'Pre-Homo confirmation',
verificationComplianceReview: 'Verify conformance validation',
jero-web/src/components/menu/SideMenu.vue
+1 -1
View File
@@ -6,7 +6,7 @@
:collapsible="collapsible"
v-model="collapsed"
:trigger="null">
<logo/>
<logo :collapsed="collapsed"/>
<s-menu
:collapsed="collapsed"
:menu="menus"
jero-web/src/components/page/GlobalHeader.vue
+1 -1
View File
@@ -27,7 +27,7 @@
<div v-else :class="['top-nav-header-index', theme]">
<div class="header-index-wide">
<div class="header-index-left" :style="topMenuStyle.headerIndexLeft">
<logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader"/>
<logo class="top-nav-header" :show-title="device !== 'mobile'" :style="topMenuStyle.topNavHeader"/>
<div v-if="device !== 'mobile'" :style="topMenuStyle.topSmenuStyle">
<s-menu
mode="horizontal"
jero-web/src/components/tools/Logo.vue
+15 -3
View File
@@ -2,10 +2,11 @@
<div class="logo">
<router-link :to="{name:'dashboard'}">
<!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
<img src="~@/assets/logo.png" alt="logo" class="logoImg">
<img v-if="!collapsed" src="~@/assets/logo.png" alt="logo" class="logoImg">
<img v-if="collapsed" src="~@/assets/logoOne.png" alt="logo" class="logoImgOne">
<!-- <img v-else src="~@/assets/logo.png" alt="logo">-->
<!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
<span v-if="showTitle" class="logoTitle">{{ title }}</span>
<span v-if="showTitle && !collapsed" class="logoTitle">{{ title }}</span>
</router-link>
</div>
</template>
@@ -26,8 +27,16 @@
type: Boolean,
default: true,
required: false
},
collapsed: {
type: Boolean,
required: false,
default: false
}
}
},
mounted() {
console.log(this.collapsed)
},
}
</script>
<style lang="less" scoped>
@@ -63,6 +72,9 @@
height: 29px;
}
/*.logoImgOne{*/
/* width: ;*/
/*} */
.logoTitle {
font-size: 25px;
font-weight: 300 !important;
jero-web/src/views/documentManage/library/index.vue
+7 -3
View File
@@ -77,6 +77,7 @@
import { ACCESS_TOKEN } from '@/store/mutation-types'
import ImportFile from '@/components/ImportFile/index'
import Vue from 'vue'
import moment from 'moment'
export default {
name: 'docLibrary',
@@ -141,7 +142,8 @@
...this.$refs.searchRef.queryParam,
id: this.idList.join(',')
}
downloadFile('document/bussDocumentLibraryEO/exportExcel', this.$t('DocumentLibrary')+'.xls', query, this.Deselect)
let handlingTime = moment(new Date()).format('YYYY-MM-DD')
downloadFile('document/bussDocumentLibraryEO/exportExcel', this.$t('DocumentLibrary')+handlingTime+'.xls', query, this.Deselect)
},
Deselect() {
this.$refs.tableDataRef.selectedRowKeys = []
@@ -154,7 +156,8 @@
id: this.idList.join(','),
flag: 'file'
}
downloadFile('document/bussDocumentLibraryEO/exportZip', '文档库.zip', query, this.Deselect)
let handlingTime = moment(new Date()).format('YYYY-MM-DD')
downloadFile('document/bussDocumentLibraryEO/exportZip', this.$t('DocumentLibrary')+handlingTime+'.zip', query, this.Deselect)
},
//新增
handleAdd() {
@@ -162,7 +165,8 @@
},
//下载模板
handleModule() {
downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库导入模板.xls', {})
downloadFile('document/bussDocumentLibraryEO/exportTemplate', this.$t('importTemplate')+this.$t('importTemplate')+'.xls', {})
},
//批量删除
handleDel() {
jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+1 -1
View File
@@ -126,7 +126,7 @@
name: this.$t('experimentFailed'),
status: res.certificationProgress
})
color.push('#FF8543')
color.push('#E83030')
this.dataSource[0].experimentFailed = res.certificationProgressCount
} else if (res.certificationProgress == 'Test passed') {
data.push({
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+13 -9
View File
@@ -1077,9 +1077,11 @@
}
})
} else {
let index = 0
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
index++
this.dataSource[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
Object.keys(this.dataSource[i]).forEach(res => {
if (this.dataSource[i][res] && this.dataSource[i][res] instanceof String) {
@@ -1089,7 +1091,7 @@
})
setTimeout(() => {
this.confirmLoading = true
this.startProcess(this.dataSource[i])
this.startProcess(this.dataSource[i],index)
}, 500)
}
}
@@ -1099,7 +1101,7 @@
})
},
startProcess(value) {
startProcess(value,index) {
let query = {
type: 1,
msg: JSON.stringify(value).replace(/\"/g, '\''),
@@ -1110,12 +1112,12 @@
}
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
this.completeTask(value, res.result)
this.completeTask(value, res.result,index)
}
})
},
completeTask(value, taskId) {
completeTask(value, taskId,index) {
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
value.handlingTime = handlingTime
let query = {
@@ -1125,11 +1127,13 @@
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
this.visible = false
this.selectedRowKeys = []
this.$message.success(this.$t('OperationSuccessful'))
this.confirmLoading = false
this.getList()
if (index == this.selectedRowKeys.length){
this.visible = false
this.selectedRowKeys = []
this.$message.success(this.$t('OperationSuccessful'))
this.confirmLoading = false
this.getList()
}
} else {
this.$message.warning(this.$t('operationFailed'))
}