xymp
/
frontend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

登录优化

Browse Source
master
fanluyan 2 years ago
parent 4f8893b1c2
commit 2d7b82461f
3 changed files with 91 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
src/views/Login.vue
Unescape Escape View File

@ -150,7 +150,7 @@ export default {
background: rgba(0, 0, 0, 0.6); background: rgba(0, 0, 0, 0.6);
} }
.loginFilter { .loginFilter {
width: 1000px; width: 800px;
height: 450px; height: 450px;
background: #fff; background: #fff;
box-shadow: 0px 4px 12px 0px rgba(51, 51, 51, 0.15); box-shadow: 0px 4px 12px 0px rgba(51, 51, 51, 0.15);

108
src/views/devicePhotoSchedule/index.vue
Unescape Escape View File

@ -2,11 +2,23 @@
<div class="deviceInformation"> <div class="deviceInformation">
<div class="deviceBox"> <div class="deviceBox">
<div class="deviceBtnGroup"> <div class="deviceBtnGroup">
<el-button type="primary" icon="el-icon-plus" @click.native.stop="handleAdddevice()" >新增</el-button> <el-button
type="primary"
icon="el-icon-plus"
@click.native.stop="handleAdddevice()"
>新增</el-button
>
</div> </div>
<div class="deviceTable"> <div class="deviceTable">
<el-table ref="multipleTable" :data="deviceTableData" tooltip-effect="dark" style="width: 100%" <el-table
height="calc(100% - 40px)" @selection-change="handleSelectionChange" @row-click="handleRowClick"> ref="multipleTable"
:data="deviceTableData"
tooltip-effect="dark"
style="width: 100%"
height="calc(100% - 40px)"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<!-- <el-table-column type="index" width="55"> </el-table-column> <!-- <el-table-column type="index" width="55"> </el-table-column>
<el-table-column type="selection" width="55"> </el-table-column> --> <el-table-column type="selection" width="55"> </el-table-column> -->
<el-table-column label="单位" show-overflow-tooltip> <el-table-column label="单位" show-overflow-tooltip>
@ -15,40 +27,76 @@
<el-table-column label="时间表类型" show-overflow-tooltip> <el-table-column label="时间表类型" show-overflow-tooltip>
<template>时间表类型</template> <template>时间表类型</template>
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="开始时间" show-overflow-tooltip ></el-table-column> <el-table-column
<el-table-column prop="endTime" label="结束时间" show-overflow-tooltip ></el-table-column> prop="startTime"
<el-table-column prop="span" label="间隔（分）" show-overflow-tooltip></el-table-column> label="开始时间"
<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column> show-overflow-tooltip
></el-table-column>
<el-table-column
prop="endTime"
label="结束时间"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="span"
label="间隔（分）"
show-overflow-tooltip
></el-table-column>
<el-table-column
prop="remark"
label="备注"
show-overflow-tooltip
></el-table-column>
<el-table-column fixed="right" label="操作" width="200"> <el-table-column fixed="right" label="操作" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click.native.stop="handleResive(scope.row)" type="text" >修改</el-button> <el-button
<el-button type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)">删除</el-button> @click.native.stop="handleResive(scope.row)"
<el-button type="text" @click.native.stop="handleSet(scope.row)">设置</el-button> type="text"
>修改</el-button
>
<el-button
type="text"
class="deleteText"
@click.native.stop="handleDelete(scope.row)"
>删除</el-button
>
<el-button type="text" @click.native.stop="handleSet(scope.row)"
>设置</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pageNation"> <div class="pageNation">
<el-pagination @current-change="handleCurrentChange" :current-page="page" :page-size="pageSize" <el-pagination
layout=" prev, pager, next, jumper,total" :total="total" background > @current-change="handleCurrentChange"
:current-page="page"
:page-size="pageSize"
layout=" prev, pager, next, jumper,total"
:total="total"
background
>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
<!-- 新增时间表 --> <!-- 新增时间表 -->
<adddeviceDialog :title="title" ref="adddeviceDialogref" ></adddeviceDialog> <adddeviceDialog :title="title" ref="adddeviceDialogref"></adddeviceDialog>
<!-- 设置时间表 --> <!-- 设置时间表 -->
<setdevice ref="setdeviceDialogref" ></setdevice> <setdevice ref="setdeviceDialogref"></setdevice>
</div> </div>
</template> </template>
<script> <script>
import { getScheduleRulelListJoggle,deleteScheduleRulel } from "@/utils/api/index"; import {
getScheduleRulelListJoggle,
deleteScheduleRulel,
} from "@/utils/api/index";
import adddeviceDialog from "./components/adddeviceDialog.vue"; import adddeviceDialog from "./components/adddeviceDialog.vue";
import setdevice from './components/setdevice.vue'; import setdevice from "./components/setdevice.vue";
export default { export default {
components: { components: {
adddeviceDialog, adddeviceDialog,
setdevice setdevice,
}, },
data() { data() {
return { return {
@ -68,11 +116,11 @@ export default {
deviceList() { deviceList() {
getScheduleRulelListJoggle({ getScheduleRulelListJoggle({
pageindex: this.page, pageindex: this.page,
pagesize: this.pageSize pagesize: this.pageSize,
}) })
.then((res) => { .then((res) => {
this.deviceTableData = res.data.list; this.deviceTableData = res.data.list;
this.total = res.data.total this.total = res.data.total;
}) })
.catch((err) => {}); .catch((err) => {});
}, },
@ -88,26 +136,26 @@ export default {
// 新建 // 新建
handleAdddevice() { handleAdddevice() {
this.title = "新增"; this.title = "新增";
this.$refs.adddeviceDialogref.display() this.$refs.adddeviceDialogref.display();
this.$refs.adddeviceDialogref.getdataform(null) this.$refs.adddeviceDialogref.getdataform(null);
}, },
//修改 //修改
handleResive(data) { handleResive(data) {
this.title = "修改"; this.title = "修改";
this.$refs.adddeviceDialogref.display() this.$refs.adddeviceDialogref.display();
this.$refs.adddeviceDialogref.getdataform(data) this.$refs.adddeviceDialogref.getdataform(data);
}, },
//设置 //设置
handleSet(data){ handleSet(data) {
this.$refs.setdeviceDialogref.display() this.$refs.setdeviceDialogref.display();
this.$refs.setdeviceDialogref.getdataform(data) this.$refs.setdeviceDialogref.getdataform(data);
}, },
//删除数据 //删除数据
handleDelete(data) { handleDelete(data) {
let deleteArr=[] let deleteArr = [];
deleteArr.push({ deleteArr.push({
id: data.id, id: data.id,
}); });
@ -131,7 +179,7 @@ export default {
this.page = val; this.page = val;
this.deviceList(); this.deviceList();
}, },
} },
}; };
</script> </script>
<style lang="less"> <style lang="less">
@ -154,8 +202,8 @@ export default {
} }
.deviceTable { .deviceTable {
padding: 16px 8px 0 8px; margin-top: 16px;
height: calc(100% - 80px); height: calc(100% - 48px);
//background: #fcc; //background: #fcc;
} }
} }

15
src/views/management/monitoringEquipment/photographicDevice/index.vue
Unescape Escape View File

@ -18,8 +18,15 @@
> >
<!-- <el-table-column type="index" width="55"> </el-table-column> <!-- <el-table-column type="index" width="55"> </el-table-column>
<el-table-column type="selection" width="55"> </el-table-column> --> <el-table-column type="selection" width="55"> </el-table-column> -->
<el-table-column prop="displayName" label="显示名"> </el-table-column> <el-table-column
<el-table-column prop="equipName" label="装置名称"> </el-table-column> prop="displayName"
label="显示名"
show-overflow-tooltip
width="160px"
>
</el-table-column>
<el-table-column prop="equipName" label="装置名称" width="140px">
</el-table-column>
<el-table-column <el-table-column
prop="cmdid" prop="cmdid"
label="图像监测装置ID" label="图像监测装置ID"
@ -74,10 +81,10 @@
label="修改时间" label="修改时间"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:formatter="dateFormat" :formatter="dateFormat"
width="140px" width="100px"
> >
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="200"> <el-table-column fixed="right" label="操作" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click.native.stop="handleRevisePhoto(scope.row)" @click.native.stop="handleRevisePhoto(scope.row)"

Write Preview
Loading…
Cancel
Save