bug修改,新增设备,模板等模块

prod
anthonywj 2 years ago
parent 6f44066cf1
commit ba3683445e

@ -124,7 +124,7 @@
margin-left: 1px;
}
td {
padding: 0;
padding: 0px;
}
tr.current-row > td,
.el-table__body tr:hover > td {

@ -94,8 +94,8 @@
</el-col>
<el-col :span="11">
<el-form-item prop="status" label="启用状态">
<el-radio v-model="formData.status" :label="0"></el-radio>
<el-radio v-model="formData.status" :label="1"></el-radio>
<el-radio v-model="formData.status" :label="0"></el-radio>
</el-form-item>
</el-col>
</el-row>

@ -109,7 +109,7 @@
<el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true"/>
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true"/>
<el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true"/>
<el-table-column label="操作系统" align="center" prop="os"/>
<el-table-column label="操作系统" align="center" prop="os" show-overflow-tooltip/>
<el-table-column label="登录状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>

@ -106,10 +106,9 @@
<template slot-scope="scope">
<el-button
type="text"
icon="el-icon-view"
@click="handleView(scope.row,scope.index)"
v-hasPermi="['monitor:operlog:query']"
>
>
</el-button>
</template>
</el-table-column>
@ -123,7 +122,7 @@
/>
<!-- 操作日志详细 -->
<el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
<el-dialog title="操作日志-详情" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">

@ -209,7 +209,6 @@
<el-table v-loading="userloading" :data="userlist" style="width: 100%" border
row-key="id"
@current-change="handleDeptChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
@ -277,7 +276,6 @@
</el-form>
<el-table v-loading="invLoading" :data="invlist" style="width: 100%" border
row-key="id"
@current-change="handleDeptChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
@ -290,7 +288,7 @@
></el-table-column>
<el-table-column label="备注" prop="remark">
</el-table-column>
<!-- <el-table-column label="操作">-->
<!-- <el-table-column label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->

@ -17,7 +17,8 @@
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置</el-button>
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询
</el-button
@ -92,7 +93,6 @@
<template slot-scope="scope">
<el-button
type="text"
size="small"
v-if="scope.row.isCheck !== 1"
@click.native.stop="checkDialog(scope.row)"
>审核
@ -101,14 +101,12 @@
<el-button
type="text"
size="small"
@click.native.stop="editDialog(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
>删除
</el-button

@ -1,309 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="岗位编码" prop="postCode">
<el-input
v-model="queryParams.postCode"
placeholder="请输入岗位编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="岗位名称" prop="postName">
<el-input
v-model="queryParams.postName"
placeholder="请输入岗位名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:post:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:post:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:post:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:post:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="岗位编号" align="center" prop="postId" />
<el-table-column label="岗位编码" align="center" prop="postCode" />
<el-table-column label="岗位名称" align="center" prop="postName" />
<el-table-column label="岗位排序" align="center" prop="postSort" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:post:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:post:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改岗位对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="岗位名称" prop="postName">
<el-input v-model="form.postName" placeholder="请输入岗位名称" />
</el-form-item>
<el-form-item label="岗位编码" prop="postCode">
<el-input v-model="form.postCode" placeholder="请输入编码名称" />
</el-form-item>
<el-form-item label="岗位顺序" prop="postSort">
<el-input-number v-model="form.postSort" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="岗位状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listPost, getPost, delPost, addPost, updatePost } from "@/api/system/post";
export default {
name: "Post",
dicts: ['sys_normal_disable'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
postList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
postCode: undefined,
postName: undefined,
status: undefined
},
//
form: {},
//
rules: {
postName: [
{ required: true, message: "岗位名称不能为空", trigger: "blur" }
],
postCode: [
{ required: true, message: "岗位编码不能为空", trigger: "blur" }
],
postSort: [
{ required: true, message: "岗位顺序不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
/** 查询岗位列表 */
getList() {
this.loading = true;
listPost(this.queryParams).then(response => {
this.postList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
postId: undefined,
postCode: undefined,
postName: undefined,
postSort: 0,
status: "0",
remark: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.postId)
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加岗位";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const postId = row.postId || this.ids
getPost(postId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改岗位";
});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.postId != undefined) {
updatePost(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addPost(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const postIds = row.postId || this.ids;
this.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?').then(function() {
return delPost(postIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/post/export', {
...this.queryParams
}, `post_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -1,6 +1,5 @@
<template>
<div>
<el-card class="el-card">
<el-form
:inline="true"
@ -28,13 +27,12 @@
{{ moduleTypeMap[scope.row.templateType] }}
</template>
</el-table-column>
<el-table-column label="功能名称" prop="name" width="250"></el-table-column>
<el-table-column label="功能名称" prop="name"></el-table-column>
<el-table-column label="模板名称" width="250">
<template slot-scope="scope">
<p v-if="scope.row.templateName === null">
<el-button
type="primary"
size="mini"
type="text"
:disabled="scope.row.templateType == 2"
@click.native.stop="moduleSelectTemplate(scope.row)"
>选择模板
@ -43,9 +41,8 @@
</p>
<p v-if="scope.row.templateName !== null">
<el-button
type="primary"
type="text"
:disabled="scope.row.templateType == 2"
size="mini"
@click.native.stop="moduleSelectTemplate(scope.row)"
>{{ scope.row.templateName }}
</el-button
@ -58,14 +55,12 @@
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="showFieldExpain(scope.row)"
>字段说明
</el-button
>
<el-button
type="text"
size="small"
@click="jumpDl(scope.row)"
>初始模板下载
</el-button
@ -187,7 +182,7 @@
:limit.sync="query.limit"
@pagination="getList"
/>
<div style="margin-top: 18px ; color: #F71616;">
<div style="margin-top: 18px ; color: #F71616; font-size: 13px">
<span>重要提示本页功能仅供技术提供方修改&nbsp;</span>
</div>
</el-card>
@ -202,8 +197,6 @@
top="5vh"
>
<el-form :model="formData" :rules="formRules" ref="dataForm">
<el-form-item label="模板名称" prop="name">
<el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
</el-form-item>

@ -45,34 +45,28 @@
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="handleForm(scope.$index, scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.native="deleteTemplate(scope.row)"
>删除
</el-button
>
<el-button
type="text"
size="small"
@click="jumpDl(scope.row)"
>模板下载
</el-button
>
<el-button
type="text"
size="small"
@click="previewPdf(scope.row)"
>预览
</el-button
>
</template>
</el-table-column>
</el-table>
@ -94,17 +88,19 @@
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="60%"
width="45%"
top="5vh"
>
<el-form :model="formData" :rules="formRules" ref="dataForm">
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="11" class="el-col" type="flex">
<el-col :span="22" class="el-col" type="flex">
<el-form-item prop="name" label="模板名称:" label-width="100px">
<el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col" type="flex">
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="22" class="el-col" type="flex">
<el-form-item prop="module" label="模板类型:" label-width="100px">
<el-select v-model="formData.module" placeholder="模板类型" style="width: 100%">
<el-option label="标签" value="0"></el-option>
@ -115,15 +111,9 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="22" class="el-col" type="flex">
<el-form-item label="备注:" label-width="100px">
<el-input type="textarea" v-model="formData.remark" rows=3></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="22">
<el-form-item label="jasper模板:" label-width="100px" prop="jasper">
<el-upload
class="upload-demo"
@ -151,8 +141,9 @@
</el-upload>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row :gutter="20">
<el-col :span="22">
<el-form-item label="jrxml模板:" prop="jrxml" label-width="100px">
<el-upload
class="upload-demo"
@ -176,6 +167,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="22" class="el-col" type="flex">
<el-form-item label="备注:" label-width="100px">
<el-input type="textarea" v-model="formData.remark" rows=3></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm">取消</el-button>

Loading…
Cancel
Save