Skip to content

W
web
Commit 846088a7 authored by 盖献康's avatar 盖献康
Browse files
Options

Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang 

# Conflicts:
#	src/store/modules/user.js
parents 38fb4af0 eb79f00a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 92 deletions
src/assets/styles/process.scss
View file @ 846088a7
...@@ -79,7 +79,12 @@ ...@@ -79,7 +79,12 @@
.orange { .orange {
color: #f9a221; color: #f9a221;
} }
.taskLeader {
width:120px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.standard-box { .standard-box {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
src/components/ImageUpload/index.vue
View file @ 846088a7
...@@ -133,6 +133,7 @@ export default { ...@@ -133,6 +133,7 @@ export default {
// const regex = /[\s~`!@#$%^&*()\-_=+[\]{}|;:'",<>/?]/ // const regex = /[\s~`!@#$%^&*()\-_=+[\]{}|;:'",<>/?]/
const regex = /[~`!@#$%^&*=[\]{}|;:'",<>/?]/ const regex = /[~`!@#$%^&*=[\]{}|;:'",<>/?]/
const result = regex.test(file.name) const result = regex.test(file.name)
if (result === true) { if (result === true) {
this.fileList = [] this.fileList = []
// this.$refs.imageUpload.clearFiles() // this.$refs.imageUpload.clearFiles()
...@@ -141,6 +142,7 @@ export default { ...@@ -141,6 +142,7 @@ export default {
let isImg = false let isImg = false
if (this.fileType.length) { if (this.fileType.length) {
let fileExtension = '' let fileExtension = ''
if (file.name.lastIndexOf('.') > -1) { if (file.name.lastIndexOf('.') > -1) {
fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1) fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
} }
...@@ -149,6 +151,7 @@ export default { ...@@ -149,6 +151,7 @@ export default {
if (fileExtension && fileExtension.indexOf(type) > -1) return true if (fileExtension && fileExtension.indexOf(type) > -1) return true
return false return false
}) })
console.log(isImg)
} else { } else {
isImg = file.type.indexOf('image') > -1 isImg = file.type.indexOf('image') > -1
} }
......
src/layout/components/Navbar.vue
View file @ 846088a7
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
> >
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="avatar" class="user-avatar" /> <img :src="avatar" class="user-avatar" />
<div class="user-name">{{ name }}</div>
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
...@@ -50,7 +51,7 @@ import Breadcrumb from '@/components/Breadcrumb' ...@@ -50,7 +51,7 @@ import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav' import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger' import Hamburger from '@/components/Hamburger'
import QuickNew from '@/components/QuickNew' import QuickNew from '@/components/QuickNew'
import avatar from '@/assets/images/touxiang.png' // import avatar from '@/assets/images/touxiang.png'
// import QuickNew from '@/components/QuickNew' // import QuickNew from '@/components/QuickNew'
// import MessageWaring from '@/components/MessageWaring' // import MessageWaring from '@/components/MessageWaring'
export default { export default {
...@@ -63,11 +64,10 @@ export default { ...@@ -63,11 +64,10 @@ export default {
}, },
data() { data() {
return { return {
avatar
} }
}, },
computed: { computed: {
...mapGetters(['sidebar', 'device']), ...mapGetters(['sidebar', 'device', 'name','avatar']),
setting: { setting: {
get() { get() {
return this.$store.state.settings.showSettings return this.$store.state.settings.showSettings
...@@ -177,7 +177,19 @@ export default { ...@@ -177,7 +177,19 @@ export default {
.avatar-wrapper { .avatar-wrapper {
margin-top: 5px; margin-top: 5px;
position: relative; position: relative;
display: flex;
align-items: flex;
.user-name {
line-height: 40px;
font-size: 14px;
font-weight: bold;
max-width: 100px;
margin: 0 10px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.user-avatar { .user-avatar {
cursor: pointer; cursor: pointer;
width: 40px; width: 40px;
......
src/store/modules/user.js
View file @ 846088a7
...@@ -75,7 +75,7 @@ const user = { ...@@ -75,7 +75,7 @@ const user = {
commit('SET_ROLES', ['ROLE_DEFAULT']) commit('SET_ROLES', ['ROLE_DEFAULT'])
} }
commit('SET_ID', user.userId) commit('SET_ID', user.userId)
commit('SET_NAME', user.userName) commit('SET_NAME', user.nickName)
commit('SET_AVATAR', avatar) commit('SET_AVATAR', avatar)
commit('SET_DEPT', res.user.dept) commit('SET_DEPT', res.user.dept)
resolve(res) resolve(res)
......
src/views/processing/archivedTask/index.vue
View file @ 846088a7
...@@ -136,7 +136,9 @@ ...@@ -136,7 +136,9 @@
style="margin-right: 5px" style="margin-right: 5px"
fill="#999999" fill="#999999"
/> />
{{ item.leader ? item.leader : '---' }} <span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
</div> </div>
</div> </div>
</div> </div>
......
src/views/processing/carTest/confirmation-test/index.vue
View file @ 846088a7
...@@ -15,25 +15,27 @@ ...@@ -15,25 +15,27 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务编号:</span> <span class="task-label">任务编号:</span>
<span class="task-content"> <span class="task-content">
{{ task.taskNo }} {{ taskDetail.taskNo }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ task.taskName }} {{ taskDetail.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
<span class="task-label">委托单位:</span> <span class="task-label">委托单位:</span>
<span class="task-content"> <span class="task-content">
{{ task.entrustedUnit }} {{ taskDetail.entrustedUnit }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
<span class="task-label">任务状态:</span> <span class="task-label">任务状态:</span>
<span class="task-content"> <span class="task-content">
{{ getDictData(dict.type.task_test_status, task.taskStatus) }} {{
getDictData(dict.type.task_test_status, taskDetail.taskStatus)
}}
</span> </span>
</div> </div>
</div> </div>
...@@ -268,6 +270,7 @@ export default { ...@@ -268,6 +270,7 @@ export default {
reviewSceneChangeTasks: {}, reviewSceneChangeTasks: {},
detailsList: [] detailsList: []
}, },
taskDetail: {},
ruleForm: { ruleForm: {
enterpriseLeader: '', enterpriseLeader: '',
inspectionLeader: '', inspectionLeader: '',
...@@ -338,7 +341,8 @@ export default { ...@@ -338,7 +341,8 @@ export default {
getTestDetail() { getTestDetail() {
this.loading = true this.loading = true
testDetail({ taskId: this.$route.query.id }).then(res => { testDetail({ taskId: this.$route.query.id }).then(res => {
this.tableData = res.data this.taskDetail = res.data
this.tableData = res.data.modelTestTaskViewResponseList
this.loading = false this.loading = false
this.openAll() this.openAll()
}) })
......
src/views/processing/carTest/execution-test-plan/components/SchemeView.vue
View file @ 846088a7
...@@ -229,7 +229,8 @@ export default { ...@@ -229,7 +229,8 @@ export default {
async getTestDetail(id) { async getTestDetail(id) {
this.loading = true this.loading = true
const res = await testDetail({ taskId: id }) const res = await testDetail({ taskId: id })
this.model = res.data
this.model = res.data.modelTestTaskViewResponseList
this.loading = false this.loading = false
}, },
/** 全部展开 */ /** 全部展开 */
......
src/views/processing/carTest/review-form/index.vue
View file @ 846088a7
...@@ -19,25 +19,25 @@ ...@@ -19,25 +19,25 @@
<div class="task-item"> <div class="task-item">
<span class="task-label">任务编号:</span> <span class="task-label">任务编号:</span>
<span class="task-content"> <span class="task-content">
{{ task.taskNo }} {{ taskDetail.taskNo }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
<span class="task-label">任务名称:</span> <span class="task-label">任务名称:</span>
<span class="task-content"> <span class="task-content">
{{ task.taskName }} {{ taskDetail.taskName }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
<span class="task-label">委托单位:</span> <span class="task-label">委托单位:</span>
<span class="task-content"> <span class="task-content">
{{ task.entrustedUnit }} {{ taskDetail.entrustedUnit }}
</span> </span>
</div> </div>
<div class="task-item"> <div class="task-item">
<span class="task-label">任务状态:</span> <span class="task-label">任务状态:</span>
<span class="task-content"> <span class="task-content">
{{ getDictData(dict.type.task_test_status, task.taskStatus) }} {{ getDictData(dict.type.task_test_status, taskDetail.taskStatus) }}
</span> </span>
</div> </div>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</div> </div>
</div> </div>
<div class="standard-result"> <div class="standard-result">
<el-button type="text" @click="testmMthod(item)" <el-button type="text" @click.stop="testmMthod(item)"
>标准测试方法</el-button >标准测试方法</el-button
> >
</div> </div>
...@@ -164,6 +164,7 @@ export default { ...@@ -164,6 +164,7 @@ export default {
open: false, open: false,
tableData: [], tableData: [],
activeNames: [], activeNames: [],
taskDetail: {},
model: { model: {
systemReviewTask: {}, systemReviewTask: {},
reviewSceneChangeTasks: {}, reviewSceneChangeTasks: {},
...@@ -211,7 +212,8 @@ export default { ...@@ -211,7 +212,8 @@ export default {
getTestDetail() { getTestDetail() {
this.loading = true this.loading = true
testDetail({ taskId: this.$route.query.id }).then(res => { testDetail({ taskId: this.$route.query.id }).then(res => {
this.tableData = res.data this.taskDetail = res.data
this.tableData = res.data.modelTestTaskViewResponseList
this.loading = false this.loading = false
this.openAll() this.openAll()
}) })
......
src/views/processing/processed-review/index.vue
View file @ 846088a7
...@@ -135,7 +135,9 @@ ...@@ -135,7 +135,9 @@
style="margin-right: 5px" style="margin-right: 5px"
fill="#999999" fill="#999999"
/> />
{{ item.leader ? item.leader : '---' }} <span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
</div> </div>
</div> </div>
<div class="card-buttons"> <div class="card-buttons">
......
src/views/processing/unprocessed-review/index.vue
View file @ 846088a7
...@@ -127,7 +127,9 @@ ...@@ -127,7 +127,9 @@
style="margin-right: 5px" style="margin-right: 5px"
fill="#999999" fill="#999999"
/> />
{{ item.leader ? item.leader : '---' }} <span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
</div> </div>
</div> </div>
</div> </div>
......
src/views/system/dept/index.vue
View file @ 846088a7
...@@ -82,6 +82,22 @@ ...@@ -82,6 +82,22 @@
<el-table-column <el-table-column
prop="deptName" prop="deptName"
label="部门名称" label="部门名称"
show-overflow-tooltip
width="260"
align="left"
></el-table-column>
<el-table-column
prop="address"
label="地址"
show-overflow-tooltip
width="260"
align="left"
></el-table-column>
<el-table-column
prop="postcode"
label="邮政编码"
show-overflow-tooltip
width="260" width="260"
align="left" align="left"
></el-table-column> ></el-table-column>
......
src/views/system/user/profile/userAvatar.vue
View file @ 846088a7
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<div class="user-info-head" @click="editCropper()"> <div class="user-info-head" @click="editCropper()">
<img :src="options.img" title="点击上传头像" class="img-circle img-lg" /> <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
</div> </div>
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="open" :visible.sync="open"
...@@ -90,11 +91,12 @@ import store from '@/store' ...@@ -90,11 +91,12 @@ import store from '@/store'
import { VueCropper } from 'vue-cropper' import { VueCropper } from 'vue-cropper'
import { uploadAvatar } from '@/api/system/user' import { uploadAvatar } from '@/api/system/user'
import { debounce } from '@/utils' import { debounce } from '@/utils'
import avatar from '@/assets/images/touxiang.png'
export default { export default {
components: { VueCropper }, components: { VueCropper },
data() { data() {
return { return {
avatar,
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 是否显示cropper // 是否显示cropper
...@@ -102,7 +104,7 @@ export default { ...@@ -102,7 +104,7 @@ export default {
// 弹出层标题 // 弹出层标题
title: '修改头像', title: '修改头像',
options: { options: {
img: store.getters.avatar, // 裁剪图片的地址 img: store.getters.avatar, // 裁剪图片的地址
autoCrop: true, // 是否默认生成截图框 autoCrop: true, // 是否默认生成截图框
autoCropWidth: 200, // 默认生成截图框宽度 autoCropWidth: 200, // 默认生成截图框宽度
autoCropHeight: 200, // 默认生成截图框高度 autoCropHeight: 200, // 默认生成截图框高度
...@@ -163,7 +165,7 @@ export default { ...@@ -163,7 +165,7 @@ export default {
} }
} }
}, },
// 上传图片 // 上传图片
uploadImg() { uploadImg() {
this.$refs.cropper.getCropBlob(data => { this.$refs.cropper.getCropBlob(data => {
const formData = new FormData() const formData = new FormData()
......
src/views/task/on/index.vue
View file @ 846088a7
...@@ -137,7 +137,9 @@ ...@@ -137,7 +137,9 @@
style="margin-right: 5px" style="margin-right: 5px"
fill="#999999" fill="#999999"
/> />
{{ item.leader ? item.leader : '---' }} <span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
</div> </div>
</div> </div>
<div class="card-cell"> <div class="card-cell">
...@@ -406,7 +408,9 @@ ...@@ -406,7 +408,9 @@
style="margin-right: 5px" style="margin-right: 5px"
fill="#999999" fill="#999999"
/> />
{{ item.leader ? item.leader : '---' }} <span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
</div> </div>
</div> </div>
<div class="card-buttons"> <div class="card-buttons">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment