From 4a7ef7797ddd3c8d5f3f7fd3efad5ed2644c1956 Mon Sep 17 00:00:00 2001
From: liaoboping <2824044657@qq.com>
Date: Thu, 22 Aug 2024 18:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8A=A8=EF=BC=8Ccoding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/Editor/index.vue      |  4 ++
 ruoyi-ui/src/views/official/index/index.vue   | 46 ++++++++++++++-----
 .../src/views/official/slideshow/index.vue    |  2 +-
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 0e324e1..3d35ff2 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -191,6 +191,10 @@ export default {
 </script>
 
 <style>
+.editor {
+  max-height: 90vh;
+  overflow-y: overlay;
+}
 .editor, .ql-toolbar {
   white-space: pre-wrap !important;
   line-height: normal !important;
diff --git a/ruoyi-ui/src/views/official/index/index.vue b/ruoyi-ui/src/views/official/index/index.vue
index d94f8b2..b8ecc5e 100644
--- a/ruoyi-ui/src/views/official/index/index.vue
+++ b/ruoyi-ui/src/views/official/index/index.vue
@@ -104,14 +104,22 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="文件类型" align="center" prop="fileType" /> -->
-      <el-table-column label="业务名称" align="center" prop="businessName" />
-      <el-table-column label="英文名称" align="center" prop="businessNameEnglish" />
+      <el-table-column label="业务名称" align="center" prop="businessName">
+        <template slot-scope="{ row }">
+          <div class="multiple-line-content-show">{{ row.businessName }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="副/英文名称" align="center" prop="businessNameEnglish">
+        <template slot-scope="{ row }">
+          <div class="multiple-line-content-show">{{ row.businessNameEnglish }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="中文描述" align="center" prop="titleChinese">
         <template slot-scope="{ row }">
           <div class="multiple-line-content-show">{{ row.titleChinese }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="英文描述" align="center" prop="titleEnglish">
+      <el-table-column label="副/英文描述" align="center" prop="titleEnglish">
         <template slot-scope="{ row }">
           <div class="multiple-line-content-show">{{ row.titleEnglish }}</div>
         </template>
@@ -162,14 +170,24 @@
             placeholder="请选择栏目名称"
             :props="{ value: 'label' }"
             style="width: 100%;"
-            :disabled="Boolean(form.id)"
           ></el-cascader>
+            <!-- :disabled="Boolean(form.id)" -->
         </el-form-item>
         <el-form-item label="业务名称" prop="businessName">
-          <el-input v-model="form.businessName" placeholder="请输入业务名称" />
+          <el-input
+            type="textarea"
+            v-model="form.businessName"
+            placeholder="请输入业务名称"
+            :autosize="{ minRows: 1, maxRows: 4 }"
+          />
         </el-form-item>
-        <el-form-item label="英文名称" prop="businessNameEnglish">
-          <el-input v-model="form.businessNameEnglish" placeholder="请输入业务名称" />
+        <el-form-item label="副/英文名称" prop="businessNameEnglish">
+          <el-input
+            type="textarea"
+            v-model="form.businessNameEnglish"
+            placeholder="请输入业务副/英文名称"
+            :autosize="{ minRows: 1, maxRows: 4 }"
+          />
         </el-form-item>
         <!-- <el-form-item label="文件类型" prop="fileType">
           <el-radio-group v-model="form.fileType">
@@ -192,7 +210,7 @@
             :autosize="{ minRows: 4, maxRows: 10 }"
           />
         </el-form-item>
-        <el-form-item label="英文描述" prop="titleEnglish">
+        <el-form-item label="副/英文描述" prop="titleEnglish">
           <el-input
             type="textarea"
             v-model="form.titleEnglish"
@@ -281,7 +299,11 @@ export default {
       captionOptions: [
         {
           label: '首页',
-          children: [{ label: 'banner' }, { label: 'about' }, { label: 'businessBanner' }],
+          children: [
+          { label: 'banner' },
+          { label: 'about' },
+          { label: 'businessBanner' }
+        ],
         },
         {
           label: '业务范围',
@@ -295,6 +317,7 @@ export default {
                 { label: '主营方向' },
                 { label: '产品简介' },
                 { label: '石油产品' },
+                { label: '石油产品彩色版' },
                 { label: '专业团队' },
                 { label: 'joinus' },
               ],
@@ -391,8 +414,9 @@ export default {
               label: '美好昊坤',
               children: [
               { label: 'banner' },
-              { label: 'navigationSchool' },
-              { label: 'livingInHaokun' },
+              { label: '发展在昊坤' },
+              { label: '生活在昊坤' },
+              { label: '工作在昊坤' },
               { label: 'joinus' },
             ]
             },
diff --git a/ruoyi-ui/src/views/official/slideshow/index.vue b/ruoyi-ui/src/views/official/slideshow/index.vue
index f34b524..9af9f3d 100644
--- a/ruoyi-ui/src/views/official/slideshow/index.vue
+++ b/ruoyi-ui/src/views/official/slideshow/index.vue
@@ -156,7 +156,7 @@
     />
 
     <!-- 添加或修改新闻信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1520px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题名称" prop="captionName">
           <el-input v-model="form.captionName" placeholder="请输入标题名称" />