zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页样式调整

This commit is contained in:
曹前明 2022-07-18 17:08:13 +08:00
parent eccf3892f9
commit 5b9b8b72dc
7 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/am/audio.vue
View File

@ -39,7 +39,7 @@
prop="name" prop="name"
min-width="150" min-width="150"
></el-table-column> ></el-table-column>
<el-table-column label="音量" prop="extra" min-width="100"> <el-table-column label="音量" prop="extra" min-width="40">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.extra && scope.row.extra.player">{{ <span v-if="scope.row.extra && scope.row.extra.player">{{
scope.row.extra.player.EnvVolume scope.row.extra.player.EnvVolume
@ -51,7 +51,7 @@
<span v-if="scope.row.extra">{{ scope.row.extra.ip }}</span> <span v-if="scope.row.extra">{{ scope.row.extra.ip }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="在线状态" prop="extra" min-width="90"> <el-table-column label="在线状态" prop="extra" min-width="40">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.extra"> <span v-if="scope.row.extra">
<el-tag v-if="scope.row.extra.online">在线</el-tag> <el-tag v-if="scope.row.extra.online">在线</el-tag>
@ -62,15 +62,10 @@
<!--<el-table-column label="位置" prop="count_people" min-width="90"></el-table-column>--> <!--<el-table-column label="位置" prop="count_people" min-width="90"></el-table-column>-->
<el-table-column <el-table-column
label="所在区域" label="所在区域"
prop="create_time" prop="my_info.area_name"
min-width="180" min-width="100"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column label="操作" fixed="right" align="center" width="180">
label="覆盖区域"
prop="create_time"
width="160"
></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="160">
<template #default="scope"> <template #default="scope">
<el-button-group> <el-button-group>
<el-button <el-button

2
src/views/am/blt.vue
View File

@ -64,7 +64,7 @@
<span v-if="scope.row.employee">{{scope.row.employee_.name}}</span> <span v-if="scope.row.employee">{{scope.row.employee_.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="160"> <el-table-column label="操作" fixed="right" align="center" width="180">
<template #default="scope"> <template #default="scope">
<el-button-group> <el-button-group>
<el-button <el-button

7
src/views/am/monitor.vue
View File

@ -71,12 +71,17 @@
<span v-else><el-tag type="success">在线</el-tag></span> <span v-else><el-tag type="success">在线</el-tag></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="所在区域"
prop="my_info.area_name"
min-width="100"
></el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
prop="createTime" prop="createTime"
min-width="160" min-width="160"
></el-table-column> ></el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="260"> <el-table-column label="操作" fixed="right" align="center" width="180">
<template #default="scope"> <template #default="scope">
<el-button-group> <el-button-group>
<el-button <el-button

111
src/views/home/widgets/components/eventlist.vue
View File

@ -1,32 +1,33 @@
<template> <template>
<el-row> <el-row :gutter="10">
<el-col :md="4" :sm="24" style="padding-left: 7.5px;padding-right: 7.5px"> <el-col :md="6" :sm="24">
<el-card shadow="hover" style="height:438px;" header="工单待办"> <el-card shadow="hover" style="height: 360px" header="工单待办">
<div class="welcome" v-for="item in dutyAgg" :key="item.workflow"> <div class="welcome" v-for="item in dutyAgg" :key="item.workflow">
<div style="width:33%;float:left"> <div style="width: 33%; float: left">
<div style="margin: 0px 20px 12px 40px;"> <div style="margin: 0px 20px 12px 40px">
<el-badge :value="item.count" class="item"> <el-badge :value="item.count" class="item">
<el-button <el-button
icon="el-icon-document-copy" icon="el-icon-document-copy"
type="primary" type="primary"
size="small" size="small"
></el-button> ></el-button>
</el-badge>
</el-badge> </div>
</div> <div style="margin: 0px 20px 12px 40px">
<div style="margin: 0px 20px 12px 40px"> <span>{{ item.workflow__name }}</span>
<span>{{item.workflow__name}}</span> </div>
</div> </div>
</div> </div>
</div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :md="10" :sm="24" style="padding-left: 7.5px;padding-right: 7.5px; <el-col :md="10" :sm="24">
">
<el-card shadow="hover" header="今日事件"> <el-card shadow="hover" header="今日事件">
<el-button style="float: right; padding: 3px;margin-top: -44px;" link @click="moreEvent">更多</el-button> <template #header>
<div class="welcome"> <div class="card-header">
<span>今日事件</span>
<el-button @click="moreEvent" type="primary" text>更多</el-button>
</div>
</template>
<scTable <scTable
ref="table" ref="table"
:apiObj="apiObj" :apiObj="apiObj"
@ -34,8 +35,7 @@
row-key="id" row-key="id"
fit fit
stripe stripe
hideDo hideDo
> >
<el-table-column <el-table-column
label="#" label="#"
@ -101,24 +101,16 @@
prop="create_time" prop="create_time"
></el-table-column> ></el-table-column>
<el-table-column <!-- <el-table-column
label="处理人" label="处理人"
prop="handle_user_name" prop="handle_user_name"
></el-table-column> ></el-table-column> -->
</scTable> </scTable>
</div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :md="10" :sm="24" style=" <el-col :md="8" :sm="24">
padding-left: 7.5px;"> <el-card shadow="hover" header="今日事件统计">
<el-card header="今日事件统计"> <scEcharts height="360px" :option="option3"></scEcharts>
<scEcharts
height="360px"
:option="option3"
></scEcharts>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
@ -136,33 +128,34 @@ export default {
}, },
data() { data() {
return { return {
dutyAgg:[], dutyAgg: [],
params: { params: {
page: 1, page: 1,
page_size: 20, page_size: 20,
start_create: "" start_create: "",
}, },
apiObj: null, apiObj: null,
postOptions: [], postOptions: [],
option3:null, option3: null,
operationnumber: null, operationnumber: null,
rpjnumber:null, rpjnumber: null,
visitnumber:null visitnumber: null,
}; };
}, },
created() { created() {
var craeteTime=this.$TOOL.dateFormat( var craeteTime = this.$TOOL.dateFormat(
new Date().toLocaleDateString(), new Date().toLocaleDateString(),
"yyyy-MM-dd" "yyyy-MM-dd"
); );
this.postOptions = []; this.postOptions = [];
this.$API.ecm.event.cateAgg.req({ completed: false,start_create:craeteTime }).then((res) => { this.$API.ecm.event.cateAgg
res.details.forEach((itemI, indexI) => { .req({ completed: false, start_create: craeteTime })
this.postOptions.push({ value: itemI.count, name: itemI.cate__name }); .then((res) => {
res.details.forEach((itemI, indexI) => {
this.postOptions.push({ value: itemI.count, name: itemI.cate__name });
});
}); });
});
this.option3 = { this.option3 = {
title: {}, title: {},
tooltip: { tooltip: {
@ -182,24 +175,21 @@ export default {
this.params.start_create = craeteTime; this.params.start_create = craeteTime;
this.apiObj = this.$API.ecm.event.list; this.apiObj = this.$API.ecm.event.list;
this.getdutyAgg(); this.getdutyAgg();
}, },
methods: { methods: {
moreEvent(){ moreEvent() {
this.$router.push({ this.$router.push({
name: "event", name: "event",
query: { query: {},
});
},
});
}, },
//工单待办 //工单待办
async getdutyAgg() { async getdutyAgg() {
let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 }); let res = await this.$API.wf.ticket.dutyAgg.req({ page: 0 });
this.dutyAgg = res.details; this.dutyAgg = res.details;
}, },
}, },
}; };
</script> </script>
@ -258,4 +248,9 @@ export default {
text-align: center; text-align: center;
margin: 40px 0 20px 0; margin: 40px 0 20px 0;
} }
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
}
</style> </style>

23
src/views/home/widgets/components/ticket.vue
View File

@ -1,8 +1,7 @@
<template> <template>
<el-row> <el-row :gutter="10">
<el-col :md="12" :sm="24">
<el-col :md="12" :sm="24" style="padding-right: 7.5px; padding-left: 7.5px"> <el-card shadow="hover" header="进行项目">
<el-card header="进行项目">
<div style="width:33%;float:left"> <div style="width:33%;float:left">
<div style="margin: 0px 20px 12px 40px;"> <div style="margin: 0px 20px 12px 40px;">
<el-badge :value="operationnumber" class="item"> <el-badge :value="operationnumber" class="item">
@ -47,13 +46,19 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :md="12" :sm="24" style="padding-left: 7.5px"> <el-col :md="12" :sm="24">
<el-card> <el-card shadow="hover">
<template #header>
<div class="card-header">
<span>人员统计</span>
<el-button class="button" text>在厂</el-button>
<el-button class="button" text>有卡</el-button>
</div>
</template>
<div class="screen-cockpits"> <div class="screen-cockpits">
<div class="cockpit-count"> <div class="cockpit-count">
<div class="divider"></div> <!-- <div class="divider"></div>
<div class="simple-title"> <div class="simple-title">
<span>人员统计</span>
<div class="countTypeWrap"> <div class="countTypeWrap">
<span <span
:class="{ activeCount: countIndex === '1' }" :class="{ activeCount: countIndex === '1' }"
@ -67,7 +72,7 @@
>在厂</span >在厂</span
> >
</div> </div>
</div> </div> -->
<div class="count-list"> <div class="count-list">
<div class="count-list-item"> <div class="count-list-item">
<div class="item-img item-img2"></div> <div class="item-img item-img2"></div>

4
src/views/home/widgets/index.vue
View File

@ -13,7 +13,7 @@
<div v-if="nowCompsList.length<=0" class="no-widgets"> <div v-if="nowCompsList.length<=0" class="no-widgets">
<el-empty image="img/no-widgets.svg" description="没有部件啦" :image-size="280"></el-empty> <el-empty image="img/no-widgets.svg" description="没有部件啦" :image-size="280"></el-empty>
</div> </div>
<el-row :gutter="15"> <el-row :gutter="10">
<el-col v-for="(item, index) in grid.layout" v-bind:key="index" :md="item" :xs="24"> <el-col v-for="(item, index) in grid.layout" v-bind:key="index" :md="item" :xs="24">
<draggable v-model="grid.copmsList[index]" animation="200" handle=".customize-overlay" group="people" item-key="com" dragClass="aaaaa" force-fallback fallbackOnBody class="draggable-box"> <draggable v-model="grid.copmsList[index]" animation="200" handle=".customize-overlay" group="people" item-key="com" dragClass="aaaaa" force-fallback fallbackOnBody class="draggable-box">
<template #item="{ element }"> <template #item="{ element }">
@ -193,7 +193,7 @@
<style scoped lang="scss"> <style scoped lang="scss">
.widgets-home {display: flex;flex-direction: row;flex: 1;height: 100%;} .widgets-home {display: flex;flex-direction: row;flex: 1;height: 100%;}
.widgets-content {flex: 1;overflow: auto;overflow-x:hidden;padding:15px;} .widgets-content {flex: 1;overflow: auto;overflow-x:hidden;padding:8px;}
.widgets-aside {width: 360px;background: #fff;box-shadow: 0 0 10px rgba(0,0,0,.1);position: relative;overflow: auto;} .widgets-aside {width: 360px;background: #fff;box-shadow: 0 0 10px rgba(0,0,0,.1);position: relative;overflow: auto;}
.widgets-aside-title {font-size: 14px;display: flex;align-items: center;justify-content: center;} .widgets-aside-title {font-size: 14px;display: flex;align-items: center;justify-content: center;}
.widgets-aside-title i {margin-right: 10px;font-size: 18px;} .widgets-aside-title i {margin-right: 10px;font-size: 18px;}

2
src/views/ops/menu.vue
View File

@ -223,7 +223,7 @@ export default {
//编辑 //编辑
editMenu(row) { editMenu(row) {
this.type = "edit"; this.type = "edit";
this.addForm = row; this.addForm = Object.assign({}, row);
this.limitedVisible = true; this.limitedVisible = true;
}, },