Skip to content

V
video-monitoring
Commit 75a6a33c authored by 罗林杰's avatar 罗林杰
Browse files
Options

修改新增用户界面ui,历史记录查询

parent 4713ed84
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 137 deletions
src/views/employee/index.vue
View file @ 75a6a33c
...@@ -224,39 +224,34 @@ ...@@ -224,39 +224,34 @@
</el-row> </el-row>
<!--新增用户配置对话框 --> <!--新增用户配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class=".el-dialog__wrapper;"> <el-dialog :visible.sync="open" width="1000px" append-to-body>
<div class="form-header"> <template slot="title">
<h3><span class="blue-square"></span> 用户详细信息</h3> <div class="form-header">
<h3>
<span>{{ title }}</span>
</h3>
</div>
</template>
<div style="padding-bottom:25px;font-size:15px">
<span class="blue-square"></span>详情信息
</div> </div>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px" style="height: 250px;">
<!-- <el-row> <el-row >
<el-col :span="12">
<el-form-item label="账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="10px" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
</el-form-item>
</el-col>
</el-row>-->
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="员工姓名" prop="nickName"> <el-form-item label="员工姓名" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入员工姓名" maxlength="30" /> <el-input v-model="form.nickName" placeholder="请输入员工姓名" maxlength="30" style="width: 80%;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="10">
<el-form-item label="手机号码" prop="phonenumber"> <el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" /> <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" style="width: 100%;"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="form.status" placeholder="请选择状态"> <el-select v-model="form.status" placeholder="请选择状态" style="width: 80%;">
<el-option <el-option
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
:key="dict.value" :key="dict.value"
...@@ -266,16 +261,16 @@ ...@@ -266,16 +261,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="10">
<el-form-item label="权重"> <el-form-item label="权重" >
<el-input-number v-model="form.weightNum" controls-position="right" :min="1" ></el-input-number> <el-input-number v-model="form.weightNum" controls-position="right" :min="1" style="width: 100%;" ></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -287,39 +282,34 @@ ...@@ -287,39 +282,34 @@
</el-dialog> </el-dialog>
<!-- 修改用户配置对话框 --> <!-- 修改用户配置对话框 -->
<el-dialog :title="title" :visible.sync="userupdate" width="1000px" append-to-body class=".el-dialog__wrapper;"> <el-dialog :visible.sync="userupdate" width="1000px" append-to-body>
<div class="form-header"> <template slot="title">
<h3><span class="blue-square"></span> 用户详细信息</h3> <div class="form-header">
<h3>
<span>{{ title }}</span>
</h3>
</div>
</template>
<div style="padding-bottom:20px;font-size:15px">
<span class="blue-square"></span>详情信息
</div> </div>
<el-form ref="form" :model="form" :rules="updaterules" label-width="80px"> <el-form ref="form" :model="form" :rules="updaterules" label-width="120px" style="height: 250px;">
<!-- <el-row>
<el-col :span="12">
<el-form-item label="账号" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="10px" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
</el-form-item>
</el-col>
</el-row>-->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="员工姓名" prop="nickName"> <el-form-item label="员工姓名" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" /> <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" style="width: 80%" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="10">
<el-form-item label="手机号码" prop="phonenumber"> <el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" /> <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" style="width: 100%"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="form.status" placeholder="请选择状态"> <el-select v-model="form.status" placeholder="请选择状态" style="width: 80%">
<el-option <el-option
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
:key="dict.value" :key="dict.value"
...@@ -329,71 +319,28 @@ ...@@ -329,71 +319,28 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="10">
<el-form-item label="权重"> <el-form-item label="权重">
<el-input-number v-model="form.weightNum" controls-position="right" :min="0" ></el-input-number> <el-input-number v-model="form.weightNum" controls-position="right" :min="0" style="width: 100%" ></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>-->
<!-- </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
<el-option
v-for="item in postOptions"
:key="item.postId"
:label="item.postName"
:value="item.postId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<el-option
v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>-->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="创建账号"> <el-form-item label="创建账号">
<el-input v-model="form.createBy" maxlength="11" :disabled="form.createBy"></el-input> <el-input v-model="form.createBy" maxlength="11" :disabled="form.createBy" style="width: 80%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="10">
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-input v-model="form.createTime" maxlength="11" :disabled="form.createTime" ></el-input> <el-input v-model="form.createTime" maxlength="11" :disabled="form.createTime" style="width: 100%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -597,6 +544,7 @@ export default { ...@@ -597,6 +544,7 @@ export default {
} }
}, },
created() { created() {
this.form.weightNum = 1;
this.getList(); this.getList();
// this.getDeptTree(); // this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then(response => { this.getConfigKey("sys.user.initPassword").then(response => {
...@@ -660,7 +608,7 @@ export default { ...@@ -660,7 +608,7 @@ export default {
sex: undefined, sex: undefined,
status: "0", status: "0",
remark: undefined, remark: undefined,
weightNum: undefined, weightNum: 1,
postIds: [], postIds: [],
roleIds: [] roleIds: []
}; };
...@@ -873,32 +821,28 @@ export default { ...@@ -873,32 +821,28 @@ export default {
} }
.form-header { .form-header {
text-align: left; display: inline-block;
margin-bottom: 3px; margin-bottom: -15px;
} margin-left: -20px;
/* 为标题下方添加横线 */ width: 1000px;
.el-dialog__header::after {
content: "";
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background-color: #ccc; /* 横线的颜色 */
} }
.form-header h3 { .form-header h3 {
font-size: 15px; font-size: 18px;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
text-decoration: none; text-decoration: none;
margin-left: 20px;
margin-top: 0;
} }
.blue-square { .blue-square {
display: inline-block; display: inline-block;
width: 5px; width: 5px;
height: 12px; height: 18px;
background-color: #0D8EEE; /* 蓝色 */ background-color: #0D8EEE; /* 蓝色 */
margin-right: 1px; /* 与文字之间的间距 */ margin-right: 6px; /* 与文字之间的间距 */
vertical-align: middle;
} }
.status-enabled { .status-enabled {
color: green; /* 已启用状态的颜色 */ color: green; /* 已启用状态的颜色 */
...@@ -908,8 +852,6 @@ export default { ...@@ -908,8 +852,6 @@ export default {
color: red; /* 已禁用状态的颜色 */ color: red; /* 已禁用状态的颜色 */
} }
</style> </style>
<!-- 按钮靠右对齐 -->
<style scoped> <style scoped>
/* 使用 Flexbox */ /* 使用 Flexbox */
.el-dialog__wrapper { .el-dialog__wrapper {
......
src/views/history/index.vue
View file @ 75a6a33c
...@@ -59,34 +59,15 @@ ...@@ -59,34 +59,15 @@
<el-date-picker <el-date-picker
placeholder="请选择开始时间" placeholder="请选择开始时间"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="queryParams.monitoringStarttime" type="daterange"
type="date" v-model="queryParams.daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="handleDateChange">
> >
</el-date-picker> </el-date-picker>
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.monitorTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择监控时间">-->
<!-- </el-date-picker>-->
</el-form-item> </el-form-item>
<el-form-item>
<el-date-picker
placeholder="请选择结束时间"
value-format="yyyy-MM-dd"
v-model="queryParams.monitoringFinallytime"
type="date"
>
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="监控状态" prop="monitorState">-->
<!-- <el-input-->
<!-- v-model="queryParams.monitorState"-->
<!-- placeholder="请输入监控状态"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<div style="margin-left: 90%"> <div style="margin-left: 90%">
<el-form-item> <el-form-item>
<el-button <el-button
...@@ -262,6 +243,7 @@ export default { ...@@ -262,6 +243,7 @@ export default {
monitoringFinallytime: "", monitoringFinallytime: "",
monitorState: "", monitorState: "",
monitorTime: "", monitorTime: "",
daterange: [],
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
...@@ -387,6 +369,19 @@ export default { ...@@ -387,6 +369,19 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
// 解构 daterange 为开始和结束日期
const [startDate, endDate] = this.queryParams.daterange || [];
// 如果有选择日期范围，则设置到查询参数中
if (startDate && endDate) {
this.queryParams.monitoringStarttime = `${startDate} 00:00`;
this.queryParams.monitoringFinallytime = `${endDate} 23:59`;
} else {
// 清除时间范围参数
this.queryParams.monitoringStarttime = '';
this.queryParams.monitoringFinallytime = '';
}
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
......
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