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:
shijing 2024-03-19 14:10:08 +08:00
parent a4d490ec5b 7d69285bf0
commit b74e71b659
5 changed files with 477 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/bi/dataset.vue
View File

@ -17,7 +17,7 @@
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe>
<el-table-column label="#" type="index" width="50"></el-table-column>
<el-table-column label="名称" prop="name" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="sql语句" prop="sql_query" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="代号" prop="code" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="操作" fixed="right" align="left" width="200">
<template #default="scope">
<el-button type="primary" plain size="small" @click="handleShow(scope.row)"

18
src/views/bi/dataset_form.vue
View File

@ -25,14 +25,18 @@
</el-form-item>
</el-col>
<el-col :md="24" :sm="24" :xs="24">
<el-form-item label="图表配置">
<el-input v-model="form.echart_options" clearable type="textarea" :rows="8"></el-input>
<el-form-item label="默认参数">
<JsonEditorVue class="vueJsonEditor" v-model="form.default_param" @blur="validate" />
</el-form-item>
</el-col>
<el-col :md="24" :sm="24" :xs="24">
<el-form-item label="默认参数">
<JsonEditorVue class="vueJsonEditor" v-model="form.default_param" @blur="validate" />
<!-- <el-input v-model="form.default_param" clearable type="textarea" :rows="8"></el-input> -->
<el-form-item label="测试参数">
<JsonEditorVue class="vueJsonEditor" v-model="form.test_param" @blur="validate" />
</el-form-item>
</el-col>
<el-col :md="24" :sm="24" :xs="24">
<el-form-item label="图表配置">
<el-input v-model="form.echart_options" clearable type="textarea" :rows="8"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -66,7 +70,6 @@ export default {
},
visible: false,
isSaveing: false,
default_param:{},
selectionFilters: [],
setFiltersVisible: false,
belong_dept_options: []
@ -135,4 +138,5 @@ export default {
<style>
.vueJsonEditor {
width: 100%;
}</style>
}
</style>

49
src/views/statistics/pass_num.vue
View File

@ -3,30 +3,14 @@
<el-header>
<div class="right-panel">
<el-select v-model="queryType" @change="queryTypeChange">
<el-option v-for="item in typeOptions"
:key="item"
:label="item"
:value="item"
>
<el-option v-for="item in typeOptions" :key="item" :label="item" :value="item">
</el-option>
</el-select>
<el-date-picker
v-if="queryType=='月'"
v-model="queryDate"
type="month"
placeholder="查询月期"
value-format="YYYY-MM"
style="width:100%"
>
<el-date-picker v-if="queryType == '月'" v-model="queryDate" type="month" placeholder="查询月期"
value-format="YYYY-MM" style="width:100%">
</el-date-picker>
<el-date-picker
v-if="queryType=='年'"
v-model="queryDate"
type="year"
placeholder="查询年份"
value-format="YYYY"
style="width:100%"
>
<el-date-picker v-if="queryType == '年'" v-model="queryDate" type="year" placeholder="查询年份"
value-format="YYYY" style="width:100%">
</el-date-picker>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div>
@ -54,8 +38,14 @@
</el-table-column>
<el-table-column label="型号" prop="型号">
</el-table-column>
<el-table-column label="生产数" prop="生产数">
</el-table-column>
<el-table-column label="合格数" prop="合格数">
</el-table-column>
<el-table-column label="不合格数" prop="不合格数">
</el-table-column>
<el-table-column label="合格率" prop="合格率">
</el-table-column>
</el-table>
</el-card>
</el-col>
@ -83,8 +73,14 @@
</el-table-column>
<el-table-column label="型号" prop="型号">
</el-table-column>
<el-table-column label="生产数" prop="生产数">
</el-table-column>
<el-table-column label="合格数" prop="合格数">
</el-table-column>
<el-table-column label="不合格数" prop="不合格数">
</el-table-column>
<el-table-column label="合格率" prop="合格率">
</el-table-column>
</el-table>
</el-card>
</el-col>
@ -112,8 +108,14 @@
</el-table-column>
<el-table-column label="型号" prop="型号">
</el-table-column>
<el-table-column label="生产数" prop="生产数">
</el-table-column>
<el-table-column label="合格数" prop="合格数">
</el-table-column>
<el-table-column label="不合格数" prop="不合格数">
</el-table-column>
<el-table-column label="合格率" prop="合格率">
</el-table-column>
</el-table>
</el-card>
</el-col>
@ -266,7 +268,7 @@
let option = deepCopy(that.basicOption);
option.xAxis.data = that.xAxisData;
option.title.text = '6车间';
let exec = that.queryType=='月'?'productStatisticWeek':'productStatisticYear';
let exec = that.queryType == '月' ? 'lineWeek' : 'lineMonth';
let obj = {
query: { start_date: that.start_date, end_date: that.end_date, dept_name: "6车间" },
};
@ -485,5 +487,4 @@
}
</script>
<style>
</style>
<style></style>

4
src/views/statistics/ppass_num.vue
View File

@ -34,6 +34,10 @@
</el-table-column>
<el-table-column label="合格数" prop="合格数">
</el-table-column>
<el-table-column label="完成进度" prop="完成进度">
</el-table-column>
<el-table-column label="合格率" prop="合格率">
</el-table-column>
</el-table>
</el-card>
</el-col>

29
src/views/statistics/user_statistics.vue
View File

@ -2,24 +2,12 @@
<el-container>
<el-header>
<div class="right-panel">
<el-select
v-model="queryBelongDept"
clearable
style="width:200px"
placeholder="请选择部门">
<el-option v-for="item in deptData"
:key="item.id"
:label="item.name"
:value="item.name">
<el-select v-model="queryBelongDept" clearable style="width:200px" placeholder="请选择部门">
<el-option v-for="item in deptData" :key="item.id" :label="item.name" :value="item.name">
</el-option>
</el-select>
<el-date-picker
v-model="queryDate"
type="month"
placeholder="查询月期"
value-format="YYYY-MM"
style="width:200px"
>
<el-date-picker v-model="queryDate" type="month" placeholder="查询月期" value-format="YYYY-MM"
style="width:200px">
</el-date-picker>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
</div>
@ -46,8 +34,14 @@
<el-table-column label="车间">
{{ queryBelongDept }}
</el-table-column>
<el-table-column label="生产数" prop="生产数">
</el-table-column>
<el-table-column label="合格数" prop="合格数">
</el-table-column>
<el-table-column label="不合格数" prop="不合格数">
</el-table-column>
<el-table-column label="合格率" prop="合格率">
</el-table-column>
</el-table>
</el-card>
</el-col>
@ -163,5 +157,4 @@
}
</script>
<style>
</style>
<style></style>