Skip to content

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

Merge remote-tracking branch 'origin/develop' into develop

parents 4b77a377 78621bd2
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 91 deletions
.eslintrc.js
View file @ 03002517
...@@ -21,7 +21,7 @@ module.exports = { ...@@ -21,7 +21,7 @@ module.exports = {
"singleline": 10, "singleline": 10,
"multiline": { "multiline": {
"max": 1, "max": 1,
"allowFirstLine": false "allowFirstLine": true
} }
}], }],
"vue/singleline-html-element-content-newline": "off", "vue/singleline-html-element-content-newline": "off",
......
src/plugins/modal.js
View file @ 03002517
...@@ -52,8 +52,8 @@ export default { ...@@ -52,8 +52,8 @@ export default {
Notification.warning(content) Notification.warning(content)
}, },
// 确认窗体 // 确认窗体
confirm(content) { confirm(content, title = '系统提示') {
return MessageBox.confirm(content, '系统提示', { return MessageBox.confirm(content, title, {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
......
src/views/monitor/operlog/index.vue
View file @ 03002517
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form
:model="queryParams" v-show="showSearch"
ref="queryForm" ref="queryForm"
:model="queryParams"
size="small" size="small"
:inline="true" :inline="true"
v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="操作地址" prop="operIp"> <el-form-item label="操作地址" prop="operIp">
...@@ -85,7 +85,11 @@ ...@@ -85,7 +85,11 @@
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -94,35 +98,35 @@ ...@@ -94,35 +98,35 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['monitor:operlog:remove']"
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['monitor:operlog:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['monitor:operlog:remove']"
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
@click="handleClean" @click="handleClean"
v-hasPermi="['monitor:operlog:remove']"
>清空</el-button >清空</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['monitor:operlog:export']"
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['monitor:operlog:export']"
>导出</el-button >导出</el-button
> >
</el-col> </el-col>
...@@ -136,8 +140,8 @@ ...@@ -136,8 +140,8 @@
ref="tables" ref="tables"
v-loading="loading" v-loading="loading"
:data="list" :data="list"
@selection-change="handleSelectionChange"
:default-sort="defaultSort" :default-sort="defaultSort"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
...@@ -218,11 +222,11 @@ ...@@ -218,11 +222,11 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-hasPermi="['monitor:operlog:query']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-view" icon="el-icon-view"
@click="handleView(scope.row, scope.index)" @click="handleView(scope.row, scope.index)"
v-hasPermi="['monitor:operlog:query']"
>详细</el-button >详细</el-button
> >
</template> </template>
...@@ -289,7 +293,7 @@ ...@@ -289,7 +293,7 @@
}}</el-form-item> }}</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="异常信息：" v-if="form.status === 1">{{ <el-form-item v-if="form.status === 1" label="异常信息：">{{
form.errorMsg form.errorMsg
}}</el-form-item> }}</el-form-item>
</el-col> </el-col>
...@@ -397,7 +401,7 @@ export default { ...@@ -397,7 +401,7 @@ export default {
const operIds = row.operId || this.ids const operIds = row.operId || this.ids
this.$modal this.$modal
.confirm('是否确认删除日志编号为"' + operIds + '"的数据项？') .confirm('是否确认删除日志编号为"' + operIds + '"的数据项？')
.then(function () { .then(() => {
return delOperlog(operIds) return delOperlog(operIds)
}) })
.then(() => { .then(() => {
...@@ -410,7 +414,7 @@ export default { ...@@ -410,7 +414,7 @@ export default {
handleClean() { handleClean() {
this.$modal this.$modal
.confirm('是否确认清空所有操作日志数据项？') .confirm('是否确认清空所有操作日志数据项？')
.then(function () { .then(() => {
return cleanOperlog() return cleanOperlog()
}) })
.then(() => { .then(() => {
......
src/views/monitor/server/index.vue
View file @ 03002517
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div class="cell">核心数</div> <div class="cell">核心数</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.cpu"> <div v-if="server.cpu" class="cell">
{{ server.cpu.cpuNum }} {{ server.cpu.cpuNum }}
</div> </div>
</td> </td>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div class="cell">用户使用率</div> <div class="cell">用户使用率</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.cpu"> <div v-if="server.cpu" class="cell">
{{ server.cpu.used }}% {{ server.cpu.used }}%
</div> </div>
</td> </td>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<div class="cell">系统使用率</div> <div class="cell">系统使用率</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.cpu"> <div v-if="server.cpu" class="cell">
{{ server.cpu.sys }}% {{ server.cpu.sys }}%
</div> </div>
</td> </td>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<div class="cell">当前空闲率</div> <div class="cell">当前空闲率</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.cpu"> <div v-if="server.cpu" class="cell">
{{ server.cpu.free }}% {{ server.cpu.free }}%
</div> </div>
</td> </td>
...@@ -91,12 +91,12 @@ ...@@ -91,12 +91,12 @@
<div class="cell">总内存</div> <div class="cell">总内存</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.mem"> <div v-if="server.mem" class="cell">
{{ server.mem.total }}G {{ server.mem.total }}G
</div> </div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.total }}M {{ server.jvm.total }}M
</div> </div>
</td> </td>
...@@ -106,12 +106,12 @@ ...@@ -106,12 +106,12 @@
<div class="cell">已用内存</div> <div class="cell">已用内存</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.mem"> <div v-if="server.mem" class="cell">
{{ server.mem.used }}G {{ server.mem.used }}G
</div> </div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.used }}M {{ server.jvm.used }}M
</div> </div>
</td> </td>
...@@ -121,12 +121,12 @@ ...@@ -121,12 +121,12 @@
<div class="cell">剩余内存</div> <div class="cell">剩余内存</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.mem"> <div v-if="server.mem" class="cell">
{{ server.mem.free }}G {{ server.mem.free }}G
</div> </div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.free }}M {{ server.jvm.free }}M
</div> </div>
</td> </td>
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div <div
class="cell"
v-if="server.mem" v-if="server.mem"
class="cell"
:class="{ 'text-danger': server.mem.usage > 80 }" :class="{ 'text-danger': server.mem.usage > 80 }"
> >
{{ server.mem.usage }}% {{ server.mem.usage }}%
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,8 @@
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div <div
class="cell"
v-if="server.jvm" v-if="server.jvm"
class="cell"
:class="{ 'text-danger': server.jvm.usage > 80 }" :class="{ 'text-danger': server.jvm.usage > 80 }"
> >
{{ server.jvm.usage }}% {{ server.jvm.usage }}%
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
<div class="cell">服务器名称</div> <div class="cell">服务器名称</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.sys"> <div v-if="server.sys" class="cell">
{{ server.sys.computerName }} {{ server.sys.computerName }}
</div> </div>
</td> </td>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<div class="cell">操作系统</div> <div class="cell">操作系统</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.sys"> <div v-if="server.sys" class="cell">
{{ server.sys.osName }} {{ server.sys.osName }}
</div> </div>
</td> </td>
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<div class="cell">服务器IP</div> <div class="cell">服务器IP</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.sys"> <div v-if="server.sys" class="cell">
{{ server.sys.computerIp }} {{ server.sys.computerIp }}
</div> </div>
</td> </td>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<div class="cell">系统架构</div> <div class="cell">系统架构</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.sys"> <div v-if="server.sys" class="cell">
{{ server.sys.osArch }} {{ server.sys.osArch }}
</div> </div>
</td> </td>
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
<div class="cell">Java名称</div> <div class="cell">Java名称</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.name }} {{ server.jvm.name }}
</div> </div>
</td> </td>
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
<div class="cell">Java版本</div> <div class="cell">Java版本</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.version }} {{ server.jvm.version }}
</div> </div>
</td> </td>
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<div class="cell">启动时间</div> <div class="cell">启动时间</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.startTime }} {{ server.jvm.startTime }}
</div> </div>
</td> </td>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
<div class="cell">运行时长</div> <div class="cell">运行时长</div>
</td> </td>
<td class="el-table__cell is-leaf"> <td class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.runTime }} {{ server.jvm.runTime }}
</div> </div>
</td> </td>
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
<div class="cell">安装路径</div> <div class="cell">安装路径</div>
</td> </td>
<td colspan="3" class="el-table__cell is-leaf"> <td colspan="3" class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.home }} {{ server.jvm.home }}
</div> </div>
</td> </td>
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
<div class="cell">项目路径</div> <div class="cell">项目路径</div>
</td> </td>
<td colspan="3" class="el-table__cell is-leaf"> <td colspan="3" class="el-table__cell is-leaf">
<div class="cell" v-if="server.sys"> <div v-if="server.sys" class="cell">
{{ server.sys.userDir }} {{ server.sys.userDir }}
</div> </div>
</td> </td>
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
<div class="cell">运行参数</div> <div class="cell">运行参数</div>
</td> </td>
<td colspan="3" class="el-table__cell is-leaf"> <td colspan="3" class="el-table__cell is-leaf">
<div class="cell" v-if="server.jvm"> <div v-if="server.jvm" class="cell">
{{ server.jvm.inputArgs }} {{ server.jvm.inputArgs }}
</div> </div>
</td> </td>
......
src/views/redirect.vue
View file @ 03002517
...@@ -5,7 +5,7 @@ export default { ...@@ -5,7 +5,7 @@ export default {
const { path } = params const { path } = params
this.$router.replace({ path: '/' + path, query }) this.$router.replace({ path: '/' + path, query })
}, },
render: function (h) { render: h => {
return h() // avoid warning message return h() // avoid warning message
} }
} }
......
src/views/setting/rules/index.vue
View file @ 03002517
...@@ -105,23 +105,32 @@ ...@@ -105,23 +105,32 @@
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 50vh"
border border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :data="tableData"
> >
<el-table-column width="100" label="序号" align="left"> <el-table-column width="80" label="序号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标准章节" sortable align="left"> <el-table-column label="标准章节" min-width="200" sortable align="left">
</el-table-column> </el-table-column>
<el-table-column label="标准要求" sortable align="left"> <el-table-column label="标准要求" min-width="200" sortable align="left">
</el-table-column> </el-table-column>
<el-table-column label="审查要点" sortable align="left"> <el-table-column label="审查要点" min-width="200" sortable align="left">
</el-table-column> </el-table-column>
<el-table-column label="审查细则" align="left"> </el-table-column> <el-table-column label="审查细则" min-width="200" align="left">
<el-table-column label="关联场景" align="left"> </el-table-column> </el-table-column>
<el-table-column label="更新时间" align="left" sortable prop="createTime"> <el-table-column label="关联场景" min-width="200" align="left">
</el-table-column>
<el-table-column
label="更新时间"
min-width="200"
align="left"
sortable
prop="createTime"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
...@@ -129,7 +138,9 @@ ...@@ -129,7 +138,9 @@
<el-table-column <el-table-column
label="操作" label="操作"
align="left" align="left"
class-name="small-padding fixed-width" width="160"
fixed="right"
class-name="fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -219,7 +230,18 @@ export default { ...@@ -219,7 +230,18 @@ export default {
this.dialogPointManger.dialogVisible = true this.dialogPointManger.dialogVisible = true
this.dialogPointManger.source = {} this.dialogPointManger.source = {}
}, },
handleDelete() {}, handleDelete(row) {
this.$modal
.confirm('是否确定删除该条数据？', '操作确认')
.then(() => {
// return delNotice(noticeIds)
})
.then(() => {
this.loadData()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
},
handleUpdate(row) { handleUpdate(row) {
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
this.dialogManger.source = row this.dialogManger.source = row
......
src/views/setting/scene/index.vue
View file @ 03002517
...@@ -64,23 +64,40 @@ ...@@ -64,23 +64,40 @@
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 50vh"
border border
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:scroll-x="'1500px'"
:data="tableData" :data="tableData"
> >
<el-table-column width="100" label="序号" align="left"> <el-table-column width="80" label="序号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
<el-table-column label="检验场景编号" sortable align="left"> label="检验场景编号"
min-width="200"
sortable
align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="场景分类" sortable align="left"> <el-table-column label="场景分类" min-width="200" sortable align="left">
</el-table-column> </el-table-column>
<el-table-column label="检验场景内容" sortable align="left"> <el-table-column
label="检验场景内容"
min-width="200"
sortable
align="left"
>
</el-table-column>
<el-table-column label="更新人员" min-width="200" align="left">
</el-table-column> </el-table-column>
<el-table-column label="更新人员" align="left"> </el-table-column>
<el-table-column label="更新时间" align="left" sortable prop="createTime"> <el-table-column
label="更新时间"
min-width="200"
align="left"
sortable
prop="createTime"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
...@@ -88,7 +105,9 @@ ...@@ -88,7 +105,9 @@
<el-table-column <el-table-column
label="操作" label="操作"
align="left" align="left"
class-name="small-padding fixed-width" width="160"
fixed="right"
class-name="fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -162,7 +181,18 @@ export default { ...@@ -162,7 +181,18 @@ export default {
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
this.dialogManger.source = {} this.dialogManger.source = {}
}, },
handleDelete() {}, handleDelete(row) {
this.$modal
.confirm('是否确定删除场景？', '操作确认')
.then(() => {
// return delNotice(noticeIds)
})
.then(() => {
this.loadData()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
},
handleUpdate(row) { handleUpdate(row) {
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
this.dialogManger.source = row this.dialogManger.source = row
......
src/views/setting/standard/components/dialog.vue
View file @ 03002517
...@@ -106,6 +106,7 @@ export default { ...@@ -106,6 +106,7 @@ export default {
handleConfirm() { handleConfirm() {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
console.log(valid)
} }
}) })
} }
......
src/views/setting/standard/index.vue
View file @ 03002517
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
> >
{{ dict.label }} {{ dict.label }}{{ dict.value }}
</el-radio-button> </el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
...@@ -18,24 +18,18 @@ ...@@ -18,24 +18,18 @@
size="small" size="small"
:inline="true" :inline="true"
> >
<el-form-item prop="deptName"> <el-form-item prop="status">
<el-select <el-input
v-model="queryParams.configType" v-model="queryParams.deptName"
placeholder="场景分类" placeholder="标准章节关键词"
clearable clearable
> @keyup.enter.native="handleQuery"
<el-option
v-for="dict in dict.type.sys_scene_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item prop="status"> <el-form-item prop="status">
<el-input <el-input
v-model="queryParams.deptName" v-model="queryParams.deptName"
placeholder="请输入关键词" placeholder="标准要求关键词"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -80,25 +74,67 @@ ...@@ -80,25 +74,67 @@
v-loading="loading" v-loading="loading"
style="width: 100%; min-height: 50vh" style="width: 100%; min-height: 50vh"
border border
:scroll-x="'1500px'"
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :data="tableData"
> >
<el-table-column width="100" label="序号" align="center"> <el-table-column width="80" label="序号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标准分类" sortable align="center"> <el-table-column
v-if="queryParams.type == 1"
label="标准分类"
min-width="200"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column label="标准章节" sortable align="center"> <el-table-column label="标准章节" min-width="200" align="center">
</el-table-column>
<el-table-column label="标准要求" min-width="200" align="center">
</el-table-column>
<el-table-column
label="检验结果描述（符合）"
min-width="200"
align="left"
>
</el-table-column>
<el-table-column
label="检验结果描述（不符合）"
min-width="200"
align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="标准要求" sortable align="center"> <el-table-column
v-if="queryParams.type == 2"
label="标准测试方法"
min-width="200"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column label="检验结果描述（符合）" align="left"> <el-table-column
v-if="queryParams.type == 2"
label="对象"
min-width="200"
align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="检验结果描述（不符合）" align="left"> <el-table-column
v-if="queryParams.type == 2"
label="场景"
min-width="200"
align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="更新时间" align="left" sortable prop="createTime"> <el-table-column
v-if="queryParams.type == 1"
label="更新时间"
min-width="200"
align="left"
sortable
prop="createTime"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
...@@ -106,7 +142,9 @@ ...@@ -106,7 +142,9 @@
<el-table-column <el-table-column
label="操作" label="操作"
align="left" align="left"
class-name="small-padding fixed-width" min-width="160"
fixed="right"
class-name="fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -153,12 +191,13 @@ export default { ...@@ -153,12 +191,13 @@ export default {
'yan-dialog': dialog 'yan-dialog': dialog
}, },
mixins: [page], mixins: [page],
dicts: ['sys_scene_type', 'sys_detailed_classification'], dicts: ['sys_detailed_classification'],
data() { data() {
return { return {
listUrl: '/system/role/list', listUrl: '/system/role/list',
showSearch: true, showSearch: true,
tableData: [], tableData: [],
queryParams: { type: 1 },
dialogManger: { dialogManger: {
dialogVisible: false, dialogVisible: false,
refreshList: false, refreshList: false,
...@@ -180,7 +219,18 @@ export default { ...@@ -180,7 +219,18 @@ export default {
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
this.dialogManger.source = {} this.dialogManger.source = {}
}, },
handleDelete() {}, handleDelete(row) {
this.$modal
.confirm('是否确定删除该条标准？', '操作确认')
.then(() => {
// return delNotice(noticeIds)
})
.then(() => {
this.loadData()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
},
handleUpdate(row) { handleUpdate(row) {
this.dialogManger.dialogVisible = true this.dialogManger.dialogVisible = true
this.dialogManger.source = row this.dialogManger.source = row
......
src/views/system/notice/index.vue
View file @ 03002517
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form
:model="queryParams" v-show="showSearch"
ref="queryForm" ref="queryForm"
:model="queryParams"
size="small" size="small"
:inline="true" :inline="true"
v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="公告标题" prop="noticeTitle"> <el-form-item label="公告标题" prop="noticeTitle">
...@@ -46,45 +46,48 @@ ...@@ -46,45 +46,48 @@
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:notice:add']"
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:notice:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:notice:edit']"
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:notice:edit']"
>修改</el-button >修改</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
v-hasPermi="['system:notice:remove']"
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:notice:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
...@@ -156,19 +159,19 @@ ...@@ -156,19 +159,19 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-hasPermi="['system:notice:edit']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:notice:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
v-hasPermi="['system:notice:remove']"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:notice:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>
...@@ -349,7 +352,7 @@ export default { ...@@ -349,7 +352,7 @@ export default {
}) })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm() {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.noticeId !== undefined) { if (this.form.noticeId !== undefined) {
...@@ -373,7 +376,7 @@ export default { ...@@ -373,7 +376,7 @@ export default {
const noticeIds = row.noticeId || this.ids const noticeIds = row.noticeId || this.ids
this.$modal this.$modal
.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？') .confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？')
.then(function () { .then(() => {
return delNotice(noticeIds) return delNotice(noticeIds)
}) })
.then(() => { .then(() => {
......
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