Skip to content

W
web
Commit 27bfe828 authored by mengzixuan's avatar mengzixuan
Browse files
Options

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

parents 6dec96e0 f2300040
Hide whitespace changes
Inline Side-by-side
Showing with 349 additions and 149 deletions
src/assets/styles/process.scss
View file @ 27bfe828
......@@ -720,3 +720,21 @@
align-items: center;
color: #ccc;
}
.leader-name {
display: flex;
align-items: center;
p {
width: 90px;
margin: 0;
overflow: hidden; /* 确保超出的文本被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出的文本显示为省略号 */
}
}
.ellipsis {
overflow: hidden; /* 确保超出的文本被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出的文本显示为省略号 */
}
src/store/getters.js
View file @ 27bfe828
......@@ -19,6 +19,7 @@ const getters = {
companyFiles: state => state.processing.companyFiles,
standard: state => state.standard.standard,
standardList: state => state.standard.standardList,
testScenarioList: state => state.testScenario.testScenarioList
testScenarioList: state => state.testScenario.testScenarioList,
dept: state => state.user.dept
}
export default getters
src/store/modules/user.js
View file @ 27bfe828
......@@ -8,7 +8,8 @@ const user = {
name: '',
avatar: '',
roles: [],
permissions: []
permissions: [],
dept: {}
},
mutations: {
......@@ -29,6 +30,9 @@ const user = {
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
},
SET_DEPT: (state, dept) => {
state.dept = dept
}
},
......@@ -73,7 +77,7 @@ const user = {
commit('SET_ID', user.userId)
commit('SET_NAME', user.nickName)
commit('SET_AVATAR', avatar)
commit('SET_DEPT', res.user.dept)
resolve(res)
})
.catch(error => {
......
src/views/processing/archivedTask/index.vue
View file @ 27bfe828
......@@ -128,18 +128,22 @@
<div class="card-cell">
<div class="cell-label">任务组长</div>
<div class="cell-value">
<div style="display: flex; align-items: center">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
</div>
<el-tooltip
effect="dark"
:content="item.leader ? item.leader : '---'"
placement="bottom-start"
>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<p>{{ item.leader ? item.leader : '---' }}</p>
</div>
</el-tooltip>
</div>
</div>
<div v-if="item.taskStatus === 'FINISH'" class="card-buttons">
......
src/views/processing/carReview/review-form/index.vue
View file @ 27bfe828
......@@ -10,7 +10,7 @@
<div class="main-content-style">
<!--任务编号,名称,单位-->
<div class="task">
<!-- <div class="task">
<div class="task-item">
<span class="task-label">任务编号:</span>
<span class="task-content">
......@@ -40,8 +40,44 @@
}}
</span>
</div>
</div>
</div> -->
<el-form>
<el-row gutter="20">
<el-col :span="6">
<el-form-item label="任务编号">
<el-input
v-model="model.carReviewTask.taskNo"
type="text"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="任务名称">
<el-input v-model="task.taskName" type="text" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="委托单位">
<el-input v-model="task.entrustedUnit" type="text" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="任务状态">
<el-input
type="text"
disabled
:value="
getDictData(
dict.type.test_cartype_type,
model.carReviewTask.taskStatus
)
"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!--审查表单概要-->
<div>
<div class="form-review-questionnaire">
......@@ -129,15 +165,25 @@
</div>
<div v-else>__</div>
</td>
<td align="center" class="written-by">
{{
<el-tooltip
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
: '__'
}}
</td>
}}
</td>
</el-tooltip>
</tr>
</template>
</template>
......
src/views/processing/carReview/source-record/index.vue
View file @ 27bfe828
......@@ -225,15 +225,25 @@
</div>
<div v-else>__</div>
</td>
<td align="center" class="written-by">
{{
<el-tooltip
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
: '__'
}}
</td>
}}
</td>
</el-tooltip>
</tr>
</template>
</template>
......
src/views/processing/carReview/vehicle-type/index.vue
View file @ 27bfe828
......@@ -207,15 +207,25 @@
</div>
<div v-else>__</div>
</td>
<td align="center" class="written-by">
{{
<el-tooltip
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
: '__'
}}
</td>
}}
</td>
</el-tooltip>
</tr>
</template>
</template>
......
src/views/processing/carReview/write-check-form/components/previewView.vue
View file @ 27bfe828
......@@ -112,15 +112,23 @@
</div>
<div v-else>__</div>
</td>
<td align="center" class="written-by">
{{
reviewDetail.result
? reviewDetail.result.userName
<el-tooltip
effect="dark"
:content="
reviewDetail.result ? reviewDetail.result.userName : '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
: '__'
}}
</td>
}}
</td>
</el-tooltip>
</tr>
</template>
</template>
......
src/views/processing/carTest/review-form/index.vue
View file @ 27bfe828
......@@ -14,8 +14,37 @@
<!--2-统计值-->
<div class="main-content-style">
<!--任务编号,名称,单位-->
<div class="task">
<el-form>
<el-row gutter="20">
<el-col :span="6">
<el-form-item label="任务编号">
<el-input v-model="task.taskNo" type="text" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="任务名称">
<el-input v-model="task.taskName" type="text" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="委托单位">
<el-input v-model="task.entrustedUnit" type="text" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="任务状态">
<el-input
type="text"
disabled
:value="
getDictData(dict.type.task_test_status, task.taskStatus)
"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- <div class="task">
<div class="task-item">
<span class="task-label">任务编号:</span>
<span class="task-content">
......@@ -40,7 +69,7 @@
{{ getDictData(dict.type.task_test_status, taskDetail.taskStatus) }}
</span>
</div>
</div>
</div> -->
<!--查看试验方案列表-->
<div>
......
src/views/processing/processed-review/index.vue
View file @ 27bfe828
......@@ -127,17 +127,23 @@
</div>
<div class="card-cell">
<div class="cell-label">任务组长</div>
<div style="display: flex; align-items: center">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
<div class="cell-value">
<el-tooltip
effect="dark"
:content="item.leader ? item.leader : '---'"
placement="bottom-start"
>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<p>{{ item.leader ? item.leader : '---' }}</p>
</div>
</el-tooltip>
</div>
</div>
<div class="card-buttons">
......
src/views/processing/systemReview/confirm-result/index.vue
View file @ 27bfe828
......@@ -209,15 +209,25 @@
>不符合</el-tag
>
</td>
<td align="center" class="written-by">
{{
<el-tooltip
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
: '__'
}}
</td>
}}
</td>
</el-tooltip>
</tr>
</template>
</template>
......
src/views/processing/systemReview/review-form/index.vue
View file @ 27bfe828
......@@ -14,39 +14,43 @@
<!--2-统计值-->
<div class="main-content-style">
<!--任务编号,名称,单位-->
<div class="task">
<div class="task-item">
<span class="task-label">任务编号:</span>
<span class="task-content">
{{ model.systemReviewTask.taskNo }}
</span>
</div>
<div class="task-item">
<span class="task-label">任务名称:</span>
<span class="task-content">
{{ task.taskName }}
</span>
</div>
<div class="task-item">
<span class="task-label">委托单位:</span>
<span class="task-content">
{{ task.entrustedUnit }}
</span>
</div>
<div class="task-item">
<span class="task-label">任务状态:</span>
<span class="task-content">
{{
getDictData(
dict.type.system_review_test,
model.systemReviewTask.taskStatus
)
}}
</span>
</div>
</div>
<el-form>
<el-row gutter="20">
<el-col :span="6">
<el-form-item label="任务编号">
<el-input
v-model="model.systemReviewTask.taskNo"
type="text"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="任务名称">
<el-input v-model="task.taskName" type="text" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="委托单位">
<el-input v-model="task.entrustedUnit" type="text" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="任务状态">
<el-input
type="text"
disabled
:value="
getDictData(
dict.type.system_review_test,
model.systemReviewTask.taskStatus
)
"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!--审查表单概要-->
<div>
<div class="form-review-questionnaire">
......@@ -133,15 +137,25 @@
</div>
<div v-else>__</div>
</td>
<td align="center" class="written-by">
{{
<el-tooltip
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
: '__'
}}
</td>
}}
</td>
</el-tooltip>
</tr>
</template>
</template>
......
src/views/processing/systemReview/source-record/index.vue
View file @ 27bfe828
......@@ -230,15 +230,25 @@
</div>
<div v-else>__</div>
</td>
<td align="center" class="written-by">
{{
<el-tooltip
effect="dark"
:content="
reviewDetail.result
? reviewDetail.result.userName
: '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
: '__'
}}
</td>
}}
</td>
</el-tooltip>
</tr>
</template>
</template>
......
src/views/processing/systemReview/write-check-form/components/previewView.vue
View file @ 27bfe828
......@@ -112,15 +112,23 @@
</div>
<div v-else>__</div>
</td>
<td align="center" class="written-by">
{{
reviewDetail.result
? reviewDetail.result.userName
<el-tooltip
effect="dark"
:content="
reviewDetail.result ? reviewDetail.result.userName : '---'
"
placement="bottom-start"
>
<td align="center" class="written-by ellipsis">
{{
reviewDetail.result
? reviewDetail.result.userName
? reviewDetail.result.userName
: '__'
: '__'
: '__'
}}
</td>
}}
</td>
</el-tooltip>
</tr>
</template>
</template>
......
src/views/processing/unprocessed-review/index.vue
View file @ 27bfe828
......@@ -119,18 +119,22 @@
<div class="card-cell">
<div class="cell-label">任务组长</div>
<div class="cell-value">
<div style="display: flex; align-items: center">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
</div>
<el-tooltip
effect="dark"
:content="item.leader ? item.leader : '---'"
placement="bottom-start"
>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<p>{{ item.leader ? item.leader : '---' }}</p>
</div>
</el-tooltip>
</div>
</div>
<div class="card-cell">
......
src/views/setting/sample/taskDetails/index.vue
View file @ 27bfe828
......@@ -1004,8 +1004,8 @@ export default {
return Math.round((b / a) * 100)
},
dictValueReturn(item) {
if (item === 'sraifv') {
return '信息安全管理体系要求'
if (item === 'sraif') {
return '汽车信息安全管理体系要求'
} else if (item === 'grfis') {
return '信息安全一般要求'
} else {
......@@ -1277,6 +1277,7 @@ export default {
}
::v-deep .el-progress-bar__inner {
border-radius: 0px !important;
text-align: center;
}
.messsage-item {
......
src/views/system/dept/index.vue
View file @ 27bfe828
......@@ -82,18 +82,22 @@
<el-table-column
prop="deptName"
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"
align="left"
></el-table-column>
......@@ -447,7 +451,7 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
this.$modal
this.$alert
.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？', {
type: 'warning',
title: '删除',
......
src/views/system/user/profile/index.vue
View file @ 27bfe828
......@@ -17,11 +17,11 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="phone" />手机号码
<div class="pull-right">{{ user.phonenumber }}</div>
<div class="pull-right">{{ user.phonenumber || '--' }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱
<div class="pull-right">{{ user.email }}</div>
<div class="pull-right">{{ user.email || '--' }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
......
src/views/system/user/profile/userInfo.vue
View file @ 27bfe828
......@@ -80,7 +80,8 @@ export default {
submit() {
this.$refs['form'].validate(valid => {
if (valid) {
updateUserProfile(this.form).then(response => {
updateUserProfile(this.form).then(async response => {
await this.$store.dispatch('GetInfo')
this.$modal.msgSuccess('修改成功')
this.user.phonenumber = this.form.phonenumber
this.user.email = this.form.email
......
src/views/task/on/index.vue
View file @ 27bfe828
......@@ -129,17 +129,23 @@
</div>
<div class="card-cell">
<div class="cell-label">任务组长</div>
<div style="display: flex; align-items: center">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
<div class="cell-value">
<el-tooltip
effect="dark"
:content="item.leader ? item.leader : '---'"
placement="bottom-start"
>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<p>{{ item.leader ? item.leader : '---' }}</p>
</div>
</el-tooltip>
</div>
</div>
<div class="card-cell">
......@@ -400,17 +406,23 @@
</div>
<div class="card-cell">
<div class="cell-label">任务组长</div>
<div style="display: flex; align-items: center">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<span class="taskLeader">{{
item.leader ? item.leader : '---'
}}</span>
<div class="cell-value">
<el-tooltip
effect="dark"
:content="item.leader ? item.leader : '---'"
placement="bottom-start"
>
<div class="leader-name">
<icon-park
type="me"
theme="outline"
size="16"
style="margin-right: 5px"
fill="#999999"
/>
<p>{{ item.leader ? item.leader : '---' }}</p>
</div>
</el-tooltip>
</div>
</div>
<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