Merge branch 'master' into kk_mes

pages/handle/index.vue

@@ -209,7 +209,7 @@ export default {
   created() {
     window.screenHeight = window.innerHeight
     this.iframeHeight = window.screenHeight - 58
-    this.gridHeight = window.screenHeight - 240
+    this.gridHeight = window.screenHeight - 260
   },
   mounted() {
     window.onresize = () => {
@@ -217,7 +217,7 @@ export default {
       return (() => {
         window.screenHeight = window.innerHeight
         this.iframeHeight = window.screenHeight - 58
-        this.gridHeight = window.screenHeight - 240
+        this.gridHeight = window.screenHeight - 260
       })()
     }
     this.getSchema()

pages/order/quotation/index.vue

@@ -145,7 +145,7 @@ import PhotosensitiveDetails from "./components/photosensitiveDetails.vue"; //
 
 import MetalQuotationGeneration from "./components/metalQuotationGeneration.vue"; //生成报价单弹框
 import PhotosensitiveGeneration from "./components/photosensitiveGeneration.vue"; //生成报价单弹框
-var userId = this.$store.state.userInfo.userId;
+var userId = this.$store.state.userInfo.userId
 export default {
   components: {
     DrawerSet,

pages/resourceManagement/EquipmentCalendar/index.vue

@@ -19,7 +19,7 @@
               clearable
               style="width:235px;flaot:left;"
             />
-            <Button type="success" class @click="easySearch">查询</Button>
+            <Button type="primary" class @click="easySearch">查询</Button>
             <!-- <Button @click="advancedSearch" type="success" style="margin-left:8px;">高级搜索</Button> -->
           </Col>
           <!-- <Col span="12" style=" text-align: right;">

pages/resourceManagement/deviceManagementCP/index.vue

@@ -19,13 +19,13 @@
               clearable
               style="width:235px;flaot:left;"
             />
-            <Button type="success" class="" @click="easySearch">查询</Button>
+            <Button type="primary" class="" @click="easySearch">查询</Button>
             <!-- <Button @click="advancedSearch" type="success" style="margin-left:8px;">高级搜索</Button> -->
           </Col>
           <Col span="12" style=" text-align: right;">
-            <Button type="success" @click="newEquipment">新增设备</Button>
-            <Button type="success" @click="newMain1">设备维修</Button>
-            <Button type="success" @click="newMain">设备保养</Button>
+            <Button type="primary" @click="newEquipment">新增设备</Button>
+            <Button type="primary" @click="newMain1">设备维修</Button>
+            <Button type="primary" @click="newMain">设备保养</Button>
             <!-- <Button type="success" @click="deleted">删除</Button> -->
           </Col>
         </Row>