From b7848911102cf37a2b6c0e29cc76036fe4e5df75 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 1 Apr 2025 09:50:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E8=A7=88=E5=9B=BE=E7=89=87=E3=80=81?=
 =?UTF-8?q?=E5=8D=B3=E6=97=B6=E6=8C=87=E4=BB=A4=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigServiceDirective.data.ts            | 26 ++++++++++++++-----
 .../components/ConfigServiceDirectiveForm.vue | 15 +++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/views/serviceDirective/serviceDirective/ConfigServiceDirective.data.ts b/src/views/serviceDirective/serviceDirective/ConfigServiceDirective.data.ts
index e10c5d1..a717331 100644
--- a/src/views/serviceDirective/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/serviceDirective/serviceDirective/ConfigServiceDirective.data.ts
@@ -45,13 +45,13 @@ export const columns: BasicColumn[] = [
     title: '指令标签',
     align: 'center',
     dataIndex: 'tagList',
-    width:150,
+    width: 150,
     ellipsis: false,
     format(text, record, index) {
-      if(!!text && text.length>0){
-        return text.map(item => item.tagName).join('、');
-      }else{
-        return '-'
+      if (!!text && text.length > 0) {
+        return text.map((item) => item.tagName).join('、');
+      } else {
+        return '-';
       }
     },
   },
@@ -113,12 +113,12 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '语音文件',
-    align: "center",
+    align: 'center',
     dataIndex: 'mp3File',
   },
   {
     title: '视频文件',
-    align: "center",
+    align: 'center',
     dataIndex: 'mp4File',
   },
   // {
@@ -143,6 +143,18 @@ export const columns: BasicColumn[] = [
   //   sorter: true,
   //   dataIndex: 'updateTime'
   // },
+  {
+    title: '预览图片',
+    align: 'center',
+    dataIndex: 'previewFile',
+    customRender: render.renderImage,
+  },
+  {
+    title: '即时指令图片',
+    align: 'center',
+    dataIndex: 'immediateFile',
+    customRender: render.renderImage,
+  },
 ];
 
 // 高级查询数据
diff --git a/src/views/serviceDirective/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/serviceDirective/serviceDirective/components/ConfigServiceDirectiveForm.vue
index 6f31cc7..93661d0 100644
--- a/src/views/serviceDirective/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/serviceDirective/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -136,6 +136,18 @@
               </a-form-item>
             </a-col> -->
           </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item label="预览图片" v-bind="validateInfos.previewFile">
+                <JImageUpload :fileMax="1" v-model:value="formData.previewFile"></JImageUpload>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item label="即时指令图片" v-bind="validateInfos.immediateFile">
+                <JImageUpload :fileMax="1" v-model:value="formData.immediateFile"></JImageUpload>
+              </a-form-item>
+            </a-col>
+          </a-row>
           <a-row>
             <a-col :span="12">
               <a-form-item label="语音文件" v-bind="validateInfos.mp3File" id="ConfigServiceDirectiveForm-mp3File"
@@ -186,6 +198,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
 import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 import { JCheckbox } from '/@/components/Form';
 import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
+import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
 import { getValueType } from '/@/utils';
 import { saveOrUpdate } from '../ConfigServiceDirective.api';
 import { Form } from 'ant-design-vue';
@@ -221,6 +234,8 @@ const formData = reactive<Record<string, any>>({
   updateTime: '',
   mp3File: '',
   mp4File: '',
+  previewFile: '',
+  immediateFile: '',
 });
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 6 } });