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

Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

This commit is contained in:
曹前明 2022-10-26 22:34:35 +08:00
parent 6de65e3d78 8455524a18
commit 4322fb1108
7 changed files with 100 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
src/components/scTable/index.vue
View File

@ -8,43 +8,18 @@
-->
<template>
<div
class="scTable"
:style="{ height: _height }"
ref="scTableMain"
v-loading="loading"
>
<div class="scTable" :style="{ height: _height }" ref="scTableMain" v-loading="loading">
<div class="scTable-table" :style="{ height: _table_height }">
<el-table
v-bind="$attrs"
:data="tableData"
:row-key="rowKey"
:key="toggleIndex"
ref="scTable"
:height="height == 'auto' ? null : '100%'"
:size="config.size"
:border="config.border"
:stripe="config.stripe"
:summary-method="remoteSummary ? remoteSummaryMethod : summaryMethod"
@sort-change="sortChange"
@filter-change="filterChange"
>
<el-table v-bind="$attrs" :data="tableData" :row-key="rowKey" :key="toggleIndex" ref="scTable"
:height="height == 'auto' ? null : '100%'" :size="config.size" :border="config.border" :stripe="config.stripe"
:summary-method="remoteSummary ? remoteSummaryMethod : summaryMethod" @sort-change="sortChange"
@filter-change="filterChange">
<slot></slot>
<template v-for="(item, index) in userColumn" :key="index">
<el-table-column
v-if="!item.hide"
:column-key="item.prop"
:label="item.label"
:prop="item.prop"
:width="item.width"
:sortable="item.sortable"
:fixed="item.fixed"
:filters="item.filters"
:filter-method="
<el-table-column v-if="!item.hide" :column-key="item.prop" :label="item.label" :prop="item.prop"
:width="item.width" :sortable="item.sortable" :fixed="item.fixed" :filters="item.filters" :filter-method="
remoteFilter || !item.filters ? null : filterHandler
"
:show-overflow-tooltip="item.showOverflowTooltip"
>
" :show-overflow-tooltip="item.showOverflowTooltip">
<template #default="scope">
<slot :name="item.prop" v-bind="scope">
{{ scope.row[item.prop] }}
@ -60,92 +35,37 @@
</div>
<div class="scTable-page" v-if="!hidePagination || !hideDo">
<div class="scTable-pagination">
<el-pagination
v-if="!hidePagination"
background
:small="true"
:layout="paginationLayout"
:total="total"
:page-size="scPageSize"
:page-sizes="pageSizes"
v-model:currentPage="currentPage"
@current-change="paginationChange"
@update:page-size="pageSizeChange"
></el-pagination>
<el-pagination v-if="!hidePagination" background :small="true" :layout="paginationLayout" :total="total"
:page-size="scPageSize" :page-sizes="pageSizes" v-model:currentPage="currentPage"
@current-change="paginationChange" @update:page-size="pageSizeChange"></el-pagination>
</div>
<div class="scTable-do" v-if="!hideDo">
<el-button
v-if="!hideRefresh"
@click="refresh"
icon="el-icon-refresh"
circle
style="margin-left: 15px"
></el-button>
<el-button
v-if="!hideRefresh"
@click="reload"
icon="el-icon-refresh-right"
circle
style="margin-left: 15px"
></el-button>
<el-popover
v-if="column"
placement="top"
title="列设置"
:width="500"
trigger="click"
:hide-after="0"
@show="customColumnShow = true"
@after-leave="customColumnShow = false"
>
<el-button v-if="!hideRefresh" @click="refresh" icon="el-icon-refresh" circle style="margin-left: 15px">
</el-button>
<el-button v-if="!hideRefresh" @click="reload" icon="el-icon-refresh-right" circle style="margin-left: 15px">
</el-button>
<el-popover v-if="column" placement="top" title="列设置" :width="500" trigger="click" :hide-after="0"
@show="customColumnShow = true" @after-leave="customColumnShow = false">
<template #reference>
<el-button
icon="el-icon-set-up"
circle
style="margin-left: 15px"
></el-button>
<el-button icon="el-icon-set-up" circle style="margin-left: 15px"></el-button>
</template>
<columnSetting
v-if="customColumnShow"
ref="columnSetting"
@userChange="columnSettingChange"
@save="columnSettingSave"
@back="columnSettingBack"
:column="userColumn"
></columnSetting>
<columnSetting v-if="customColumnShow" ref="columnSetting" @userChange="columnSettingChange"
@save="columnSettingSave" @back="columnSettingBack" :column="userColumn"></columnSetting>
</el-popover>
<el-popover
v-if="!hideSetting"
placement="top"
title="表格设置"
:width="400"
trigger="click"
:hide-after="0"
>
<el-popover v-if="!hideSetting" placement="top" title="表格设置" :width="400" trigger="click" :hide-after="0">
<template #reference>
<el-button
icon="el-icon-setting"
circle
style="margin-left: 15px"
></el-button>
<el-button icon="el-icon-setting" circle style="margin-left: 15px"></el-button>
</template>
<el-form label-width="80px" label-position="left">
<el-form-item label="表格尺寸">
<el-radio-group
v-model="config.size"
size="small"
@change="configSizeChange"
>
<el-radio-group v-model="config.size" size="small" @change="configSizeChange">
<el-radio-button label="large">大</el-radio-button>
<el-radio-button label="default">正常</el-radio-button>
<el-radio-button label="small">小</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="样式">
<el-checkbox
v-model="config.border"
label="纵向边框"
></el-checkbox>
<el-checkbox v-model="config.border" label="纵向边框"></el-checkbox>
<el-checkbox v-model="config.stripe" label="斑马纹"></el-checkbox>
</el-form-item>
</el-form>
@ -166,9 +86,9 @@ export default {
},
props: {
tableName: { type: String, default: "" },
apiObj: { type: Object, default: () => {} },
apiObj: { type: Object, default: () => { } },
params: { type: Object, default: () => ({}) },
data: { type: Object, default: () => {} },
data: { type: Object, default: () => { } },
height: { type: [String, Number], default: "100%" },
size: { type: String, default: "default" },
border: { type: Boolean, default: false },
@ -182,7 +102,7 @@ export default {
parseData: { type: Function, default: config.parseData },
rowKey: { type: String, default: "" },
summaryMethod: { type: Function, default: null },
column: { type: Object, default: () => {} },
column: { type: Object, default: () => { } },
remoteSort: { type: Boolean, default: false },
remoteFilter: { type: Boolean, default: false },
remoteSummary: { type: Boolean, default: false },
@ -287,6 +207,7 @@ export default {
}
Object.assign(reqData, this.tableParams);
try {
if (this.apiObj) {
var res = await this.apiObj.req(reqData);
var response = this.parseData(res);
if (response.total === 0) {
@ -306,15 +227,16 @@ export default {
this.total = response.total || 0;
this.summary = response.summary || {};
this.loading = false;
if(!this.hidePagination){
this.$refs.scTable.setScrollTop(0);
}
// if(!this.hidePagination){
// this.$refs.scTable.setScrollTop(0);
// }
this.$emit("dataChange", res, this.tableData);
}
} catch (error) {
this.loading = false;
if(error.response && error.response.data){
if (error.response && error.response.data) {
this.emptyText = error.response.data.err_msg;
}else{
} else {
this.emptyText = error.statusText || "数据格式错误";
}
return false;
@ -550,11 +472,12 @@ export default {
</script>
<style scoped>
.scTable {
}
.scTable {}
.scTable-table {
height: calc(100% - 50px);
}
.scTable-page {
height: 50px;
display: flex;
@ -562,16 +485,20 @@ export default {
justify-content: space-between;
padding: 0 15px;
}
.scTable-do {
white-space: nowrap;
}
.scTable:deep(.el-table__footer) .cell {
font-weight: bold;
}
.scTable:deep(.el-table__body-wrapper) .el-scrollbar__bar.is-horizontal {
height: 12px;
border-radius: 12px;
}
.scTable:deep(.el-table__body-wrapper) .el-scrollbar__bar.is-vertical {
width: 12px;
border-radius: 12px;

32
src/views/bigScreen/index.vue
View File

@ -81,6 +81,16 @@
<div class="suggestion-select-ul"></div>
</div> -->
</div>
<div style="text-align: right;margin-top: 15px;">
<div v-if="tracking&&!screenUser" class="danger-btn-bg btn-item" @click="userUnTrack">
<span class="trackImg"></span>
<span>取消跟踪</span>
</div>
<div v-if="lineTracking&&!screenUser" class="simple-btn-bg btn-item" @click="userLineTrackCancel">
<span class="viewImg"></span>
<span>取消轨迹</span>
</div>
</div>
</div>
</div>
<!--人员统计/事件统计/部门统计-->
@ -409,19 +419,27 @@
</div>
</div>
<div class="basic-btn-group">
<div v-if="tracking" class="danger-btn-bg btn-item" @click="userUnTrack">
<span class="trackImg"></span>
<span>取消跟踪</span>
</div>
<div v-else class="danger-btn-bg btn-item" @click="userTrack">
<div v-if="!tracking&&!lineTracking" class="danger-btn-bg btn-item" @click="userTrack">
<span class="trackImg"></span>
<span>跟踪</span>
</div>
<div v-if="!lineTracking" class="simple-btn-bg btn-item" @click="userLineTrack">
<div v-else-if="!tracking&&lineTracking" class="danger-btn-bg btn-item">
<span class="trackImg"></span>
<span>跟踪</span>
</div>
<div v-else-if="tracking" class="danger-btn-bg btn-item" @click="userUnTrack">
<span class="trackImg"></span>
<span>取消跟踪</span>
</div>
<div v-if="!lineTracking&&!tracking" class="simple-btn-bg btn-item" @click="userLineTrack">
<span class="viewImg"></span>
<span>轨迹</span>
</div>
<div v-else class="simple-btn-bg btn-item" @click="userLineTrackCancel">
<div v-if="!lineTracking&&tracking" class="simple-btn-bg btn-item">
<span class="viewImg"></span>
<span>轨迹</span>
</div>
<div v-else-if="lineTracking" class="simple-btn-bg btn-item" @click="userLineTrackCancel">
<span class="viewImg"></span>
<span>取消轨迹</span>
</div>

11
src/views/ecm/event.vue
View File

@ -54,12 +54,13 @@
@resetQuery="resetQuery"
>
<el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="事件种类" width="200">
<el-table-column label="事件种类" width="240" :show-overflow-tooltip="true">
<template #default="scope">
<el-tag
v-for="item in scope.row.cates_"
:key="item.id"
type="warning"
effect="plain"
>{{ item.name }}</el-tag
>
</template>
@ -92,14 +93,14 @@
<!-- <el-table-column label="处理时间" prop="handle_time"></el-table-column> -->
<el-table-column label="事件标记" prop="mark">
<template #default="scope">
<el-span v-if="scope.row.mark == 20" color="red">误报</el-span>
<el-span v-else color="green">正常</el-span>
<el-tag v-if="scope.row.mark == 20" type="warning" effect="plain">误报</el-tag>
<el-tag v-else type="success" effect="plain">正常</el-tag>
</template>
</el-table-column>
<el-table-column label="处理超时">
<template #default="scope">
<el-tag v-if="scope.row.is_timeout" type="warning">是</el-tag>
<el-tag v-else type="success">否</el-tag>
<el-tag v-else type="success" effect="plain">否</el-tag>
</template>
</el-table-column>
@ -212,7 +213,7 @@ export default {
})
},
handleSuccess(){
this.$refs.table.refresh();
},
//搜索

2
src/views/ecm/event_handlefrom.vue
View File

@ -262,7 +262,7 @@ export default {
},
onSubmit() {
this.$API.ecm.event.handle.req(this.form.id, this.form).then((res) => {
this.$router.go(-1);
this.$emit("success");
this.$message.success("操作成功");
return res;
});

4
src/views/ecm/myevent.vue
View File

@ -54,7 +54,7 @@
@resetQuery="resetQuery"
>
<el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="事件种类" width="200">
<el-table-column label="事件种类" width="240" :show-overflow-tooltip="true">
<template #default="scope">
<el-tag v-for="item in scope.row.event_.cates_"
:key="item.id" type="warning">{{item.name}}</el-tag>
@ -71,6 +71,7 @@
label="警报信息"
prop="event_.voice_msg"
width="200"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
@ -192,6 +193,7 @@ export default {
});
},
handleSuccess(){
this.$refs.table.refresh();
this.dialog.handle = false
},
//搜索

6
src/views/hrm/ep_form.vue
View File

@ -127,7 +127,7 @@
<el-row>
<el-form-item label="最近定位信息">
<span v-if="form.location">{{form.location.area_fix_name}}-
<span v-if="form.location.xx_detail">经纬度(form.location.xx_detail.longitude, form.location.xx_detail.latitude)</span>
<span v-if="form.location.xx_detail">经纬度({{form.location.xx_detail.longitude}}, {{form.location.xx_detail.latitude}})</span>
</span>
</el-form-item>
</el-row>
@ -302,9 +302,11 @@
//debugger;
// console.log(defaultForm);
// this.form = defaultForm;
this.loading = true;
this.$API.hrm.employee.item.req(data.id).then(res=>{
this.loading = false;
this.form = res
})
}).catch(e=>{this.loading = false;})
// Object.assign(this.form, data);
},
//设置过滤项

2
src/views/sys/user.vue
View File

@ -100,7 +100,7 @@
<span>{{userTypeOptions[scope.row.type]}}</span>
</template>
</el-table-column>
<el-table-column label="部门" prop="belong_dept_name">
<el-table-column label="部门" prop="belong_dept_name" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="岗位" prop="post_name">
</el-table-column>