From 198b3639977a8d73b91927a981892b3da160afcf Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Fri, 11 Aug 2023 17:29:21 +0800
Subject: [PATCH] bugfix and performance improves

---
 src/api/dataApproval/enterpriseProduct.js     |  46 +--
 .../dataApproval/enterpriseServiceDemand.js   |   4 +-
 src/plugins/tab.js                            |   1 +
 src/utils/parameter.js                        | 168 +++++----
 src/utils/validate.js                         |  61 +--
 src/views/components/AgentForm/index.vue      |  44 ++-
 .../Businessneeds/Approvaldetails.vue         |  29 +-
 src/views/components/ExpertForm/index.vue     | 276 +++++++-------
 src/views/components/LaboratoryForm/index.vue | 182 +++++----
 src/views/components/ResearchForm/index.vue   |  18 +-
 .../Enterpriseproducts/approval.vue           | 181 +++++----
 .../Enterpriseproducts/index.vue              | 165 +++++----
 src/views/dataAuditList/demand/approval.vue   |  27 +-
 src/views/dataAuditList/demand/index.vue      |   9 +-
 .../dataAuditList/serviceDemand/approval.vue  |  68 ++--
 .../dataAuditList/serviceDemand/index.vue     | 171 +++++----
 src/views/dataList/expert/index.vue           | 347 +++++++++---------
 src/views/dataList/thesis/index.vue           | 132 +++----
 src/views/userAuditList/expert/index.vue      |  75 ++--
 src/views/website/aboutUs/index.vue           | 146 ++++----
 src/views/website/activity/active/index.vue   |  13 +-
 src/views/website/innovate/service/index.vue  | 153 ++++----
 .../website/solution/serviceCase/index.vue    | 184 +++++-----
 23 files changed, 1383 insertions(+), 1117 deletions(-)

diff --git a/src/api/dataApproval/enterpriseProduct.js b/src/api/dataApproval/enterpriseProduct.js
index 5087698..27fb20a 100644
--- a/src/api/dataApproval/enterpriseProduct.js
+++ b/src/api/dataApproval/enterpriseProduct.js
@@ -2,35 +2,35 @@ import request from "@/utils/request";
 
 // 获取企业产品审核列表
 export const enterpriseProductApprovalList = (params) =>
-  request({
-    url: "/business/dataReview/enterpriseProductList",
-    method: "get",
-    params,
-  });
+    request({
+        url: "/business/dataReview/enterpriseProductList",
+        method: "get",
+        params,
+    });
 // 获取企业产品审核详情
 export const getProductApprovalInfo = (id) =>
-  request({
-    url: `/business/dataReview/getProductInfo/${id}`,
-    method: "get",
-  });
+    request({
+        url: `/business/dataReview/getProductInfo/${id}`,
+        method: "get",
+    });
 // 修改企业产品审核状态
 export const updateEnterpriseApprovalProduct = (data) =>
-  request({
-    url: `/business/dataReview/updateEnterpriseProduct`,
-    method: "post",
-    data,
-  });
+    request({
+        url: `/business/dataReview/updateEnterpriseProduct`,
+        method: "post",
+        data,
+    });
 
 // 批量审核企业产品
-export const batchEnterpriseProduct = (ids) =>
-  request({
-    url: `/business/dataReview/batchEnterpriseProduct/${ids}`,
-    method: "PUT",
-  });
+export const batchEnterpriseProduct = (ids, status) =>
+    request({
+        url: `/business/dataReview/batchEnterpriseProduct/${ids}/${status}`,
+        method: "PUT",
+    });
 
 // 批量删除企业产品
 export const deleteEnterpriseProduct = (ids) =>
-  request({
-    url: `/business/dataReview/deleteEnterpriseProduct/${ids}`,
-    method: "DELETE",
-  });
+    request({
+        url: `/business/dataReview/deleteEnterpriseProduct/${ids}`,
+        method: "DELETE",
+    });
diff --git a/src/api/dataApproval/enterpriseServiceDemand.js b/src/api/dataApproval/enterpriseServiceDemand.js
index 37551b6..ae43fff 100644
--- a/src/api/dataApproval/enterpriseServiceDemand.js
+++ b/src/api/dataApproval/enterpriseServiceDemand.js
@@ -30,9 +30,9 @@ export const deleteCasDemand = (ids) =>
   });
 
 // 批量审核企业服务需求
-export const batchCasDemand = (ids) =>
+export const batchCasDemand = (ids,status) =>
   request({
-    url: `/business/dataReview/batchCasDemand/${ids}`,
+    url: `/business/dataReview/batchCasDemand/${ids}/${status}`,
     method: "PUT",
   });
 
diff --git a/src/plugins/tab.js b/src/plugins/tab.js
index 420bd37..6f27c6f 100644
--- a/src/plugins/tab.js
+++ b/src/plugins/tab.js
@@ -31,6 +31,7 @@ export default {
       return router.push(obj);
     }
   },
+
   // 关闭指定tab页签
   closePage(obj) {
     if (obj === undefined) {
diff --git a/src/utils/parameter.js b/src/utils/parameter.js
index 7c98aeb..6db9be7 100644
--- a/src/utils/parameter.js
+++ b/src/utils/parameter.js
@@ -1,31 +1,31 @@
 // 归属导航
 export const modeOptions = [
-  {
-    value: 101,
-    label: "中小企业服务",
-  },
-  {
-    value: 102,
-    label: "大型企业服务",
-  },
-  {
-    value: 103,
-    label: "政府企业服务",
-  },
-  {
-    value: 104,
-    label: "科研院所服务",
-  },
+    {
+        value: 101,
+        label: "中小企业服务",
+    },
+    {
+        value: 102,
+        label: "大型企业服务",
+    },
+    {
+        value: 103,
+        label: "政府企业服务",
+    },
+    {
+        value: 104,
+        label: "科研院所服务",
+    },
 ];
 // 学历
 export const educationOptions = [
-  { key: 1, text: "小学" },
-  { key: 2, text: "初中" },
-  { key: 3, text: "高中" },
-  { key: 4, text: "大专" },
-  { key: 5, text: "本科" },
-  { key: 6, text: "研究生" },
-  { key: 7, text: "博士" },
+    {key: "1", text: "小学"},
+    {key: "2", text: "初中"},
+    {key: "3", text: "高中"},
+    {key: "4", text: "大专"},
+    {key: "5", text: "本科"},
+    {key: "6", text: "研究生"},
+    {key: "7", text: "博士"},
 ];
 // 企业类型
 // export const enterpriseOptions = [
@@ -34,65 +34,97 @@ export const educationOptions = [
 //   { key: "103", value: "普通企业" },
 // ];
 export const enterpriseOptions = [
-  { key: "101", value: "上市企业" },
-  { key: "102", value: "独角兽企业" },
-  { key: "103", value: "国家级专精特新企业" },
-  { key: "104", value: "高新技术企业" },
-  { key: "105", value: "科技企业" },
+    {key: "101", value: "上市企业"},
+    {key: "102", value: "独角兽企业"},
+    {key: "103", value: "国家级专精特新企业"},
+    {key: "104", value: "高新技术企业"},
+    {key: "105", value: "科技企业"},
 ];
 
 // 需求类型
 export const demandCategoryList = [
-  { id: 1, name: "基金对接" },
-  { id: 2, name: "贷款" },
-  { id: 3, name: "对接专家院士" },
-  { id: 4, name: "人才培养" },
-  { id: 5, name: "一带一路国际合作" },
-  { id: 6, name: "上市辅导" },
-  { id: 7, name: "成果产业化" },
-  { id: 8, name: "国家级科研平台合作" },
-  { id: 9, name: "研发项目立项评估" },
-  { id: 10, name: "科技查新" },
-  { id: 11, name: "产业链上下游对接" },
-  { id: 12, name: "委托研发" },
-  { id: 13, name: "对接政府项目落地" },
-  { id: 14, name: "技术咨询" },
-  { id: 15, name: "高价值专利培育" },
-  { id: 16, name: "知识产权布局" },
-  { id: 17, name: "设立院士工作站" },
-  { id: 18, name: "海外留学生培养" },
+    {id: 1, name: "基金对接"},
+    {id: 2, name: "贷款"},
+    {id: 3, name: "对接专家院士"},
+    {id: 4, name: "人才培养"},
+    {id: 5, name: "一带一路国际合作"},
+    {id: 6, name: "上市辅导"},
+    {id: 7, name: "成果产业化"},
+    {id: 8, name: "国家级科研平台合作"},
+    {id: 9, name: "研发项目立项评估"},
+    {id: 10, name: "科技查新"},
+    {id: 11, name: "产业链上下游对接"},
+    {id: 12, name: "委托研发"},
+    {id: 13, name: "对接政府项目落地"},
+    {id: 14, name: "技术咨询"},
+    {id: 15, name: "高价值专利培育"},
+    {id: 16, name: "知识产权布局"},
+    {id: 17, name: "设立院士工作站"},
+    {id: 18, name: "海外留学生培养"},
 ];
 // 成果成熟度  技术
 export const maturityOptions = [
-  { key: "1", value: "正在研发" },
-  { key: "2", value: "小试阶段" },
-  { key: "3", value: "通过小试" },
-  { key: "4", value: "中试阶段" },
-  { key: "5", value: "通过中试" },
-  { key: "6", value: "可规模生产" },
+    {key: "1", value: "正在研发"},
+    {key: "2", value: "小试阶段"},
+    {key: "3", value: "通过小试"},
+    {key: "4", value: "中试阶段"},
+    {key: "5", value: "通过中试"},
+    {key: "6", value: "可规模生产"},
 ];
 // 成果领先型  领先标准
 export const leadOptions = [
-  { key: "1", value: "国内先进" },
-  { key: "2", value: "国内领先" },
-  { key: "3", value: "国际先进" },
-  { key: "4", value: "国际领先" },
+    {key: "1", value: "国内先进"},
+    {key: "2", value: "国内领先"},
+    {key: "3", value: "国际先进"},
+    {key: "4", value: "国际领先"},
 ];
 // 专利类型
 export const patentOptions = [
-  { key: "1", value: "发明专利" },
-  { key: "2", value: "外观设计" },
-  { key: "3", value: "实用新型" },
+    {key: "1", value: "发明专利"},
+    {key: "2", value: "外观设计"},
+    {key: "3", value: "实用新型"},
 ];
 // 合作模式
 export const cooperationOptions = [
-  { key: "101", value: "技术转让" },
-  { key: "102", value: "技术许可" },
-  { key: "103", value: "技术入股" },
-  { key: "104", value: "合作开发" },
-  { key: "105", value: "融资" },
-  { key: "106", value: "公司" },
-  { key: "107", value: "代理加盟" },
-  { key: "108", value: "市场推广" },
-  { key: "109", value: "其他" },
+    {key: "101", value: "技术转让"},
+    {key: "102", value: "技术许可"},
+    {key: "103", value: "技术入股"},
+    {key: "104", value: "合作开发"},
+    {key: "105", value: "融资"},
+    {key: "106", value: "公司"},
+    {key: "107", value: "代理加盟"},
+    {key: "108", value: "市场推广"},
+    {key: "109", value: "其他"},
 ];
+
+
+export const countryOptions = [
+    {
+        key: "zh",
+        value: "中国",
+    },
+    {
+        key: "ru",
+        value: "俄罗斯",
+    },
+    {
+        key: "tj",
+        value: "塔吉克斯坦",
+    },
+    {
+        key: "tm",
+        value: "土库曼斯坦",
+    },
+    {
+        key: "uz",
+        value: "乌兹别克斯坦",
+    },
+    {
+        key: "kz",
+        value: "哈萨克斯坦",
+    },
+    {
+        key: "kg",
+        zh: "吉尔吉斯斯坦",
+    }
+];
\ No newline at end of file
diff --git a/src/utils/validate.js b/src/utils/validate.js
index c5967db..a57ff50 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -4,7 +4,7 @@
  * @returns {Boolean}
  */
 export function isHttp(url) {
-  return url.indexOf("http://") !== -1 || url.indexOf("https://") !== -1;
+    return url.indexOf("http://") !== -1 || url.indexOf("https://") !== -1;
 }
 
 /**
@@ -13,7 +13,7 @@ export function isHttp(url) {
  * @returns {Boolean}
  */
 export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path);
+    return /^(https?:|mailto:|tel:)/.test(path);
 }
 
 /**
@@ -21,8 +21,8 @@ export function isExternal(path) {
  * @returns {Boolean}
  */
 export function validUsername(str) {
-  const valid_map = ["admin", "editor"];
-  return valid_map.indexOf(str.trim()) >= 0;
+    const valid_map = ["admin", "editor"];
+    return valid_map.indexOf(str.trim()) >= 0;
 }
 
 /**
@@ -30,9 +30,9 @@ export function validUsername(str) {
  * @returns {Boolean}
  */
 export function validURL(url) {
-  const reg =
-    /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
-  return reg.test(url);
+    const reg =
+        /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
+    return reg.test(url);
 }
 
 /**
@@ -40,8 +40,8 @@ export function validURL(url) {
  * @returns {Boolean}
  */
 export function validLowerCase(str) {
-  const reg = /^[a-z]+$/;
-  return reg.test(str);
+    const reg = /^[a-z]+$/;
+    return reg.test(str);
 }
 
 /**
@@ -49,8 +49,8 @@ export function validLowerCase(str) {
  * @returns {Boolean}
  */
 export function validUpperCase(str) {
-  const reg = /^[A-Z]+$/;
-  return reg.test(str);
+    const reg = /^[A-Z]+$/;
+    return reg.test(str);
 }
 
 /**
@@ -58,8 +58,8 @@ export function validUpperCase(str) {
  * @returns {Boolean}
  */
 export function validAlphabets(str) {
-  const reg = /^[A-Za-z]+$/;
-  return reg.test(str);
+    const reg = /^[A-Za-z]+$/;
+    return reg.test(str);
 }
 
 /**
@@ -67,9 +67,9 @@ export function validAlphabets(str) {
  * @returns {Boolean}
  */
 export function validEmail(email) {
-  const reg =
-    /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-  return reg.test(email);
+    const reg =
+        /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return reg.test(email);
 }
 
 /**
@@ -77,10 +77,10 @@ export function validEmail(email) {
  * @returns {Boolean}
  */
 export function isString(str) {
-  if (typeof str === "string" || str instanceof String) {
-    return true;
-  }
-  return false;
+    if (typeof str === "string" || str instanceof String) {
+        return true;
+    }
+    return false;
 }
 
 /**
@@ -88,8 +88,21 @@ export function isString(str) {
  * @returns {Boolean}
  */
 export function isArray(arg) {
-  if (typeof Array.isArray === "undefined") {
-    return Object.prototype.toString.call(arg) === "[object Array]";
-  }
-  return Array.isArray(arg);
+    if (typeof Array.isArray === "undefined") {
+        return Object.prototype.toString.call(arg) === "[object Array]";
+    }
+    return Array.isArray(arg);
 }
+
+
+export const scrollToInvalidField = () => {
+    const errEl = document.querySelector(".is-error")
+    if (errEl) {
+        window.scrollTo(
+            {
+                top: errEl?.getBoundingClientRect()?.top + document.scrollingElement.scrollTop - 20,
+                behavior: "smooth",
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/views/components/AgentForm/index.vue b/src/views/components/AgentForm/index.vue
index db59783..0390962 100644
--- a/src/views/components/AgentForm/index.vue
+++ b/src/views/components/AgentForm/index.vue
@@ -23,6 +23,24 @@
       </el-col>
     </el-row>
 
+    <!--    ADDEMAIL-->
+    <!--    邮箱-->
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="邮箱" prop="email">
+          <el-input placeholder="请输入邮箱" v-model="modelValue.email"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!--    其他联系方式-->
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="其他联系方式" prop="otherContact">
+          <el-input v-model="modelValue.otherContact"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
     <el-row>
       <el-col :span="24">
         <el-form-item label="身份证号:" prop="idCard">
@@ -84,7 +102,7 @@
 
     <el-row>
       <el-col :span="24">
-        <el-form-item label="身份证:" required>
+        <el-form-item label="身份证:" >
           <el-row :gutter="20" justify="space-between" type="flex">
             <el-col :span="8">
               <el-form-item prop="idImage.0">
@@ -170,13 +188,13 @@ const data = reactive({
     name: [{required: true, message: "请输入", trigger: "blur"}],
     mobile: [
       {required: true, message: "请输入", trigger: "blur"},
-      {
-        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        message: "请输入正确的手机号码",
-        trigger: "blur",
-      },
+      // {
+      //   pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+      //   message: "请输入正确的手机号码",
+      //   trigger: "blur",
+      // },
     ],
-    idCard: [{required: true, message: "请输入", trigger: "blur"}],
+    idCard: [/*{required: true, message: "请输入", trigger: "blur"}*/],
     workAddress: [{required: true, message: "请输入", trigger: "blur"}],
     experience: [{required: true, message: "请输入", trigger: "blur"}],
     // tenantId: [
@@ -187,25 +205,25 @@ const data = reactive({
     //   },
     // ],
     "idImage.0": [
-      {
+      /*{
         required: true,
         message: "请上传",
         trigger: ["blur", "change"],
-      },
+      },*/
     ],
     "idImage.1": [
-      {
+      /*{
         required: true,
         message: "请上传",
         trigger: ["blur", "change"],
-      },
+      },*/
     ],
     "idImage.2": [
-      {
+      /*{
         required: true,
         message: "请上传",
         trigger: ["blur", "change"],
-      },
+      },*/
     ],
   },
 });
diff --git a/src/views/components/Businessneeds/Approvaldetails.vue b/src/views/components/Businessneeds/Approvaldetails.vue
index e09920d..7355ee9 100644
--- a/src/views/components/Businessneeds/Approvaldetails.vue
+++ b/src/views/components/Businessneeds/Approvaldetails.vue
@@ -54,12 +54,27 @@
           ref="fieldFormRef"
       />
 
-      <CityOptions
-          disabled
-          v-model="modelValue"
-          :labelWidth="labelWidth"
-          ref="cityFormRef"
-      />
+<!--      <CityOptions-->
+<!--          disabled-->
+<!--          v-model="modelValue"-->
+<!--          :labelWidth="labelWidth"-->
+<!--          ref="cityFormRef"-->
+<!--      />-->
+      <el-form-item
+          label="国家"
+          prop="country"
+      >
+        <el-select
+            v-model="modelValue.country"
+            placeholder="请选择国家"
+        >
+          <el-option
+              v-for="option in countryOptions"
+              :label="option.value"
+              :value="option.key"
+          />
+        </el-select>
+      </el-form-item>
 
       <el-row>
         <el-col :span="12">
@@ -163,7 +178,7 @@
   </el-dialog>
 </template>
 <script setup>
-import {demandCategoryList} from "@/utils/parameter";
+import {countryOptions, demandCategoryList} from "@/utils/parameter";
 import WangEditor from "@/components/WangEditor";
 import CityOptions from "@/views/components/CityOptions";
 import FieldOptions from "@/views/components/FieldOptions";
diff --git a/src/views/components/ExpertForm/index.vue b/src/views/components/ExpertForm/index.vue
index 7b57651..a5f55ee 100644
--- a/src/views/components/ExpertForm/index.vue
+++ b/src/views/components/ExpertForm/index.vue
@@ -1,15 +1,15 @@
 <template>
   <el-form
-    ref="formRef"
-    :label-width="labelWidth + 'px'"
-    :model="modelValue"
-    :rules="rules"
+      ref="formRef"
+      :label-width="labelWidth + 'px'"
+      :model="modelValue"
+      :rules="rules"
   >
     <div v-if="showTitle" class="form_title">基本信息</div>
     <el-row>
       <el-col :span="24">
         <el-form-item :label="imageName" prop="image">
-          <ImageUpload v-model="modelValue.image" :fileSize="2" :limit="1" />
+          <ImageUpload v-model="modelValue.image" :fileSize="2" :limit="1"/>
         </el-form-item>
       </el-col>
     </el-row>
@@ -18,8 +18,8 @@
       <el-col :span="24">
         <el-form-item :label="nameName" prop="name">
           <el-input
-            v-model="modelValue.name"
-            :disabled="isAdd ? false : true"
+              v-model="modelValue.name"
+              :disabled="isAdd ? false : true"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -53,40 +53,70 @@
       <el-col :span="24">
         <el-form-item label="联系方式" prop="phone">
           <el-input
-            v-model="modelValue.phone"
-            :maxlength="11"
-            oninput="
-                value = value
-                  .replace(/[^\d.]/g, '')
-                  .replace(/\.{2,}/g, '.')
-                  .replace('.', '$#$')
-                  .replace(/\./g, '')
-                  .replace('$#$', '.')
-                  .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
-                  .replace(/^\./g, '')
-              "
+              v-model="modelValue.phone"
           ></el-input>
           <!-- v-number -->
         </el-form-item>
       </el-col>
     </el-row>
-    <el-row v-if="formType == 2">
-      <el-col :span="24">
-        <el-form-item label="邮箱" prop="email">
-          <el-input v-model="modelValue.email"></el-input>
+
+
+
+
+
+    <el-row v-if="formType == 1">
+      <el-col :span="12">
+        <el-form-item label="姓名:" prop="name">
+          <el-input
+              v-model="modelValue.name"
+              :disabled="isAdd ? false : true"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="手机号:" prop="mobile">
+          <el-input
+              v-model="modelValue.mobile"
+              :disabled="isAdd ? false : true"
+          ></el-input>
         </el-form-item>
       </el-col>
     </el-row>
 
+    <!--    ADDEMAIL-->
+    <!--    邮箱-->
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="邮箱" prop="email">
+          <el-input placeholder="请输入邮箱" v-model="modelValue.email"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!--    其他联系方式-->
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="其他联系方式" prop="otherContact">
+          <el-input v-model="modelValue.otherContact"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!-- <el-row>
+      <el-col :span="24">
+        <el-form-item label="所属站点:" prop="tenantId">
+          <SiteOptions v-model="modelValue.tenantId" :site-list="siteList" />
+        </el-form-item>
+      </el-col>
+    </el-row> -->
+
     <el-row v-if="formType == 2">
       <el-col :span="24">
         <el-form-item label="企业类型:" prop="kind">
           <el-select v-model="modelValue.kind" placeholder="请选择">
             <el-option
-              v-for="item in enterpriseOptions"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
+                v-for="item in enterpriseOptions"
+                :key="item.key"
+                :label="item.value"
+                :value="item.key"
             >
             </el-option>
           </el-select>
@@ -99,33 +129,6 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="formType == 1">
-      <el-col :span="12">
-        <el-form-item label="姓名:" prop="name">
-          <el-input
-            v-model="modelValue.name"
-            :disabled="isAdd ? false : true"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="手机号:" prop="mobile">
-          <el-input
-            v-model="modelValue.mobile"
-            :disabled="isAdd ? false : true"
-          ></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <!-- <el-row>
-      <el-col :span="24">
-        <el-form-item label="所属站点:" prop="tenantId">
-          <SiteOptions v-model="modelValue.tenantId" :site-list="siteList" />
-        </el-form-item>
-      </el-col>
-    </el-row> -->
-
     <el-row v-if="formType == 1">
       <!--      <el-col :span="12">-->
       <!--        <el-form-item label="所属单位:" prop="researchId">-->
@@ -148,36 +151,52 @@
       <el-col :span="12">
         <el-form-item label="所属实验室:">
           <infinite-select
-            v-model="modelValue.laboratoryId"
-            :prop="{ label: 'name', value: 'id' }"
-            :query="{ page: 'pageNum', size: 'pageSize', searchKey: 'name' }"
-            :remote-method="loadLabOptions"
-            :default-label="modelValue.laboratoryName"
-            class="infinite-select"
-            prefix-icon="pointer"
+              v-model="modelValue.laboratoryId"
+              :prop="{ label: 'name', value: 'id' }"
+              :query="{ page: 'pageNum', size: 'pageSize', searchKey: 'name' }"
+              :remote-method="loadLabOptions"
+              :default-label="modelValue.laboratoryName"
+              class="infinite-select"
+              prefix-icon="pointer"
           />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="所属研究机构:">
           <infinite-select
-            v-model="modelValue.researchId"
-            :default-label="modelValue.researchName"
-            :prop="{ label: 'name', value: 'id' }"
-            :query="{ page: 'pageNum', size: 'pageSize', searchKey: 'name' }"
-            :remote-method="loadResearchOptions"
-            class="infinite-select"
-            prefix-icon="pointer"
+              v-model="modelValue.researchId"
+              :default-label="modelValue.researchName"
+              :prop="{ label: 'name', value: 'id' }"
+              :query="{ page: 'pageNum', size: 'pageSize', searchKey: 'name' }"
+              :remote-method="loadResearchOptions"
+              class="infinite-select"
+              prefix-icon="pointer"
           />
         </el-form-item>
       </el-col>
     </el-row>
 
-    <CityOptions
-      ref="cityFormRef"
-      v-model="modelValue"
-      :labelWidth="labelWidth"
-    />
+    <!--    <CityOptions-->
+    <!--        ref="cityFormRef"-->
+    <!--        v-model="modelValue"-->
+    <!--        :labelWidth="labelWidth"-->
+    <!--    />-->
+
+    <el-form-item
+        label="国家"
+        prop="country"
+    >
+      <el-select
+          v-model="modelValue.country"
+          placeholder="请选择国家"
+      >
+        <el-option
+            v-for="option in countryOptions"
+            :label="option.value"
+            :value="option.key"
+        />
+      </el-select>
+    </el-form-item>
 
     <el-row>
       <el-col :span="24">
@@ -204,10 +223,11 @@
       <el-col :span="12">
         <el-form-item label="最高学历:" prop="education">
           <el-select v-model="modelValue.education" placeholder="请选择">
-            <el-option label="博士" value="博士"></el-option>
-            <el-option label="硕士" value="硕士"></el-option>
-            <el-option label="本科" value="本科"></el-option>
-            <el-option label="专科" value="专科"></el-option>
+            <!--            <el-option label="博士" value="博士"></el-option>-->
+            <!--            <el-option label="硕士" value="硕士"></el-option>-->
+            <!--            <el-option label="本科" value="本科"></el-option>-->
+            <!--            <el-option label="专科" value="专科"></el-option>-->
+            <el-option v-for="option in educationOptions" :key="option.key" :value="option.key" :label="option.text"/>
           </el-select>
         </el-form-item>
       </el-col>
@@ -235,11 +255,11 @@
       <el-col :span="12">
         <el-form-item label="从业时间:" prop="workTime">
           <el-date-picker
-            v-model="modelValue.workTime"
-            format="YYYY-MM"
-            placeholder="选择日期"
-            type="month"
-            value-format="YYYY-MM"
+              v-model="modelValue.workTime"
+              format="YYYY-MM"
+              placeholder="选择日期"
+              type="month"
+              value-format="YYYY-MM"
           >
           </el-date-picker>
         </el-form-item>
@@ -253,28 +273,28 @@
     </el-row>
 
     <FieldOptions
-      ref="fieldFormRef"
-      v-model="modelValue"
-      :labelWidth="labelWidth"
+        ref="fieldFormRef"
+        v-model="modelValue"
+        :labelWidth="labelWidth"
     />
 
     <InputBoxAdd
-      ref="keywordsFormRef"
-      v-model="modelValue"
-      :labelWidth="labelWidth"
-      fieldKey="keywords"
-      placeholder="应用场景关键词+技术产品关键词"
-      title="关键词"
+        ref="keywordsFormRef"
+        v-model="modelValue"
+        :labelWidth="labelWidth"
+        fieldKey="keywords"
+        placeholder="应用场景关键词+技术产品关键词"
+        title="关键词"
     />
 
     <InputBoxAdd
-      v-if="formType != 2"
-      ref="researchsFormRef"
-      v-model="modelValue"
-      :labelWidth="labelWidth"
-      fieldKey="researchs"
-      placeholder="请输入研究方向"
-      title="研究方向"
+        v-if="formType != 2"
+        ref="researchsFormRef"
+        v-model="modelValue"
+        :labelWidth="labelWidth"
+        fieldKey="researchs"
+        placeholder="请输入研究方向"
+        title="研究方向"
     />
 
     <!-- <InputBoxAdd
@@ -308,9 +328,9 @@
       <el-col :span="24">
         <el-form-item label="营业执照:" prop="license">
           <ImageUpload
-            v-model="modelValue.license"
-            :isShowTip="false"
-            :limit="1"
+              v-model="modelValue.license"
+              :isShowTip="false"
+              :limit="1"
           />
         </el-form-item>
       </el-col>
@@ -325,7 +345,7 @@
             :autosize="{ minRows: 2, maxRows: 6 }"
           /> -->
           <!-- v-else -->
-          <WangEditor v-model="modelValue.introduce" minHeight="150px" />
+          <WangEditor v-model="modelValue.introduce" minHeight="150px"/>
           <!-- <Editor
             v-else
             v-model="modelValue.introduce"
@@ -344,18 +364,18 @@ import CityOptions from "@/views/components/CityOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
 // import { researchSelect } from "@/api/dataList/research";
 // import { laboratorySelect } from "@/api/dataList/laboratory";
-import { tenantSelect } from "@/api/subPlatform/tenant";
-import { enterpriseOptions } from "@/utils/parameter";
-import { reactive, ref, toRefs } from "vue";
+import {tenantSelect} from "@/api/subPlatform/tenant";
+import {countryOptions, educationOptions, enterpriseOptions} from "@/utils/parameter";
+import {reactive, ref, toRefs} from "vue";
 import WangEditor from "@/components/WangEditor/index.vue";
 // import SiteOptions from "@/views/components/SiteOptions";
 import FieldOptions from "@/views/components/FieldOptions";
-import { casLaboratoryList } from "@/api/dataList/laboratory";
+import {casLaboratoryList} from "@/api/dataList/laboratory";
 import InfiniteSelect from "@/components/InfiniteSelect";
-import { researchList } from "@/api/dataList/research";
+import {researchList} from "@/api/dataList/research";
 
 const props = defineProps({
-  modelValue: { type: Object },
+  modelValue: {type: Object},
   isAdd: {
     type: Boolean,
     default: true,
@@ -373,8 +393,8 @@ const props = defineProps({
     default: 120,
   },
 });
-const { formType, modelValue, labelWidth, showTitle, isAdd } = toRefs(props);
-const cityFormRef = ref(null);
+const {formType, modelValue, labelWidth, showTitle, isAdd} = toRefs(props);
+// const cityFormRef = ref(null);
 const formRef = ref(null);
 const keywordsFormRef = ref(null);
 const researchsFormRef = ref(null);
@@ -385,10 +405,10 @@ const options = ref([]);
 const siteList = ref([]);
 const data = reactive({
   rules: {
-    product: [{ required: true, message: "请输入", trigger: "blur" }],
-    name: [{ required: true, message: "请输入", trigger: "blur" }],
-    kind: [{ required: true, message: "请选择", trigger: "change" }],
-    code: [{ required: true, message: "请输入", trigger: "blur" }],
+    product: [{required: true, message: "请输入", trigger: "blur"}],
+    name: [{required: true, message: "请输入", trigger: "blur"}],
+    kind: [{required: true, message: "请选择", trigger: "change"}],
+    code: [{required: true, message: "请输入", trigger: "blur"}],
     // mobile: [
     //   { required: true, message: "请输入", trigger: "blur" },
     //   {
@@ -397,7 +417,7 @@ const data = reactive({
     //     trigger: "blur",
     //   },
     // ],
-    researchId: [{ message: "请选择", trigger: "change" }],
+    researchId: [{message: "请选择", trigger: "change"}],
     tenantId: [
       {
         required: true,
@@ -405,12 +425,12 @@ const data = reactive({
         trigger: ["blur", "change"],
       },
     ],
-    school: [{ required: true, message: "请输入", trigger: "blur" }],
-    organization: [{ required: true, message: "请输入", trigger: "blur" }],
-    education: [{ message: "请选择", trigger: "change" }],
+    school: [{required: true, message: "请输入", trigger: "blur"}],
+    organization: [{required: true, message: "请输入", trigger: "blur"}],
+    education: [{message: "请选择", trigger: "change", required: true}],
     // major: [{ required: true, message: "请输入", trigger: "blur" }],
     // job: [{ required: true, message: "请输入", trigger: "blur" }],
-    title: [{ required: true, message: "请输入", trigger: "blur" }],
+    title: [{required: true, message: "请输入", trigger: "blur"}],
     workTime: [
       {
         required: true,
@@ -425,10 +445,10 @@ const data = reactive({
         trigger: ["blur", "change"],
       },
     ],
-    introduce: [{ required: true, message: "请输入", trigger: "blur" }],
+    introduce: [{required: true, message: "请输入", trigger: "blur"}],
   },
 });
-const { rules } = toRefs(data);
+const {rules} = toRefs(data);
 const introduceName = computed(() => {
   if (formType.value === 1) {
     return "个人简介:";
@@ -464,19 +484,19 @@ const validateForm = async () => {
   } catch (error) {
     formValid = false;
   }
-  const cityFormValid = await cityFormRef.value.validateForm();
+  // const cityFormValid = await cityFormRef.value.validateForm();
   const fieldFormValid = await fieldFormRef.value.validateForm();
   if (formType.value == 1) {
     //个人
     const researchsFormValid = await researchsFormRef.value.validateForm(); //研究方向验证
-    return formValid && cityFormValid && fieldFormValid && researchsFormValid;
+    return formValid && fieldFormValid && researchsFormValid;
   } else if (formType.value == 2) {
     //企业
     // const directionsFormValid = await directionsFormRef.value.validateForm(); //生产方向验证
     return (
-      formValid && cityFormValid && fieldFormValid
-      // keywordsFormValid &&
-      // directionsFormValid
+        formValid && fieldFormValid
+        // keywordsFormValid &&
+        // directionsFormValid
     );
   } else {
     throw "未知的formType";
@@ -490,9 +510,9 @@ const getSiteList = async () => {
 };
 
 const loadLabOptions = (query) =>
-  casLaboratoryList({ ...query, examineStatus: "1" }).then((resp) => resp.rows);
+    casLaboratoryList({...query, examineStatus: "1"}).then((resp) => resp.rows);
 const loadResearchOptions = (query) =>
-  researchList({ ...query, examineStatus: "1" }).then((resp) => resp.rows);
+    researchList({...query, examineStatus: "1"}).then((resp) => resp.rows);
 getSiteList();
 defineExpose({
   validateForm,
diff --git a/src/views/components/LaboratoryForm/index.vue b/src/views/components/LaboratoryForm/index.vue
index 93ad87a..4f9136d 100644
--- a/src/views/components/LaboratoryForm/index.vue
+++ b/src/views/components/LaboratoryForm/index.vue
@@ -1,18 +1,18 @@
 <template>
   <el-form
-    ref="formRef"
-    :label-width="labelWidth + 'px'"
-    :model="modelValue"
-    :rules="rules"
+      ref="formRef"
+      :label-width="labelWidth + 'px'"
+      :model="modelValue"
+      :rules="rules"
   >
     <div v-if="showTitle" class="form_title">基本信息</div>
     <el-row>
       <el-col :span="24">
         <el-form-item label="实验室名称" prop="name">
           <el-input
-            v-model="modelValue.name"
-            :disabled="!isAdd"
-            placeholder="请输入实验室全称"
+              v-model="modelValue.name"
+              :disabled="!isAdd"
+              placeholder="请输入实验室全称"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -22,8 +22,8 @@
       <el-col :span="24">
         <el-form-item label="所属单院所或高校:" prop="school">
           <el-input
-            v-model="modelValue.school"
-            placeholder="请输入所属单院所或高校"
+              v-model="modelValue.school"
+              placeholder="请输入所属单院所或高校"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -32,13 +32,13 @@
       <el-col :span="24">
         <el-form-item label="所属科研机构:" prop="researchId">
           <infinite-select
-            v-model="modelValue.researchId"
-            :default-label="modelValue.researchName"
-            :prop="{ label: 'name', value: 'id' }"
-            :query="{ page: 'pageNum', size: 'pageSize', searchKey: 'name' }"
-            :remote-method="loadResearchOptions"
-            class="infinite-select"
-            prefix-icon="pointer"
+              v-model="modelValue.researchId"
+              :default-label="modelValue.researchName"
+              :prop="{ label: 'name', value: 'id' }"
+              :query="{ page: 'pageNum', size: 'pageSize', searchKey: 'name' }"
+              :remote-method="loadResearchOptions"
+              class="infinite-select"
+              prefix-icon="pointer"
           />
         </el-form-item>
       </el-col>
@@ -61,45 +61,45 @@
       <el-col :span="24">
         <el-form-item label="实验室网站:">
           <el-input
-            v-model="modelValue.url"
-            placeholder="请输入实验室网站"
+              v-model="modelValue.url"
+              placeholder="请输入实验室网站"
           ></el-input>
         </el-form-item>
       </el-col>
     </el-row>
 
     <FieldOptions
-      ref="fieldFormRef"
-      v-model="modelValue"
-      :labelWidth="labelWidth"
+        ref="fieldFormRef"
+        v-model="modelValue"
+        :labelWidth="labelWidth"
     />
 
     <InputBoxAdd
-      ref="keywordsFormRef"
-      v-model="modelValue"
-      :labelWidth="labelWidth"
-      fieldKey="keywords"
-      placeholder="应用场景关键词+技术产品关键词"
-      title="关键词"
+        ref="keywordsFormRef"
+        v-model="modelValue"
+        :labelWidth="labelWidth"
+        fieldKey="keywords"
+        placeholder="应用场景关键词+技术产品关键词"
+        title="关键词"
     />
 
     <InputBoxAdd
-      ref="directionsFormRef"
-      v-model="modelValue"
-      :labelWidth="labelWidth"
-      fieldKey="researchs"
-      placeholder="请输入研究方向"
-      title="研究方向"
+        ref="directionsFormRef"
+        v-model="modelValue"
+        :labelWidth="labelWidth"
+        fieldKey="researchs"
+        placeholder="请输入研究方向"
+        title="研究方向"
     />
 
     <el-row>
       <el-col :span="24">
         <el-form-item label="主要技术应用场景" prop="primaryTechnology">
           <el-input
-            v-model="modelValue.primaryTechnology"
-            :autosize="{ minRows: 4 }"
-            placeholder="请输入主要技术应用场景"
-            type="textarea"
+              v-model="modelValue.primaryTechnology"
+              :autosize="{ minRows: 4 }"
+              placeholder="请输入主要技术应用场景"
+              type="textarea"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -108,10 +108,10 @@
       <el-col :span="24">
         <el-form-item label="承担科研项目情况" prop="researchProject">
           <el-input
-            v-model="modelValue.researchProject"
-            :autosize="{ minRows: 4 }"
-            placeholder="请输入承担科研项目情况"
-            type="textarea"
+              v-model="modelValue.researchProject"
+              :autosize="{ minRows: 4 }"
+              placeholder="请输入承担科研项目情况"
+              type="textarea"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -120,10 +120,10 @@
       <el-col :span="24">
         <el-form-item label="代表性科技成果" prop="achievement">
           <el-input
-            v-model="modelValue.achievement"
-            :autosize="{ minRows: 4 }"
-            placeholder="请输入代表性科技成果"
-            type="textarea"
+              v-model="modelValue.achievement"
+              :autosize="{ minRows: 4 }"
+              placeholder="请输入代表性科技成果"
+              type="textarea"
           ></el-input>
         </el-form-item>
       </el-col>
@@ -132,14 +132,32 @@
       <el-col :span="24">
         <el-form-item label="联系电话" prop="phone">
           <el-input
-            v-model="modelValue.phone"
-            :maxlength="11"
-            oninput="value = value.replace(/\D+/, '')"
-            placeholder="请输入联系电话"
+              v-model="modelValue.phone"
+              :maxlength="11"
+              oninput="value = value.replace(/\D+/, '')"
+              placeholder="请输入联系电话"
           ></el-input>
         </el-form-item>
       </el-col>
     </el-row>
+
+    <!--    ADDEMAIL-->
+    <!--    邮箱-->
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="邮箱" prop="email">
+          <el-input placeholder="请输入邮箱" v-model="modelValue.email"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <!--    其他联系方式-->
+    <el-row>
+      <el-col :span="24">
+        <el-form-item label="其他联系方式" prop="otherContact">
+          <el-input v-model="modelValue.otherContact"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
     <!-- <el-row>
       <el-col :span="24">
         <el-form-item label="网址" prop="url">
@@ -152,10 +170,10 @@
       <el-col :span="24">
         <el-form-item label="实验室简介" prop="introduction">
           <WangEditor
-            ref="introductionRef"
-            v-model="modelValue.introduction"
-            minHeight="320px"
-            @blur="formRef.validateField(`introduction`)"
+              ref="introductionRef"
+              v-model="modelValue.introduction"
+              minHeight="320px"
+              @blur="formRef.validateField(`introduction`)"
           />
           <!-- @click.native="handleEditAble" -->
         </el-form-item>
@@ -165,10 +183,10 @@
       <el-col :span="24">
         <el-form-item label="核心成员及简介" prop="member">
           <WangEditor
-            ref="memberRef"
-            v-model="modelValue.member"
-            minHeight="320px"
-            @blur="formRef.validateField(`member`)"
+              ref="memberRef"
+              v-model="modelValue.member"
+              minHeight="320px"
+              @blur="formRef.validateField(`member`)"
           />
           <!-- @click.native="handleEditAble" -->
         </el-form-item>
@@ -180,9 +198,10 @@
 <script setup>
 import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
-import { reactive, ref, toRefs } from "vue";
+import {reactive, ref, toRefs} from "vue";
 import InfiniteSelect from "@/components/InfiniteSelect/index.vue";
-import { researchList } from "@/api/dataList/research";
+import {researchList} from "@/api/dataList/research";
+import {scrollToInvalidField} from "@/utils/validate";
 
 const props = defineProps({
   modelValue: Object,
@@ -199,24 +218,24 @@ const props = defineProps({
     default: 120,
   },
 });
-const { modelValue, isAdd, showTitle, labelWidth } = toRefs(props);
+const {modelValue, isAdd, showTitle, labelWidth} = toRefs(props);
 
 const options = ref([]);
 const data = reactive({
   rules: {
-    product: [{ required: true, message: "请输入", trigger: "blur" }],
-    name: [{ required: true, message: "请输入", trigger: "blur" }],
-    kind: [{ required: true, message: "请选择", trigger: "change" }],
-    code: [{ required: true, message: "请输入", trigger: "blur" }],
+    product: [{required: true, message: "请输入", trigger: "blur"}],
+    name: [{required: true, message: "请输入", trigger: "blur"}],
+    kind: [{required: true, message: "请选择", trigger: "change"}],
+    code: [{required: true, message: "请输入", trigger: "blur"}],
     phone: [
       // { required: true, message: "请输入联系电话", trigger: "blur" },
-      {
-        pattern: /^1[3-9]\d{9}$/,
-        message: "请输入正确的手机号码",
-        trigger: "blur",
-      },
+      // {
+      //   pattern: /^1[3-9]\d{9}$/,
+      //   message: "请输入正确的手机号码",
+      //   trigger: "blur",
+      // },
     ],
-    researchId: [{ required: true, message: "请选择", trigger: "change" }],
+    researchId: [{required: true, message: "请选择", trigger: "change"}],
     tenantId: [
       {
         required: true,
@@ -224,11 +243,11 @@ const data = reactive({
         trigger: ["blur", "change"],
       },
     ],
-    school: [{ required: true, message: "请输入", trigger: "blur" }],
-    education: [{ required: true, message: "请选择", trigger: "change" }],
-    major: [{ required: true, message: "请输入", trigger: "blur" }],
-    job: [{ required: true, message: "请输入", trigger: "blur" }],
-    title: [{ required: true, message: "请输入", trigger: "blur" }],
+    school: [{required: true, message: "请输入", trigger: "blur"}],
+    education: [{required: true, message: "请选择", trigger: "change"}],
+    major: [{required: true, message: "请输入", trigger: "blur"}],
+    job: [{required: true, message: "请输入", trigger: "blur"}],
+    title: [{required: true, message: "请输入", trigger: "blur"}],
     workAt: [
       {
         required: true,
@@ -244,12 +263,12 @@ const data = reactive({
       },
     ],
     introduce: [
-      { required: true, message: "请输入实验室简介", trigger: "blur" },
+      {required: true, message: "请输入实验室简介", trigger: "blur"},
     ],
   },
 });
 
-const { rules } = toRefs(data);
+const {rules} = toRefs(data);
 
 const formRef = ref();
 const fieldFormRef = ref();
@@ -267,7 +286,7 @@ const keywordsFormRef = ref();
 // });
 
 const loadResearchOptions = (query) =>
-  researchList({ ...query, examineStatus: "1" }).then((resp) => resp.rows);
+    researchList({...query, examineStatus: "1"}).then((resp) => resp.rows);
 const validateForm = async () => {
   let formValid;
   try {
@@ -278,7 +297,12 @@ const validateForm = async () => {
   // const cityFormValid = await cityFormRef.value.validateForm();
   const fieldFormValid = await fieldFormRef.value.validateForm();
   const keywordsFormValid = await keywordsFormRef.value.validateForm();
-  return formValid && fieldFormValid && keywordsFormValid;
+
+  const validResult = formValid && fieldFormValid && keywordsFormValid;
+  if (!validResult) {
+    scrollToInvalidField()
+  }
+  return validResult
   // if (formType.value == 1) {
   //   //个人
   //   // const researchsFormValid = await researchsFormRef.value.validateForm(); //研究方向验证
diff --git a/src/views/components/ResearchForm/index.vue b/src/views/components/ResearchForm/index.vue
index 1349fbf..162ebb9 100644
--- a/src/views/components/ResearchForm/index.vue
+++ b/src/views/components/ResearchForm/index.vue
@@ -38,7 +38,22 @@
     <!--      </el-col>-->
     <!--    </el-row>-->
 
-    <CityOptions ref="cityForm" v-model="modelValue" :labelWidth="labelWidth" />
+<!--    <CityOptions ref="cityForm" v-model="modelValue" :labelWidth="labelWidth" />-->
+    <el-form-item
+        label="国家"
+        prop="country"
+    >
+      <el-select
+          v-model="modelValue.country"
+          placeholder="请选择国家"
+      >
+        <el-option
+            v-for="option in countryOptions"
+            :label="option.value"
+            :value="option.key"
+        />
+      </el-select>
+    </el-form-item>
 
     <el-row>
       <el-col :span="24">
@@ -96,6 +111,7 @@ import SiteOptions from "@/views/components/SiteOptions";
 import FieldOptions from "@/views/components/FieldOptions";
 import { onMounted, reactive, ref, toRefs } from "vue";
 import { tenantSelect } from "@/api/subPlatform/tenant";
+import {countryOptions} from "@/utils/parameter";
 
 const siteList = ref([]);
 const props = defineProps({
diff --git a/src/views/dataAuditList/Enterpriseproducts/approval.vue b/src/views/dataAuditList/Enterpriseproducts/approval.vue
index 5abbec3..7982354 100644
--- a/src/views/dataAuditList/Enterpriseproducts/approval.vue
+++ b/src/views/dataAuditList/Enterpriseproducts/approval.vue
@@ -2,10 +2,10 @@
   <div class="app-container">
     <div style="width: 55%">
       <el-form
-        ref="formRef"
-        :model="form"
-        :label-width="labelWidth + 'px'"
-        :disabled="true"
+          ref="formRef"
+          :model="form"
+          :label-width="labelWidth + 'px'"
+          :disabled="true"
       >
         <div class="form_title" v-if="showTitle">基本信息</div>
 
@@ -13,8 +13,8 @@
           <el-col :span="24">
             <el-form-item label="企业名称:" prop="enterpriseName">
               <el-input
-                v-model="form.enterpriseName"
-                placeholder="请输入企业名称"
+                  v-model="form.enterpriseName"
+                  placeholder="请输入企业名称"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -23,8 +23,8 @@
           <el-col :span="24">
             <el-form-item label="联系人:" prop="username">
               <el-input
-                v-model="form.username"
-                placeholder="请输入联系人"
+                  v-model="form.username"
+                  placeholder="请输入联系人"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -33,8 +33,8 @@
           <el-col :span="24">
             <el-form-item label="联系方式:" prop="phone">
               <el-input
-                v-model="form.phone"
-                placeholder="请输入联系方式"
+                  v-model="form.phone"
+                  placeholder="请输入联系方式"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -53,48 +53,63 @@
           <el-col :span="24">
             <el-form-item label="产品名称:" prop="title">
               <el-input
-                v-model="form.title"
-                placeholder="请输入产品名称"
+                  v-model="form.title"
+                  placeholder="请输入产品名称"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <city-options
-          disabled
-          v-model="form"
-          :labelWidth="labelWidth"
-          ref="cityFormRef"
-        ></city-options>
+        <!--        <city-options-->
+        <!--          disabled-->
+        <!--          v-model="form"-->
+        <!--          :labelWidth="labelWidth"-->
+        <!--          ref="cityFormRef"-->
+        <!--        ></city-options>-->
+        <el-form-item
+            label="国家"
+            prop="country"
+        >
+          <el-select
+              v-model="form.country"
+              placeholder="请选择国家"
+          >
+            <el-option
+                v-for="option in countryOptions"
+                :label="option.value"
+                :value="option.key"
+            />
+          </el-select>
+        </el-form-item>
         <FieldOptions
-          v-model="form"
-          :labelWidth="labelWidth"
-          ref="fieldForm"
-          :disabled="true"
+            v-model="form"
+            :labelWidth="labelWidth"
+            ref="fieldForm"
+            :disabled="true"
         />
 
         <InputBoxAdd
-          :labelWidth="labelWidth"
-          v-model="form"
-          title="应用客户"
-          placeholder="请输入应用客户"
-          fieldKey="customers"
-          ref="customerForm"
-          :disabled="true"
+            :labelWidth="labelWidth"
+            v-model="form"
+            title="应用客户"
+            placeholder="请输入应用客户"
+            fieldKey="customers"
+            ref="customerForm"
+            :disabled="true"
         />
 
         <el-row>
           <el-col :span="24">
             <el-form-item label="产品成熟度:" prop="maturity">
               <el-select
-                v-model="form.maturity"
-                clearable
-                placeholder="请选择产品成熟度"
+                  v-model="form.maturity"
+                  clearable
+                  placeholder="请选择产品成熟度"
               >
                 <el-option
-                  v-for="item in maturityOptions"
-                  :key="item.key"
-                  :label="item.value"
-                  :value="item.key"
+                    v-for="item in maturityOptions"
+                    :key="item.key"
+                    :label="item.value"
+                    :value="item.key"
                 >
                 </el-option>
               </el-select>
@@ -105,15 +120,15 @@
           <el-col :span="24">
             <el-form-item label="产品领先性:" prop="leadStandard">
               <el-select
-                v-model="form.leadStandard"
-                clearable
-                placeholder="请选择产品领先性"
+                  v-model="form.leadStandard"
+                  clearable
+                  placeholder="请选择产品领先性"
               >
                 <el-option
-                  v-for="item in leadOptions"
-                  :key="item.key"
-                  :label="item.value"
-                  :value="item.key"
+                    v-for="item in leadOptions"
+                    :key="item.key"
+                    :label="item.value"
+                    :value="item.key"
                 >
                 </el-option>
               </el-select>
@@ -124,16 +139,16 @@
           <el-col :span="24">
             <el-form-item label="合作模式:">
               <el-select
-                v-model="form.cooperationModeArr"
-                clearable
-                multiple
-                placeholder="请选择合作模式"
+                  v-model="form.cooperationModeArr"
+                  clearable
+                  multiple
+                  placeholder="请选择合作模式"
               >
                 <el-option
-                  v-for="item in cooperationOptions"
-                  :key="item.key"
-                  :label="item.value"
-                  :value="item.key"
+                    v-for="item in cooperationOptions"
+                    :key="item.key"
+                    :label="item.value"
+                    :value="item.key"
                 >
                 </el-option>
               </el-select>
@@ -142,13 +157,13 @@
         </el-row>
 
         <InputBoxAdd
-          :labelWidth="labelWidth"
-          v-model="form"
-          title="关键词"
-          placeholder="请输入关键词"
-          fieldKey="keywords"
-          ref="keywordsForm"
-          :disabled="true"
+            :labelWidth="labelWidth"
+            v-model="form"
+            title="关键词"
+            placeholder="请输入关键词"
+            fieldKey="keywords"
+            ref="keywordsForm"
+            :disabled="true"
         />
 
         <!-- <el-row>
@@ -166,9 +181,9 @@
           <el-col :span="24">
             <el-form-item label="成果简介:">
               <WangEditor
-                v-model="form.introduce"
-                minHeight="150"
-                :readOnly="true"
+                  v-model="form.introduce"
+                  minHeight="150"
+                  :readOnly="true"
               />
             </el-form-item>
           </el-col>
@@ -178,10 +193,11 @@
             <el-form-item label="产品图片:" prop="image">
               <!-- <ImageUpload v-model="form.image" :limit="1" :disabled="true" /> -->
               <el-link
-                :disabled="!form.image"
-                type="primary"
-                @click="downloadProductImage"
-                >下载产品图片</el-link
+                  :disabled="!form.image"
+                  type="primary"
+                  @click="downloadProductImage"
+              >下载产品图片
+              </el-link
               >
             </el-form-item>
           </el-col>
@@ -208,10 +224,11 @@
                 :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'jpg']"
               /> -->
               <el-link
-                :disabled="!form.material"
-                type="primary"
-                @click="downloadProductMaterial"
-                >下载成熟度证明材料</el-link
+                  :disabled="!form.material"
+                  type="primary"
+                  @click="downloadProductMaterial"
+              >下载成熟度证明材料
+              </el-link
               >
             </el-form-item>
           </el-col>
@@ -225,24 +242,26 @@
   </div>
 </template>
 <script setup>
-import { reactive, toRefs } from "vue";
+import {reactive, toRefs} from "vue";
 import CityOptions from "@/views/components/CityOptions";
 import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
 import {
+  batchEnterpriseProduct,
   getProductApprovalInfo,
   updateEnterpriseApprovalProduct,
 } from "@/api/dataApproval/enterpriseProduct";
 import {
   maturityOptions,
   leadOptions,
-  cooperationOptions,
+  cooperationOptions, countryOptions,
 } from "@/utils/parameter";
-import { useRoute, useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import saveAs from "file-saver";
-import { ElMessage } from "element-plus";
-import { customDownload, downloadFile } from "@/utils/request";
+import {ElMessage} from "element-plus";
+import {customDownload, downloadFile} from "@/utils/request";
 import useUserStore from "@/store/modules/user";
+
 const userStore = useUserStore();
 // import WangEditor from "@/components/WangEditor/index.vue";
 // const isAdd = ref(false);
@@ -265,14 +284,14 @@ const showTitle = ref(false);
 const data = reactive({
   form: {},
 });
-const { form } = toRefs(data);
+const {form} = toRefs(data);
 
 const getDetail = async (id) => {
-  const { data } = await getProductApprovalInfo(id);
+  const {data} = await getProductApprovalInfo(id);
   form.value = data;
   form.value.cooperationModeArr = data.cooperationMode
-    ? data.cooperationMode.split(",")
-    : [];
+      ? data.cooperationMode.split(",")
+      : [];
   // form.value.keywords = data.keyword ? data.keyword.split(",") : [];
 };
 if (route.query.id) {
@@ -280,20 +299,20 @@ if (route.query.id) {
 }
 const downloadProductImage = () => {
   const filename =
-    form.value.image.split("/")[form.value.image.split("/").length - 1];
+      form.value.image.split("/")[form.value.image.split("/").length - 1];
   // saveAs(form.value.image, filename);
   downloadFile(form.value.image, filename);
 };
 const downloadProductMaterial = () => {
   const filename =
-    form.value.material.split("/")[form.value.material.split("/").length - 1];
+      form.value.material.split("/")[form.value.material.split("/").length - 1];
   // const baseUrl = import.meta.env.VITE_APP_BASE_API;
   // customDownload(`/file${form.value.material}`, {}, filename);
   downloadFile(form.value.material, filename);
 };
 
 const submitForm = async (status) => {
-  await updateEnterpriseApprovalProduct({ ...form.value, status });
+  await batchEnterpriseProduct(route.query.id, status);
   let successMessage;
   switch (status) {
     case "1":
diff --git a/src/views/dataAuditList/Enterpriseproducts/index.vue b/src/views/dataAuditList/Enterpriseproducts/index.vue
index d096ef9..ca2621e 100644
--- a/src/views/dataAuditList/Enterpriseproducts/index.vue
+++ b/src/views/dataAuditList/Enterpriseproducts/index.vue
@@ -6,9 +6,9 @@
         <el-col>
           <el-form-item prop="status">
             <el-radio-group
-              v-model="queryParams.status"
-              size="small"
-              @change="handleQuery"
+                v-model="queryParams.status"
+                size="small"
+                @change="handleQuery"
             >
               <!-- <el-radio-button :label="1">已发布</el-radio-button> -->
               <el-radio-button :label="0">待审核</el-radio-button>
@@ -19,66 +19,72 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="所属站点" prop="tenantId">
-            <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
+            <SiteOptions v-model="queryParams.tenantId" :site-list="siteList"/>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-button
-            type="primary"
-            icon="search"
-            size="default"
-            @click="handleQuery"
-            >搜索</el-button
+              type="primary"
+              icon="search"
+              size="default"
+              @click="handleQuery"
+          >搜索
+          </el-button
           >
           <el-button icon="refresh" size="default" @click="resetQuery"
-            >重置</el-button
+          >重置
+          </el-button
           >
         </el-col>
       </el-row>
     </el-form>
     <el-row>
       <el-button
-        v-if="queryParams.status == 0"
-        size="small"
-        type="primary"
-        :disabled="!selectedIds.length"
-        @click="handleBatchApproval"
-        >批量审核</el-button
+          v-if="queryParams.status == 0"
+          size="small"
+          type="primary"
+          :disabled="!selectedIds.length"
+          @click="handleBatchApproval"
+      >批量审核
+      </el-button
       >
       <el-button
-        size="small"
-        type="danger"
-        :disabled="!selectedIds.length"
-        @click="handleDelete(...selectedIds)"
-        >批量删除</el-button
-      ><el-button
-        size="small"
-        type="primary"
-        @click="userStore.resetUnApproval('product', 'unApprovedProduct')"
-        >未读归零</el-button
+          size="small"
+          type="danger"
+          :disabled="!selectedIds.length"
+          @click="handleDelete(...selectedIds)"
+      >批量删除
+      </el-button
+      >
+      <el-button
+          size="small"
+          type="primary"
+          @click="userStore.resetUnApproval('product', 'unApprovedProduct')"
+      >未读归零
+      </el-button
       >
     </el-row>
     <!-- 表格区域 -->
     <el-table
-      :data="dataList"
-      :loading="loading"
-      @selection-change="handleSelectionChange"
+        :data="dataList"
+        :loading="loading"
+        @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="80"></el-table-column>
       <el-table-column
-        label="产品名称"
-        align="center"
-        prop="title"
+          label="产品名称"
+          align="center"
+          prop="title"
       ></el-table-column>
       <el-table-column
-        label="所属领域"
-        align="center"
-        prop="industryStr"
+          label="所属领域"
+          align="center"
+          prop="industryStr"
       ></el-table-column>
       <el-table-column
-        label="所属企业"
-        align="center"
-        prop="enterpriseName"
+          label="所属企业"
+          align="center"
+          prop="enterpriseName"
       ></el-table-column>
       <el-table-column label="站点" align="center">
         <template #default="{ row }">
@@ -86,44 +92,46 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="申请时间"
-        align="center"
-        prop="createTime"
+          label="申请时间"
+          align="center"
+          prop="createTime"
       ></el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="{ row }">
           <el-button
-            type="primary"
-            round
-            size="small"
-            :disabled="queryParams.status != 0"
-            @click="handleApproval(row.id)"
-            >审批</el-button
+              type="primary"
+              round
+              size="small"
+              :disabled="queryParams.status != 0"
+              @click="handleApproval(row.id)"
+          >审批
+          </el-button
           >
           <el-button
-            type="danger"
-            round
-            size="small"
-            @click="handleDelete(row.id)"
-            >删除</el-button
+              type="danger"
+              round
+              size="small"
+              @click="handleDelete(row.id)"
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
   </div>
 </template>
 <script setup>
-import { reactive, ref, toRefs } from "vue";
+import {reactive, ref, toRefs} from "vue";
 import SiteOptions from "@/views/components/SiteOptions";
-import { tenantSelect } from "@/api/subPlatform/tenant";
+import {tenantSelect} from "@/api/subPlatform/tenant";
 import {
   enterpriseProductApprovalList,
   batchEnterpriseProduct,
@@ -131,8 +139,9 @@ import {
 } from "@/api/dataApproval/enterpriseProduct";
 import useUserStore from "@/store/modules/user";
 
-import { useRouter } from "vue-router";
-import { ElMessage, ElMessageBox } from "element-plus";
+import {useRouter} from "vue-router";
+import {ElMessage, ElMessageBox} from "element-plus";
+
 const userStore = useUserStore();
 const router = useRouter();
 const dataList = ref([]);
@@ -147,7 +156,7 @@ const data = reactive({
     status: 0,
   },
 });
-const { queryParams } = toRefs(data);
+const {queryParams} = toRefs(data);
 
 // const statusDic = {
 //   0: "待审核",
@@ -197,26 +206,28 @@ const handleSelectionChange = (val) => {
 
 const handleDelete = async (...ids) => {
   ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
-    .then(async () => {
-      await deleteEnterpriseProduct(ids);
-      userStore.getUnApprovedProduct();
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await deleteEnterpriseProduct(ids);
+        userStore.getUnApprovedProduct();
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 
 const handleBatchApproval = async () => {
   ElMessageBox.confirm(
-    `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
+      `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
   )
-    .then(async () => {
-      await batchEnterpriseProduct(selectedIds.value);
-      userStore.getUnApprovedProduct();
-      getList();
-      ElMessage.success("批量审核成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await batchEnterpriseProduct(selectedIds.value.join(","), 1);
+        userStore.getUnApprovedProduct();
+        getList();
+        ElMessage.success("批量审核成功");
+      })
+      .catch(() => {
+      });
 };
 userStore.getUnApprovedProduct();
 userStore.getProductTotal();
diff --git a/src/views/dataAuditList/demand/approval.vue b/src/views/dataAuditList/demand/approval.vue
index df7fffd..9accd0c 100644
--- a/src/views/dataAuditList/demand/approval.vue
+++ b/src/views/dataAuditList/demand/approval.vue
@@ -57,11 +57,26 @@
           </el-col>
         </el-row>
 
-        <CityOptions
-          v-model="modelValue"
-          :labelWidth="labelWidth"
-          ref="cityFormRef"
-        />
+<!--        <CityOptions-->
+<!--          v-model="modelValue"-->
+<!--          :labelWidth="labelWidth"-->
+<!--          ref="cityFormRef"-->
+<!--        />-->
+        <el-form-item
+            label="国家"
+            prop="country"
+        >
+          <el-select
+              v-model="modelValue.country"
+              placeholder="请选择国家"
+          >
+            <el-option
+                v-for="option in countryOptions"
+                :label="option.value"
+                :value="option.key"
+            />
+          </el-select>
+        </el-form-item>
         <FieldOptions
           v-model="modelValue"
           :labelWidth="labelWidth"
@@ -155,7 +170,7 @@
 <script setup>
 import { updateExpertAchievement } from "@/api/dataApproval/achivement";
 import WangEditor from "@/components/WangEditor";
-import { demandCategoryList } from "@/utils/parameter";
+import {countryOptions, demandCategoryList} from "@/utils/parameter";
 import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
 import { ElMessage } from "element-plus";
diff --git a/src/views/dataAuditList/demand/index.vue b/src/views/dataAuditList/demand/index.vue
index 031bee4..e89d72f 100644
--- a/src/views/dataAuditList/demand/index.vue
+++ b/src/views/dataAuditList/demand/index.vue
@@ -38,7 +38,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-row>
+    <el-row class="mb8">
       <el-button
           v-if="queryParams.status == 0"
           :disabled="!selectedIds.length"
@@ -111,7 +111,7 @@
           label="截至日期"
           prop="deadline"
       ></el-table-column>
-      <el-table-column align="center" label="操作" width="320">
+      <el-table-column align="center" label="操作" width="320" v-if="queryParams.status!==4">
         <template #default="{ row }">
           <el-button round size="small" type="text" @click="approval(row)"
           >审批
@@ -265,10 +265,11 @@ const handleBatchApproval = async () => {
 const complete = (id) => {
   ElMessageBox.confirm(`是否确认结束编号为${id}的数据项？`)
       .then(async () => {
-        await updateTechnologyDemand({id, status: 4});
+        await batchTechnologyDemand(id, 4)
+        // await updateTechnologyDemand({id, status: 4});
         userStore.getUnApprovedTechnology();
         getList();
-        ElMessage.success("删除成功");
+        ElMessage.success("已结束");
       })
       .catch(() => {
       });
diff --git a/src/views/dataAuditList/serviceDemand/approval.vue b/src/views/dataAuditList/serviceDemand/approval.vue
index 963c986..68ee9cb 100644
--- a/src/views/dataAuditList/serviceDemand/approval.vue
+++ b/src/views/dataAuditList/serviceDemand/approval.vue
@@ -2,11 +2,11 @@
   <div class="app-container">
     <div shadow="always" style="width: 55%">
       <el-form
-        disabled
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        :label-width="labelWidth + 'px'"
+          disabled
+          ref="formRef"
+          :model="form"
+          :rules="rules"
+          :label-width="labelWidth + 'px'"
       >
         <p><b>基本信息</b></p>
 
@@ -23,18 +23,19 @@
             <el-form-item label="需求类别:">
               <el-checkbox-group v-model="form.kinds">
                 <el-checkbox
-                  v-for="item in checkList"
-                  :key="item.id"
-                  :label="item.name"
-                  >{{ item.name }}</el-checkbox
+                    v-for="item in checkList"
+                    :key="item.id"
+                    :label="item.name"
+                >{{ item.name }}
+                </el-checkbox
                 >
                 <!-- <el-checkbox label="0" @change="handleCheck">其他</el-checkbox> -->
               </el-checkbox-group>
               <el-row :gutter="20">
                 <el-col :span="20">
                   <el-input
-                    v-model="checkInput"
-                    placeholder="请输入需求类别"
+                      v-model="checkInput"
+                      placeholder="请输入需求类别"
                   ></el-input>
                 </el-col>
                 <el-col :span="4">
@@ -50,10 +51,10 @@
             <el-form-item label="需求描述:" prop="description">
               <!-- <Editor v-model="form.description" :minHeight="150" /> -->
               <wangEditor
-                readOnly
-                v-model="form.description"
-                width="100%"
-                min-height="150px"
+                  readOnly
+                  v-model="form.description"
+                  width="100%"
+                  min-height="150px"
               ></wangEditor>
             </el-form-item>
           </el-col>
@@ -70,16 +71,16 @@
           <el-col :span="12">
             <el-form-item label="需求联系人:" prop="name">
               <el-input
-                v-model="form.name"
-                placeholder="请输入需求联系人"
+                  v-model="form.name"
+                  placeholder="请输入需求联系人"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系人手机号:" prop="mobile">
               <el-input
-                v-model="form.mobile"
-                placeholder="请输入联系人手机号"
+                  v-model="form.mobile"
+                  placeholder="请输入联系人手机号"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -113,15 +114,17 @@
 </template>
 <script setup name="ServiceDemandApproval">
 import {
+  batchCasDemand,
   getCasDemandInfo,
   updateCasDemand,
 } from "@/api/dataApproval/enterpriseServiceDemand";
-import { uniqueId } from "lodash";
+import {uniqueId} from "lodash";
 // import CityOptions from "@/views/components/CityOptions";
-import { ElMessage } from "element-plus";
-import { useRoute, useRouter } from "vue-router";
-import { demandCategoryList } from "@/utils/parameter";
+import {ElMessage} from "element-plus";
+import {useRoute, useRouter} from "vue-router";
+import {demandCategoryList} from "@/utils/parameter";
 import useUserStore from "@/store/modules/user";
+
 const userStore = useUserStore();
 const router = useRouter();
 const route = useRoute();
@@ -135,22 +138,22 @@ const data = reactive({
     postCode: undefined,
   },
   rules: {
-    title: [{ required: true, message: "需求名称不能为空", trigger: "blur" }],
+    title: [{required: true, message: "需求名称不能为空", trigger: "blur"}],
     description: [
-      { required: true, message: "需求描述不能为空", trigger: "blur" },
+      {required: true, message: "需求描述不能为空", trigger: "blur"},
     ],
-    name: [{ required: true, message: "需求联系人不能为空", trigger: "blur" }],
+    name: [{required: true, message: "需求联系人不能为空", trigger: "blur"}],
     mobile: [
-      { required: true, message: "联系人手机号不能为空", trigger: "blur" },
+      {required: true, message: "联系人手机号不能为空", trigger: "blur"},
     ],
     username: [
-      { required: true, message: "需求提交人不能为空", trigger: "blur" },
+      {required: true, message: "需求提交人不能为空", trigger: "blur"},
     ],
-    userPhone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
+    userPhone: [{required: true, message: "手机号不能为空", trigger: "blur"}],
   },
 });
 
-const { form, rules } = toRefs(data);
+const {form, rules} = toRefs(data);
 
 const labelWidth = 140;
 const checkList = reactive(demandCategoryList);
@@ -159,7 +162,7 @@ const cityFormRef = ref();
 const formRef = ref();
 
 const submitForm = async (status) => {
-  await updateCasDemand({ ...form.value, status });
+  await batchCasDemand(route.query.id, status);
   let successMessage;
   switch (status) {
     case "1":
@@ -172,6 +175,7 @@ const submitForm = async (status) => {
   ElMessage.success(successMessage);
   router.back();
 };
+
 // 添加需求类别时验证
 function addCheck() {
   if (!checkInput.value.trim().length) return ElMessage.error("请输入");
@@ -193,7 +197,7 @@ if (route.query.id) {
     // checkList
     for (const item of resp.data.kinds) {
       if (!checkList.find((el) => el.name === item)) {
-        checkList.push({ id: uniqueId("unq-"), name: item });
+        checkList.push({id: uniqueId("unq-"), name: item});
       }
     }
   });
diff --git a/src/views/dataAuditList/serviceDemand/index.vue b/src/views/dataAuditList/serviceDemand/index.vue
index 6ad3775..78db102 100644
--- a/src/views/dataAuditList/serviceDemand/index.vue
+++ b/src/views/dataAuditList/serviceDemand/index.vue
@@ -6,9 +6,9 @@
         <el-col>
           <el-form-item>
             <el-radio-group
-              v-model="queryParams.status"
-              size="small"
-              @change="handleQuery"
+                v-model="queryParams.status"
+                size="small"
+                @change="handleQuery"
             >
               <!-- <el-radio-button :label="1">已发布</el-radio-button> -->
               <el-radio-button :label="0">待审核</el-radio-button>
@@ -22,45 +22,51 @@
           <el-form-item label="需求类型" prop="category">
             <!-- <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" /> -->
             <el-select v-model="queryParams.category">
-              <el-option label="企业" value="1" />
-              <el-option label="专家" value="2" />
+              <el-option label="企业" value="1"/>
+              <el-option label="专家" value="2"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-button
-            type="primary"
-            icon="search"
-            size="default"
-            @click="handleQuery"
-            >搜索</el-button
+              type="primary"
+              icon="search"
+              size="default"
+              @click="handleQuery"
+          >搜索
+          </el-button
           >
           <el-button icon="refresh" size="default" @click="resetQuery"
-            >重置</el-button
+          >重置
+          </el-button
           >
         </el-col>
       </el-row>
     </el-form>
-    <el-row>
+    <el-row class="mb8">
       <el-button
-        v-if="queryParams.status == 0"
-        size="small"
-        type="primary"
-        :disabled="!selectedIds.length"
-        @click="handleBatchApproval"
-        >批量审核</el-button
+          v-if="queryParams.status == 0"
+          size="small"
+          type="primary"
+          :disabled="!selectedIds.length"
+          @click="handleBatchApproval"
+      >批量审核
+      </el-button
       >
       <el-button
-        size="small"
-        type="danger"
-        :disabled="!selectedIds.length"
-        @click="handleDelete(...selectedIds)"
-        >批量删除</el-button
-      ><el-button
-        size="small"
-        type="primary"
-        @click="userStore.resetUnApproval('service', 'unApprovedService')"
-        >未读归零</el-button
+          size="small"
+          type="danger"
+          :disabled="!selectedIds.length"
+          @click="handleDelete(...selectedIds)"
+      >批量删除
+      </el-button
+      >
+      <el-button
+          size="small"
+          type="primary"
+          @click="userStore.resetUnApproval('service', 'unApprovedService')"
+      >未读归零
+      </el-button
       >
     </el-row>
     <!-- 表格区域 -->
@@ -83,14 +89,14 @@
         prop="industryStr"
       ></el-table-column> -->
       <el-table-column
-        label="联系人"
-        align="center"
-        prop="name"
+          label="联系人"
+          align="center"
+          prop="name"
       ></el-table-column>
       <el-table-column
-        label="手机"
-        align="center"
-        prop="mobile"
+          label="手机"
+          align="center"
+          prop="mobile"
       ></el-table-column>
       <!-- <el-table-column
         label="所属经纪人"
@@ -110,9 +116,9 @@
         >
       </el-table-column> -->
       <el-table-column
-        label="发布时间"
-        align="center"
-        prop="createTime"
+          label="发布时间"
+          align="center"
+          prop="createTime"
       ></el-table-column>
       <!-- <el-table-column
         label="截止日期"
@@ -122,28 +128,31 @@
       <el-table-column label="操作" align="center">
         <template #default="{ row }">
           <el-button type="text" size="small" @click="approval(row.id)"
-            >审批</el-button
+          >审批
+          </el-button
           >
           <el-button type="text" size="small" @click="complete(row.id)"
-            >完成</el-button
+          >完成
+          </el-button
           >
           <el-button
-            type="text"
-            size="small"
-            icon="delete3"
-            @click="handleDelete(row.id)"
-            >删除</el-button
+              type="text"
+              size="small"
+              icon="delete3"
+              @click="handleDelete(row.id)"
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
   </div>
 </template>
@@ -158,12 +167,13 @@ import {
 
 // import Edialog from "@/views/components/Businessneeds/Approvaldetails.vue";
 // import SiteOptions from "@/views/components/SiteOptions";
-import { tenantSelect } from "@/api/subPlatform/tenant";
-import { ref, toRefs } from "vue";
+import {tenantSelect} from "@/api/subPlatform/tenant";
+import {ref, toRefs} from "vue";
 // import { cloneDeep } from "lodash";
-import { useRouter } from "vue-router";
+import {useRouter} from "vue-router";
 import useUserStore from "@/store/modules/user";
-import { ElMessage, ElMessageBox } from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
+
 const router = useRouter();
 const userStore = useUserStore();
 const data = reactive({
@@ -184,7 +194,7 @@ const siteList = ref([]);
 const dataList = ref([]);
 const total = ref(0);
 const isShow = ref(false);
-const { queryParams, demandForm } = toRefs(data);
+const {queryParams, demandForm} = toRefs(data);
 const queryFormRef = ref();
 const getList = async () => {
   const resp = await listCasDemand(queryParams.value);
@@ -239,39 +249,42 @@ const resetQuery = () => {
 
 const handleDelete = async (...ids) => {
   ElMessageBox.confirm(`是否确认删除编号为${ids.join(",")}的数据项？`)
-    .then(async () => {
-      await deleteCasDemand(ids);
-      userStore.getServiceDemandTotal();
-      userStore.getUnApprovedService();
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await deleteCasDemand(ids);
+        userStore.getServiceDemandTotal();
+        userStore.getUnApprovedService();
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 const handleBatchApproval = async () => {
   ElMessageBox.confirm(
-    `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
+      `是否确认批量审核通过编号为${selectedIds.value.join(",")}的数据项？`
   )
-    .then(async () => {
-      await batchCasDemand(selectedIds.value);
-      userStore.getServiceDemandTotal();
-      userStore.getUnApprovedService();
-      getList();
-      ElMessage.success("批量审核成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await batchCasDemand(selectedIds.value.join(","), 1);
+        userStore.getServiceDemandTotal();
+        userStore.getUnApprovedService();
+        getList();
+        ElMessage.success("批量审核成功");
+      })
+      .catch(() => {
+      });
 };
 // 修改为完成状态
 const complete = (id) => {
   ElMessageBox.confirm(`是否确认结束编号为${id}的数据项？`)
-    .then(async () => {
-      await updateCasDemand({ id, status: 4 });
-      userStore.getServiceDemandTotal();
-      userStore.getUnApprovedService();
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await updateCasDemand({id, status: 4});
+        userStore.getServiceDemandTotal();
+        userStore.getUnApprovedService();
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 getSiteList();
 getList();
diff --git a/src/views/dataList/expert/index.vue b/src/views/dataList/expert/index.vue
index aa1e246..70d1c46 100644
--- a/src/views/dataList/expert/index.vue
+++ b/src/views/dataList/expert/index.vue
@@ -3,24 +3,24 @@
     <el-form :inline="true" :model="queryParams">
       <el-form-item label="姓名" prop="name">
         <el-input
-          v-model="queryParams.name"
-          clearable
-          placeholder="请输入关键字"
-          size="default"
-          style="width: 240px"
+            v-model="queryParams.name"
+            clearable
+            placeholder="请输入关键字"
+            size="default"
+            style="width: 240px"
         />
       </el-form-item>
 
       <el-form-item>
         <el-button
-          icon="search"
-          size="default"
-          type="primary"
-          @click="handleQuery"
-          >搜索
+            icon="search"
+            size="default"
+            type="primary"
+            @click="handleQuery"
+        >搜索
         </el-button>
         <el-button icon="refresh" size="default" @click="resetQuery"
-          >重置
+        >重置
         </el-button>
       </el-form-item>
     </el-form>
@@ -28,108 +28,113 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          icon="plus"
-          plain
-          size="default"
-          type="primary"
-          @click="handleAdd"
-          >新增
+            icon="plus"
+            plain
+            size="default"
+            type="primary"
+            @click="handleAdd"
+        >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          icon="upload"
-          plain
-          size="default"
-          type="info"
-          @click="handleImport"
-          >导入
+            icon="upload"
+            plain
+            size="default"
+            type="info"
+            @click="handleImport"
+        >导入
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          :disabled="!ids.length"
-          icon="delete"
-          type="danger"
-          @click="handleDelete()"
-          >批量删除
+            :disabled="!ids.length"
+            icon="delete"
+            type="danger"
+            @click="handleDelete()"
+        >批量删除
         </el-button>
       </el-col>
       <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
     <!-- 表格区域 -->
     <el-table
-      v-loading="loading"
-      :data="dataList"
-      @selection-change="handleSelectionChange"
+        v-loading="loading"
+        :data="dataList"
+        @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="数据编号" prop="id" />
-      <el-table-column align="center" label="专家姓名" prop="name" />
+      <el-table-column type="selection" width="55"/>
+      <el-table-column align="center" label="数据编号" prop="id"/>
+      <el-table-column align="center" label="专家姓名" prop="name"/>
       <el-table-column align="center" label="研究领域" show-overflow-tooltip>
         <template #default="{ row }">
           <div>{{ row.industryStr }}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="学历" prop="education" />
+      <el-table-column align="center" label="学历">
+        <template #default="{row}">
+          {{ educationOptions.find((el) => el.key === row.education)?.text ?? "无" }}
+        </template>
+
+      </el-table-column>
       <!-- <el-table-column label="备注" align="center" prop="introduce" /> -->
       <!-- <el-table-column label="站点" align="center">
         <template #default="{ row }">
           {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
         </template>
       </el-table-column> -->
-      <el-table-column align="center" label="所在地" prop="address" />
+      <el-table-column align="center" label="所在地" prop="address"/>
       <el-table-column
-        align="center"
-        label="所属研究机构"
-        prop="researchName"
+          align="center"
+          label="所属研究机构"
+          prop="researchName"
       />
       <el-table-column
-        align="center"
-        label="所属实验室"
-        prop="laboratoryName"
+          align="center"
+          label="所属实验室"
+          prop="laboratoryName"
       />
       <el-table-column align="center" label="操作">
         <template #default="{ row }">
           <el-button
-            icon="edit"
-            size="small"
-            type="text"
-            @click="handleDetail(row.id)"
-            >修改
+              icon="edit"
+              size="small"
+              type="text"
+              @click="handleDetail(row.id)"
+          >修改
           </el-button>
           <el-button
-            icon="edit"
-            size="small"
-            type="text"
-            @click="handleDelete(row.id)"
-            >删除
+              icon="edit"
+              size="small"
+              type="text"
+              @click="handleDelete(row.id)"
+          >删除
           </el-button>
           <el-button
-            icon="plus"
-            size="small"
-            type="text"
-            @click="handleClaim(row.id)"
-            >已认领专利
+              icon="plus"
+              size="small"
+              type="text"
+              @click="handleClaim(row.id)"
+          >已认领专利
           </el-button>
 
           <el-button
-            icon="edit"
-            size="small"
-            type="text"
-            @click="openAssignAccount(row.id)"
-            >分配账号
+              icon="edit"
+              size="small"
+              type="text"
+              @click="openAssignAccount(row.id)"
+          >分配账号
           </el-button>
           <el-button
-            icon="edit"
-            size="small"
-            type="text"
-            @click="openResetPassword(row.id)"
-            >重置密码
+              icon="edit"
+              size="small"
+              type="text"
+              @click="openResetPassword(row.id)"
+          >重置密码
           </el-button>
         </template>
       </el-table-column>
@@ -137,34 +142,34 @@
 
     <!-- 分页器 -->
     <pagination
-      v-show="total > 0"
-      v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNum"
-      :total="total"
-      @pagination="getList"
+        v-show="total > 0"
+        v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.pageNum"
+        :total="total"
+        @pagination="getList"
     />
 
     <!-- 用户导入对话框 -->
     <el-dialog
-      v-model="upload.open"
-      :title="upload.title"
-      append-to-body
-      width="400px"
+        v-model="upload.open"
+        :title="upload.title"
+        append-to-body
+        width="400px"
     >
       <el-upload
-        ref="uploadRef"
-        :action="upload.url"
-        :auto-upload="false"
-        :disabled="upload.isUploading"
-        :headers="upload.headers"
-        :limit="1"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        accept=".xlsx, .xls"
-        drag
+          ref="uploadRef"
+          :action="upload.url"
+          :auto-upload="false"
+          :disabled="upload.isUploading"
+          :headers="upload.headers"
+          :limit="1"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          accept=".xlsx, .xls"
+          drag
       >
         <el-icon class="el-icon--upload">
-          <upload-filled />
+          <upload-filled/>
         </el-icon>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <template #tip>
@@ -194,34 +199,34 @@
     </el-dialog>
 
     <el-dialog
-      v-model="showAssignAccount"
-      append-to-body
-      title="分配账号"
-      width="400px"
+        v-model="showAssignAccount"
+        append-to-body
+        title="分配账号"
+        width="400px"
     >
       <el-form
-        ref="assignAccountFormRef"
-        :model="assignAccountForm"
-        :rules="assignAccoutRules"
-        label-width="80px"
+          ref="assignAccountFormRef"
+          :model="assignAccountForm"
+          :rules="assignAccoutRules"
+          label-width="80px"
       >
         <el-form-item label="手机号" prop="username">
           <el-input
-            v-model="assignAccountForm.username"
-            :maxlength="11"
+              v-model="assignAccountForm.username"
+              :maxlength="11"
           ></el-input>
         </el-form-item>
         <el-form-item label="密码" prop="password">
           <el-input
-            v-model="assignAccountForm.password"
-            show-password
+              v-model="assignAccountForm.password"
+              show-password
           ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitAssignAccount"
-            >确 定
+          >确 定
           </el-button>
           <el-button @click="closeAssignAccount">取 消</el-button>
         </div>
@@ -229,28 +234,28 @@
     </el-dialog>
 
     <el-dialog
-      v-model="showResetPassword"
-      append-to-body
-      title="重置密码"
-      width="400px"
+        v-model="showResetPassword"
+        append-to-body
+        title="重置密码"
+        width="400px"
     >
       <el-form
-        ref="resetPasswordFormRef"
-        :model="resetPasswordForm"
-        :rules="assignAccoutRules"
-        label-width="80px"
+          ref="resetPasswordFormRef"
+          :model="resetPasswordForm"
+          :rules="assignAccoutRules"
+          label-width="80px"
       >
         <el-form-item label="密码" prop="password">
           <el-input
-            v-model="resetPasswordForm.password"
-            show-password
+              v-model="resetPasswordForm.password"
+              show-password
           ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitResetPassword"
-            >确 定
+          >确 定
           </el-button>
           <el-button @click="closeResetPassword">取 消</el-button>
         </div>
@@ -267,13 +272,14 @@ import {
 } from "@/api/dataList/expert";
 import md5 from "js-md5";
 // import SiteOptions from "@/views/components/SiteOptions";
-import { expertList } from "@/api/expert/expert";
-import { useRouter } from "vue-router";
-import { getToken } from "@/utils/auth";
-import { blobValidate } from "@/utils/ruoyi";
-import { ElLoading, ElMessage, ElMessageBox } from "element-plus";
+import {expertList} from "@/api/expert/expert";
+import {useRouter} from "vue-router";
+import {getToken} from "@/utils/auth";
+import {blobValidate} from "@/utils/ruoyi";
+import {ElLoading, ElMessage, ElMessageBox} from "element-plus";
 import dayjs from "dayjs";
 import request from "@/utils/request";
+import {educationOptions} from "@/utils/parameter";
 
 const router = useRouter();
 // const siteList = ref([]);
@@ -302,26 +308,26 @@ const upload = reactive({
   // 是否更新已经存在的用户数据
   // updateSupport: 0,
   // 设置上传的请求头部
-  headers: { Authorization: "Bearer " + getToken() },
+  headers: {Authorization: "Bearer " + getToken()},
   // 上传的地址
   url: import.meta.env.VITE_APP_BASE_API + "/business/casExpert/importData",
 });
 
-const { queryParams } = toRefs(data);
+const {queryParams} = toRefs(data);
 
 const assignAccoutRules = {
   username: [
-    { required: true, message: "请输入手机号", trigger: "blur" },
+    {required: true, message: "请输入手机号", trigger: "blur"},
     {
       pattern: /^1[3-9]\d{9}$/,
       message: "请输入正确的手机号码",
       trigger: "blur",
     },
   ],
-  password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-  vipType: [{ required: true, message: "请选择会员类型", trigger: "change" }],
+  password: [{required: true, message: "请输入密码", trigger: "blur"}],
+  vipType: [{required: true, message: "请选择会员类型", trigger: "change"}],
   expireTime: [
-    { required: true, message: "请选择到期时间", trigger: "change" },
+    {required: true, message: "请选择到期时间", trigger: "change"},
   ],
 };
 const showAssignAccount = ref(false);
@@ -338,7 +344,7 @@ const showResetPassword = ref(false);
 
 const openAssignAccount = async (id) => {
   resetForm();
-  const { have, data } = await getAccount(id);
+  const {have, data} = await getAccount(id);
   if (have) {
     ElMessageBox.alert(`已经存在账号：${data}`, "账号已经存在");
   } else {
@@ -349,7 +355,7 @@ const openAssignAccount = async (id) => {
 
 const openResetPassword = async (id) => {
   resetForm();
-  const { have, userId } = await getAccount(id);
+  const {have, userId} = await getAccount(id);
   if (have) {
     resetPasswordForm.id = userId;
     showResetPassword.value = true;
@@ -417,14 +423,14 @@ const handleAdd = () => {
 const handleDetail = (id) => {
   router.push({
     path: "/dataList/expert/add",
-    query: { id },
+    query: {id},
   });
 };
 // 认领专利
 const handleClaim = (id) => {
   router.push({
     path: "/dataList/expert/claim",
-    query: { id },
+    query: {id},
   });
 };
 /** 搜索按钮操作 */
@@ -449,9 +455,9 @@ function handleImport() {
 /** 下载模板操作 */
 function importTemplate() {
   proxy.download(
-    "system/user/importTemplate",
-    {},
-    `user_template_${new Date().getTime()}.xlsx`
+      "system/user/importTemplate",
+      {},
+      `user_template_${new Date().getTime()}.xlsx`
   );
 }
 
@@ -465,11 +471,11 @@ const handleFileSuccess = (response, file, fileList) => {
   upload.isUploading = false;
   uploadRef.value.handleRemove(file);
   ElMessageBox.alert(
-    "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+      "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
       response.msg +
       "</div>",
-    "导入结果",
-    { dangerouslyUseHTMLString: true }
+      "导入结果",
+      {dangerouslyUseHTMLString: true}
   );
   getList();
 };
@@ -482,12 +488,13 @@ function submitFileForm() {
 const handleDelete = async (id) => {
   const delIds = id || ids.value.join(",");
   ElMessageBox.confirm(`是否确认删除编号为${delIds}的数据项？`)
-    .then(async () => {
-      await expertDelete(delIds);
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await expertDelete(delIds);
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 
 let downloadLoadingInstance;
@@ -497,41 +504,41 @@ const download = (url, filename) => {
     background: "rgba(0, 0, 0, 0.7)",
   });
   return request
-    .get(url, {
-      // transformRequest: [
-      //   (params) => {
-      //     return tansParams(params);
-      //   },
-      // ],
-      headers: { "Content-Type": "application/x-www-form-urlencoded" },
-      responseType: "blob",
-    })
-    .then(async (data) => {
-      const isLogin = await blobValidate(data);
-      if (isLogin) {
-        const blob = new Blob([data]);
-        saveAs(blob, filename);
-      } else {
-        const resText = await data.text();
-        const rspObj = JSON.parse(resText);
-        const errMsg =
-          errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
-        ElMessage.error(errMsg);
-      }
-      downloadLoadingInstance.close();
-    })
-    .catch((r) => {
-      console.error(r);
-      ElMessage.error("下载文件出现错误，请联系管理员！");
-      downloadLoadingInstance.close();
-    });
+      .get(url, {
+        // transformRequest: [
+        //   (params) => {
+        //     return tansParams(params);
+        //   },
+        // ],
+        headers: {"Content-Type": "application/x-www-form-urlencoded"},
+        responseType: "blob",
+      })
+      .then(async (data) => {
+        const isLogin = await blobValidate(data);
+        if (isLogin) {
+          const blob = new Blob([data]);
+          saveAs(blob, filename);
+        } else {
+          const resText = await data.text();
+          const rspObj = JSON.parse(resText);
+          const errMsg =
+              errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
+          ElMessage.error(errMsg);
+        }
+        downloadLoadingInstance.close();
+      })
+      .catch((r) => {
+        console.error(r);
+        ElMessage.error("下载文件出现错误，请联系管理员！");
+        downloadLoadingInstance.close();
+      });
 };
 
 const handleExport = () => {
   ElMessageBox.confirm(`是否确认企业列表？`).then(() => {
     download(
-      `/business/enterprise/export`,
-      `企业信息(${dayjs().format("YYYYMMDDHHmmss")}).xlsx`
+        `/business/enterprise/export`,
+        `企业信息(${dayjs().format("YYYYMMDDHHmmss")}).xlsx`
     );
   });
 };
diff --git a/src/views/dataList/thesis/index.vue b/src/views/dataList/thesis/index.vue
index f05f042..c0fa0a1 100644
--- a/src/views/dataList/thesis/index.vue
+++ b/src/views/dataList/thesis/index.vue
@@ -4,51 +4,56 @@
     <el-form :model="queryData" :inline="true">
       <el-form-item>
         <el-input
-          v-model="queryData.title"
-          placeholder="请输入论文题目"
-          class="m-2"
-          style="width: 300px"
+            v-model="queryData.title"
+            placeholder="请输入论文题目"
+            class="m-2"
+            style="width: 300px"
         ></el-input>
       </el-form-item>
       <el-form-item label="">
         <el-button
-          type="primary"
-          icon="search"
-          size="default"
-          @click="handleQuery"
-          >搜索</el-button
+            type="primary"
+            icon="search"
+            size="default"
+            @click="handleQuery"
+        >搜索
+        </el-button
         >
         <el-button icon="refresh" size="default" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
       <!-- <el-form-item style="float: right"> </el-form-item> -->
     </el-form>
-    <el-row>
+    <el-row class="mb8">
       <el-button type="primary" @click="btnAdd">新增论文</el-button>
       <el-button :disabled="!ids.length" type="danger" @click="delList()"
-        >批量删除</el-button
+      >批量删除
+      </el-button
       >
     </el-row>
     <!-- 表格区域 -->
     <el-table :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" />
-      <el-table-column prop="title" label="论文题目" align="center" />
-      <el-table-column prop="ext" label="期刊名称" align="center" />
-      <el-table-column prop="author" label="作者" align="center" />
+      <el-table-column type="selection" width="55"/>
+      <el-table-column prop="title" label="论文题目" align="center"/>
+      <el-table-column prop="ext" label="期刊名称" align="center"/>
+      <el-table-column prop="author" label="作者" align="center"/>
       <el-table-column label="关键词" align="center">
         <template #default="{ row }">
           {{ row.keyword }}
         </template>
       </el-table-column>
-      <el-table-column prop="publishTime" label="出版日期" align="center" />
+      <el-table-column prop="publishTime" label="出版日期" align="center"/>
       <el-table-column prop="" label="操作" align="center">
         <template #default="{ row }">
           <el-button size="small" type="text" @click="editBtn(row.id)"
-            >编辑</el-button
+          >编辑
+          </el-button
           >
           <el-button size="small" type="text" @click="delList(row.id)"
-            >删除</el-button
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
@@ -56,50 +61,50 @@
 
     <!-- 分页器 -->
     <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryData.pageNum"
-      v-model:limit="queryData.page_size"
-      @pagination="getList"
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryData.pageNum"
+        v-model:limit="queryData.page_size"
+        @pagination="getList"
     />
 
     <!-- 弹出框 -->
     <el-dialog
-      :title="formData.id ? '编辑论文' : '新增论文'"
-      v-model="isShow"
-      @close="close"
+        :title="formData.id ? '编辑论文' : '新增论文'"
+        v-model="isShow"
+        @close="close"
     >
       <el-form :model="formData" label-width="100px">
         <el-form-item label="论文题目">
           <el-input
-            v-model="formData.title"
-            placeholder="请输入论文题目"
+              v-model="formData.title"
+              placeholder="请输入论文题目"
           ></el-input>
         </el-form-item>
         <el-form-item label="期刊名称">
           <el-input
-            v-model="formData.ext"
-            placeholder="请输入期刊名称"
+              v-model="formData.ext"
+              placeholder="请输入期刊名称"
           ></el-input>
         </el-form-item>
         <el-form-item label="作者">
           <el-input
-            v-model="formData.author"
-            placeholder="请输入作者"
+              v-model="formData.author"
+              placeholder="请输入作者"
           ></el-input>
         </el-form-item>
         <el-form-item label="出版日期">
           <el-input
-            v-model="formData.publishTime"
-            placeholder="请输入出版日期"
+              v-model="formData.publishTime"
+              placeholder="请输入出版日期"
           ></el-input>
         </el-form-item>
         <!-- :labelWidth="labelWidth" -->
         <InputBoxAdd
-          :labelWidth="100"
-          v-model="formData"
-          title="标签"
-          fieldKey="keywords"
+            :labelWidth="100"
+            v-model="formData"
+            title="标签"
+            fieldKey="keywords"
         />
         <!-- <el-form-item label="标签">
           <template #default="{ row }">
@@ -124,26 +129,27 @@
         </el-form-item> -->
         <el-form-item label="摘要">
           <el-input
-            v-model="formData.remark"
-            :rows="4"
-            type="textarea"
-            placeholder="请输入摘要"
+              v-model="formData.remark"
+              :rows="4"
+              type="textarea"
+              placeholder="请输入摘要"
           />
         </el-form-item>
         <el-form-item label="上传论文:" prop="fileUrl">
           <FileUpload
-            v-model="formData.fileUrl"
-            :limit="1"
-            :fileType="['docx', 'doc', 'pdf']"
+              v-model="formData.fileUrl"
+              :limit="1"
+              :fileType="['docx', 'doc', 'pdf']"
           ></FileUpload>
         </el-form-item>
       </el-form>
       <el-row type="flex" justify="end">
         <el-button type="" @click="close">取消</el-button>
         <el-button type="primary" v-if="formData.id" @click="btnPut"
-          >修改</el-button
+        >修改
+        </el-button
         >
-        <el-button type="primary" v-else @click="btnReadd">保存</el-button>
+        <el-button type="primary" v-else @click="btnReady">保存</el-button>
       </el-row>
     </el-dialog>
   </div>
@@ -157,8 +163,9 @@ import {
   rebtnItem,
 } from "@/api/thesis/index";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
-import { ElMessageBox, ElMessage } from "element-plus";
-import { reactive, ref, toRefs } from "vue";
+import {ElMessageBox, ElMessage} from "element-plus";
+import {reactive, ref, toRefs} from "vue";
+
 const data = reactive({
   queryData: {
     pageNum: 1,
@@ -175,12 +182,12 @@ const form = reactive({
     remark: "",
   },
 });
-const { formData } = toRefs(form);
+const {formData} = toRefs(form);
 const dataList = ref([]);
 const total = ref(0);
 const isShow = ref(false);
 const ids = ref([]);
-const { queryData } = toRefs(data);
+const {queryData} = toRefs(data);
 // const tags = ref([]);
 // 获取论文列表
 const getList = async () => {
@@ -209,12 +216,13 @@ const resetQuery = () => {
 const delList = async (id) => {
   const delIds = id || ids.value.join(",");
   ElMessageBox.confirm(`是否确认删除编号为${delIds}的数据项？`)
-    .then(async () => {
-      await delItem(delIds);
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await delItem(delIds);
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
   getList();
 };
 // 新增功能
@@ -233,8 +241,8 @@ const btnAdd = () => {
 //   tags.value.splice(tags.value.indexOf(val), 1);
 // };
 // 添加/编辑
-const btnReadd = async () => {
-  formData.value.tags = formData.value.keyword.join(",");
+const btnReady = async () => {
+  formData.value.keyword = formData.value.keywords.join(",");
   await addItem(formData.value);
   ElMessage.success("添加成功");
   getList();
@@ -253,8 +261,8 @@ const editBtn = async (id) => {
   const resp = await editItem(id);
   formData.value = resp.data;
   formData.value.keywords = formData.value.keyword
-    ? formData.value.keyword.split(",")
-    : [];
+      ? formData.value.keyword.split(",")
+      : [];
   // tags.value = formData.value.tags && formData.value.tags.split(",");
   // formData.value.tags = "";
   isShow.value = true;
diff --git a/src/views/userAuditList/expert/index.vue b/src/views/userAuditList/expert/index.vue
index a179fb4..43ce38e 100644
--- a/src/views/userAuditList/expert/index.vue
+++ b/src/views/userAuditList/expert/index.vue
@@ -4,65 +4,69 @@
     <el-form :inline="true" :model="queryData">
       <el-form-item label="专家姓名">
         <el-input
-          v-model="queryData.name"
-          placeholder="请输入关键字"
-          style="width: 150px"
+            v-model="queryData.name"
+            placeholder="请输入关键字"
+            style="width: 150px"
         ></el-input>
       </el-form-item>
       <el-form-item label="审核状态">
         <el-select
-          v-model="queryData.examineStatus"
-          class="m-2"
-          placeholder="请选择"
-          style="width: 100px"
+            v-model="queryData.examineStatus"
+            class="m-2"
+            placeholder="请选择"
+            style="width: 100px"
         >
-          <el-option :value="0" label="待审核" />
-          <el-option :value="1" label="已审核" />
-          <el-option :value="2" label="已拒绝" />
+          <el-option :value="0" label="待审核"/>
+          <el-option :value="1" label="已审核"/>
+          <el-option :value="2" label="已拒绝"/>
         </el-select>
       </el-form-item>
 
       <el-form-item style="float: right">
         <el-button
-          icon="search"
-          size="default"
-          type="primary"
-          @click="handleQuery"
-          >搜索
+            icon="search"
+            size="default"
+            type="primary"
+            @click="handleQuery"
+        >搜索
         </el-button>
         <el-button icon="refresh" size="default" @click="resetQuery"
-          >重置
+        >重置
         </el-button>
       </el-form-item>
     </el-form>
 
     <!--表格区域-->
     <el-table :data="dataList" border style="width: 100%">
-      <el-table-column align="center" label="专家姓名" prop="name" />
+      <el-table-column align="center" label="专家姓名" prop="name"/>
       <el-table-column align="center" label="研究领域">
         <template #default="{ row }">
           <div>{{ row.industryStr }}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="学历" prop="education" />
+      <el-table-column align="center" label="学历" prop="education">
+        <template #default="{row}">
+          {{ educationOptions.find((el) => el.key === row.education)?.text ?? "无" }}
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="个人备注" show-overflow-tooltip>
         <template #default="{ row }">
           <div v-html="row.introduce"></div>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="毕业院校" prop="school" />
-      <el-table-column align="center" label="职务" prop="post" />
-      <el-table-column align="center" label="所在地" prop="address" />
+      <el-table-column align="center" label="毕业院校" prop="school"/>
+      <el-table-column align="center" label="职务" prop="post"/>
+      <el-table-column align="center" label="所在地" prop="address"/>
       <el-table-column align="center" label="审核状态" prop="examineStatus">
         <template #default="{ row }">
-          <dict-tag :options="auditStatusDict" :value="row.examineStatus" />
+          <dict-tag :options="auditStatusDict" :value="row.examineStatus"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="申请时间" prop="createTime" />
+      <el-table-column align="center" label="申请时间" prop="createTime"/>
       <el-table-column align="center" label="操作" prop="">
         <template #default="{ row }">
           <el-button size="small" type="text" @click="btnAudit(row.id)"
-            >审核
+          >审核
           </el-button>
         </template>
       </el-table-column>
@@ -70,22 +74,23 @@
 
     <!-- 分页器 -->
     <pagination
-      v-show="total > 0"
-      v-model:limit="queryData.page_size"
-      v-model:page="queryData.pageNum"
-      :total="total"
-      @pagination="getList"
+        v-show="total > 0"
+        v-model:limit="queryData.page_size"
+        v-model:page="queryData.pageNum"
+        :total="total"
+        @pagination="getList"
     />
   </div>
 </template>
 
 <script setup>
-import { expertList } from "@/api/expert/expert";
-import { useRouter } from "vue-router";
+import {expertList} from "@/api/expert/expert";
+import {useRouter} from "vue-router";
 import useUserStore from "@/store/modules/user";
 import DictTag from "@/components/DictTag/index.vue";
-import { auditStatusDict } from "@/constant/dict";
-import { reactive, ref, toRefs } from "vue";
+import {auditStatusDict} from "@/constant/dict";
+import {reactive, ref, toRefs} from "vue";
+import {educationOptions} from "@/utils/parameter";
 
 const router = useRouter();
 const data = reactive({
@@ -97,7 +102,7 @@ const data = reactive({
 });
 const total = ref(0);
 const dataList = ref([]);
-const { queryData } = toRefs(data);
+const {queryData} = toRefs(data);
 
 // 获取专家列表
 const getList = async () => {
@@ -124,7 +129,7 @@ const resetQuery = () => {
 const btnAudit = (id) => {
   router.push({
     path: "/approval/dataList/expert",
-    query: { id },
+    query: {id},
   });
 };
 getList();
diff --git a/src/views/website/aboutUs/index.vue b/src/views/website/aboutUs/index.vue
index 151933b..c11d005 100644
--- a/src/views/website/aboutUs/index.vue
+++ b/src/views/website/aboutUs/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form
-      :model="queryParams"
-      ref="queryFormRef"
-      v-show="showSearch"
-      :inline="true"
-      @submit.native.prevent
+        :model="queryParams"
+        ref="queryFormRef"
+        v-show="showSearch"
+        :inline="true"
+        @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenantId">
-        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
+        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList"/>
         <!-- <el-select
           v-model="queryParams.tenantId"
           placeholder="请选择，支持搜索"
@@ -25,14 +25,16 @@
       </el-form-item>
       <el-form-item>
         <el-button
-          type="primary"
-          icon="search"
-          size="default"
-          @click="handleQuery"
-          >搜索</el-button
+            type="primary"
+            icon="search"
+            size="default"
+            @click="handleQuery"
+        >搜索
+        </el-button
         >
         <el-button icon="refresh" size="default" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -40,11 +42,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="plus"
-          size="default"
-          @click="handleAdd"
+            type="primary"
+            plain
+            icon="plus"
+            size="default"
+            @click="handleAdd"
         >
           新增
         </el-button>
@@ -52,12 +54,12 @@
     </el-row>
 
     <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="dataList"
-      row-key="id"
-      :default-expand-all="isExpandAll"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        v-if="refreshTable"
+        v-loading="loading"
+        :data="dataList"
+        row-key="id"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
       <el-table-column prop="title" label="导航名称"></el-table-column>
       <el-table-column prop="area" label="站点" align="center">
@@ -71,32 +73,35 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
       >
         <template #default="{ row }">
           <el-button
-            size="small"
-            type="text"
-            icon="edit"
-            @click="handleUpdate(row)"
-            >修改</el-button
+              size="small"
+              type="text"
+              icon="edit"
+              @click="handleUpdate(row)"
+          >修改
+          </el-button
           >
           <el-button
-            size="small"
-            type="text"
-            icon="delete"
-            @click="handleDelete(row)"
-            >删除</el-button
+              size="small"
+              type="text"
+              icon="delete"
+              @click="handleDelete(row)"
+          >删除
+          </el-button
           >
           <el-button
-            v-if="row.parentId == ''"
-            size="small"
-            type="text"
-            icon="plus"
-            @click="handleAdd(row)"
-            >新增子导航</el-button
+              v-if="row.parentId == ''"
+              size="small"
+              type="text"
+              icon="plus"
+              @click="handleAdd(row)"
+          >新增子导航
+          </el-button
           >
         </template>
       </el-table-column>
@@ -104,33 +109,39 @@
 
     <!-- 添加或修改导航对话框 -->
     <el-dialog
-      :title="title"
-      v-model="showEditDialog"
-      destroy-on-close
-      width="680px"
-      append-to-body
+        :title="title"
+        v-model="showEditDialog"
+        destroy-on-close
+        width="680px"
+        append-to-body
     >
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenantId">
-          <SiteOptions v-model="form.tenantId" :site-list="siteList" />
+          <SiteOptions v-model="form.tenantId" :site-list="siteList"/>
         </el-form-item>
         <el-form-item label="上级导航" prop="parentId">
           <TreeSelect
-            :objMap="{
+              :objMap="{
               value: 'id', // ID字段名
               label: 'title', // 显示名称
               children: 'children', // 子级字段名
             }"
-            :options="menuOptions"
-            v-model:value="form.parentId"
-            placeholder="选择上级领域"
+              :options="menuOptions"
+              v-model:value="form.parentId"
+              placeholder="选择上级领域"
           />
         </el-form-item>
         <el-form-item label="导航名称" prop="title">
-          <el-input v-model="form.title" placeholder="请输入导航名称" />
+          <el-input v-model="form.title" placeholder="请输入导航名称"/>
         </el-form-item>
         <el-form-item label="内容:" prop="content">
-          <WangEditor v-model="form.content" minHeight="150px" />
+          <!--          <WangEditor v-model="form.content" minHeight="150px" />-->
+          <el-input
+              type="textarea"
+              v-model="form.content"
+              placeholder="请输入内容"
+              :autosize="{ minRows: 6, maxRows: 8 }"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -149,9 +160,9 @@ import {
   aboutEdit,
   aboutDelete,
 } from "@/api/website/about";
-import { cloneDeep } from "lodash";
-import { tenantSelect } from "@/api/subPlatform/tenant";
-import { ElMessage, ElMessageBox } from "element-plus";
+import {cloneDeep} from "lodash";
+import {tenantSelect} from "@/api/subPlatform/tenant";
+import {ElMessage, ElMessageBox} from "element-plus";
 import WangEditor from "@/components/WangEditor/index.vue";
 import SiteOptions from "@/views/components/SiteOptions";
 
@@ -183,7 +194,7 @@ const data = reactive({
         trigger: ["blur", "change"],
       },
     ],
-    title: [{ required: true, message: "导航名称不能为空", trigger: "blur" }],
+    title: [{required: true, message: "导航名称不能为空", trigger: "blur"}],
     content: [
       {
         required: true,
@@ -193,7 +204,7 @@ const data = reactive({
     ],
   },
 });
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询导航列表 */
 const getList = async () => {
@@ -207,7 +218,7 @@ const getList = async () => {
 
 // 获取站点列表
 const getSiteList = async () => {
-  const { rows } = await tenantSelect();
+  const {rows} = await tenantSelect();
   siteList.value = rows;
 };
 
@@ -231,7 +242,7 @@ const getTreeselect = (options) => {
     delete item.children;
   });
   menuOptions.value = [];
-  const menu = { id: 0, title: "主类目", children: [] };
+  const menu = {id: 0, title: "主类目", children: []};
   menu.children = arr;
   menuOptions.value.push(menu);
 };
@@ -308,12 +319,13 @@ const submitForm = async () => {
 /** 删除按钮操作 */
 const handleDelete = (row) => {
   ElMessageBox.confirm(`是否确认删除编号为${row.id}的数据项？`)
-    .then(async () => {
-      await aboutDelete(row.id);
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await aboutDelete(row.id);
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 getList();
 getSiteList();
diff --git a/src/views/website/activity/active/index.vue b/src/views/website/activity/active/index.vue
index 117b531..a0d15a4 100644
--- a/src/views/website/activity/active/index.vue
+++ b/src/views/website/activity/active/index.vue
@@ -232,10 +232,16 @@
             label="国家"
             prop="country"
         >
-          <el-input
+          <el-select
               v-model="form.country"
-              placeholder="请输入国家"
-          />
+              placeholder="请选择国家"
+          >
+            <el-option
+                v-for="option in countryOptions"
+                :label="option.value"
+                :value="option.key"
+            />
+          </el-select>
         </el-form-item>
         <!--        <CityOptions v-model="form" ref="cityOptionsRef"/>-->
         <!-- <el-form-item label="地点:" required>
@@ -418,6 +424,7 @@ import {reactive, ref, toRefs} from "vue";
 import {ElMessage, ElMessageBox} from "element-plus";
 // import SiteOptions from "@/views/components/SiteOptions";
 import {useRouter} from "vue-router";
+import {countryOptions} from "@/utils/parameter";
 
 const router = useRouter();
 const dataList = ref([]);
diff --git a/src/views/website/innovate/service/index.vue b/src/views/website/innovate/service/index.vue
index 530e99a..a707e20 100644
--- a/src/views/website/innovate/service/index.vue
+++ b/src/views/website/innovate/service/index.vue
@@ -1,25 +1,27 @@
 <template>
   <div class="app-container">
     <el-form
-      :model="queryParams"
-      ref="queryFormRef"
-      v-show="showSearch"
-      :inline="true"
-      @submit.native.prevent
+        :model="queryParams"
+        ref="queryFormRef"
+        v-show="showSearch"
+        :inline="true"
+        @submit.native.prevent
     >
       <el-form-item label="导航名称:" prop="categoryId">
-        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
+        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList"/>
       </el-form-item>
       <el-form-item>
         <el-button
-          type="primary"
-          icon="search"
-          size="default"
-          @click="handleQuery"
-          >搜索</el-button
+            type="primary"
+            icon="search"
+            size="default"
+            @click="handleQuery"
+        >搜索
+        </el-button
         >
         <el-button icon="refresh" size="default" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -27,26 +29,28 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="plus"
-          size="default"
-          @click="handleAdd"
-          >新增</el-button
+            type="primary"
+            plain
+            icon="plus"
+            size="default"
+            @click="handleAdd"
+        >新增
+        </el-button
         >
       </el-col>
       <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="数据编号" prop="id" align="center" />
-      <el-table-column label="服务标题" prop="title" width="120" />
+      <el-table-column label="数据编号" prop="id" align="center"/>
+      <el-table-column label="服务标题" prop="title" width="120"/>
       <el-table-column label="导航名称" align="center">
         <template #default="{ row }">
-          {{ getCategoryName(row.categoryId) }}</template
+          {{ getCategoryName(row.categoryId) }}
+        </template
         >
       </el-table-column>
       <el-table-column label="所属站点" align="center">
@@ -60,69 +64,77 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
       >
         <template #default="{ row }">
           <el-button
-            size="small"
-            type="text"
-            icon="edit"
-            @click="handleUpdate(row)"
-            >编辑</el-button
+              size="small"
+              type="text"
+              icon="edit"
+              @click="handleUpdate(row)"
+          >编辑
+          </el-button
           >
           <el-button
-            size="small"
-            type="text"
-            icon="delete"
-            @click="handleDelete(row)"
-            >删除</el-button
+              size="small"
+              type="text"
+              icon="delete"
+              @click="handleDelete(row)"
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
     </el-table>
     <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
     <!-- 添加或修改对话框 -->
     <el-dialog
-      :title="title"
-      v-model="showEditDialog"
-      destroy-on-close
-      width="40%"
+        :title="title"
+        v-model="showEditDialog"
+        destroy-on-close
+        width="40%"
     >
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点" prop="tenantId">
-          <SiteOptions v-model="form.tenantId" :site-list="siteList" />
+          <SiteOptions v-model="form.tenantId" :site-list="siteList"/>
         </el-form-item>
         <el-form-item label="归属导航:" prop="categoryId">
           <el-select v-model="form.categoryId" placeholder="请选择">
             <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.title"
-              :value="item.id"
+                v-for="item in categoryList"
+                :key="item.id"
+                :label="item.title"
+                :value="item.id"
             >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="服务标题:" prop="title">
-          <el-input v-model="form.title" placeholder="请输入服务标题" />
+          <el-input v-model="form.title" placeholder="请输入服务标题"/>
         </el-form-item>
         <el-form-item label="服务简述:" prop="description">
           <el-input
-            v-model="form.description"
-            placeholder="请输入服务简述"
-            maxlength="20"
+              v-model="form.description"
+              placeholder="请输入服务简述"
+              maxlength="20"
           />
         </el-form-item>
         <el-form-item label="服务描述:" prop="content">
-          <WangEditor v-model="form.content" minHeight="150px"></WangEditor>
+          <!--          <WangEditor v-model="form.content" minHeight="150px"></WangEditor>-->
+          <el-input
+              type="textarea"
+              v-model="form.content"
+              placeholder="请输入服务描述"
+              :autosize="{ minRows: 6, maxRows: 8 }"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -142,10 +154,10 @@ import {
   serviceDelete,
   navigationList,
 } from "@/api/website/innovate";
-import { tenantSelect } from "@/api/subPlatform/tenant";
+import {tenantSelect} from "@/api/subPlatform/tenant";
 import WangEditor from "@/components/WangEditor/index.vue";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { reactive, ref } from "vue";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {reactive, ref} from "vue";
 import SiteOptions from "@/views/components/SiteOptions";
 
 const loading = ref(true); // 是否正在加载
@@ -172,11 +184,11 @@ const data = reactive({
   // 表单参数
   form: {},
   rules: {
-    title: [{ required: true, message: "数据名称不能为空", trigger: "blur" }],
+    title: [{required: true, message: "数据名称不能为空", trigger: "blur"}],
     description: [
-      { required: true, message: "服务简述不能为空", trigger: "blur" },
+      {required: true, message: "服务简述不能为空", trigger: "blur"},
     ],
-    content: [{ required: true, message: "服务描述不能为空", trigger: "blur" }],
+    content: [{required: true, message: "服务描述不能为空", trigger: "blur"}],
     tenantId: [
       {
         required: true,
@@ -185,12 +197,12 @@ const data = reactive({
       },
     ],
     categoryId: [
-      { required: true, message: "导航名称不能为空", trigger: "change" },
+      {required: true, message: "导航名称不能为空", trigger: "change"},
     ],
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 const resetQuery = () => {
   if (queryFormRef.value) {
@@ -228,7 +240,7 @@ const getcategoryList = async () => {
 
 // 获取站点列表
 const getSiteList = async () => {
-  const { rows } = await tenantSelect();
+  const {rows} = await tenantSelect();
   siteList.value = rows;
 };
 // 取消按钮
@@ -286,12 +298,13 @@ const submitForm = async () => {
 /** 删除按钮操作 */
 const handleDelete = (row) => {
   ElMessageBox.confirm(`是否确认删除名为${row.title}的数据项？`)
-    .then(async () => {
-      await serviceDelete(row.id);
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await serviceDelete(row.id);
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 
 getList();
diff --git a/src/views/website/solution/serviceCase/index.vue b/src/views/website/solution/serviceCase/index.vue
index d687fab..9b95c56 100644
--- a/src/views/website/solution/serviceCase/index.vue
+++ b/src/views/website/solution/serviceCase/index.vue
@@ -1,36 +1,38 @@
 <template>
   <div class="app-container">
     <el-form
-      :model="queryParams"
-      ref="queryFormRef"
-      v-show="showSearch"
-      :inline="true"
-      @submit.native.prevent
+        :model="queryParams"
+        ref="queryFormRef"
+        v-show="showSearch"
+        :inline="true"
+        @submit.native.prevent
     >
       <el-form-item label="案例标题" prop="title">
         <el-input
-          v-model="queryParams.title"
-          placeholder="请输入关键字"
-          clearable
-          size="default"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.title"
+            placeholder="请输入关键字"
+            clearable
+            size="default"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
       <el-form-item label="所属站点" prop="tenantId">
-        <SiteOptions v-model="queryParams.tenantId" :siteList="siteList" />
+        <SiteOptions v-model="queryParams.tenantId" :siteList="siteList"/>
       </el-form-item>
       <el-form-item>
         <el-button
-          type="primary"
-          icon="search"
-          size="default"
-          @click="handleQuery"
-          >搜索</el-button
+            type="primary"
+            icon="search"
+            size="default"
+            @click="handleQuery"
+        >搜索
+        </el-button
         >
         <el-button icon="refresh" size="default" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -38,30 +40,31 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="plus"
-          size="default"
-          @click="handleAdd"
-          >新增</el-button
+            type="primary"
+            plain
+            icon="plus"
+            size="default"
+            @click="handleAdd"
+        >新增
+        </el-button
         >
       </el-col>
       <right-toolbar
-        v-model:showSearch="showSearch"
-        @queryTable="getList"
+          v-model:showSearch="showSearch"
+          @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="数据编码" prop="id" align="center" />
-      <el-table-column label="案例标题" prop="title" align="center" />
+      <el-table-column label="数据编码" prop="id" align="center"/>
+      <el-table-column label="案例标题" prop="title" align="center"/>
       <el-table-column label="图片" prop="image" align="center" width="120">
         <template #default="{ row }">
           <div>
             <el-image
-              style="width: 100px; height: 100px"
-              :src="row.image"
-              fit="cover"
+                style="width: 100px; height: 100px"
+                :src="row.image"
+                fit="cover"
             ></el-image>
           </div>
         </template>
@@ -72,10 +75,10 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="描述"
-        prop="description"
-        show-overflow-tooltip
-        align="center"
+          label="描述"
+          prop="description"
+          show-overflow-tooltip
+          align="center"
       />
       <el-table-column label="创建时间" prop="created_at" align="center">
         <template #default="{ row }">
@@ -83,73 +86,81 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
       >
         <template #default="{ row }">
           <el-button
-            size="small"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(row)"
-            >编辑</el-button
+              size="small"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(row)"
+          >编辑
+          </el-button
           >
           <el-button
-            size="small"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(row)"
-            >删除</el-button
+              size="small"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(row)"
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" v-model="showEditDialog" width="40%">
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="案例标题:" prop="title">
-          <el-input v-model="form.title" placeholder="请输入案例标题" />
+          <el-input v-model="form.title" placeholder="请输入案例标题"/>
         </el-form-item>
         <el-form-item label="描述:" prop="description">
           <el-input
-            v-model="form.description"
-            placeholder="请输入描述"
-            maxlength="30"
+              v-model="form.description"
+              placeholder="请输入描述"
+              maxlength="30"
           />
         </el-form-item>
         <el-form-item label="图片:" prop="image">
-          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
+          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1"/>
         </el-form-item>
         <el-form-item label="所属站点:" prop="tenantId">
-          <SiteOptions v-model="form.tenantId" :siteList="siteList" />
+          <SiteOptions v-model="form.tenantId" :siteList="siteList"/>
         </el-form-item>
         <el-form-item label="所属服务:" prop="kindId">
           <el-cascader
-            v-model="form.kindId"
-            clearable
-            separator="-"
-            placeholder="请选择，支持搜索"
-            :options="caseOptions"
-            filterable
-            :props="{ emitPath: false, value: 'id', label: 'title' }"
+              v-model="form.kindId"
+              clearable
+              separator="-"
+              placeholder="请选择，支持搜索"
+              :options="caseOptions"
+              filterable
+              :props="{ emitPath: false, value: 'id', label: 'title' }"
           ></el-cascader>
         </el-form-item>
         <el-form-item label="案例描述:" prop="content">
-          <WangEditor
-            v-model="form.content"
-            destroy-on-close
-            minHeight="150px"
-          ></WangEditor>
+          <!--          <WangEditor-->
+          <!--            v-model="form.content"-->
+          <!--            destroy-on-close-->
+          <!--            minHeight="150px"-->
+          <!--          ></WangEditor>-->
+          <el-input
+              type="textarea"
+              v-model="form.content"
+              placeholder="请输入案例描述"
+              :autosize="{ minRows: 6, maxRows: 8}"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -160,9 +171,9 @@
   </div>
 </template>
 <script setup name="serviceCase">
-import { ElMessage, ElMessageBox } from "element-plus";
-import { reactive, ref, toRefs } from "vue";
-import { tenantSelect } from "@/api/subPlatform/tenant";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {reactive, ref, toRefs} from "vue";
+import {tenantSelect} from "@/api/subPlatform/tenant";
 import {
   serviceCaseList,
   serviceCaseAdd,
@@ -173,7 +184,7 @@ import {
 } from "@/api/website/solution";
 import WangEditor from "@/components/WangEditor/index.vue";
 import SiteOptions from "@/views/components/SiteOptions";
-import { planCategoryList } from "../../../../api/website/solution";
+import {planCategoryList} from "../../../../api/website/solution";
 
 const dataList = ref([]);
 const loading = ref(true);
@@ -195,8 +206,8 @@ const data = reactive({
   },
   form: {},
   rules: {
-    title: [{ required: true, message: "案例标题不能为空", trigger: "blur" }],
-    description: [{ required: true, message: "描述不能为空", trigger: "blur" }],
+    title: [{required: true, message: "案例标题不能为空", trigger: "blur"}],
+    description: [{required: true, message: "描述不能为空", trigger: "blur"}],
     image: [
       {
         required: true,
@@ -227,7 +238,7 @@ const data = reactive({
     ],
   },
 });
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 const resetQuery = () => {
   if (queryFormRef.value) {
     queryFormRef.value.resetFields();
@@ -248,7 +259,7 @@ const getList = async () => {
 };
 
 const getSiteList = async () => {
-  const { rows } = await tenantSelect();
+  const {rows} = await tenantSelect();
   siteList.value = rows;
 };
 
@@ -258,7 +269,7 @@ const getCaseKindList = async () => {
   // const serviceResp= await ser
   for (const key in resp.data) {
     if (Object.hasOwnProperty.call(resp.data, key)) {
-      const item = { ...resp.data[key], id: parseInt(key) };
+      const item = {...resp.data[key], id: parseInt(key)};
       caseOptions.value.push(item);
     }
   }
@@ -320,12 +331,13 @@ const submitForm = async () => {
 /** 删除按钮操作 */
 const handleDelete = (row) => {
   ElMessageBox.confirm(`是否确认删除名为${row.title}的数据项？`)
-    .then(async () => {
-      await serviceCaseDelete(row.id);
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await serviceCaseDelete(row.id);
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 
 getList();