Skip to content

W
web
Commit 0221556f authored by jiaxu.yan's avatar jiaxu.yan
Browse files
Options

修改格式。& 修改 检验场景库 审查细则库

parent ceb65d2b
Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 121 deletions
src/views/monitor/job/index.vue
View file @ 0221556f
......@@ -117,7 +117,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/monitor/job/log.vue
View file @ 0221556f
......@@ -118,7 +118,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/monitor/logininfor/index.vue
View file @ 0221556f
......@@ -115,7 +115,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/monitor/operlog/index.vue
View file @ 0221556f
......@@ -127,7 +127,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/review/already/index.vue
View file @ 0221556f
......@@ -97,7 +97,7 @@
@pagination="loadData"
>
</pagination>
<yan-dialog :dialogManger="dialogManger"></yan-dialog>
<yan-dialog :dialog-sanger="dialogManger"></yan-dialog>
</page-standard>
</template>
<script>
......
src/views/review/wait/index.vue
View file @ 0221556f
......@@ -56,7 +56,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>
......@@ -121,7 +121,7 @@
@pagination="loadData"
>
</pagination>
<yan-dialog :dialogManger="dialogManger"></yan-dialog>
<yan-dialog :dialog-sanger="dialogManger"></yan-dialog>
</page-standard>
</template>
<script>
......
src/views/setting/company/index.vue
View file @ 0221556f
......@@ -50,7 +50,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>
......@@ -116,7 +116,7 @@
@pagination="loadData"
>
</pagination>
<!-- <yan-dialog :dialogManger="dialogManger"></yan-dialog> -->
<!--<yan-dialog :dialog-sanger="dialogManger"></yan-dialog> -->
</page-standard>
</template>
<script>
......
src/views/setting/file/index.vue
View file @ 0221556f
......@@ -45,7 +45,7 @@
<el-row :gutter="10" class="mb10">
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>
......@@ -120,7 +120,7 @@
@pagination="loadData"
>
</pagination>
<!-- <yan-dialog :dialogManger="dialogManger"></yan-dialog> -->
<!--<yan-dialog :dialog-sanger="dialogManger"></yan-dialog> -->
</page-standard>
</template>
<script>
......
src/views/setting/rules/components/dialog.vue
View file @ 0221556f
......@@ -10,8 +10,8 @@
<el-form ref="form" :model="model" :rules="rules">
<el-form-item label="细则分类" prop="status">
<el-select
style="width: 100%"
v-model="model.status"
style="width: 100%"
placeholder="请选择"
clearable
>
......@@ -60,12 +60,17 @@
<el-form-item label="关联场景" prop="status">
<br />
<template v-for="(item, key) in model.scene">
<el-row :key="key" :gutter="20">
<el-col :span="20">
<el-row :key="key" class="mb10" :gutter="20">
<el-col :span="22">
<el-input v-model="model.text" placeholder="请输入" clearable />
</el-col>
<el-col :span="4">
<i class="icon el-icon-circle-plus-outline"></i>
<el-col :span="2">
<template v-if="key === 0">
<i class="icon el-icon-circle-plus-outline" @click="add()"></i>
</template>
<template v-else>
<i class="icon el-icon-remove-outline" @click="remove(key)"></i>
</template>
</el-col>
</el-row>
</template>
......@@ -81,9 +86,12 @@
export default {
props: {
dialogManger: {
default: {
dialogVisible: false,
source: {}
type: Object,
default: () => {
return {
dialogVisible: false,
source: {}
}
}
}
},
......@@ -120,13 +128,20 @@ export default {
}
},
methods: {
add() {
this.model.scene.push({
text: ''
})
},
remove(key) {
this.model.scene.splice(key, 1)
},
handleClose() {
this.dialogManger.dialogVisible = false
this.$emit('close')
},
handleConfirm() {
this.$refs['form'].validate(valid => {
if (valid) {
}
if (valid) {}
})
}
}
......@@ -134,5 +149,6 @@ export default {
</script>
<style scoped>
.icon {
font-size: 20px;
}
</style>
src/views/setting/rules/index.vue
View file @ 0221556f
......@@ -50,7 +50,11 @@
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -69,16 +73,16 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
v-if="refreshTable"
:default-sort="{ prop: 'createTime', order: 'descending' }"
v-loading="loading"
:data="tableData"
>
<el-table-column width="100" label="序号" align="left">
......@@ -102,7 +106,6 @@
<el-table-column
label="操作"
align="left"
sortable
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
......@@ -136,7 +139,10 @@
@pagination="loadData"
>
</pagination>
<yan-dialog :dialogManger="dialogManger"></yan-dialog>
<yan-dialog
:dialog-sanger="dialogManger"
@close="dialogManger.dialogVisible = false"
></yan-dialog>
</page-standard>
</template>
<script>
......@@ -160,6 +166,14 @@ export default {
}
}
},
watch: {
'dialogManger.refreshList'(val) {
if (val) {
this.loadData()
this.dialogManger.refreshList = false
}
}
},
methods: {
handleAdd() {
this.dialogManger.dialogVisible = true
......@@ -170,14 +184,6 @@ export default {
this.dialogManger.dialogVisible = true
this.dialogManger.source = row
}
},
watch: {
'dialogManger.refreshList': function (val) {
if (val) {
this.loadData()
this.dialogManger.refreshList = false
}
}
}
}
</script>
src/views/setting/scene/components/dialog.vue
View file @ 0221556f
......@@ -8,7 +8,7 @@
:before-close="handleClose"
>
<el-form ref="form" :model="model" :rules="rules">
<el-form-item label="场景编号" prop="status">
<el-form-item label="校验场景编号" prop="status">
<el-input v-model="model.status" placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="场景类型" prop="status">
......@@ -26,12 +26,13 @@
/>
</el-select>
</el-form-item>
<el-form-item label="场景内容" prop="status">
<el-form-item label="校验场景内容" prop="status">
<el-input
v-model="model.status"
placeholder="请输入"
type="textarea"
maxlength="100"
show-word-limit
:autosize="{ minRows: 4, maxRows: 4 }"
clearable
/>
......@@ -47,9 +48,12 @@
export default {
props: {
dialogManger: {
default: {
dialogVisible: false,
source: {}
type: Object,
default: () => {
return {
dialogVisible: false,
source: {}
}
}
}
},
......@@ -68,10 +72,14 @@ export default {
}
}
},
created() {},
computed: {
modelTitle() {
return this.dialogManger.source.id ? '编辑' : '新增' + '校验场景'
}
},
methods: {
handleClose() {
this.dialogManger.dialogVisible = false
this.$emit('close')
},
handleConfirm() {
this.$refs['form'].validate(valid => {
......@@ -79,11 +87,6 @@ export default {
}
})
}
},
computed: {
modelTitle: function () {
return this.dialogManger.source.id ? '编辑' : '新增' + '场景库'
}
}
}
</script>
src/views/setting/scene/index.vue
View file @ 0221556f
<template>
<page-standard>
<el-form
:model="queryParams"
v-show="showSearch"
ref="queryForm"
:model="queryParams"
size="small"
:inline="true"
v-show="showSearch"
>
<el-form-item prop="deptName">
<el-select
v-model="queryParams.configType"
placeholder="场景分类"
<el-form-item prop="status">
<el-input
v-model="queryParams.deptName"
placeholder="校验场景编号"
clearable
>
<el-option
v-for="dict in dict.type.sys_scene_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="status">
<el-input
v-model="queryParams.deptName"
placeholder="请输入关键词"
placeholder="校验场景名称"
clearable
@keyup.enter.native="handleQuery"
/>
......@@ -37,7 +31,11 @@
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -46,26 +44,26 @@
<el-row :gutter="10" class="mb10">
<el-col :span="1.5">
<el-button
v-hasPermi="['setting:scene:add']"
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['setting:scene:add']"
>新增</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
v-if="refreshTable"
:default-sort="{ prop: 'createTime', order: 'descending' }"
v-loading="loading"
:data="tableData"
>
<el-table-column width="100" label="序号" align="left">
......@@ -74,11 +72,11 @@
</template>
</el-table-column>
<el-table-column label="场景编号" sortable align="left">
<el-table-column label="检验场景编号" sortable align="left">
</el-table-column>
<el-table-column label="场景分类" sortable align="left">
</el-table-column>
<el-table-column label="场景内容" sortable align="left">
<el-table-column label="检验场景内容" sortable align="left">
</el-table-column>
<el-table-column label="更新人员" align="left"> </el-table-column>
......@@ -90,26 +88,25 @@
<el-table-column
label="操作"
align="left"
sortable
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
v-hasPermi="['setting:scene:update']"
plain
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['setting:scene:update']"
plain
>修改</el-button
>
<el-button
v-hasPermi="['setting:scene:delete']"
plain
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['setting:scene:delete']"
plain
>删除</el-button
>
</template>
......@@ -124,7 +121,10 @@
@pagination="loadData"
>
</pagination>
<yan-dialog :dialogManger="dialogManger"></yan-dialog>
<yan-dialog
:dialog-sanger="dialogManger"
@close="dialogManger.dialogVisible = false"
></yan-dialog>
</page-standard>
</template>
<script>
......@@ -148,6 +148,15 @@ export default {
}
}
},
watch: {
'dialogManger.refreshList'(val) {
if (val) {
this.loadData()
this.dialogManger.refreshList = false
}
}
},
methods: {
handleAdd() {
this.dialogManger.dialogVisible = true
......@@ -158,14 +167,6 @@ export default {
this.dialogManger.dialogVisible = true
this.dialogManger.source = row
}
},
watch: {
'dialogManger.refreshList': function (val) {
if (val) {
this.loadData()
this.dialogManger.refreshList = false
}
}
}
}
</script>
src/views/setting/standard/components/dialog.vue
View file @ 0221556f
......@@ -70,9 +70,12 @@
export default {
props: {
dialogManger: {
default: {
dialogVisible: false,
source: {}
type: Object,
default: () => {
return {
dialogVisible: false,
source: {}
}
}
}
},
......@@ -94,7 +97,7 @@ export default {
created() {},
methods: {
handleClose() {
this.dialogManger.dialogVisible = false
this.$emit('close')
},
handleConfirm() {
this.$refs['form'].validate(valid => {
......
src/views/setting/standard/index.vue
View file @ 0221556f
......@@ -48,7 +48,11 @@
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button
type="default"
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -57,26 +61,26 @@
<el-row :gutter="10" class="mb10">
<el-col :span="1.5">
<el-button
v-hasPermi="['setting:standard:add']"
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['setting:standard:add']"
>新增</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="loadData"
></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
style="width: 100%; min-height: 50vh"
border
v-if="refreshTable"
:default-sort="{ prop: 'createTime', order: 'descending' }"
v-loading="loading"
:data="tableData"
>
<el-table-column width="100" label="序号" align="center">
......@@ -92,7 +96,7 @@
</el-table-column>
<el-table-column label="检验结果描述（符合）" align="left">
</el-table-column>
<el-table-column label="检验结果描述（不符合）" sortable align="left">
<el-table-column label="检验结果描述（不符合）" align="left">
</el-table-column>
<el-table-column label="更新时间" align="left" sortable prop="createTime">
<template slot-scope="scope">
......@@ -102,26 +106,25 @@
<el-table-column
label="操作"
align="left"
sortable
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
v-hasPermi="['setting:standard:update']"
plain
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['setting:standard:update']"
plain
>修改</el-button
>
<el-button
v-hasPermi="['setting:standard:delete']"
plain
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['setting:standard:delete']"
plain
>删除</el-button
>
</template>
......@@ -136,7 +139,10 @@
@pagination="loadData"
>
</pagination>
<yan-dialog :dialogManger="dialogManger"></yan-dialog>
<yan-dialog
:dialog-sanger="dialogManger"
@close="dialogManger.dialogVisible = false"
></yan-dialog>
</page-standard>
</template>
<script>
......@@ -160,6 +166,15 @@ export default {
}
}
},
watch: {
'dialogManger.refreshList'(val) {
if (val) {
this.loadData()
this.dialogManger.refreshList = false
}
}
},
methods: {
handleAdd() {
this.dialogManger.dialogVisible = true
......@@ -170,14 +185,6 @@ export default {
this.dialogManger.dialogVisible = true
this.dialogManger.source = row
}
},
watch: {
'dialogManger.refreshList': function (val) {
if (val) {
this.loadData()
this.dialogManger.refreshList = false
}
}
}
}
</script>
src/views/setting/template/index.vue
View file @ 0221556f
......@@ -55,7 +55,7 @@
@pagination="loadData"
>
</pagination>
<yan-dialog :dialogManger="dialogManger"></yan-dialog>
<yan-dialog :dialog-sanger="dialogManger"></yan-dialog>
</page-standard>
</template>
<script>
......
src/views/system/config/index.vue
View file @ 0221556f
......@@ -124,7 +124,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/dept/index.vue
View file @ 0221556f
......@@ -66,7 +66,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/dict/data.vue
View file @ 0221556f
......@@ -112,7 +112,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/dict/index.vue
View file @ 0221556f
......@@ -125,7 +125,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/menu/index.vue
View file @ 0221556f
......@@ -66,7 +66,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/notice/index.vue
View file @ 0221556f
......@@ -89,7 +89,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/post/index.vue
View file @ 0221556f
......@@ -100,7 +100,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/role/authUser.vue
View file @ 0221556f
......@@ -74,7 +74,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/role/index.vue
View file @ 0221556f
......@@ -113,7 +113,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
src/views/system/user/index.vue
View file @ 0221556f
......@@ -154,7 +154,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
:columns="columns"
></right-toolbar>
......
src/views/task/archived/index.vue
View file @ 0221556f
......@@ -49,7 +49,7 @@
>新增</el-button
>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="loadData"></right-toolbar> -->
<!-- <right-toolbar :show-search.sync="showSearch" @queryTable="loadData"></right-toolbar> -->
</el-row>
<el-table
style="width: 100%; min-height: 50vh"
......
src/views/tool/gen/index.vue
View file @ 0221556f
......@@ -97,7 +97,7 @@
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
:show-search.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
......
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