From 03c046b36b7a1b2606207194b368338d9090df66 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 10 Jan 2024 14:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common/renderUtils.ts               |  3 +++
 .../kc/jiaoshi/KcJiaoshirongliang.data.ts     | 21 ++++++++++---------
 .../kc/jiaoshi/KcJiaoshirongliangList.vue     |  1 +
 src/views/kc/xxhbtkxx/XxhbtkxxList.vue        |  4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/utils/common/renderUtils.ts b/src/utils/common/renderUtils.ts
index cf8d1d6..f860dda 100644
--- a/src/utils/common/renderUtils.ts
+++ b/src/utils/common/renderUtils.ts
@@ -78,6 +78,9 @@ const render = {
           shape: 'square',
           size: 25,
           style: { marginRight: '5px' },
+          previewMask: () => {
+            return h(Icon, { icon: 'ant-design:eye-outlined', size: 20 });
+          },
         });
       })
     );
diff --git a/src/views/kc/jiaoshi/KcJiaoshirongliang.data.ts b/src/views/kc/jiaoshi/KcJiaoshirongliang.data.ts
index 533a621..7311a51 100644
--- a/src/views/kc/jiaoshi/KcJiaoshirongliang.data.ts
+++ b/src/views/kc/jiaoshi/KcJiaoshirongliang.data.ts
@@ -34,11 +34,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'jsrl'
    },
-   {
-    title: '教室图片',
-    align:"center",
-    dataIndex: 'jstp'
-   },
    {
     title: '建筑物名称',
     align:"center",
@@ -59,6 +54,12 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'mph'
    },
+  //  {
+  //   title: '教室图片',
+  //   align:"center",
+  //   dataIndex: 'jstp',
+  //   customRender: render.renderImage,
+  //  },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -95,11 +96,6 @@ export const formSchema: FormSchema[] = [
     field: 'jsrl',
     component: 'Input',
   },
-  {
-    label: '教室图片',
-    field: 'jstp',
-    component: 'Input',
-  },
   {
     label: '建筑物名称',
     field: 'jzwmc',
@@ -119,6 +115,11 @@ export const formSchema: FormSchema[] = [
     label: '门牌号',
     field: 'mph',
     component: 'Input',
+  },
+  {
+    label: '教室图片',
+    field: 'jstp',
+    component: 'JImageUpload',
   },
 	// TODO 主键隐藏字段，目前写死为ID
 	{
diff --git a/src/views/kc/jiaoshi/KcJiaoshirongliangList.vue b/src/views/kc/jiaoshi/KcJiaoshirongliangList.vue
index 5b3cea9..3d2d688 100644
--- a/src/views/kc/jiaoshi/KcJiaoshirongliangList.vue
+++ b/src/views/kc/jiaoshi/KcJiaoshirongliangList.vue
@@ -52,6 +52,7 @@
   import {columns, searchFormSchema} from './KcJiaoshirongliang.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './KcJiaoshirongliang.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
+  import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
diff --git a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
index 0420a1c..f409dce 100644
--- a/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
+++ b/src/views/kc/xxhbtkxx/XxhbtkxxList.vue
@@ -159,7 +159,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+    <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
         <!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
@@ -168,7 +168,7 @@
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
+              <a-menu-item key="1" @click="batchHandleDelete"> 
                 <Icon icon="ant-design:delete-outlined"></Icon>
                 删除
               </a-menu-item>