From 0a2b414821ce4872edd09f3f98738a10c696910e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 10:43:06 +0800
Subject: [PATCH] 所有搜索按钮mini改为small

---
 src/views/system/point/index.vue |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 6d51e3f..671d55c 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
-        <el-input v-model="queryParams.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.pointName" placeholder="杈撳叆鐐逛綅鍚嶇О" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
     </el-form>
 
@@ -41,10 +41,20 @@
 
     <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200" />
-      <el-table-column label="鏍囩" align="center" width="90">
+      <el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200" show-overflow-tooltip/>
+      <el-table-column label="鏍囩" align="center" width="90" show-overflow-tooltip>
         <template slot-scope="scope">
           <dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
+        </template>
+      </el-table-column>
+      <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="鐐逛綅缁撴潫鏃堕棿" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
@@ -102,6 +112,11 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="鐐逛綅鏃跺尯" prop="timezone">
+          <el-date-picker @change="dateChange" v-model="form.timezone" type="daterange" align="right" unlink-panels
+                          range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="鐐逛綅澶囨敞" prop="remark">
           <el-input type="textarea" v-model="form.remark"/>
         </el-form-item>
@@ -125,6 +140,11 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="杩愮淮鏃堕棿娈�" prop="timezone">
+          <el-date-picker @change="dateChange" v-model="batchEditForm.timezone" type="daterange" align="right"
+                          unlink-panels range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitBatchEdit">纭� 瀹�</el-button>

--
Gitblit v1.8.0