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

anniuyjh

Browse Source
This commit is contained in:
yangjiahang
2020-02-08 16:36:22 +08:00
parent b4ab7b62bc 6d4033c92a
commit 51ad1177b4
37 changed files with 1567 additions and 1463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,18 +39,12 @@
<!-- size="small"-->
<!-- type="date"-->
<!-- placeholder="请选择结束日期"/>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<!--<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
<!--<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>-->
</el-tooltip>
<!--<<<<<<< HEAD-->
<!--&lt;!&ndash;<<<<<<< HEAD&ndash;&gt;-->
<!--&lt;!&ndash; &lt;!&ndash; <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;=======&ndash;&gt;-->
<!--&lt;!&ndash; &lt;!&ndash;<el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&gt;>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7&ndash;&gt;-->
<!--=======-->
<!--&gt;>>>>>> 75e884a0fca545b1a478c0a0dcaf498a46cbe009-->
</div>
</el-card>
<el-row>
@@ -91,14 +85,11 @@
</el-table-column>
<el-table-column label="操作" align="center" width="160">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
<el-button
size="mini"
type="warning"
plain
icon="el-icon-plus"
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
</el-tooltip>
<el-button
size="mini"
type="text"
icon="el-icon-circle-plus-outline"
@click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
<el-button
size="mini"
type="text"
@@ -126,7 +117,8 @@
</el-col>
<el-col style="width: 43%">
<el-card>
<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">
<!--<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">-->
<el-table :data="tableData2" border stripe style="width: 100%; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -480,6 +472,21 @@ export default {
/*}*/
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
.subTableHeader {
th {
background: #8ff4ea !important;