From 8487abecf2d7cd894f2732a4a14c0ba75e86a0f6 Mon Sep 17 00:00:00 2001
From: jiangfuzhuang <jiangfuzhuang@meswork.com>
Date: Wed, 5 Feb 2020 11:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E8=AE=BE=E5=A4=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WorkshopEquipmentManagement.js            |  4 +-
 .../WorkshopEquipmentManagement/index.vue     | 83 ++++++++++++-------
 .../MarketingCenter/CreateProject/index.vue   | 36 ++++----
 3 files changed, 73 insertions(+), 50 deletions(-)

diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
index 470c27a3..428d589e 100644
--- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
+++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
@@ -7,8 +7,8 @@ export function getData(check, equipmentName, pageCurrent, pageSize) {
     data: {
       type: '1',
       name: '设备管理_设备加工能力_查询数据_设备维护NEW',
-      param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName,
-      pagination: pageCurrent + '&' + pageSize
+      param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName
+      // pagination: pageCurrent + '&' + pageSize
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index 98f8ef2d..ebb621c9 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -3,14 +3,27 @@
     <el-card>
       <span>设备名称:</span>
       <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px" @click="pageCurrent = 1;fetchData()">查询</el-button>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>
       <el-tooltip effect="dark" content="添加新设备" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>
+      </el-tooltip>
+      <span style="margin-left: 40px">有效时间：</span>
+      <el-date-picker
+        v-model="time"
+        type="date"
+        size="small"
+        value-format="yyyy-MM-dd"
+        placeholder="选择日期"/>
+      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
+        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>
+      </el-tooltip>
+      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
+        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>
       </el-tooltip>
     </el-card>
 
     <el-card>
-      <el-table :data="List" border size="small" stripe highlight-current-row height="500px">
+      <el-table :data="List" border size="small" stripe highlight-current-row height="700px">
         <el-table-column label="设备名称" prop="设备名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}
@@ -68,32 +81,32 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
-    <el-card>
-      <span>有效时间：</span>
-      <el-date-picker
-        v-model="time"
-        type="date"
-        size="small"
-        value-format="yyyy-MM-dd"
-        placeholder="选择日期"/>
-      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
-      </el-tooltip>
-      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
-        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
-      </el-tooltip>
+    <!--      <div class="block" style="margin-top: 10px;">-->
+    <!--        <el-pagination-->
+    <!--          :current-page="pageCurrent"-->
+    <!--          :page-sizes="[10, 20, 30, 40]"-->
+    <!--          :page-size="pageSize"-->
+    <!--          :total="total"-->
+    <!--          layout="total, sizes, prev, pager, next, jumper"-->
+    <!--          @size-change="handleSizeChange"-->
+    <!--          @current-change="handleCurrentChange"/>-->
+    <!--      </div>-->
     </el-card>
+    <!--    <el-card>-->
+    <!--      <span>有效时间：</span>-->
+    <!--      <el-date-picker-->
+    <!--        v-model="time"-->
+    <!--        type="date"-->
+    <!--        size="small"-->
+    <!--        value-format="yyyy-MM-dd"-->
+    <!--        placeholder="选择日期"/>-->
+    <!--      <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">-->
+    <!--        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>-->
+    <!--      </el-tooltip>-->
+    <!--      <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">-->
+    <!--        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>-->
+    <!--      </el-tooltip>-->
+    <!--    </el-card>-->
 
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
@@ -240,8 +253,8 @@ export default {
         this.check = 0
       }
       getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
-        this.List = response.data.rows
-        this.total = response.data.total
+        this.List = response.data
+        // this.total = response.data.total
       })
     },
     initialization() {
@@ -399,4 +412,14 @@ export default {
   .el-card{
     margin-bottom: 1px;
   }
+  /*.el-button--success {*/
+  /*  background: #ecf5ff;*/
+  /*  border-color: #2d72d5;*/
+  /*  color: #2d72d5;*/
+  /*}*/
+  /*.el-button--primary {*/
+  /*  background: #fdf6ec;*/
+  /*  border-color: #ff9759;*/
+  /*  color: #ff9759;*/
+  /*}*/
 </style>
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 4201b2bf..47c31da1 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -39,11 +39,11 @@
         <!--          size="small"-->
         <!--          type="date"-->
         <!--          placeholder="请选择结束日期"/>-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <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-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" @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>
-<!--        <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
+        <!--        <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
       </div>
     </el-card>
     <el-row>
@@ -456,21 +456,21 @@ export default {
 </script>
 
 <style scoped>
-  .el-button--success {
-    background: #ffffff;
-    border-color: #2d72d5;
-    color: #2d72d5;
-  }
-  .el-button--primary {
-     background: #ffffff;
-     border-color: #ff9759;
-     color: #ff9759;
-   }
-  .el-button--info {
-    background: #ffffff;
-    border-color: #67c23a;
-    color: #67c23a;
-  }
+  /*.el-button--success {*/
+  /*  background: #ecf5ff;*/
+  /*  border-color: #2d72d5;*/
+  /*  color: #2d72d5;*/
+  /*}*/
+  /*.el-button--primary {*/
+  /*   background: #fdf6ec;*/
+  /*   border-color: #ff9759;*/
+  /*   color: #ff9759;*/
+  /* }*/
+  /*.el-button--info {*/
+  /*  background: #f0f9eb;*/
+  /*  border-color: #67c23a;*/
+  /*  color: #67c23a;*/
+  /*}*/
 </style>
 <style lang="scss">
   .subTableHeader {