From 1c0d53fe69f4fe442810d2ccc0cd44ca54931393 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 03 一月 2023 14:45:29 +0800
Subject: [PATCH] 1.优化系统搜索栏布局

---
 src/views/sbgl/wxjl.vue |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/sbgl/wxjl.vue b/src/views/sbgl/wxjl.vue
index bbdf244..69a0880 100644
--- a/src/views/sbgl/wxjl.vue
+++ b/src/views/sbgl/wxjl.vue
@@ -11,10 +11,10 @@
           :model="form"
           label-width="100px"
           inline
-          style="display: flex;justify-content: space-between"
+          style="display: flex;"
         >
           <div class="elForm">
-            <el-form-item label="鐢熶骇杞﹂棿" label-width="70px" style=" display: flex;">
+            <el-form-item label="鐢熶骇杞﹂棿"style=" display: flex;">
               <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
                 <el-option
                   v-for="item in wkshopSelectArr"
@@ -33,7 +33,7 @@
             <el-form-item label="鎶ヤ慨浜哄憳" style=" display: flex;">
               <el-input v-model="form.reportuser" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
-            <el-form-item v-show="isExpandForm" label-width="70px" label="缁翠慨浜哄憳" style=" display: flex;">
+            <el-form-item v-show="isExpandForm" label="缁翠慨浜哄憳" style=" display: flex;">
               <el-input v-model="form.repairuser" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="楠岃瘉浜哄憳" style=" display: flex;">
@@ -67,7 +67,6 @@
             </el-form-item>
             <el-form-item
               v-show="isExpandForm"
-              label-width="70px"
               label="楠岃瘉鏃堕棿"
               style=" display: flex;align-items: center"
             >
@@ -84,7 +83,7 @@
               />
             </el-form-item>
           </div>
-          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
             <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
             <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
           </div>
@@ -317,7 +316,12 @@
         <div style="display: flex;flex-direction: column;margin-left: 40px">
           <div style="margin-bottom: 10px;display: flex;">楠岃瘉缁撴灉锛�
 
-            <i v-if="isResult==='閫氳繃'" class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+            <i
+              v-if="isResult==='閫氳繃'"
+              class="el-icon-success"
+              :style="{color:$store.state.settings.theme}"
+              style="margin-right: 2px"
+            />
             <i v-if="isResult==='涓嶉�氳繃'" class="el-icon-info" style="margin-right: 2px" />
 
             {{ isResult }}
@@ -334,7 +338,7 @@
         @close="pictureHandleClose"
       >
         <div style="font-size: 16px;margin-bottom: 10px">
-          <i class="el-icon-s-comment" style="color:#42b983;" /> {{ pictureName }}
+          <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> {{ pictureName }}
         </div>
 
         <img :key="new Date()" width="100%" :src="pictureUrl" alt="">
@@ -344,7 +348,8 @@
             v-if="pictureUrlAll.findIndex(item => item.url === pictureUrl)!==0"
             style="position: absolute;top: 48%;left: 3.5%;"
           ><i
-            style="color:#fff;cursor: pointer;font-size: 20px"
+            :style="{color:$store.state.settings.theme}"
+            style="cursor: pointer;font-size: 20px"
             class="el-icon-d-arrow-left"
             @click="arrowLeftClick(pictureUrl,pictureName)"
           /></div>
@@ -355,7 +360,8 @@
             style="position: absolute;top: 48%;right: 3.5%;"
           >
             <i
-              style="color:#fff;cursor: pointer;font-size: 20px"
+              :style="{color:$store.state.settings.theme}"
+              style="cursor: pointer;font-size: 20px"
               class="el-icon-d-arrow-right"
               @click="arrowRightClick(pictureUrl,pictureName)"
             /></div>
@@ -430,7 +436,7 @@
       isResult: '', // 楠岃瘉缁撴灉
       operation: '',
 
-      baseUrl: 'http://121.196.36.24:8001/', // 鍥剧墖棰勮鍦板潃鍓嶇紑
+      baseUrl: '', // 鍥剧墖棰勮鍦板潃鍓嶇紑
 
       pictureVisible: false, // 鍥剧墖棰勮瀵硅瘽妗�
       pictureUrl: '', // 鍥剧墖棰勮Url
@@ -456,6 +462,8 @@
   mounted() {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
+
+    this.baseUrl = process.env.VUE_APP_BASE_API_FILE
   },
   methods: {
     handleRequest() {

--
Gitblit v1.9.3