From f18f98f3ea19ccdc1a7179311a49991c5131f5ef Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 13 Jan 2022 10:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../2.0.5/AppGridBlock/components/list.vue    | 36 +++++--------
 .../2.0.5/AppGridMember/components/list.vue   | 50 ++++++-------------
 2 files changed, 28 insertions(+), 58 deletions(-)

diff --git a/packages/2.0.5/AppGridBlock/components/list.vue b/packages/2.0.5/AppGridBlock/components/list.vue
index 828fd4e1..310368a1 100644
--- a/packages/2.0.5/AppGridBlock/components/list.vue
+++ b/packages/2.0.5/AppGridBlock/components/list.vue
@@ -116,14 +116,6 @@
               >
             </ai-import>
           </template>
-          <!-- <template slot="right">
-              <el-input placeholder="输入网格名称" size="small" v-model="searchObj.con"
-           @keyup.enter.native="page.current=1,getList()" prefix-icon="iconfont iconSearch"/>
-             <el-button type="primary" icon="iconfont iconSearch" size="small"
-                     @click="page.current=1,getList()">查询
-             </el-button>
-             <el-button icon="el-icon-refresh-right" size="small" @click="resetSearch">重置</el-button>
-          </template> -->
         </ai-search-bar>
         <ai-table
           class="mt10"
@@ -148,14 +140,13 @@
             slot="options"
             align="center"
             fixed="right"
-            width="250"
-          >
-            <template v-slot="{ row }">
-              <el-button type="text" @click="see(row)">编辑</el-button>
-              <el-button type="text" @click="poltting(row)">标绘</el-button>
-              <el-button type="text" @click="deleteById(row.id)"
-                >删除</el-button
-              >
+            width="160">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" @click="see(row)">编辑</el-button>
+                <el-button type="text" @click="poltting(row)">标绘</el-button>
+                <el-button type="text" @click="deleteById(row.id)">删除</el-button>
+              </div>
             </template>
           </el-table-column>
         </ai-table>
@@ -279,12 +270,12 @@ export default {
         },
         {
           prop: "girdCode",
-          align: "left",
+          align: "center",
           label: "网格编码",
         },
         {
           prop: "girdType",
-          align: "left",
+          align: "center",
           label: "网格类型",
           render(h, { row }) {
             return h("span", {}, _.dict.getLabel("girdType", row.girdType));
@@ -292,7 +283,7 @@ export default {
         },
         {
           prop: "girdLevel",
-          align: "left",
+          align: "center",
           label: "网格层级",
           render(h, { row }) {
             return h("span", {}, _.dict.getLabel("girdLevel", row.girdLevel));
@@ -316,16 +307,16 @@ export default {
         },
         {
           prop: "createTime",
-          align: "left",
+          align: "center",
           label: "创建时间",
-          width: 200,
           render(h, { row }) {
             return h("span", {}, row.createTime.substring(0, 11));
           },
         },
         {
           prop: "girdMemberNames",
-          align: "left",
+          align: "center",
+          width: 200,
           label: "网格员",
         },
       ];
@@ -333,7 +324,6 @@ export default {
   },
   methods: {
     handleNodeClick(val) {
-      console.log(val);
       this.info = { ...val };
       this.searchId = val.id;
       this.getList();
diff --git a/packages/2.0.5/AppGridMember/components/list.vue b/packages/2.0.5/AppGridMember/components/list.vue
index 10c614d1..752fa885 100644
--- a/packages/2.0.5/AppGridMember/components/list.vue
+++ b/packages/2.0.5/AppGridMember/components/list.vue
@@ -4,7 +4,7 @@
       <ai-title title="网格员管理" :isShowBottomBorder="true"></ai-title>
     </template>
     <template slot="content">
-      <ai-search-bar>
+      <ai-search-bar bottomBorder>
         <template slot="left">
           <el-date-picker
             v-model="searchObj.selectionDate"
@@ -12,8 +12,7 @@
             @change="(page.current = 1), getList()"
             value-format="yyyy-MM-dd"
             size="small"
-            placeholder="选用时间"
-          >
+            placeholder="选用时间">
           </el-date-picker>
         </template>
         <template slot="right">
@@ -23,24 +22,22 @@
             placeholder="网格员/网格名称"
             @keyup.enter.native="(page.current = 1), getList()"
             clearable
-            prefix-icon="iconfont iconSearch"
-          />
+            prefix-icon="iconfont iconSearch" />
           <el-button
             type="primary"
             icon="iconfont iconSearch"
             size="small"
-            @click="(page.current = 1), getList()"
-            >查询</el-button
-          >
+            @click="(page.current = 1), getList()">
+            查询
+          </el-button>
           <el-button
             icon="el-icon-refresh-right"
             size="small"
             @click="resetSearch"
-            >重置</el-button
-          >
+            >重置</el-button>
         </template>
       </ai-search-bar>
-      <ai-search-bar style="padding: 16px 0">
+      <ai-search-bar style="padding: 16px 0 0">
         <template slot="left">
           <el-button
             icon="iconfont iconAdd"
@@ -55,24 +52,6 @@
             :disabled="!Boolean(ids.length)"
             >删除</el-button
           >
-          <!-- <ai-download :instance="instance" url="/app/appgirdinfo/downloadGirdInfo" :params="{...searchObj,ids}" fileName="网格区块">
-                          <el-button  icon="iconfont iconExported" size="small">导出全部</el-button>
-                      </ai-download>                        
-                      <ai-import
-                          ref="import"
-                          style="margin-top: -8px;"
-                          title="导入"
-                          name="网格区块"
-                          url="/app/appgirdinfo/downloadGirdInfo"
-                          importUrl="/app/appgirdinfo/importGirdInfo"
-                          suffixName="xlsx"
-                          :customCliker="true"
-                          :instance="instance">
-                          <template slot="tips">
-                              <p>如果表格中已经存在数据，则会被本次导入的数据覆盖；不存在数据，系统将生成新的标准记录；</p>
-                          </template>
-                          <el-button  size="small" icon="iconfont iconImport">导入</el-button>
-                      </ai-import> -->
         </template>
       </ai-search-bar>
       <ai-table
@@ -83,12 +62,13 @@
         :current.sync="page.current"
         :size.sync="page.size"
         @selection-change="(v) => (ids = v.map((e) => e.id))"
-        @getList="getList()"
-      >
-        <el-table-column label="操作" slot="options" align="center">
-          <template v-slot="{ row }">
-            <el-button type="text" @click="add(row.id)">查看</el-button>
-            <el-button type="text" @click="deleteById(row.id)">删除</el-button>
+        @getList="getList()">
+        <el-table-column label="操作" slot="options" align="center" fixed="right" width="120">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="add(row.id)">查看</el-button>
+              <el-button type="text" @click="deleteById(row.id)">删除</el-button>
+            </div>
           </template>
         </el-table-column>
       </ai-table>