From d33eacc1f85ac3a736b33ba4713a19aae466d711 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 05 八月 2022 16:42:53 +0800
Subject: [PATCH] 1.做适应平板显示的内容大小

---
 src/views/sbgl/sbqd.vue |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 5ed3550..78e86d7 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -120,25 +120,30 @@
             prop="RowNum"
             width="50"
             label="搴忓彿"
+            fixed
           />
           <el-table-column
             prop="code"
             label="璁惧缂栫爜"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="name"
             label="璁惧鍚嶇О"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="eqptype_name"
             label="璁惧绫诲瀷"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
             prop="eqpgroup_name"
             label="璁惧缁�"
+            min-width="110"
             sortable="custom"
           />
           <el-table-column
@@ -166,6 +171,7 @@
             prop="wksp_name"
             label="鐢熶骇杞﹂棿"
             sortable="custom"
+            min-width="120"
           />
           <!--          <el-table-column-->
           <!--            prop="Line_name"-->
@@ -190,12 +196,14 @@
           />
           <el-table-column
             prop="lm_date"
+            width="160"
             label="鍒涘缓鏃堕棿"
             sortable="custom"
           />
           <el-table-column
             label="鎿嶄綔"
-            width="100"
+            fixed="right"
+            width="120"
           >
             <template slot-scope="{row}">
               <div class="operationClass">
@@ -331,7 +339,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="绋煎姩鐜�" prop="ratio">
-          <el-input v-model="dialogForm.ratio" style="width: 195px" />
+          <el-input v-model="dialogForm.ratio" style="width: 175px" />
           <span style="margin-left: 10px">%</span>
         </el-form-item>
 
@@ -547,7 +555,6 @@
 
 <script>
 import Pagination from '@/components/Pagination'
-import { getCookie } from '@/utils/auth'
 import {
   AddUpdateDeviceGroup, AddUpdateDeviceManger,
   AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
@@ -609,10 +616,10 @@
         devicename: '',
         devicetypecode: '',
         devicegroupcode: '',
-        importdate: '',
+        importdate: handleDatetime(new Date()),
         workshopcode: '',
         linecode: '',
-        status: '',
+        status: 'Y',
         ratio: ''
       },
       DeviceGroupDialogArr: [], // 璁惧缁勬暟缁�
@@ -665,23 +672,30 @@
     }
   },
   created() {
-    // 鑾峰彇璁惧娓呭崟鍒楄〃
-    this.getDeviceMangerSearch()
-    // 鑾峰彇璁惧绫诲瀷涓嬫媺
-    this.getDeviceTypeSelect()
-    // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
-    this.getWorkShopSelect()
+    this.handleRequest()
   },
   mounted() {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
   },
   methods: {
+    handleRequest() {
+      // 鑾峰彇璁惧娓呭崟鍒楄〃
+      this.getDeviceMangerSearch().then(res => {
+        if (res.code === '200') {
+          // 鑾峰彇璁惧绫诲瀷涓嬫媺
+          this.getDeviceTypeSelect()
+          // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+          this.getWorkShopSelect()
+        }
+      })
+    },
     // 鑾峰彇璁惧娓呭崟鍒楄〃
     async getDeviceMangerSearch() {
       const res = await DeviceMangerSearch(this.form)
       this.tableData = res.data
       this.total = res.count
+      return { code: res.code }
     },
     // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
     async getWorkShopSelect() {
@@ -781,10 +795,10 @@
       this.dialogForm.devicename = ''
       this.dialogForm.devicetypecode = ''
       this.dialogForm.devicegroupcode = ''
-      this.dialogForm.importdate = ''
+      this.dialogForm.importdate = handleDatetime(new Date())
       this.dialogForm.workshopcode = ''
       // this.dialogForm.linecode = ''
-      this.dialogForm.status = ''
+      this.dialogForm.status = 'Y'
       this.dialogForm.ratio = ''
       this.$refs.dialogForm.clearValidate()
     },
@@ -839,9 +853,6 @@
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 250
         this.tableHeight = this.mainHeight - 100
-        if (window.innerHeight < 800) {
-          this.tableHeight = this.tableHeight - 50
-        }
       })
     },
 
@@ -912,9 +923,9 @@
       if (row.name.trim().length < 1) {
         return this.$message.info('绫诲瀷鍚嶇О涓嶈兘涓虹┖锛�')
       }
-      if (row.remark.trim().length < 1) {
-        return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
-      }
+      // if (row.remark.trim().length < 1) {
+      //   return this.$message.info('绫诲瀷鎻忚堪涓嶈兘涓虹┖锛�')
+      // }
       const data = {
         'code': row.code,
         'name': row.name,
@@ -1026,9 +1037,9 @@
       if (row.eqptype_code.trim().length < 1) {
         return this.$message.info('鎵�灞炶澶囩被鍨嬩笉鑳戒负绌猴紒')
       }
-      if (row.remark.trim().length < 1) {
-        return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
-      }
+      // if (row.remark.trim().length < 1) {
+      //   return this.$message.info('鍒嗙粍鎻忚堪涓嶈兘涓虹┖锛�')
+      // }
       const data = {
         'code': row.code,
         'name': row.name,

--
Gitblit v1.9.3