meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
yanggongyan
2020-02-10 15:08:35 +08:00
parent 0cf673eead e12ce46a6b
commit d5ed9b2da5
16 changed files with 119 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/ManufacturingCenter/AntonMonitoring/index.vue
View File

@@ -10,7 +10,8 @@
size="mini"
height="800"
highlight-current-row
border>
border
stripe>
<el-table-column align="center" label="照片" width="50">
<template slot-scope="scope">
<el-popover
@@ -40,8 +41,8 @@
</el-table-column>
<el-table-column align="center" label="登陆人">
<template slot-scope="scope">
<el-tag v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</el-tag>
<el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </el-tag>
<span v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</span>
<span v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </span>
</template>
</el-table-column>
<el-table-column align="center" label="呼叫类型">
@@ -55,7 +56,7 @@
<el-button
:disabled="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
size="mini"
type="primary"
type="text"
icon="el-icon-picture"
@click="handlePicture(scope.row)">上传图片</el-button>
</template>

6
src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
View File

@@ -20,7 +20,7 @@
style="width: 160px"
type="date"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin:0px 10px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin:0px 10px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
</el-card>
<el-card>
<el-table
@@ -118,7 +118,7 @@
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData1()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData1()">查询</el-button>
</el-card>
<el-card>
<div id="myChart" style="width: 1000px; height: 570px; margin: auto"/>
@@ -153,7 +153,7 @@
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData2()">查询</el-button>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData2()">查询</el-button>
</el-card>
<el-card>
<div id="myChart3" style="width: 100%; height: 520px; margin: auto"/>

4
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -21,7 +21,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
</el-card>
<el-card>
<h3 style="text-align: center;">车间生产</h3>
@@ -73,7 +73,7 @@
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<template slot-scope="scope">
<el-button type="primary" plain size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
<el-button type="text" size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
</template>
</el-table-column>
</el-table>

2
src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
View File

@@ -32,7 +32,7 @@
<span>提前</span>
<el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
<span>天预警</span>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
</el-row>
</div>
<h1 class="word" style="margin: 0">总计划:</h1>

2
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -24,7 +24,7 @@
:value="item.value"/>
</el-select>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
</el-row>
</el-card>
<el-card>

10
src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
View File

@@ -19,9 +19,9 @@
style="width: 170px;margin:0px 10px"
type="date"
placeholder="选择加工完成日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
<el-button type="primary" plain class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
<el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
<el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
<el-button type="primary" plain size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -66,7 +66,7 @@
</div>
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -128,7 +128,7 @@
</el-option>
</el-select>
<el-tooltip :open-delay="1000" content="导出机床工时统计明细表" placement="top">
<el-button type="warning" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" content="导出组件工时统计明细表" placement="top">
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" plain @click="exportUninquirySheet3()">组件导出</el-button>
@@ -165,7 +165,7 @@
<!-- </div>-->
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="机床编号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}