Skip to content

C
car-database-web
Commit bb608aa1 authored by 高滢's avatar 高滢
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/router/index.js
#	src/views/review/wait/index.vue
parents be9fe9ca 34c90699
Show whitespace changes
Inline Side-by-side
Showing with 578 additions and 239 deletions
src/components/Page/chapterOption.vue
View file @ bb608aa1
......@@ -212,8 +212,7 @@ export default {
},
async loadData() {
this.loading = true
getStandardListNew().then(res => {
await getStandardListNew().then(res => {
this.tableData = res.data
this.tableData = this.normalizeTreeData(this.tableData)
forEach(this.tableData, (t1, index) => {
......@@ -261,12 +260,13 @@ export default {
type: this.tableData[0].children[0].value,
name:'',
chapter: '',
standardNo: ''
standardNo: this.tableData[0].standardNo
}
this.$store.dispatch('standard/setInitStandard', standard)
this.$store.dispatch('standard/setStandardObj', standardObj)
this.standard = standard
})
this.loading = false
})
//console.log(this.standardList)
// for(let i = 0; i < this.standardList.length ; i++ ){
......
src/views/plan/list/index.vue
View file @ bb608aa1
......@@ -221,9 +221,10 @@ export default {
this.queryParams.isAsc = 'desc'
this.queryParams.orderByColumn = 'createTime'
this.view = this.$route.query.view
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
},
methods: {
download(url) {
......@@ -252,14 +253,14 @@ export default {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
this.loadData()
},
resetQuery() {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
this.queryParams = {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
......
src/views/review/already/index.vue
View file @ bb608aa1
......@@ -288,6 +288,10 @@ export default {
}
},
created(){
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},1000)
this.gainDictDataList()
},
methods: {
......@@ -391,7 +395,7 @@ export default {
/*查看按钮页面跳转 */
handleDetail (row){
this.$router.push({
path: `/review/view`,
path: `/review/views`,
query: { id: row.id },
// params:{ },
})
......@@ -405,7 +409,7 @@ export default {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
this.queryParams.page = 1
this.getList()
},
......@@ -413,7 +417,7 @@ export default {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
this.getList()
},
getList(){
......
src/views/review/createReview/deleteReviewDetails/index.vue
View file @ bb608aa1
......@@ -84,7 +84,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button>
<el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div>
</el-dialog>
</div>
......@@ -131,7 +131,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false"
<el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button
>
</div>
......@@ -187,7 +187,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false"
<el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button
>
</div>
......@@ -222,7 +222,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -579,10 +579,10 @@ export default {
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/createReview/deleteReviewKeypoints/index.vue
View file @ bb608aa1
......@@ -84,7 +84,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button>
<el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div>
</el-dialog>
</div>
......@@ -130,7 +130,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false"
<el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button
>
</div>
......@@ -165,7 +165,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -538,10 +538,10 @@ export default {
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/createReview/deleteReviewScene/index.vue
View file @ bb608aa1
......@@ -91,7 +91,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button>
<el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div>
</el-dialog>
</div>
......@@ -143,7 +143,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false"
<el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button
>
</div>
......@@ -203,7 +203,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false"
<el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button
>
</div>
......@@ -263,7 +263,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleScene = false"
<el-button type="primary" plain @click="dialogVisibleScene = false"
>确认</el-button
>
</div>
......@@ -279,7 +279,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -674,10 +674,10 @@ export default {
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/createReview/deleteUseCase/index.vue
View file @ bb608aa1
......@@ -104,7 +104,7 @@
</collapse>
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleUseCase = false"
<el-button type="primary" plain @click="dialogVisibleUseCase = false"
>确认</el-button
>
</div>
......@@ -153,7 +153,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -552,10 +552,10 @@ export default {
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/createReview/index.vue
View file @ bb608aa1
......@@ -2,9 +2,7 @@
<page-standard class="create-review">
<div slot="tab">
<el-row class="vif0">
<el-col :span="3">
</el-col>
<el-col :span="3"> </el-col>
<el-col :span="21">
<div v-if="pageIndex === 0" class="create-review-content">
<div class="center-tip">
......@@ -28,10 +26,11 @@
size="small"
:inline="true"
>
<el-form-item label="选择标准" v-bind="standardList"
:style=" { margin: '30px',
'margin-left': '-100px',
}">
<el-form-item
label="选择标准"
v-bind="standardList"
:style="{ margin: '30px', 'margin-left': '-100px' }"
>
<el-select
placeholder="请选择标准"
v-model="selected"
......@@ -44,18 +43,14 @@
v-for="(item, indexS) in standardList"
:key="indexS"
:label="item.standardNo"
:value="item.standardNo"
:value="item.id"
>{{ item.standardNo }}
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="bg-transparent">
<p :style="{ color:'transparent',
UserSelect: 'none',
}">sss</p>
<p :style="{ color: 'transparent', UserSelect: 'none' }">sss</p>
</div>
<div
v-for="(reviewType, typeIndex) in dict.type.create_review_type"
......@@ -366,7 +361,8 @@ export default {
standardNo: '',
name: '',
id: '',
operationSort: ''
operationSort: '',
inspectStandardId:''
},
selectedItem: {
name: '',
......@@ -412,36 +408,65 @@ export default {
created() {
this.getStandardList()
},
mounted() {},
mounted() {
},
methods: {
getStandardList() {
testInitatereview(this.standardData)
.then(response => {
this.standardList = response.rows
console.log(response, '1111')
this.selected = this.standardList[0].standardNo
this.pageIndexSec.inspectStandardId = this.standardList[0].id
this.pageIndexSec.standardNo = this.standardList[0].standardNo
// console.log(response, '1111')
})
.catch(error => {
console.error('testInitatereview接口出错', error)
})
},
// vif0 下拉框选择标准
// handleSelectStandard(selected) {
// this.selectedItem = this.standardList.find(
// item => item.id === selected
// )
// if (this.selectedItem) {
// // 将 item.name 赋值给 this.pageIndexSec.name
// this.pageIndexSec.name = this.selectedItem.name
// this.pageIndexSec.inspectStandardId = this.selectedItem.id
// this.pageIndexSec.standardNo = this.selectedItem.standardNo
// } else {
// console.log('赋值给 this.pageIndexSec.name时出现问题')
// }
// },
handleSelectStandard(selected) {
this.selectedItem = this.standardList.find(
item => item.standardNo === selected
)
if (this.selectedItem) {
// 将 item.name 赋值给 this.pageIndexSec.name
this.pageIndexSec.name = this.selectedItem.name
this.pageIndexSec.id = this.selectedItem.id
console.log(selected, "handleSelectStandard selected");
// 查找选中的项
const selectedItem = this.standardList.find(
item => item.id === selected
);
if (selectedItem) {
// 将选中的项的属性赋值给 pageIndexSec
this.pageIndexSec.name = selectedItem.name;
this.pageIndexSec.inspectStandardId = selectedItem.id;
this.pageIndexSec.standardNo = selectedItem.standardNo;
} else {
console.log('赋值给 this.pageIndexSec.name时出现问题')
console.error("赋值给 this.pageIndexSec 时出现问题");
}
},
// 按钮-选择类型
handleSelectType(reviewType, reviewSubtype) {
console.log('评审类型 = ', reviewType)
console.log('评审子类型 = ', reviewSubtype)
// console.log('评审类型 = ', reviewType)
// console.log('评审子类型 = ', reviewSubtype)
this.formModel.reviewType = reviewType
this.formModel.reviewSubtype = reviewSubtype
console.log(this.formModel)
......@@ -472,9 +497,14 @@ export default {
) {
this.pageIndexSec.reviewSubtype = this.formModel.reviewSubtype
this.pageIndexSec.reviewType = this.formModel.reviewType
this.pageIndexSec.standardNo = this.selected
this.pageIndexSec.operationSort = 'ADD_KEYPOINT'
this.pageIndexSec.id = this.selectedItem.id
this.pageIndexSec.operationSort = 'ADD_KEYPOINT'
// if(this.selectedItem){
// this.pageIndexSec.inspectStandardId = this.selectedItem.id
// }else if(!this.selectedItem){
// this.pageIndexSec.inspectStandardId = '1'
// }
// this.pageIndexSec.name = this.postData.name
this.pageIndex = 1
} else if (
......
src/views/review/createReview/newReviewDetails/index.vue
View file @ bb608aa1
......@@ -83,7 +83,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button>
<el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div>
</el-dialog>
</div>
......@@ -131,7 +131,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false"
<el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button
>
</div>
......@@ -184,7 +184,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -530,10 +530,10 @@
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/createReview/newReviewKeypoints/index.vue
View file @ bb608aa1
......@@ -82,7 +82,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button>
<el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div>
</el-dialog>
</div>
......@@ -134,7 +134,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -389,8 +389,10 @@ export default {
//根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo
//operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardId = this.pageIndexSec.inspectStandardId
console.log(this.pageIndexSec.id,'submitRequirement id')
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
console.log(this.pageIndexSec.standardNo,'submitRequirement no')
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
console.log(this.newResData, '选择标准要求弹窗确认newResData')
console.log(this.newResDataAdd, '选择标准要求弹窗确认newResDataAdd')
......@@ -414,7 +416,7 @@ export default {
.then(response => {
this.receivedRequirements = response
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardId = this.pageIndexSec.inspectStandardId
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
......@@ -487,7 +489,8 @@ export default {
this.newResDataAdd.remark = this.newReviewSceneRemark
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardId = this.pageIndexSec.inspectStandardId
console.log(this.pageIndexSec)
console.log(this.newResDataAdd.inspectStandardId, '提交之前')
this.$refs.formItemName.validate(valid =>{
......@@ -496,10 +499,10 @@ export default {
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/createReview/newReviewScene/index.vue
View file @ bb608aa1
......@@ -83,7 +83,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button>
<el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div>
</el-dialog>
</div>
......@@ -130,7 +130,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleKeypoints = false"
<el-button type="primary" plain @click="dialogVisibleKeypoints = false"
>确认</el-button
>
</div>
......@@ -186,7 +186,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleDetails = false"
<el-button type="primary" plain @click="dialogVisibleDetails = false"
>确认</el-button
>
</div>
......@@ -199,7 +199,7 @@
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="8">
<el-col :span="18">
<el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing">
<el-input
v-model="formModel.shenchachangjing"
......@@ -212,7 +212,7 @@
>
</el-input>
</el-form-item> </el-col
><el-col :span="10"><p></p></el-col>
><el-col :span="3"><p></p></el-col>
</el-row>
<div class="subtitle">评审成员</div>
......@@ -221,7 +221,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -242,7 +242,7 @@
<div class="subtitle">备注信息</div>
<el-row>
<el-col :span="3"><p></p></el-col>
<el-col :span="8">
<el-col :span="18">
<el-form-item label="">
<el-input
v-model="formModel.beizhuxinxi"
......@@ -255,7 +255,7 @@
>
</el-input>
</el-form-item>
<el-col :span="10"><p></p></el-col>
<el-col :span="3"><p></p></el-col>
</el-col>
<el-col :span="3"><p></p></el-col>
</el-row>
......@@ -473,7 +473,7 @@ export default {
//根据 inspectStandardId => standard/findStandardList 的id
// inspectStandardNo => standard/findStandardList 的standardNo
//operationSort => 这个在点击下一步的界面 通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardId = this.pageIndexSec.inspectStandardId
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
console.log(this.newResData, '选择标准要求弹窗确认newResData')
......@@ -498,7 +498,7 @@ export default {
.then(response => {
this.receivedRequirements = response
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardId = this.pageIndexSec.
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
......@@ -585,10 +585,10 @@ export default {
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/createReview/newUseCase/index.vue
View file @ bb608aa1
......@@ -80,7 +80,7 @@
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">确认</el-button>
<el-button type="primary" plain @click="dialogVisible = false">确认</el-button>
</div>
</el-dialog>
</div>
......@@ -128,7 +128,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -509,10 +509,10 @@ export default {
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/createReview/reviewData/index.vue
View file @ bb608aa1
......@@ -23,7 +23,7 @@
</el-select>
</el-form-item>
<el-form-item label="标准条款" prop="biaozhuntiuaokuan">
<el-button type="primary" plain @click="handleReSelect"
<el-button type="success" plain @click="handleReSelect"
>重新选择标准条款</el-button
>
<div style="display: flex">
......@@ -110,7 +110,7 @@
</el-form-item>
</el-form>
<div class="create-review-footer">
<el-button type="primary" class="next-button" @click="handleConfirm"
<el-button type="success" class="next-button" @click="handleConfirm"
><span
class="el-icon-check"
style="margin-right: 6px"
......
src/views/review/createReview/updateUseCase/index.vue
View file @ bb608aa1
......@@ -96,7 +96,7 @@
</collapse>
<!-- 弹窗底部 -->
<div slot="footer" class="dialog-footer">
<el-button @click="handleSelectedUseCase()"
<el-button type="primary" plain @click="handleSelectedUseCase()"
>确认</el-button
>
</div>
......@@ -159,7 +159,7 @@
<el-col :span="18">
<el-form-item label="">
<div class="assessor-text">
评审人员:
<!-- 评审人员: -->
<div class="review-members">
<span
v-for="(reviewer, index) in receivedReviewer"
......@@ -614,10 +614,10 @@ export default {
.then(response => {
const aa = response
if (aa) {
this.$message.success('提交成功 页面将在5秒后跳转')
this.$message.success('提交成功')
this.timer = setTimeout(() => {
this.$router.push({ path: '/review/initiatedReview' })
}, 5000)
}, 200)
} else {
this.$message({
message: '提交失败',
......
src/views/review/initiatedReview/index.vue
View file @ bb608aa1
......@@ -37,11 +37,11 @@
<el-form-item prop="type">
<el-select
v-model="queryParams.type"
placeholder="标准要求分类"
placeholder="检验类型"
clearable
>
<el-option
v-for="dict in dict.type.type"
v-for="dict in dict.type.scene_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
......@@ -131,7 +131,7 @@
>
</el-table-column>
<el-table-column
label="标准要求分类"
label="检验类型"
width="150"
sortable
align="left"
......@@ -148,7 +148,7 @@
:formatter="formatOperationSort"
>
</el-table-column>
<el-table-column label="场景内容" width="200" align="left" prop="newText">
<el-table-column label="评审内容" width="200" align="left" prop="newText">
</el-table-column>
<el-table-column
label="评审人员"
......@@ -243,7 +243,7 @@ import { listTest } from '@/api/task/test'
export default {
name: 'Index',
mixins: [page],
dicts: ['review_status', 'review_type', 'type'],
dicts: ['review_status', 'review_type', 'scene_type'],
data() {
return {
......@@ -271,20 +271,24 @@ export default {
}
},
created() {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},1000)
this.gainDictDataList()
},
mounted() {},
methods: {
gainDictDataList() {
const obj = 'type'
const obj = 'scene_type'
const obj1 = 'review_type'
// 获取 review_type 字典数据
getDicts('review_type').then(response => {
this.reviewTypeList = response.data || []
})
// 获取 type 字典数据
getDicts('type').then(response => {
// 获取 scene_type 字典数据
getDicts('scene_type').then(response => {
this.typeList = response.data || []
})
},
......@@ -352,6 +356,10 @@ export default {
},
// 列表-查询
handleQuery() {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},1000)
this.queryParams.page = 1
this.getList()
},
......@@ -370,7 +378,7 @@ export default {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
this.loadData()
},
// 列表-重置
......@@ -378,7 +386,7 @@ export default {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
this.queryParams = {
pageNum: 1,
pageSize: 10,
......
src/views/setting/company/index.vue
View file @ bb608aa1
......@@ -234,20 +234,24 @@ export default {
this.queryParams.isAsc = 'desc'
this.queryParams.orderByColumn = 'createTime'
this.view = this.$route.query.view
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},1000)
},
methods: {
handleQuery(){
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
this.loadData()
},
resetQuery() {
this.buttonDisabled = true
setTimeout(()=>{
this.buttonDisabled = false
},2000)
},1000)
this.queryParams = {
pageNum: this.queryParams.pageNum,
pageSize: this.queryParams.pageSize,
......
src/views/setting/standard/index.vue
View file @ bb608aa1
......@@ -251,6 +251,10 @@ export default {
})
},
created() {
this.buttonDisibled = true
setTimeout(()=>{
this.buttonDisibled = false
},1000)
this.queryParams.isAsc = 'desc'
this.queryParams.orderByColumn = 'releaseDate'
},
......@@ -266,14 +270,14 @@ export default {
this.loadData()
setTimeout(() => {
this.buttonDisibled = false
}, 2000)
}, 1000)
},
handleQuery(){
this.buttonDisibled = true
this.loadData()
setTimeout(() => {
this.buttonDisibled = false
}, 2000)
}, 1000)
},
sort_change(column, prop, order) {
......
src/views/setting/standardTerms/components/caseModel.vue 0 → 100644
View file @ bb608aa1
<template>
<el-dialog
title="检验内容"
:visible.sync="dialogManger.dialogVisible"
width="60%"
>
<el-form class="form" :model="dialogManger">
<el-form-item class="title">
<span style="width: 500px">标准信息</span>
</el-form-item>
<el-form-item label="标准号" :label-width="formLabelWidth">
<el-input
class="input"
disabled
v-model="dialogManger.source.standard.standardNo"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="标准名称" :label-width="formLabelWidth">
<el-input
class="input"
disabled
v-model="dialogManger.source.standard.name"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="标准章节" :label-width="formLabelWidth">
<el-input
class="input"
disabled
v-model="dialogManger.source.standard.chapter"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="审查类型" :label-width="formLabelWidth">
<el-input
class="input"
disabled
v-model="dialogManger.source.standard.type"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="标准要求" :label-width="formLabelWidth">
<el-input
class="textarea"
disabled
resize="none"
:autosize="{ minRows: 4, maxRows: 6 }"
type="textarea"
v-model="dialogManger.source.standard.text"
autocomplete="off"
></el-input>
</el-form-item>
</el-form>
<el-form
class="form"
:model="dialogManger"
title="'审查信息'"
style="margin-top: 10px"
>
<el-form-item class="title">
<span style="width: 500px">检验内容</span>
</el-form-item>
<el-form-item label="测试场景" :label-width="formLabelWidth">
<el-input
class="textarea"
disabled
resize="none"
:autosize="{ minRows: 1, maxRows: 6 }"
type="textarea"
v-model="dialogManger.source.judge.content"
autocomplete="off"
>
</el-input>
</el-form-item>
<div v-for="(item, index) in dialogManger.source.judge.caseInfo">
<el-form-item label="用例编号" :label-width="formLabelWidth">
<el-input
class="textarea"
disabled
resize="none"
:autosize="{ minRows: 1, maxRows: 6 }"
type="textarea"
v-model="item.customizedID"
autocomplete="off"
>
</el-input>
</el-form-item>
<el-form-item label="用例描述" :label-width="formLabelWidth">
<el-input
class="textarea"
disabled
resize="none"
:autosize="{ minRows: 4, maxRows: 6 }"
type="textarea"
v-model="item.description"
autocomplete="off"
></el-input>
</el-form-item>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogManger.dialogVisible = false"
>确 定</el-button
>
</div>
</el-dialog>
</template>
<script>
export default {
name: '',
data() {
return {
titleWidth: '500px',
formLabelWidth: '120px'
}
},
props: {
dialogManger: {
type: Object,
default: () => {
return {
dialogVisible: false,
refreshList: false,
source: {
standard: {
name: '',
standardNo:'',
chapter: '',
type:'',
text:'',
},
judge:{
caseNum:'',
reviewDetailsList:[]
}
},
dialogEditId: undefined
}
}
}
},
methods: {
cancel() {
this.dialogManger.dialogVisible = false
}
}
}
</script>
<style lang="scss" scoped>
.form .title {
width: 100%;
margin-right: 50px;
color: blue;
font-weight: bold;
border-left: blue solid 6px;
padding-left: 10px;
}
.form .input {
width: 100%;
}
.form .textarea {
width: 100%;
}
::v-deep .el-dialog__body {
height: 70vh;
overflow: auto;
}
.input ::v-deep .el-input__inner {
color: black;
}
.textarea ::v-deep .el-textarea__inner {
color: black;
}
</style>
\ No newline at end of file
src/views/setting/standardTerms/index.vue
View file @ bb608aa1
......@@ -46,21 +46,13 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item v-if="queryParams.type == 'test'" prop="status">
<el-input
v-model="queryParams.testMethod"
placeholder="请输入标准测试方法"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- handleQuery:执行函数loadData -->
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
:disabled=" buttonDisibled"
:disabled="buttonDisibled"
@click="handleQuery"
>查询</el-button
>
......@@ -69,13 +61,15 @@
type="default"
icon="el-icon-refresh"
size="mini"
:disabled=" buttonDisibled"
:disabled="buttonDisibled"
@click="reset"
>重置</el-button
>
<el-button
type="text"
:icon=" this.expandAll ? 'el-icon-caret-bottom' : 'el-icon-caret-top' "
:icon="
this.expandAll ? 'el-icon-caret-bottom' : 'el-icon-caret-top'
"
@click="onShrinkUnfold"
>{{ this.expandAll ? '收缩' : '展开' }}</el-button
>
......@@ -168,7 +162,11 @@
>
<div>
<span v-if="node.level == 1" class="el-tree-label">标准要求</span>
<span v-else-if="node.parent.data.type == 'test'" class="el-tree-label"
>测试场景</span
>
<span v-else class="el-tree-label">审查要点</span>
<!-- 多个空格 -->
<span
v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"
......@@ -176,8 +174,11 @@
<span v-if="data.chapter" class="el-tree-content">
{{ (data.chapter + '\u00a0' + data.text) | ellipsis }}</span
>
<span v-else-if="data.serialNumber" class="el-tree-content">
{{ (data.serialNumber + '\u00a0' + data.requirements) | ellipsis }}</span
>
<span v-else class="el-tree-content">
{{ data.text | ellipsis }}</span
{{ data.text || data.testScenario | ellipsis }}</span
>
</div>
<!-- 当二级树为审查要点时将详情图标向左移动20px -->
......@@ -213,6 +214,12 @@
@close="detailModelManager.dialogVisible = false"
>
</detail-model>
<case-model
ref="caseModel"
:dialog-manger="caseModelManager"
@close="caseModelManager.dialogVisible = false"
>
</case-model>
<!-- <vehiclemodel-dialog
ref="vehicleModelDialog"
......@@ -238,22 +245,26 @@ import request from '../../../utils/request'
import { Change, Float, RowHeight } from '@icon-park/vue'
import { forEach } from 'lodash'
import { listInspection } from '../../../api/setting/standardTerms'
import caseModel from './components/caseModel.vue'
import detailModel from './components/detailModel.vue'
import standard from '../../../store/modules/standard'
import { parse } from 'postcss'
import stan from 'highlight.js/lib/languages/stan'
import { orderBy } from 'lodash'
export default {
// 绑定组件
components: {
'vehiclemodel-dialog': vehicleModelDialog,
'document-review-dialog': documentReviewDialog,
'detail-model': detailModel
'detail-model': detailModel,
'case-model': caseModel
},
dicts: ['sys_scene_type'],
mixins: [page],
data() {
return {
listUrl: '/review/standard/list', // 获取章节数据信息路径
modelData: [], // 储存原始获取的数据
chapterOptions: [], // 储存章节选项
reviewTypeList: [
......@@ -282,6 +293,7 @@ export default {
}
},
listNewUrl: '/review/standard/listNew',
CaseListNewUrl:'/system/testCase/getUseCaseListNew',
showSearch: true, // 是否显示搜索框
tableData: [], // 储存最终处理后的数据信息
queryParams: {
......@@ -306,14 +318,33 @@ export default {
source: {
standard: {
name: '',
standardNo:'',
standardNo: '',
chapter: '',
type: '',
text: ''
},
judge: {
content: '',
reviewDetailsList: []
}
},
dialogEditId: ''
},
caseModelManager: {
// 传递参数,储存传递给弹窗的信息
dialogVisible: false, // 弹窗是否显现
refreshList: false,
source: {
standard: {
name: '',
standardNo: '',
chapter: '',
type:'',
text:'',
type: '',
text: ''
},
judge:{
content:'',
reviewDetailsList:[]
judge: {
content: '',
caseInfo: []
}
},
dialogEditId: ''
......@@ -330,27 +361,34 @@ export default {
// source: {},
// dialogEditId: ''
// },
checkedkeys:[],
checkedkeys: [],
buttonDisibled: false,
expandAll:false,
expandAll: false,
handleClick: null,
refreshList: false
}
},
created () {
created() {
this.loadData()
},
watch: {
// 公共组件左侧标准全局变量选中
'$store.getters.standardObj': {
handler(newVal, oldVal) {
if(newVal.id == oldVal.id && newVal.type == oldVal.type && newVal.chapter == oldVal.chapter && newVal.name == oldVal.name && newVal.text == oldVal.text){
console.log(true)
}else{
if (
newVal.id == oldVal.id &&
newVal.type == oldVal.type &&
newVal.chapter == oldVal.chapter &&
newVal.name == oldVal.name &&
newVal.text == oldVal.text
) {
} else {
this.queryParams.standardId = newVal.id
this.queryParams.type = newVal.type
this.queryParams.chapter = newVal.chapter
this.queryParams.name = newVal.name
this.queryParams.standardNo = newVal.standardNo
this.loadData()
}
......@@ -394,31 +432,69 @@ export default {
},
methods: {
printNode(node) {
console.log(node)
},
handleNodeClick() {
console.log(123)
},
normalizeTreeData(data){
return data.map(node =>{
if(node.keyPointList){
node.children = this.normalizeTreeData(node.keyPointList)
normalizeTreeData(data,params) {
return data.map(node => {
if (node.keyPointList) {
node.children = this.normalizeTreeData(node.keyPointList,params)
delete node.keyPointList
}
if(node.scenarioUseCases){
node.type='test'
node.children = this.normalizeTreeData(node.scenarioUseCases,params)
delete node.scenarioUseCases
}
if(node.useCases){
node.type='test'
node.info= params
forEach(node.useCases,item=>{
if(!item.description){
item.description = '--'
}
})
}
return node
})
},
async loadData() {
this.loading = true
if (this.queryParams.type == 'test') {
let params = {
offset: {
offset: (this.queryParams.pageNum - 1) * this.queryParams.pageSize,
limit: this.queryParams.pageSize,
},
searchFields: {
serialNumber: this.queryParams.chapter,
requirements: this.queryParams.text
},
name: this.queryParams.name
}
await request({
url:this.listNewUrl,
url:this.CaseListNewUrl,
method: 'post',
data: params
}).then(res => {
this.tableData = res.data.useCases
this.tableData = this.normalizeTreeData(this.tableData,this.queryParams)
this.total = res.data.totalCount
})
} else {
await request({
url: this.listNewUrl,
method: 'post',
data: this.queryParams
}).then(res=>{
}).then(res => {
this.tableData = res.rows
this.tableData = this.normalizeTreeData(this.tableData)
this.tableData = this.normalizeTreeData(this.tableData,this.queryParams)
this.total = res.total
})
}
this.loading = false
// await request({
// url: this.listUrl,
......@@ -514,9 +590,9 @@ export default {
},
reset() {
this.buttonDisibled = true
setTimeout(()=>{
setTimeout(() => {
this.buttonDisibled = false
},2000)
}, 1000)
this.searchQueryParams.text = ''
this.searchQueryParams.chapter = ''
this.queryParams.type = this.$store.getters.initStandard.type
......@@ -526,7 +602,7 @@ export default {
this.queryParams.standardNo = ''
this.queryParams.name = ''
let standard = {
type:''
type: ''
}
this.$store.dispatch('standard/setInitStandard', standard)
......@@ -534,15 +610,17 @@ export default {
},
handleQuery() {
this.buttonDisibled = true
setTimeout(()=>{
setTimeout(() => {
this.buttonDisibled = false
},2000)
}, 1000)
this.queryParams.text = this.searchQueryParams.text
let obj = {
id: this.$store.getters.standardObj.id,
type: this.$store.getters.standardObj.type,
name: this.$store.getters.standardObj.name,
standardNo: this.$store.getters.standardObj.standardNo,
chapter: this.searchQueryParams.chapter,
text: this.searchQueryParams.text,
text: this.searchQueryParams.text
}
this.$store.dispatch('standard/setStandardObj', obj)
},
......@@ -550,7 +628,7 @@ export default {
this.expandAll = !this.expandAll
this.changeTreeNodeStatus(this.$refs.tree.store.root)
},
changeTreeNodeStatus (node) {
changeTreeNodeStatus(node) {
node.expanded = this.expandAll
for (let i = 0; i < node.childNodes.length; i++) {
// 改变节点的自身expanded状态
......@@ -563,21 +641,50 @@ export default {
},
async handleUpdate(node, Ddata) {
// 查看检验内容 data:标准信息 node:审查信息
if (Ddata.parent.data.type == 'test') {
let standard ={
name:node.info.name,
standardNo:node.info.standardNo,
chapter:Ddata.parent.data.serialNumber,
type:node.info.type == 'system'
? '体系审查'
: node.info.type == 'car'
? '车型审查'
: node.info.type == 'test'
? '车型实验'
: '',
text:Ddata.parent.data.requirements
}
let data = {
content:node.testScenario,
caseInfo:node.useCases
}
this.caseModelManager.source.standard = standard // 赋值传递弹窗
this.caseModelManager.source.judge = data
this.caseModelManager.dialogVisible = true
} else {
await request({
url:'/review/standard/getDetailsAll',
url: '/review/standard/getDetailsAll',
method: 'post',
data:{
data: {
keypointId: node.id
}
}).then(res=>{
}).then(res => {
let temp = res.data
let parent = Ddata.parent.data
let standard = {
name: parent.name,
standardNo: parent.standardNo,
chapter: parent.chapter,
type:parent.type == 'system' ? '体系审查' : parent.type == 'car' ? '车型审查' : parent.type == 'test' ? '车型实验' : '' ,
text:parent.text
type:
parent.type == 'system'
? '体系审查'
: parent.type == 'car'
? '车型审查'
: parent.type == 'test'
? '车型实验'
: '',
text: parent.text
}
forEach(temp.reviewDetailsList, detail => {
......@@ -592,16 +699,16 @@ export default {
detail.reviewSceneList = str
}
})
let data={
content:temp.text,
let data = {
content: temp.text,
reviewDetailsList: temp.reviewDetailsList
}
// 获取当前审查信息的类型
this.detailModelManager.source.standard = standard // 赋值传递弹窗
this.detailModelManager.source.judge = data
this.detailModelManager.dialogVisible = true
})
}
//当点击审查信息时,将审查信息中的关联场景拼接为字符串,如果已经为字符串了则不做更改,当关联场景没有数据时以"--"代替
......@@ -615,7 +722,6 @@ export default {
// this.$refs.vehicleModelDialog.init()
// }
// console.log('dialogEditId', this.vehicleModelDialogManger.dialogEditId)
}
// handleQuery(){
// this.$store.dispatch('standard/setStandard', this.standardList.find((item)=>item.id == this.queryParams.standardId))
......
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