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

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

This commit is contained in:
caoqianming 2024-12-06 11:53:59 +08:00
parent 9b53a3428b 3049f491a8
commit 2dd4661f44
36 changed files with 69 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/enm_base/search.vue
View File

@ -21,6 +21,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
</div>

1
src/views/enm_coal/power.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_coal/report.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_coal/teamAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_coal/workshopAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_energy/energy.vue
View File

@ -66,6 +66,7 @@
type="primary"
@click="exportExcel()"
:loading = "exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button

1
src/views/enm_energy/energyFactory.vue
View File

@ -52,6 +52,7 @@
type="primary"
@click="exportExcel()"
:loading = "exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button

1
src/views/enm_energy/hour_base.vue
View File

@ -53,6 +53,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_energy/value.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_energy/water.vue
View File

@ -53,6 +53,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_kiln/power.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_kiln/report.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_kiln/teamAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_kiln/workshopAnalysis.vue
View File

@ -32,6 +32,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_mill/power.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_mill/report.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_mill/teamAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_mill/workshopAnalysis.vue
View File

@ -31,6 +31,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_pack/report.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_pack/teamAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_pack/workshopAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

5
src/views/enm_report/costing.vue
View File

@ -20,7 +20,10 @@
<el-date-picker v-model="query.year" type="year" value-format="YYYY" format="YYYY" placeholder="年份"
class="headerSearch" v-if="query.type == 2" />
<el-button type="primary" icon="el-icon-search" @click="getTableData"></el-button>
<el-button type="primary" @click="exportExcel()" :loading="exportLoading">导出xlsx
<el-button type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'">导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印
</el-button>

8
src/views/enm_report/exception.vue
View File

@ -41,7 +41,10 @@
<el-button type="primary" icon="el-icon-search"
@click="getTableData">
</el-button>
<el-button type="primary" @click="exportExcel()" :loading="exportLoading">导出xlsx
<el-button type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'">导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印
</el-button>
@ -49,9 +52,10 @@
</el-header>
<el-main class="nopadding">
<el-container>
<el-main class="nopadding">
<el-main class="nopadding" id="myReport">
<scTable
ref="stlogTable"
id="myTable"
:apiObj="apiObjStlog"
:query="query"
:params="params"

1
src/views/enm_report/quality.vue
View File

@ -58,6 +58,7 @@
type="primary"
@click="exportExcel()"
:loading = "exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button

1
src/views/enm_report/reportDay.vue
View File

@ -35,6 +35,7 @@
type="primary"
@click="exportExcel()"
:loading = "exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button

1
src/views/enm_report/reportMonth.vue
View File

@ -21,6 +21,7 @@
type="primary"
@click="exportExcel()"
:loading = "exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button

1
src/views/enm_rm/handoverLog.vue
View File

@ -135,6 +135,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_rm/power.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_rm/report.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_rm/teamAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_rm/workshopAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_slag/power.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_slag/report.vue
View File

@ -6,6 +6,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_slag/teamAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

1
src/views/enm_slag/workshopAnalysis.vue
View File

@ -19,6 +19,7 @@
type="primary"
@click="exportExcel()"
:loading="exportLoading"
v-auth="'export_excel'"
>导出xlsx
</el-button>
<el-button type="primary" @click="handlePrint">打印 </el-button>

39
src/views/home/event.vue
View File

@ -23,7 +23,10 @@
}}</el-tag>
</template>
</el-table-column>
<el-table-column label="事件信息" prop="voice_msg" width="300" show-overflow-tooltip>
<el-table-column label="事件信息" width="300" show-overflow-tooltip>
<template #default="scope">
<el-link type="primary">{{ scope.row.voice_msg }}</el-link>
</template>
</el-table-column>
<el-table-column label="所属工段" prop="mgroupName">
<template #default="scope">
@ -62,33 +65,43 @@
</scTable>
</el-main>
<el-drawer :size="'50%'" v-model="showLimited" title="事件处理" :close-on-click-modal="false">
<el-card header="事件信息">
<el-card header="基础信息">
<el-form :model="eventItem" label-width="100px">
<el-row>
<el-col :span='12'>
<el-col :span='12' v-if="eventItem.belong_dept!==null">
<el-form-item label="所属部门：">{{ eventItem.belong_dept}}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="所属工段：">{{ eventItem.enm_data.mgroup_name }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="发生时间：">{{ eventItem.create_time }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="发生类型：">{{ eventItem.cates_[0].name }}</el-form-item>
</el-col>
<!-- <el-col :span='12'>
<el-form-item label="状态：">{{ eventItem.buy_date }}</el-form-item>
</el-col> -->
<el-col :span='12'>
<el-form-item label="处理人：">
<el-form-item >{{ eventItem.handle_user_name }}</el-form-item>
<span v-if="eventItem.handle_user_name==null" style="color: #dddddd;">待处理</span>
<span v-else>{{ eventItem.handle_user_name }}</span>
</el-form-item>
</el-col>
<!-- <el-col :span='12'>
<el-form-item label="备注：">{{ eventItem.buy_date }}</el-form-item>
</el-col> -->
</el-row>
</el-form>
</el-card>
<el-card header="事件信息" style="margin-top: 8px">
<el-form :model="eventItem" label-width="100px">
<el-row>
<el-col>
<el-form-item label="详细分类：">{{ eventItem.enm_data.type_chin }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="目标值：">{{ eventItem.enm_data.goal_val }}</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label="当前值：">{{ eventItem.enm_data.val }}</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
@ -102,7 +115,7 @@
<el-descriptions-item label="处理时间">
{{ eventItem.handle_time }}
</el-descriptions-item>
<el-descriptions-item label="异常分析" column="3">
<el-descriptions-item label="异常分析/处理" column="3">
{{ eventItem.handle_desc }}
</el-descriptions-item>
</el-descriptions>
@ -121,7 +134,7 @@
</el-row>
<el-row>
<el-col :span='12'>
<el-form-item label="异常分析">
<el-form-item label="异常分析/处理">
<el-input v-model="form.handle_desc" clearable type="textarea"></el-input>
</el-form-item>
</el-col>