Commit d8d9204b authored by 高滢's avatar 高滢

feat(样品): 隐藏按钮

parent a62a2100
...@@ -2,18 +2,18 @@ import request from '@/utils/request' ...@@ -2,18 +2,18 @@ import request from '@/utils/request'
// 体系审查、车型审查检验内容列表 // 体系审查、车型审查检验内容列表
export function listInspection(data) { export function listInspection(data) {
return request({ return request({
url: '/review/standard/getInspectionContent', url: '/review/standard/getInspectionContent',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 文档审查检验内容列表 // 文档审查检验内容列表
export function listDocumentReview(data) { export function listDocumentReview(data) {
return request({ return request({
url: '/review/standard/test/getInspectionContent', url: '/review/standard/test/getInspectionContent',
method: 'post', method: 'post',
data: data data: data
}) })
} }
import request from '@/utils/request' import request from '@/utils/request'
export function listMatrix(data) { export function listMatrix(data) {
return request({ return request({
url: '/usecase/matrix/getInfo', url: '/usecase/matrix/getInfo',
method: 'post', method: 'post',
data: data data: data
}) })
} }
import request from '@/utils/request' import request from '@/utils/request'
//获取任务详情 //获取任务详情
export function taskDetail(data) { export function taskDetail(data) {
return request({ return request({
......
...@@ -115,4 +115,3 @@ ...@@ -115,4 +115,3 @@
top: 20px; top: 20px;
transform: translateX(100%); transform: translateX(100%);
} }
...@@ -490,7 +490,7 @@ ...@@ -490,7 +490,7 @@
.img { .img {
border: 1px solid #ebebeb; border: 1px solid #ebebeb;
width: 100%; width: 100%;
height:348px height: 348px;
} }
} }
} }
......
...@@ -17,25 +17,23 @@ ...@@ -17,25 +17,23 @@
<!-- 上传按钮 --> <!-- 上传按钮 -->
<el-button size="mini" type="primary">选取文件</el-button> <el-button size="mini" type="primary">选取文件</el-button>
<!-- 上传提示 --> <!-- 上传提示 -->
<!-- <div class="el-upload__tip" slot="tip" v-if="showTip">--> <!-- <div class="el-upload__tip" slot="tip" v-if="showTip">-->
<!-- 请上传--> <!-- 请上传-->
<!-- <template v-if="fileSize">--> <!-- <template v-if="fileSize">-->
<!-- 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>--> <!-- 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>-->
<!-- </template>--> <!-- </template>-->
<!-- <template v-if="fileType">--> <!-- <template v-if="fileType">-->
<!-- 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>--> <!-- 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>-->
<!-- </template>--> <!-- </template>-->
<!-- 的文件--> <!-- 的文件-->
<!-- </div>--> <!-- </div>-->
<div class="el-upload__tip" slot="tip" v-if="showTip"> <div class="el-upload__tip" slot="tip" v-if="showTip">
只能上传 只能上传
<template v-if="fileType"> <template v-if="fileType">
{{ fileType.join('/') }} {{ fileType.join('/') }}
</template> </template>
文件, 文件,
<template v-if="fileSize"> <template v-if="fileSize"> 且不得超过{{ fileSize }}MB </template>
且不得超过{{ fileSize }}MB
</template>
</div> </div>
</el-upload> </el-upload>
......
...@@ -22,16 +22,16 @@ ...@@ -22,16 +22,16 @@
</el-upload> </el-upload>
<!-- 上传提示 --> <!-- 上传提示 -->
<!-- <div class="el-upload__tip" slot="tip" v-if="showTip">--> <!-- <div class="el-upload__tip" slot="tip" v-if="showTip">-->
<!-- 请上传--> <!-- 请上传-->
<!-- <template v-if="fileSize">--> <!-- <template v-if="fileSize">-->
<!-- 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>--> <!-- 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>-->
<!-- </template>--> <!-- </template>-->
<!-- <template v-if="fileType">--> <!-- <template v-if="fileType">-->
<!-- 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>--> <!-- 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>-->
<!-- </template>--> <!-- </template>-->
<!-- 的文件--> <!-- 的文件-->
<!-- </div>--> <!-- </div>-->
<div class="el-upload__tip" slot="tip" v-if="showTip"> <div class="el-upload__tip" slot="tip" v-if="showTip">
只能上传 只能上传
...@@ -39,16 +39,10 @@ ...@@ -39,16 +39,10 @@
{{ fileType.join('/') }} {{ fileType.join('/') }}
</template> </template>
文件, 文件,
<template v-if="fileSize"> <template v-if="fileSize"> 且不得超过{{ fileSize }}MB </template>
且不得超过{{ fileSize }}MB
</template>
</div> </div>
<el-dialog <el-dialog :visible.sync="dialogVisible" width="800" append-to-body>
:visible.sync="dialogVisible"
width="800"
append-to-body
>
<img <img
:src="dialogImageUrl" :src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto" style="display: block; max-width: 100%; margin: 0 auto"
......
...@@ -220,5 +220,4 @@ export default { ...@@ -220,5 +220,4 @@ export default {
border: 1px solid #1764c1; border: 1px solid #1764c1;
color: #1764c1; color: #1764c1;
} }
</style> </style>
...@@ -219,5 +219,4 @@ export default { ...@@ -219,5 +219,4 @@ export default {
border: 1px solid #1764c1; border: 1px solid #1764c1;
color: #1764c1; color: #1764c1;
} }
</style> </style>
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
list-style-type: none; list-style-type: none;
margin-top: 5px; margin-top: 5px;
padding: 0; padding: 0;
width:100%; width: 100%;
li { li {
margin: 10px 0; margin: 10px 0;
cursor: pointer; cursor: pointer;
......
...@@ -94,7 +94,7 @@ Vue.component('FooterButton', FooterButton) ...@@ -94,7 +94,7 @@ Vue.component('FooterButton', FooterButton)
Vue.use(directive) Vue.use(directive)
Vue.use(plugins) Vue.use(plugins)
Vue.use(VueMeta) Vue.use(VueMeta)
import ModelDataSource from './utils/ModelDataSource'; import ModelDataSource from './utils/ModelDataSource'
Vue.use(ModelDataSource) Vue.use(ModelDataSource)
DictData.install() DictData.install()
......
...@@ -2,97 +2,55 @@ ...@@ -2,97 +2,55 @@
* Model 数据源 * Model 数据源
* 用于 单条记录的增删查改 * 用于 单条记录的增删查改
*/ */
import _ from "lodash" import _ from 'lodash'
import request from "@/utils/request" import request from '@/utils/request'
function ModelDataSource(vm, settings) { function ModelDataSource(vm, settings) {
this.vm = vm this.vm = vm
this.settings = settings this.settings = settings
this.errors = {} this.errors = {}
this.debug = true this.debug = true
// this.dataKey = settings. // this.dataKey = settings.
// this.defaultAttributes = settings.attributes; // this.defaultAttributes = settings.attributes;
this.init() this.init()
} }
ModelDataSource.prototype = { ModelDataSource.prototype = {
vm: null, vm: null,
settings: null, settings: null,
uuid: 0, uuid: 0,
init: function () { init: function () {
let self = this let self = this
_.assign(self, self.settings.attributes) _.assign(self, self.settings.attributes)
_.assignInWith(self.errors, self.settings.attributes, () => { _.assignInWith(self.errors, self.settings.attributes, () => {
return '' return ''
}) })
}, },
/** /**
* Fetch * Fetch
* *
* @param id * @param id
* @param successCallback * @param successCallback
* @param failedCallback * @param failedCallback
*/ */
fetch: function ( fetch: function (
uuid = 0, uuid = 0,
params = {}, params = {},
successCallback = function () {}, successCallback = function () {},
failedCallback = function () {} failedCallback = function () {}
) { ) {
let self = this let self = this
let url = self.settings.url let url = self.settings.url
self.uuid = uuid self.uuid = uuid
if (uuid == 0 || uuid == null) { if (uuid == 0 || uuid == null) {
self.reset() self.reset()
} else { } else {
params.id = uuid params.id = uuid
request({
url: url + '/getById',
method: 'post',
data: params
})
.then(function (response) {
console.log(response)
if (response.data) {
for (let key in response.data) {
self[key] = response.data[key]
}
} else {
for (let key in response.data) {
self[key] = response.data[key]
}
}
successCallback()
})
.catch(function (error) {
failedCallback()
})
}
},
/**
* 保存model
* @param successCallback
* @param failedCallback
*/
save: function (
successCallback = function () {},
failedCallback = function () {}
) {
let self = this
let url = ''
if (self.uuid == 0) {
url = self.settings.url + '/add'
delete self.id
} else {
url = self.settings.url + '/edit'
}
request({ request({
url, url: url + '/getById',
method: 'post', method: 'post',
data: _.omit(self, ['vm', 'settings', 'errors', 'debug']) data: params
}) })
.then(function (response) { .then(function (response) {
console.log(response)
if (response.data) { if (response.data) {
for (let key in response.data) { for (let key in response.data) {
self[key] = response.data[key] self[key] = response.data[key]
...@@ -102,75 +60,117 @@ ...@@ -102,75 +60,117 @@
self[key] = response.data[key] self[key] = response.data[key]
} }
} }
successCallback() successCallback()
}) })
.catch(function (error) { .catch(function (error) {
// console.log(error.response) failedCallback()
// if (error.response) {
// _.forEach(error.response.data, function (value, key) {
// typeof value === 'object' && self.vm.$set(self.vm[self.settings.dataKey].errors, key, value[0]);
// typeof value === 'string' && self.vm.$set(self.vm[self.settings.dataKey].errors, key, value);
// });
// } else {
// // Something happened in setting up the request that triggered an Error
// self.debug && console.log(error);
// }
failedCallback(error)
}) })
}, }
/** },
* 删除model
* @param id
*/
/** /**
* * 保存model
* @param successCallback * @param successCallback
* @param failedCallback * @param failedCallback
*/ */
destroy: function ( save: function (
successCallback = function () {}, successCallback = function () {},
failedCallback = function () {} failedCallback = function () {}
) { ) {
let self = this let self = this
request({ let url = ''
url: self.settings.url + '/remove', if (self.uuid == 0) {
method: 'post', url = self.settings.url + '/add'
data: { delete self.id
ids: [self.uuid] } else {
url = self.settings.url + '/edit'
}
request({
url,
method: 'post',
data: _.omit(self, ['vm', 'settings', 'errors', 'debug'])
})
.then(function (response) {
if (response.data) {
for (let key in response.data) {
self[key] = response.data[key]
}
} else {
for (let key in response.data) {
self[key] = response.data[key]
}
} }
successCallback()
}) })
.then(function (response) { .catch(function (error) {
successCallback() // console.log(error.response)
}) // if (error.response) {
.catch(function (error) { // _.forEach(error.response.data, function (value, key) {
// Something happened in setting up the request that triggered an Error // typeof value === 'object' && self.vm.$set(self.vm[self.settings.dataKey].errors, key, value[0]);
self.debug && console.log('Error', error.message) // typeof value === 'string' && self.vm.$set(self.vm[self.settings.dataKey].errors, key, value);
failedCallback(error) // });
}) // } else {
}, // // Something happened in setting up the request that triggered an Error
// self.debug && console.log(error);
// }
failedCallback(error)
})
},
/**
* 删除model
* @param id
*/
/** /**
* 重置model 为默认值 *
* @param id * @param successCallback
*/ * @param failedCallback
reset: function () { */
let self = this destroy: function (
_.assign(self, self.settings.attributes) successCallback = function () {},
_.assignInWith(self.errors, self.settings.attributes, () => { failedCallback = function () {}
return '' ) {
let self = this
request({
url: self.settings.url + '/remove',
method: 'post',
data: {
ids: [self.uuid]
}
})
.then(function (response) {
successCallback()
}) })
} .catch(function (error) {
} // Something happened in setting up the request that triggered an Error
self.debug && console.log('Error', error.message)
failedCallback(error)
})
},
/** /**
* Vue Plugin * 重置model 为默认值
* @param id
*/ */
ModelDataSource.install = function (Vue) { reset: function () {
Vue.prototype.$modelDataSource = function (options) { let self = this
console.log(this, options); _.assign(self, self.settings.attributes)
return new ModelDataSource(this, options) _.assignInWith(self.errors, self.settings.attributes, () => {
} return ''
})
}
}
/**
* Vue Plugin
*/
ModelDataSource.install = function (Vue) {
Vue.prototype.$modelDataSource = function (options) {
console.log(this, options)
return new ModelDataSource(this, options)
} }
}
export default ModelDataSource export default ModelDataSource
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
>新建</el-button >新建</el-button
> >
</el-col> </el-col>
<right-toolbar <!-- <right-toolbar-->
:show-search.sync="showSearch" <!-- :show-search.sync="showSearch"-->
@queryTable="getList" <!-- @queryTable="getList"-->
></right-toolbar> <!-- ></right-toolbar>-->
</el-row> </el-row>
<el-table <el-table
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
:before-close="handleClose" :before-close="handleClose"
> >
<el-table <el-table
class="el-table"
v-loading="loading" v-loading="loading"
class="el-table"
style="min-height: 88px; margin: 20px" style="min-height: 88px; margin: 20px"
border border
:scroll-x="'1500px'" :scroll-x="'1500px'"
...@@ -27,12 +27,7 @@ ...@@ -27,12 +27,7 @@
prop="testScenario" prop="testScenario"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="测试类型" align="left" sortable prop="testType">
label="测试类型"
align="left"
sortable
prop="testType"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="用例编号" label="用例编号"
......
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