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

a

Browse Source
This commit is contained in:
Vergil
2020-02-18 11:34:37 +08:00
parent 8dd4cbf962
commit 33eb2cb4db
6 changed files with 200 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.js
View File

@@ -28,6 +28,9 @@ Vue.use(Direction)
Vue.use(curd)
Vue.use(htmlToPdf)
Vue.use(ElementUI)
// 关闭点弹窗周围关闭功能 -- 20200218
ElementUI.Dialog.props.closeOnClickModal.default = false
// 查看图片
Vue.use(Viewer)
Viewer.setDefaults({

2
src/styles/sidebar.scss
View File

@@ -1,7 +1,7 @@
#app {
// 主体区域
.main-container {
min-width: 1380px;
min-width: 1380px; // div3固定宽度后新增
min-height: 100%;
transition: margin-left .28s;
margin-left: 200px;

243
src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<el-card class="cardSBJK">
<el-card class="cardSBJK" style="overflow-y:hidden">
<div class="process">
<el-tooltip :enterable="false" :id="OPNAME137" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
@@ -84,7 +84,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME136" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:199px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:159px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME136+fang" class="fang"/>-->
<div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
@@ -578,8 +578,9 @@
<!-- <span style="margin-left: 5px">电流计故障</span>-->
<!-- </div>-->
<!-- </el-card>-->
</el-card>
<div style="position: absolute;margin-top: -610px;margin-left: 490px;height: 350px;width: 124px;background-color: transparent">
<div style="position: relative;margin-top: -610px;margin-left: 490px;;width: 120px;height: 600px;background-color: transparent;overflow-y:hidden">
<div style="">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData1" style="width: 433px; text-align: center" size="mini">
<el-table-column label="总装机床" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
@@ -588,11 +589,13 @@
</el-table-column>
</el-table>
</div>
<div style="position: absolute;margin-top: -610px;margin-left: 625px;background-color: transparent">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData2" max-height="365" style="width: 156px;text-align: center" size="mini">
<el-table-column label="总装机床" align="left" width="150" show-overflow-tooltip>
</div>
<div style="position: relative;margin-top: -600px;margin-left: 617px;width: 154px;height: 600px;background-color: transparent;overflow-y:hidden">
<div style="">
<el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData2" max-height="365" style="width: 148px;text-align: center" size="mini">
<el-table-column label="总装机床" align="left" width="148" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}&nbsp;&nbsp;&nbsp;&nbsp;{{ scope.row.任务名称 }}
{{ scope.row.机床图号 }}&nbsp;&nbsp;{{ scope.row.任务名称 }}
</template>
</el-table-column>
<!-- <el-table-column label="任务名称" align="left" width="70" show-overflow-tooltip>-->
@@ -603,6 +606,22 @@
</el-table>
</div>
</div>
</el-card>
<!-- <div style="position: absolute;margin-top: -610px;margin-left: 490px;;width: 1200px;height: auto;background-color: transparent">-->
<!-- <div>-->
<!-- <el-table :highlight-current-row="false" :stripe="false" :show-header="false" :data="tableData1" style="width: 433px; text-align: center" size="mini">-->
<!-- <el-table-column label="总装机床" align="center" width="120" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.机床图号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<!-- </div>-->
</div>
</template>
<script>
@@ -994,10 +1013,84 @@ export default {
</script>
<style scoped>
>>>.el-table th, .el-table tr {
/* background-color: #FFF; */
}
/* 滚动条 */
>>>.el-table__body-wrapper::-webkit-scrollbar-thumb {
background: rgb(42,118,206);
width: 1px;
border: none;
border-radius:4px;
}
>>>.el-table__body-wrapper::-webkit-scrollbar {
color: rgb(42,118,206);
width: 4px;
}
/* 滚动条 */
>>>.el-table td, .el-table th.is-leaf {
border: 0px solid #EBEEF5;
}
>>>.el-table--border,.el-table--group {
border: 0px solid #EBEEF5;
}
>>>.el-table::before {
left: 0;
bottom: 0;
width: 100%;
/* height: 1px; */
}
>>>.el-table tbody tr:hover>td {
background-color:transparent
}
>>>.el-table--enable-row-hover >>> .el-table__body tr:hover > td {
background: transparent !important;
}
>>>.el-table{
/* 表格字体颜色 */
color:black;
/* 表格边框颜色 */
/* border: 0.5px solid #758a99; */
height: 500px;
background: transparent !important;
}
/* 表格内背景颜色 */
>>>.el-table th,.el-table tr,.el-table td {
border: 0;
background-color: transparent;
}
/* 双数行背景颜色 */
>>>.el-table--striped .el-table__body tr.el-table__row--striped td {
background-color: transparent;
background-color: rgba(148, 144, 144, 0.3)
}
/* 使表格背景透明 */
>>>.el-table th, .el-table tr {
background-color: transparent;
}
/* 删除表格下横线 */
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
height: 0px;
}
/* 表格表头字体颜色 */
.el-table thead {
color: white;
font-weight: 500;
background-color: rgba(148, 144, 144, 0.3)
}
.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: transparent !important;
}
.cardSBJK{
overflow: auto;
}
.process{
position: relative;
text-align: center;
margin-left: 0px;
margin-top: 0px;
@@ -1077,71 +1170,71 @@ export default {
background-color:#FFBB00 ;
}
</style>
<style lang="scss">
/* 滚动条 */
.el-table__body-wrapper::-webkit-scrollbar-thumb {
background: rgb(42,118,206);
width: 1px;
border: none;
border-radius:4px;
}
.el-table__body-wrapper::-webkit-scrollbar {
color: rgb(42,118,206);
width: 4px;
}
/* 滚动条 */
.el-table td, .el-table th.is-leaf {
border: 0px solid #EBEEF5;
}
.el-table--border, .el-table--group {
border: 0px solid #EBEEF5;
}
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
/* height: 1px; */
}
.el-table tbody tr:hover>td {
background-color:transparent!important
}
.el-table{
/* 表格字体颜色 */
color:black;
/* 表格边框颜色 */
/* border: 0.5px solid #758a99; */
height: 500px;
background: transparent;
}
/* 表格内背景颜色 */
.el-table th, .el-table tr,.el-table td{
border: 0;
background-color: transparent;
}
/* 双数行背景颜色 */
.el-table--striped .el-table__body tr.el-table__row--striped td {
<!--<style lang="scss">-->
<!-- /* 滚动条 */-->
<!-- .el-table__body-wrapper::-webkit-scrollbar-thumb {-->
<!-- background: rgb(42,118,206);-->
<!-- width: 1px;-->
<!-- border: none;-->
<!-- border-radius:4px;-->
<!-- }-->
<!-- .el-table__body-wrapper::-webkit-scrollbar {-->
<!-- color: rgb(42,118,206);-->
<!-- width: 4px;-->
<!-- }-->
<!-- /* 滚动条 */-->
<!-- .el-table td, .el-table th.is-leaf {-->
<!-- border: 0px solid #EBEEF5;-->
<!-- }-->
<!-- .el-table&#45;&#45;border, .el-table&#45;&#45;group {-->
<!-- border: 0px solid #EBEEF5;-->
<!-- }-->
<!-- .el-table::before {-->
<!-- left: 0;-->
<!-- bottom: 0;-->
<!-- width: 100%;-->
<!-- /* height: 1px; */-->
<!-- }-->
<!-- .el-table tbody tr:hover>td {-->
<!-- background-color:transparent!important-->
<!-- }-->
<!-- .el-table{-->
<!-- /* 表格字体颜色 */-->
<!-- color:black;-->
<!-- /* 表格边框颜色 */-->
<!-- /* border: 0.5px solid #758a99; */-->
<!-- height: 500px;-->
<!-- background: transparent;-->
<!-- }-->
<!-- /* 表格内背景颜色 */-->
<!-- .el-table th, .el-table tr,.el-table td{-->
<!-- border: 0;-->
<!-- background-color: transparent;-->
<!-- }-->
<!-- /* 双数行背景颜色 */-->
<!-- .el-table&#45;&#45;striped .el-table__body tr.el-table__row&#45;&#45;striped td {-->
background-color: transparent;
background-color: rgba(148, 144, 144, 0.3)
}
/* 使表格背景透明 */
.el-table th, .el-table tr {
background-color: transparent;
}
/* 删除表格下横线 */
.el-table::before {
left: 0;
bottom: 0;
width: 100%;
height: 0px;
}
/* 表格表头字体颜色 */
.el-table thead {
color: white;
font-weight: 500;
background-color: rgba(148, 144, 144, 0.3)
}
.el-table--enable-row-hover .el-table__body tr:hover>td{
background-color: transparent !important;
}
</style>
<!-- background-color: transparent;-->
<!-- background-color: rgba(148, 144, 144, 0.3)-->
<!-- }-->
<!-- /* 使表格背景透明 */-->
<!-- .el-table th, .el-table tr {-->
<!-- background-color: transparent;-->
<!-- }-->
<!-- /* 删除表格下横线 */-->
<!-- .el-table::before {-->
<!-- left: 0;-->
<!-- bottom: 0;-->
<!-- width: 100%;-->
<!-- height: 0px;-->
<!-- }-->
<!-- /* 表格表头字体颜色 */-->
<!-- .el-table thead {-->
<!-- color: white;-->
<!-- font-weight: 500;-->
<!-- background-color: rgba(148, 144, 144, 0.3)-->
<!-- }-->
<!-- .el-table&#45;&#45;enable-row-hover .el-table__body tr:hover>td{-->
<!-- background-color: transparent !important;-->
<!-- }-->
<!--</style>-->

89
src/views/ManufacturingCenter/InventoryQuery/index.vue
View File

@@ -4,11 +4,8 @@
<div slot="header">
<el-row style="margin-bottom:-10px!important;">
<el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 20px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
<el-button type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
<!-- <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">
@@ -69,92 +66,6 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<!-- <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">-->
<!-- <el-row>-->
<!-- <el-col style="width: 240px">-->
<!-- <span>物料名称:</span>-->
<!-- <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
<!-- </el-col>-->
<!-- <el-col style="width: 240px">-->
<!-- <span>物料规格:</span>-->
<!-- <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
<!-- </el-col>-->
<!-- <el-col style="width: 240px">-->
<!-- <span>物料型号:</span>-->
<!-- <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
<!-- </el-col>-->
<!-- <el-col style="width: 80px">-->
<!-- <el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=20;searchMaterial01()">查询</el-button>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-table :data="tableData01" border stripe highlight-current-row height="300" size="mini" style="margin-bottom: 10px" @row-click="selectMaterial">-->
<!-- <el-table-column label="名称" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.物料名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="图号或型号" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.物料型号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="规格" align="center" min-width="200">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.物料规格 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="供货商" align="center" min-width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.供货商 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <div class="block" style="margin: 10px 0">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent01"-->
<!-- :page-sizes="[10, 20, 30, 40, 50]"-->
<!-- :page-size="pageSize01"-->
<!-- :total="total01"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange01"-->
<!-- @current-change="handleCurrentChange01"/>-->
<!-- </div><hr>-->
<!-- <el-row>-->
<!-- <el-col style="width: 210px">-->
<!-- <span>仓库:</span>-->
<!-- <el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">-->
<!-- <el-option-->
<!-- v-for="item in inventoryName"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<!-- </el-col>-->
<!-- <el-col style="width: 210px">-->
<!-- <span>货位:</span>-->
<!-- <el-select v-model="locateNameValue" style="margin-bottom: 10px;" size="small" clearable>-->
<!-- <el-option-->
<!-- v-for="item in locateName"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<!-- </el-col>-->
<!-- <el-col style="width: 210px">-->
<!-- <span>货位存量:</span>-->
<!-- <el-input-number v-model="localNumber" :min="0" :precision="2" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>-->
<!-- </el-col>-->
<!-- <el-col style="width: 180px">-->
<!-- <span>是否为滞货:</span>-->
<!-- <el-checkbox v-model="isBacklog" size="small" label="滞货件" border style="border: 1px solid rgb(49,56,72)"/>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button size="small" @click="dialogVisible=false">取消</el-button>-->
<!-- <el-button type="primary" size="small" @click="submitAdd">确定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>

4
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -122,12 +122,12 @@
<el-card>
<!--<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">-->
<el-table :data="tableData2" border stripe style="width: 433px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="120">
<el-table-column label="机床图号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="设备名称" align="center" width="150">
<el-table-column label="机床名称" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>

9
src/views/layout/components/TagsView.vue
View File

@@ -54,6 +54,15 @@ export default {
methods: {
// generateTitle, // generateTitle by vue-i18n
generateRoute() {
switch (this.$route.name) {
case 'EquipmentMonitoring':
document.getElementsByClassName('app-main')[0].style.width = '1710px'
document.getElementsByClassName('main-container')[0].style.minWidth = '1710px'
break
default:
document.getElementsByClassName('app-main')[0].style.width = '1380px'
document.getElementsByClassName('main-container')[0].style.minWidth = '1380px'
}
if (this.$route.name) {
return this.$route
}