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

videoView

This commit is contained in:
shijing 2022-10-27 08:37:24 +08:00
parent 346ccb5fe7 4322fb1108
commit 65b267dbda
10 changed files with 95 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.development
View File

@ -7,8 +7,13 @@ VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
# 接口地址 # 接口地址
#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api #VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
#VUE_APP_WS_API = 'ws://localhost:8000' #VUE_APP_WS_API = 'ws://localhost:8000'
<<<<<<< HEAD
#VUE_APP_API_BASEURL = http://222.222.144.147:6013/api #VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
VUE_APP_API_BASEURL = http://10.99.5.79:20309/api VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
=======
VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
#VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
>>>>>>> 4322fb11086b4b90803c346a57bc2007dd984e5b
#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api #VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
#VUE_APP_BASEURL = http://127.0.0.1:8000 #VUE_APP_BASEURL = http://127.0.0.1:8000

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

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

6
src/config/route.js
View File

@ -76,7 +76,7 @@ const routes = [
"path": "/ecm", "path": "/ecm",
"meta": { "meta": {
"title": "事件", "title": "事件",
"icon": "el-icon-alarm-clock", "icon": "el-icon-camera-filled",
"type": "menu", "type": "menu",
"perms": ["ecm"] "perms": ["ecm"]
}, },
@ -150,7 +150,7 @@ const routes = [
"name": "opm", "name": "opm",
"path": "/opm", "path": "/opm",
"meta": { "meta": {
"title": "作业", "title": "风控",
"icon": "el-icon-list", "icon": "el-icon-list",
"type": "menu", "type": "menu",
"perms": ["opm"] "perms": ["opm"]
@ -711,7 +711,7 @@ const routes = [
"path": "/ops", "path": "/ops",
"meta": { "meta": {
"title": "运维", "title": "运维",
"icon": "el-icon-wallet-filled", "icon": "el-icon-briefcase",
"type": "menu", "type": "menu",
"perms": ["ops"] "perms": ["ops"]
}, },

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

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

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

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

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

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

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

@ -302,9 +302,11 @@
//debugger; //debugger;
// console.log(defaultForm); // console.log(defaultForm);
// this.form = defaultForm; // this.form = defaultForm;
this.loading = true;
this.$API.hrm.employee.item.req(data.id).then(res=>{ this.$API.hrm.employee.item.req(data.id).then(res=>{
this.loading = false;
this.form = res this.form = res
}) }).catch(e=>{this.loading = false;})
// Object.assign(this.form, data); // Object.assign(this.form, data);
}, },
//设置过滤项 //设置过滤项

18
src/views/opm/operation.vue
View File

@ -70,7 +70,7 @@
type="index" type="index"
width="50" width="50"
></el-table-column> --> ></el-table-column> -->
<el-table-column label="许可证" prop="opls" width="160"> <el-table-column label="许可证" prop="opls" width="200" :show-overflow-tooltip="true" fixed="left">
<template #default="scope"> <template #default="scope">
<el-tag <el-tag
v-for="item in scope.row.cates_" v-for="item in scope.row.cates_"
@ -84,26 +84,27 @@
label="作业简介" label="作业简介"
prop="name" prop="name"
width="200" width="200"
:show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column label="作业状态" prop="state"> <el-table-column label="作业状态" prop="state">
<template #default="scope">{{ <template #default="scope">{{
stateoptions[scope.row.state] stateoptions[scope.row.state]
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="生产状态" prop="state_work"></el-table-column> <el-table-column label="创建时间" prop="create_time" width="150"></el-table-column>
<el-table-column label="作业区域" <el-table-column label="作业区域" width="100"
><template #default="scope"> ><template #default="scope">
{{ scope.row.area_.name }} {{ scope.row.area_.name }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计开始" prop="start_time"></el-table-column> <el-table-column label="预计开始" prop="start_time" width="150"></el-table-column>
<el-table-column label="预计结束" prop="end_time"></el-table-column> <el-table-column label="预计结束" prop="end_time" width="150"></el-table-column>
<el-table-column label="属地部门" prop="dept_ter" <el-table-column label="属地部门" prop="dept_ter" width="100"
><template #default="scope"> ><template #default="scope">
{{ scope.row.dept_ter_.name }} {{ scope.row.dept_ter_.name }}
</template></el-table-column </template></el-table-column
> >
<el-table-column label="业务部门" prop="dept_bus" <el-table-column label="业务部门" prop="dept_bus" width="100"
><template #default="scope"> ><template #default="scope">
{{ scope.row.dept_bus_.name }} {{ scope.row.dept_bus_.name }}
</template></el-table-column </template></el-table-column
@ -113,8 +114,7 @@
{{ scope.row.create_by_.name }} {{ scope.row.create_by_.name }}
</template></el-table-column </template></el-table-column
> >
<el-table-column label="创建时间" prop="create_time"></el-table-column> <el-table-column label="操作" fixed="right" align="left" width="180">
<el-table-column label="操作" fixed="right" align="center" width="180">
<template #default="scope"> <template #default="scope">
<el-button <el-button
link link

10
src/views/opm/opl.vue
View File

@ -60,7 +60,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计开始" prop="start_time" width="150"></el-table-column> <el-table-column label="预计开始" prop="start_time" width="150"></el-table-column>
<el-table-column label="作业部门" prop="dept_do"><template #default="scope"> <el-table-column label="作业部门" prop="dept_do" width="150" :show-overflow-tooltip="true"><template #default="scope">
{{ scope.row.dept_do_.name }} {{ scope.row.dept_do_.name }}
</template></el-table-column> </template></el-table-column>
<el-table-column label="作业负责人" prop="charger"><template #default="scope"> <el-table-column label="作业负责人" prop="charger"><template #default="scope">
@ -70,15 +70,13 @@
{{ scope.row.monitor_.name }} {{ scope.row.monitor_.name }}
</template></el-table-column> </template></el-table-column>
<el-table-column label="操作" fixed="right" width="80"> <el-table-column label="操作" fixed="right" width="100">
<template #default="scope"> <template #default="scope">
<el-button-group> <el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
</el-button> </el-button>
<el-button v-if="operationObj.state === 10" text type="warning" size="small" v-auth="'opl.update'" <el-button v-if="operationObj.state === 10" link type="warning" size="small" v-auth="'opl.update'"
@click="table_edit(scope.row, scope.$index)">编辑 @click="table_edit(scope.row, scope.$index)">编辑
</el-button> </el-button>
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>

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

@ -100,7 +100,7 @@
<span>{{userTypeOptions[scope.row.type]}}</span> <span>{{userTypeOptions[scope.row.type]}}</span>
</template> </template>
</el-table-column> </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>
<el-table-column label="岗位" prop="post_name"> <el-table-column label="岗位" prop="post_name">
</el-table-column> </el-table-column>