Merge remote-tracking branch 'origin/develop' into develop

src/utils/dict.ts

@@ -249,7 +249,7 @@ export enum DICT_TYPE {
   // ========== 首页信息模块  ==========
   // ========== 首页信息模块  ==========
   HOME_INFO_STATUS = 'home_info_status',
   HOME_INFO_STATUS = 'home_info_status',
   HOME_INFO_COMPUTILITY_TYPE = 'home_info_computility_type',
   HOME_INFO_COMPUTILITY_TYPE = 'home_info_computility_type',
-  HOME_INFO_ASSEMBLY_TYPE = 'home_info_assembly_type',
+  INDUSTRY_APPLICATION_TYPE = 'industry_application_type',
   HOME_INFO_INFORMATION_CATEGORY = 'home_info_information_category',
   HOME_INFO_INFORMATION_CATEGORY = 'home_info_information_category',
   HOME_INFO_INDUSTRY_CATEGORY = 'home_info_industry_category',
   HOME_INFO_INDUSTRY_CATEGORY = 'home_info_industry_category',
 }
 }

src/views/biz/bannerinfo/BannerInfoForm.vue

@@ -47,16 +47,17 @@
         <el-input v-model="formData.url" placeholder="请输入链接地址" />
         <el-input v-model="formData.url" placeholder="请输入链接地址" />
       </el-form-item>
       </el-form-item>
       <el-form-item label="描述内容" prop="description">
       <el-form-item label="描述内容" prop="description">
-        <Editor v-model="formData.description" height="150px" />
+        <!--        <Editor v-model="formData.description" height="150px" />-->
+        <el-input
+          v-model="formData.description"
+          :rows="2"
+          type="textarea"
+          placeholder="请输入描述内容"
+        />
       </el-form-item>
       </el-form-item>
       <el-form-item label="排序值" prop="orderNum">
       <el-form-item label="排序值" prop="orderNum">
         <el-input v-model="formData.orderNum" placeholder="请输入排序值" />
         <el-input v-model="formData.orderNum" placeholder="请输入排序值" />
       </el-form-item>
       </el-form-item>
-      <!--      <el-form-item label="状态" prop="showStatus">-->
-      <!--        <el-radio-group v-model="formData.showStatus">-->
-      <!--          <el-radio value="1">请选择字典生成</el-radio>-->
-      <!--        </el-radio-group>-->
-      <!--      </el-form-item>-->
       <el-form-item label="状态" prop="showStatus">
       <el-form-item label="状态" prop="showStatus">
         <el-radio-group v-model="formData.showStatus">
         <el-radio-group v-model="formData.showStatus">
           <el-radio
           <el-radio
@@ -80,8 +81,11 @@
   </Dialog>
   </Dialog>
 </template>
 </template>
 <script setup lang="ts">
 <script setup lang="ts">
-import { BannerInfoApi, BannerInfo } from '@/api/biz/bannerinfo'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { BannerInfoApi } from '@/api/biz/bannerinfo'
+import {
+  DICT_TYPE,
+  getIntDictOptions
+} from '@/utils/dict'
 import { useUpload } from '@/components/UploadFile/src/useUpload'
 import { useUpload } from '@/components/UploadFile/src/useUpload'
 import { Plus } from '@element-plus/icons-vue'
 import { Plus } from '@element-plus/icons-vue'
 
 
@@ -116,7 +120,7 @@ const formData = ref({
 const formRules = reactive({
 const formRules = reactive({
   information: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
   information: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
   title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
   title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
-  showStatus: [{ required: true, message: '状态：0-已隐藏，1-已显示不能为空', trigger: 'blur' }],
+  showStatus: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
   orderNum: [{ required: true, message: '排序值不能为空', trigger: 'blur' }]
   orderNum: [{ required: true, message: '排序值不能为空', trigger: 'blur' }]
 })
 })
 const formRef = ref() // 表单 Ref
 const formRef = ref() // 表单 Ref

src/views/biz/bannerinfo/index.vue

@@ -150,7 +150,7 @@
 
 
 <script setup lang="ts">
 <script setup lang="ts">
 import { isEmpty } from '@/utils/is'
 import { isEmpty } from '@/utils/is'
-import { dateFormatter } from '@/utils/formatTime'
+// import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import download from '@/utils/download'
 import { BannerInfoApi, BannerInfo } from '@/api/biz/bannerinfo'
 import { BannerInfoApi, BannerInfo } from '@/api/biz/bannerinfo'
 import BannerInfoForm from './BannerInfoForm.vue'
 import BannerInfoForm from './BannerInfoForm.vue'

src/views/biz/industryapplication/IndustryApplicationForm.vue

@@ -97,7 +97,7 @@
       <el-form-item label="组件类型" prop="assemblyType">
       <el-form-item label="组件类型" prop="assemblyType">
         <el-select v-model="formData.assemblyType" placeholder="请选择组件类型" clearable class="!w-150px">
         <el-select v-model="formData.assemblyType" placeholder="请选择组件类型" clearable class="!w-150px">
           <el-option
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HOME_INFO_ASSEMBLY_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.INDUSTRY_APPLICATION_TYPE)"
             :key="dict.value"
             :key="dict.value"
             :label="dict.label"
             :label="dict.label"
             :value="dict.value"
             :value="dict.value"

src/views/biz/industryapplication/index.vue

@@ -43,7 +43,7 @@
           class="!w-150px"
           class="!w-150px"
         >
         >
           <el-option
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HOME_INFO_ASSEMBLY_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.INDUSTRY_APPLICATION_TYPE)"
             :key="dict.value"
             :key="dict.value"
             :label="dict.label"
             :label="dict.label"
             :value="dict.value"
             :value="dict.value"
@@ -149,7 +149,7 @@
 
 
       <el-table-column label="组件类型" align="center" prop="assemblyType">
       <el-table-column label="组件类型" align="center" prop="assemblyType">
         <template #default="scope">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HOME_INFO_ASSEMBLY_TYPE" :value="scope.row.assemblyType" />
+          <dict-tag :type="DICT_TYPE.INDUSTRY_APPLICATION_TYPE" :value="scope.row.assemblyType" />
         </template>
         </template>
       </el-table-column>
       </el-table-column>