专家详情页

src/api/admin/expert.js

@@ -18,6 +18,16 @@ export const activitysList = (params) => {
     });
 };
 
+export const activityInfo = (id) => {
+    return request({
+        url: "/app/expert/getActivityInfo",
+        method: "GET",
+        params: {
+            id
+        },
+    });
+};
+
 // 专家论文列表
 export const paperList = (params) => {
     return request({

src/i18n/message/common/ru.js

@@ -4,6 +4,7 @@ const common = {
   home: "Главная",
   search: "Поиск",
   viewDetails: "Просмотреть детали",
+  details: "Подробности",
   systemPrompt: "Системное сообщение",
   confirm: "Подтвердить",
   cancel: "Отмена",

src/i18n/message/common/zh.js

@@ -3,6 +3,7 @@ export const common = {
   home: "首页",
   search: "搜索",
   viewDetails: "查看详情",
+  details: "详情",
   systemPrompt: "系统提示",
   confirm: "确定",
   cancel: "取消",

src/views/admin/agent/service/enterprise/technology-demand-release.vue

@@ -30,6 +30,7 @@
           <el-col :span="24">
             <!--           <el-checkbox label="0" @change="handleCheck">其他</el-checkbox>-->
             <el-form-item
+                v-if="false"
               :label="
                 t('admin.form.category', { type: t('admin.common.demand') })
               "

src/views/admin/agent/service/enterprise/technology-demand.vue

@@ -1,11 +1,11 @@
 <script setup>
-import { reactive, ref, toRefs } from "vue";
+import {reactive, ref, toRefs} from "vue";
 import dayjs from "dayjs";
-import { useRoute, useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
-import { technologyDemandList } from "@/api/admin/agent/service/technology-demand";
+import {technologyDemandList} from "@/api/admin/agent/service/technology-demand";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 
-const { t } = useI18n();
+const {t} = useI18n();
 const router = useRouter();
 const route = useRoute();
 const dataList = ref([]);
@@ -21,7 +21,7 @@ const data = reactive({
     enterpriseId: null,
   },
 });
-const { queryParams } = toRefs(data);
+const {queryParams} = toRefs(data);
 
 const getList = async () => {
   loading.value = true;
@@ -46,9 +46,12 @@ function handleResults(row) {
   });
 }
 
-const handleRelease = () => {
+const handleDetail = (id) => {
   router.push({
     path: "/admin/service/technology-demand-release",
+    query: {
+      id
+    }
   });
 };
 
@@ -127,16 +130,19 @@ if (route.query.id) {
       </el-table-column>
       <el-table-column align="center" label="">
         <template #default="{ row }">
-          <el-button type="text">
+          <el-button size="small" type="text">
             {{ t("admin.common.delete") }}
           </el-button>
-          <el-button type="text" @click="handleResults(row)"
+          <el-button size="small" type="text" @click="handleResults(row)"
           >{{ t("webSearch.viewMatchingResults") }}
           </el-button>
-          <el-button type="text" @click="handleUpdateStatus(row)"
+          <el-button size="small" type="text" @click="handleUpdateStatus(row)"
           ><!--更新状态-->
             {{ t("routes.broker.updateStatus") }}
           </el-button>
+          <el-button size="small" type="text" @click="handleDetail(row.id)">
+            {{ t("common.details") }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/admin/enterprise/demand/releaseTechnology.vue

@@ -236,29 +236,29 @@
 </template>
 <script setup>
 // import { expert } from "@/api/identity/index";
-import { insertTechnologyDemand } from "@/api/admin/enterprise";
+import {insertTechnologyDemand} from "@/api/admin/enterprise";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
-import { useRoute, useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import FieldOptions from "@/views/components/FieldOptions";
 import InputBoxAdd from "@/views/components/InputBoxAdd";
 import {
   computed,
-  getCurrentInstance,
+  getCurrentInstance, onActivated,
   onMounted,
   reactive,
   ref,
   toRefs,
 } from "vue";
-import { ElMessage } from "element-plus";
+import {ElMessage} from "element-plus";
-import { updateCount } from "@/api/admin/count";
+import {updateCount} from "@/api/admin/count";
 import {
   getTechnologyDemand,
   updateTechnologyDemand,
 } from "@/api/admin/enterprise/demand";
 import tab from "@/plugins/tab";
-import { countryOptions } from "@/utils/parameter";
+import {countryOptions} from "@/utils/parameter";
 
-const { t, locale } = useI18n();
+const {t, locale} = useI18n();
 const router = useRouter();
 const route = useRoute();
 const data = reactive({
@@ -341,7 +341,7 @@ const data = reactive({
       {
         required: true,
         message: computed(() =>
-          t("admin.form.pleaseSelect", { type: t("webContact.demandType") })
+            t("admin.form.pleaseSelect", {type: t("webContact.demandType")})
         ),
         trigger: "change",
       },
@@ -350,7 +350,7 @@ const data = reactive({
       {
         required: true,
         message: computed(() =>
-          t("admin.validation.required", { type: t("webContact.demandBudget") })
+            t("admin.validation.required", {type: t("webContact.demandBudget")})
         ),
         trigger: "blur",
       },
@@ -359,7 +359,7 @@ const data = reactive({
       {
         required: true,
         message: computed(() =>
-          t("admin.form.pleaseSelect", { type: t("admin.table.deadline") })
+            t("admin.form.pleaseSelect", {type: t("admin.table.deadline")})
         ),
         trigger: ["change", "blur"],
       },
@@ -378,33 +378,11 @@ const data = reactive({
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 const labelWidth = 160;
-// const isContainOther = ref(false);
+
-/*const checkList = reactive([
-  {
-    id: 1,
-    name: "成果推广",
-    nameRu: "Продвижение достижений",
-  },
-  {
-    id: 2,
-    name: "关键成果解决",
-    nameRu: "Решение ключевых результатов",
-  },
-  {
-    id: 3,
-    name: "对接专家院士",
-    nameRu: "Связь с экспертами и академиками",
-  },
-  {
-    id: 4,
-    name: "上市辅导",
-    nameRu: "Помощь в выходе на рынок",
-  },
-]);*/
 
 const formRef = ref(null);
 const fieldFormRef = ref(null);
@@ -435,48 +413,14 @@ const submitForm = async (status) => {
   } else {
     console.log("validation failed");
   }
-  // formRef.value.validate(async (valid) => {
-  //   // console.log(valid);
-  //   if (valid) {
-  //     form.value.amount = form.value.amount - 0;
-  //   }
-  // form.value.amount = form.value.amount - 0;
-  // const cityForm = proxy.$refs.cityForm.submitForm(); // 城市
-  // if (valid && cityForm) {
-  //   console.log(form.value);
-  //   if (form.value.id != undefined) {
-  //     // updatePost(form.value).then((response) => {
-  //     //   proxy.$modal.msgSuccess(t('admin.common.editSuccess'));
-  //     // proxy.$router.go(-1);
-  //     // });
-  //   } else {
-  //     // addPost(form.value).then((response) => {
-  //     // proxy.$modal.msgSuccess(t('admin.common.addSuccess'));
-  //     // proxy.$router.go(-1);
-  //     // });
-  //   }
-  // }
-  // });
-};
-// function addCheck() {
-//   if (!checkInput.value.trim().length) return proxy.$modal.msgError("请输入");
-//   const flag = checkList.some((item) => {
-//     return item.name.trim() == checkInput.value.trim();
-//   });
-//   if (!flag) {
-//     checkList.push({
-//       id: checkList.length + 1,
-//       name: checkInput.value,
-//     });
-//     checkInput.value = "";
-//   }
-// }
-// 返回技术需求列表
-const backToList = () => {
-  tab.closeOpenPage({ path: "/demand/technology" });
 };
 
-onMounted(() => {
+// 返回技术需求列表
+const backToList = () => {
+  tab.closeOpenPage({path: "/demand/technology"});
+};
+
+onActivated(() => {
   formRef.value.resetFields();
 
   if (route.query.id) {
@@ -486,20 +430,8 @@ onMounted(() => {
       }),
     });
     tab.updatePage(obj);
-    getTechnologyDemand({ id: route.query.id }).then((resp) => {
+    getTechnologyDemand({id: route.query.id}).then((resp) => {
       form.value = resp.data;
-
-      /*if (!form.value.kinds) {
-        form.value.kinds = resp.data.kind?.split(",") ?? [];
-        form.value.kinds.forEach((el, index) => {
-          if (!checkList.find((item) => item.name == el)) {
-            checkList.push({
-              id: index,
-              name: el,
-            });
-          }
-        });
-      }*/
       if (!form.value.wants) {
         form.value.wants = resp.data.want?.split(",") ?? [];
       }
@@ -513,6 +445,7 @@ onMounted(() => {
     }
   }
 });
+
 </script>
 <style lang="scss" scoped>
 :deep(.cooperation-mode) {

src/views/admin/enterprise/demand/technology.vue

@@ -117,6 +117,13 @@
               @click="cancelPub(row.id)"
           >{{ t("admin.table.cancelPublish") }}
           </el-button>
+          <el-button
+              size="small"
+              type="text"
+              icon="View"
+              @click="handleDetail(row.id)"
+          >{{ t("common.viewDetails") }}
+          </el-button>
           <el-button
               size="small"
               type="text"
@@ -144,14 +151,14 @@ import {
   technologyDemandList,
   updateTechnologyDemand,
 } from "@/api/admin/enterprise/demand";
-import { ElMessage } from "element-plus";
+import {ElMessage} from "element-plus";
 import modal from "@/plugins/modal";
-import { useRouter } from "vue-router";
+import {useRouter} from "vue-router";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
-import { getCurrentInstance, reactive, ref, toRefs } from "vue";
+import {getCurrentInstance, reactive, ref, toRefs} from "vue";
 
-const { t } = useI18n();
+const {t} = useI18n();
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 const router = useRouter();
 
 const dataList = ref([]); // 企业技术需求列表
@@ -166,7 +173,7 @@ const data = reactive({
   },
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询列表 */
 const getList = async () => {
@@ -206,6 +213,10 @@ function handleDelete(id) {
       });
 }
 
+const handleDetail = (id) => {
+  router.push(`/demand/releaseTechnology?id=${id}`)
+}
+
 function handleShelf(row) {
   let text =
       row.shelf_status == 2 ? t("admin.table.putOn") : t("admin.table.putOff");
@@ -220,13 +231,14 @@ function handleShelf(row) {
       )
       .then(function () {
         let status = row.shelf_status == 1 ? 2 : 1;
-      return achievementShelf({ id: row.id, status });
+        return achievementShelf({id: row.id, status});
       })
       .then(() => {
         getList();
-      ElMessage.success(t("admin.common.success", { action: text }));
+        ElMessage.success(t("admin.common.success", {action: text}));
       })
-    .catch(() => {});
+      .catch(() => {
+      });
 }
 
 function handleResults(row) {
@@ -249,7 +261,7 @@ const complete = (id) => {
           })
       )
       .then(async () => {
-      await updateTechnologyDemand({ id, status: 4 });
+        await updateTechnologyDemand({id, status: 4});
         getList();
         ElMessage.success(
             t("admin.common.success", {
@@ -257,7 +269,8 @@ const complete = (id) => {
             })
         );
       })
-    .catch(() => {});
+      .catch(() => {
+      });
 };
 const cancelPub = (id) => {
   modal
@@ -270,13 +283,14 @@ const cancelPub = (id) => {
           })
       )
       .then(async () => {
-      await updateTechnologyDemand({ id, status: 3 });
+        await updateTechnologyDemand({id, status: 3});
         getList();
         ElMessage.success(
-        t("admin.common.success", { action: t("admin.table.cancelPublish") })
+            t("admin.common.success", {action: t("admin.table.cancelPublish")})
         );
       })
-    .catch(() => {});
+      .catch(() => {
+      });
 };
 getList();
 </script>

src/views/admin/enterprise/extension/product.vue

@@ -30,7 +30,7 @@
     </el-radio-group>
 
     <el-table v-loading="loading" :data="dataList" style="margin-top: 20px">
-      <el-table-column :label="t('admin.common.dataNumber')" prop="id" />
+      <el-table-column :label="t('admin.common.dataNumber')" prop="id"/>
       <el-table-column
           :label="t('admin.form.name', { type: t('admin.form.product') })"
           prop="title"
@@ -76,7 +76,7 @@
           <!--            }}-->
           <!--          </el-button>-->
           <el-button
-            v-if="queryParams.status != 1"
+              v-if="queryParams.status !== 1"
               size="small"
               type="text"
               icon="Delete"
@@ -92,6 +92,13 @@
               @click="handleResults(row)"
           >{{ t("webSearch.viewMatchingResults") }}
           </el-button>
+          <el-button
+              size="small"
+              type="text"
+              icon="View"
+              @click="handleDetails(row.id)"
+          >{{ t("common.viewDetails") }}
+          </el-button>
           <!--          <el-button-->
           <!--            v-if="queryParams.status == 1"-->
           <!--            disabled-->
@@ -101,7 +108,7 @@
           <!--            @click="checkEnterpriseInfo(row.id)"-->
           <!--            >{{ t("tips.browseEnterpriseInformation") }}-->
           <!--          </el-button>-->
-<!--    TODO:      <el-button
+          <!--    TODO:      <el-button
                       v-if="queryParams.status == 0"
                       size="small"
                       type="text"
@@ -129,13 +136,13 @@ import {
   getEnterpriseProduct,
   updateEnterpriseProduct,
 } from "@/api/admin/enterprise/product";
-import { ElMessage } from "element-plus";
+import {ElMessage} from "element-plus";
 import modal from "@/plugins/modal";
-import { onActivated, reactive, ref, toRefs } from "vue";
+import {onActivated, reactive, ref, toRefs} from "vue";
-import { useRouter } from "vue-router";
+import {useRouter} from "vue-router";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 
-const { t } = useI18n();
+const {t} = useI18n();
 const router = useRouter();
 const dataList = ref([]);
 const loading = ref(true);
@@ -150,7 +157,7 @@ const data = reactive({
   },
 });
 
-const { queryParams } = toRefs(data);
+const {queryParams} = toRefs(data);
 
 /** 查询列表 */
 const getList = async () => {
@@ -199,7 +206,7 @@ const releaseCancel = (id) => {
           })
       )
       .then(async () => {
-      await updateEnterpriseProduct({ id, status: 3 });
+        await updateEnterpriseProduct({id, status: 3});
         ElMessage.success(t("tips.cancelReleaseSuccess"));
         getList();
       })
@@ -222,20 +229,28 @@ const handleShelf = (row) => {
       )
       .then(function () {
         let status = row.shelfStatus == 1 ? 2 : 1;
-      return updateEnterpriseProduct({ id: row.id, shelfStatus: status });
+        return updateEnterpriseProduct({id: row.id, shelfStatus: status});
       })
       .then(() => {
         getList();
-      ElMessage.success(t("admin.common.success", { action: text }));
+        ElMessage.success(t("admin.common.success", {action: text}));
       })
-    .catch(() => {});
+      .catch(() => {
+      });
 };
 const handleResults = (row) => {
-  router.push({ path: "./results", query: { keyword: row.title } });
+  router.push({path: "./results", query: {keyword: row.title}});
 };
-
+const handleDetails = (id) => {
+  router.push({
+    path: "/extension/release",
+    query: {
+      id
+    }
+  })
+}
 const checkEnterpriseInfo = (id) => {
-  router.push({ path: "./business" });
+  router.push({path: "./business"});
 };
 
 onActivated(() => {

src/views/admin/expert/activity/active.vue

@@ -49,7 +49,7 @@
 
     <!-- 表格数据 -->
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column :label="t('admin.common.dataNumber')" prop="id" />
+      <el-table-column :label="t('admin.common.dataNumber')" prop="id"/>
       <el-table-column
           :label="t('admin.form.name', { type: t('admin.common.activity') })"
           prop="title"
@@ -96,13 +96,23 @@
         <template #default="{ row }">
           <el-tag type="success" v-if="row.status == 1">{{
               t("common.show")
-          }}</el-tag>
+            }}
+          </el-tag>
           <el-tag type="danger" v-else-if="row.status == 2">{{
               t("common.hide")
-          }}</el-tag>
+            }}
+          </el-tag>
           <el-tag type="info" v-else>{{ t("common.unknown") }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column v-if="false" :label="t('admin.common.operation')" align="center" prop="status">
+        <template #default="{ row }">
+          <el-button type="text" icon="view" @click="handleDetail(row.id)" size="small">{{
+              t("common.viewDetails")
+            }}
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -112,21 +122,249 @@
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
     />
+
+    <el-dialog title="活动详情" v-model="showDialog" width="55%" destroy-on-close>
+      <el-form ref="formRef" :model="form" label-width="120px">
+        <el-form-item label="活动名称:" prop="title">
+          <el-input v-model="form.title" placeholder="请输入活动名称"/>
+        </el-form-item>
+        <el-form-item label="联系人:" prop="contact">
+          <el-input v-model="form.contact" placeholder="请输入联系人"/>
+        </el-form-item>
+        <el-form-item label="手机号码:" prop="contactMobile">
+          <el-input
+              v-model="form.contactMobile"
+              placeholder="请输入手机号码"
+              maxlength="11"
+          />
+        </el-form-item>
+        <el-form-item label="开始时间:" prop="beginTime">
+          <el-date-picker
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="form.beginTime"
+              type="datetime"
+              placeholder="选择开始时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间:" prop="finishTime">
+          <el-date-picker
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="form.finishTime"
+              type="datetime"
+              placeholder="选择结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="截止时间:" prop="joinDeadline">
+          <el-date-picker
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="form.joinDeadline"
+              type="datetime"
+              placeholder="选择截止时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <!--        国家-->
+        <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>
+        <!--        <CityOptions v-model="form" ref="cityOptionsRef"/>-->
+        <!-- <el-form-item label="地点:" required>
+          <el-row type="flex" justify="space-between" :gutter="10">
+            <el-col :span="8">
+              <el-form-item prop="province">
+                <el-select
+                  v-model="form.province"
+                  clearable
+                  placeholder="请选择"
+                  :disabled="provinceSelectList.length === 0"
+                  @change="provinceChange"
+                >
+                  <el-option
+                    v-for="item in provinceSelectList"
+                    :key="item.provinceCode"
+                    :label="item.provinceName"
+                    :value="item.provinceCode"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="city">
+                <el-select
+                  v-model="form.city"
+                  clearable
+                  placeholder="请选择"
+                  :disabled="citySelectList.length === 0"
+                  @change="cityChange"
+                >
+                  <el-option
+                    v-for="item in citySelectList"
+                    :key="item.cityCode"
+                    :label="item.cityName"
+                    :value="item.cityCode"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="district">
+                <el-select
+                  v-model="form.district"
+                  clearable
+                  placeholder="请选择"
+                  :disabled="districtSelectList.length === 0"
+                >
+                  <el-option
+                    v-for="item in districtSelectList"
+                    :key="item.areaCode"
+                    :label="item.areaName"
+                    :value="item.areaCode"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form-item> -->
+        <el-form-item label="详细地址:" prop="address">
+          <el-input v-model="form.address" placeholder="请输入详细地址"/>
+        </el-form-item>
+        <field-options v-model="form" ref="fieldOptionsRef"/>
+
+        <!-- <el-form-item label="活动分类:" required>
+          <el-row type="flex" justify="space-between">
+            <el-col :span="8">
+              <el-form-item prop="industrys">
+                <el-select
+                  v-model="form.industrys[0]"
+                  clearable
+                  placeholder="请选择"
+                  @change="field1Change"
+                >
+                  <el-option
+                    v-for="item in field1SelectList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" style="margin: 0 10px">
+              <el-form-item>
+                <el-select
+                  v-model="form.industrys[1]"
+                  clearable
+                  placeholder="请选择"
+                  @change="field2Change"
+                >
+                  <el-option
+                    v-for="item in field2SelectList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select
+                  v-model="form.industrys[2]"
+                  clearable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in field3SelectList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form-item> -->
+
+        <el-form-item label="通知人群:" prop="notifyCrowds">
+          <el-select v-model="form.notifyCrowds" multiple placeholder="请选择">
+            <el-option label="企业" value="1"></el-option>
+            <el-option label="专家" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="报名人数上限:" prop="maxNumber">
+          <el-input
+              v-model.number="form.maxNumber"
+              placeholder="请输入报名人数"
+          />
+        </el-form-item>
+        <el-form-item label="宣传图:" prop="image">
+          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1"/>
+        </el-form-item>
+        <el-form-item label="活动简介:" prop="description">
+          <el-input
+              v-model="form.description"
+              placeholder="请输入活动简介"
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 4 }"
+          />
+        </el-form-item>
+        <el-form-item label="活动介绍:" prop="content">
+          <!--          <WangEditor v-model="form.content" minHeight="150px" />-->
+          <el-input
+              v-model="form.content"
+              placeholder="请输入活动介绍"
+              type="textarea"
+              :autosize="{ minRows: 6, maxRows: 8 }"
+          />
+        </el-form-item>
+        <el-form-item label="报名费用:" prop="amount">
+          <el-input v-model.number="form.amount">
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <!--        <el-button type="primary" @click="submitForm">确 定</el-button>-->
+        <!--        <el-button @click="cancel">取 消</el-button>-->
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { activitysList } from "@/api/admin/expert";
+import {activityInfo, activitysList} from "@/api/admin/expert";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
-import { reactive, ref, toRefs } from "vue";
+import {reactive, ref, toRefs} from "vue";
-import { parseTime } from "@/utils/ruoyi";
+import {parseTime} from "@/utils/ruoyi";
+import FieldOptions from "@/views/components/FieldOptions"
 
-const { t } = useI18n();
+const {t} = useI18n();
 const dataList = ref([]);
 const loading = ref(true);
 const showSearch = ref(true);
 const total = ref(0);
 const queryRef = ref();
+const showDialog = ref(false)
 const data = reactive({
   queryParams: {
     pageNum: 1,
@@ -135,9 +373,10 @@ const data = reactive({
     title: undefined,
     status: undefined,
   },
+  form: {}
 });
 
-const { queryParams } = toRefs(data);
+const {queryParams, form} = toRefs(data);
 
 /** 查询数据列表 */
 const getList = async () => {
@@ -162,5 +401,12 @@ function resetQuery() {
   }
 }
 
+const handleDetail = (id) => {
+  activityInfo(id).then(resp => {
+    form.value = resp.data
+    showDialog.value = true
+  })
+}
+
 getList();
 </script>

src/views/admin/expert/technology/achievement.vue

@@ -30,14 +30,14 @@
     </el-radio-group>
 
     <el-table v-loading="loading" :data="dataList" style="margin-top: 20px">
-      <el-table-column :label="t('admin.common.dataNumber')" prop="id" />
+      <el-table-column :label="t('admin.common.dataNumber')" prop="id"/>
       <el-table-column
           :label="t('admin.form.name', { type: t('admin.common.achievement') })"
           prop="title"
       />
-      <el-table-column :label="t('admin.form.keywords')" prop="keyword" />
+      <el-table-column :label="t('admin.form.keywords')" prop="keyword"/>
       <!-- <el-zh-column label="浏览量" prop="visitCount" /> -->
-      <el-table-column :label="t('admin.form.industry')" prop="industryStr" />
+      <el-table-column :label="t('admin.form.industry')" prop="industryStr"/>
       <el-table-column
           :label="t('admin.table.publishTime')"
           prop="createTime"
@@ -50,32 +50,38 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-if="false"
           :label="t('admin.common.operation')"
           class-name="small-padding fixed-width"
       >
         <template #default="{ row }">
           <router-link
-            v-if="queryParams.status == 3"
+              v-if="queryParams.status === 3"
               :to="{ path: './release', query: { id: row.id } }"
           >
             <el-button icon="Edit" size="small" type="text"
             >{{ t("admin.common.edit") }}
             </el-button>
           </router-link>
-
           <el-button
-            v-if="queryParams.status == 1"
+              v-if="queryParams.status !== 3"
-            :icon="row.shelfStatus == 1 ? `Download` : `Upload`"
+              icon="view"
               size="small"
               type="text"
-            @click="handleShelf(row)"
+              @click="handleDetails(row.id)"
-            >{{
+          >{{ t("common.details") }}
-              row.shelfStatus == 1
-                ? t("admin.table.putOn")
-                : t("admin.table.putOff")
-            }}
           </el-button>
+<!--          <el-button-->
+<!--              v-if="queryParams.status == 1"-->
+<!--              :icon="row.shelfStatus == 1 ? `Download` : `Upload`"-->
+<!--              size="small"-->
+<!--              type="text"-->
+<!--              @click="handleShelf(row)"-->
+<!--          >{{-->
+<!--              row.shelfStatus == 1-->
+<!--                  ? t("admin.table.putOn")-->
+<!--                  : t("admin.table.putOff")-->
+<!--            }}-->
+<!--          </el-button>-->
           <el-button
               v-if="queryParams.status != 0"
               icon="Delete"
@@ -121,18 +127,18 @@ import {
   expertAchievementList,
   updateExpertAchievement,
 } from "@/api/admin/expert/achievement";
-import { ElMessage } from "element-plus";
+import {ElMessage} from "element-plus";
 import modal from "@/plugins/modal"; // import { update } from "lodash-unified";
-import { useRouter } from "vue-router";
+import {useRouter} from "vue-router";
-import { onActivated, reactive } from "vue";
+import {onActivated, reactive} from "vue";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 import dayjs from "dayjs";
 
 const router = useRouter();
 const dataList = ref([]);
 const loading = ref(true);
 const total = ref(0);
-const { t } = useI18n();
+const {t} = useI18n();
 const data = reactive({
   queryParams: {
     pageNum: 1,
@@ -141,7 +147,7 @@ const data = reactive({
   },
 });
 
-const { queryParams } = toRefs(data);
+const {queryParams} = toRefs(data);
 
 /** 查询列表 */
 const getList = async () => {
@@ -174,7 +180,7 @@ const handleDelete = (id) => {
           })
       )
       .then(async () => {
-      await deleteAchievementByIds({ ids: [id] });
+        await deleteAchievementByIds({ids: [id]});
         getList();
         ElMessage.success(t("admin.common.deleteSuccess"));
       });
@@ -195,7 +201,7 @@ function handleShelf(row) {
       )
       .then(async () => {
         const shelfStatus = row.shelfStatus == 1 ? 2 : 1;
-      await updateExpertAchievement({ id: row.id, shelfStatus });
+        await updateExpertAchievement({id: row.id, shelfStatus});
         getList();
         ElMessage.success(
             t("admin.common.success", {
@@ -217,7 +223,7 @@ const handleCancelPublish = (id) => {
           })
       )
       .then(async () => {
-      await updateExpertAchievement({ id, status: "3" });
+        await updateExpertAchievement({id, status: "3"});
         ElMessage.success(t("tips.cancelReleaseSuccess"));
         getList();
       });
@@ -225,6 +231,16 @@ const handleCancelPublish = (id) => {
   // handleQuery();
 };
 
+
+const handleDetails = (id) => {
+  router.push({
+    path: `/technology/release`,
+    query: {
+      id
+    }
+  })
+}
+
 function handleResults(row) {
   router.push({
     path: "./results",

src/views/website/home/comp/index9.vue

@@ -134,6 +134,14 @@ getList();
     height: 100%;
     padding: 12px;
 
+    :deep(.el-tabs__item) {
+      font-size: 18px;
+
+      &.is-active {
+        color: #0054ff;
+      }
+    }
+
     .news-list {
       .news-item {
         & > a {

src/views/website/news/detail.vue

@@ -55,6 +55,7 @@ getNews()
     }
 
     p.content {
+      text-indent: 2em each-line;
       font-size: 16px;
       line-height: 24px;
       margin: 0;

src/views/website/searchList/expertDetail.vue

@@ -9,7 +9,7 @@
         <div class="head">
           <el-breadcrumb separator="/">
             <el-breadcrumb-item>
-              <span class="one">{{ t("admin.findExpert") }}</span>
+              <span class="one">{{ t("webSearch.findExpert") }}</span>
             </el-breadcrumb-item>
             <el-breadcrumb-item>
               <span>{{ t("webSearch.expertDetails") }}</span>
@@ -133,6 +133,47 @@
               <!-- <div style="padding: 20px 0">
                 <div class="pointTit">专家视频</div>
               </div> -->
+              <!--              <template>-->
+              <div style="padding: 20px 0">
+                <div class="pointTit">{{ t("dict.patent") }}</div>
+              </div>
+              <section>
+                <div>
+                  <ul class="patent-list">
+                    <li v-for="patent in state.expertDetail.patentList??[]" :key="patent.id" class="patent-item">
+                      {{ patent.title }}
+                    </li>
+                  </ul>
+                </div>
+              </section>
+              <!--              </template>-->
+
+              <div style="padding: 20px 0">
+                <div class="pointTit">{{ t("admin.common.achievement") }}</div>
+              </div>
+              <section>
+                <div>
+                  <ul class="patent-list">
+                    <li v-for="achievement in state.expertDetail.achievementList" :key="achievement.id"
+                        class="patent-item">
+                      {{ achievement.title }}
+                    </li>
+                  </ul>
+                </div>
+              </section>
+              <div style="padding: 20px 0">
+                <div class="pointTit">{{ t("admin.common.paper") }}</div>
+              </div>
+              <section>
+                <div>
+                  <ul class="patent-list">
+                    <li v-for="paper in state.expertDetail.paperList" :key="paper.id"
+                        class="patent-item">
+                      {{ paper.title }}
+                    </li>
+                  </ul>
+                </div>
+              </section>
             </div>
             <div v-if="state.expertDetail.id" style="padding: 20px 0">
               <el-tabs v-model="state.activeName">
@@ -406,7 +447,7 @@
             </div> -->
           </div>
           <div class="r">
-            <webContact />
+            <webContact/>
           </div>
         </el-row>
       </template>
@@ -420,17 +461,20 @@ import webContact from "@/components/webContact/index.vue";
 import expertItem from "./components/expertItem.vue";
 // import loadMore from "./components/loadMore.vue";
 // import request from "@/utils/request";
-import { searchExpertDetail } from "@/api/website/home";
+import {searchExpertDetail} from "@/api/website/home";
-import { onMounted, reactive, ref } from "vue";
+import {onMounted, reactive, ref} from "vue";
 import searchContainer from "./components/searchContainer.vue";
 // import wordcloud from "./components/wordcloud.vue";
 // import productItem from "./components/productItem.vue";
-import { useRoute, useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import docking from "./components/docking.vue";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
-import { educationOptions } from "../../../utils/parameter";
+import {educationOptions} from "../../../utils/parameter";
+import {expertPatentList} from "@/api/admin/expert/patent";
+import {expertAchievementList} from "@/api/admin/expert/achievement";
+import {paperList} from "@/api/admin/expert/technology";
 
-const { t, locale } = useI18n();
+const {t, locale} = useI18n();
 const showDocking = ref(false);
 const router = useRouter();
 const route = useRoute();
@@ -457,7 +501,7 @@ const state = reactive({
 function handleList(mode, query) {
   router.push({
     path: `/searchList/${mode}`,
-    query: { query, queryType: route.query.queryType },
+    query: {query, queryType: route.query.queryType},
   });
 }
 
@@ -518,6 +562,21 @@ function getDataList() {
       .catch(() => {
         loading.value = false;
       });
+
+  expertPatentList(id).then(resp => {
+    state.expertDetail.patentList = resp.rows
+  })
+
+  expertAchievementList({
+    expertId: id
+  }).then(resp => {
+    state.expertDetail.achievementList = resp.rows
+    console.log(state.expertDetail.achievementList)
+  })
+
+  paperList({uid: id}).then(resp => {
+    state.expertDetail.paperList = resp.rows
+  })
   // companyProduct(id).then(res => {
   //     if (200 == res.code) {
   //         state.companyProduct = res.data.data;
@@ -588,6 +647,12 @@ function getDataList() {
   //   color: #666666;
   //   margin-bottom: 5px;
   // }
+  .patent-list {
+    .patent-item {
+      list-style: disc;
+      line-height: 24px;
+    }
+  }
 }
 
 .pointTit {