修改问题

src/store/api/user/school.js

@@ -0,0 +1,40 @@
+import { defineStore } from 'pinia'
+import { AxiosWrapper } from '@/utils/axios-wrapper'
+import { get } from 'lodash-es'
+const url = '/school'
+const axios = new AxiosWrapper()
+
+export const SchoolStore = defineStore('school', () => {
+  const query = async ({ skip = 0, limit = undefined, ...info } = {}) => {
+    let cond = {}
+    if (skip) cond.skip = skip
+    if (limit) cond.limit = limit
+    cond = { ...cond, ...info }
+    const res = await axios.$get(`${url}`, cond)
+    return res
+  }
+  const fetch = async (payload) => {
+    const res = await axios.$get(`${url}/${payload}`)
+    return res
+  }
+  const create = async (payload) => {
+    const res = await axios.$post(`${url}`, payload)
+    return res
+  }
+  const update = async (payload) => {
+    const id = get(payload, 'id', get(payload, '_id'))
+    const res = await axios.$post(`${url}/${id}`, payload)
+    return res
+  }
+  const del = async (payload) => {
+    const res = await axios.$delete(`${url}/${payload}`)
+    return res
+  }
+  return {
+    query,
+    fetch,
+    create,
+    update,
+    del
+  }
+})

src/store/user.js

@@ -14,6 +14,7 @@ export const UserStore = defineStore('user', () => {
    */
   const logOut = () => {
     user.value = {}
+    menus.value = null
     localStorage.removeItem('token')
   }
   const setMenus = (payload) => {

src/views/center/attestation.vue

@@ -21,6 +21,7 @@
           <competition v-if="activeName == 'Competition'"></competition>
           <investment v-if="activeName == 'Investment'"></investment>
           <association v-if="activeName == 'Association'"></association>
+          <school v-if="activeName == 'School'"></school>
           <state v-if="activeName == 'State'"></state>
           <unit v-if="activeName == 'Unit'"></unit>
         </el-col>
@@ -37,6 +38,7 @@ import { UserStore } from '@/store/user'
 const userStore = UserStore()
 const user = computed(() => userStore.user)
 // 组件
+import school from './parts/school.vue'
 import association from './parts/association.vue'
 import company from './parts/company.vue'
 import competition from './parts/competition.vue'

src/views/center/parts/school.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="index">
+    <el-form ref="ruleFormRef" :model="form" :rules="rules" label-width="auto" class="form" label-position="left">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="院校名称" prop="name">
+            <el-input size="large" clearable v-model="form.name" placeholder="请输入院校名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="负责人姓名" prop="person">
+            <el-input size="large" clearable v-model="form.person" placeholder="请输入负责人姓名" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="负责人电话" prop="person_phone">
+            <el-input size="large" clearable v-model="form.person_phone" placeholder="请输入负责人电话" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="是否公开" prop="is_show">
+            <el-radio-group size="large" v-model="form.is_show">
+              <el-radio v-for="i in isUseList" :key="i._id" :label="i.value">{{ i.label }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-col :span="24">
+        <el-form-item label="地址" prop="address">
+          <el-input size="large" v-model="form.address" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="请输入地址" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="简介" prop="brief">
+          <el-input size="large" v-model="form.brief" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="请输入简介" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24" class="button">
+        <el-button type="primary" @click="submitForm(ruleFormRef)">保存</el-button>
+      </el-col>
+    </el-form>
+  </div>
+</template>
+<script setup>
+// 基础
+const $checkRes = inject('$checkRes')
+const cloneDeep = inject('cloneDeep')
+// 用户信息
+import { UserStore } from '@/store/user'
+const userStore = UserStore()
+const user = computed(() => userStore.user)
+// 表单
+const ruleFormRef = ref()
+// 字典表
+const isUseList = inject('isUseList')
+// 接口
+import { SchoolStore } from '@/store/api/user/school'
+const schoolStore = SchoolStore()
+const form = ref({})
+const rules = reactive({
+  // nick_name: [{ required: true, message: '请输入昵称', trigger: 'blur' }],
+  // gender: [{ required: true, message: '请选择性别', trigger: 'blur' }],
+  // phone: [{ required: true, validator: validatePhoneNumber, trigger: 'blur' }],
+  // account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
+  // password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+  // refpassword: [{ required: true, validator: validatePassword, trigger: 'blur' }]
+})
+// 注册
+const submitForm = async (formEl) => {
+  if (!formEl) return
+  await formEl.validate(async (valid, fields) => {
+    if (valid) {
+      const data = cloneDeep(form.value)
+      data.status = '0'
+      let res
+      if (data.id) res = await schoolStore.update(data)
+      else res = await schoolStore.create({ ...data, user: user.value.id })
+      if ($checkRes(res, true)) {
+        search()
+      } else ElMessage.error(res.message)
+    } else {
+      console.log('error submit!', fields)
+    }
+  })
+}
+// 请求
+onMounted(async () => {
+  await search()
+})
+const search = async () => {
+  if (user.value.id) {
+    let res = await schoolStore.query({ user: user.value.id })
+    if (res.errcode == '0') form.value = res.data[0] || {}
+  }
+}
+</script>
+<style scoped lang="scss">
+.index {
+  .button {
+    text-align: center;
+  }
+}
+</style>

src/views/center/service.vue

@@ -0,0 +1,264 @@
+<template>
+  <div class="index">
+    <el-row>
+      <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
+        <el-col :span="24" class="one">
+          <div class="one_left" @click="toAdd">发布服务</div>
+          <div class="one_right">
+            <el-input v-model="searchForm.name" style="width: 250px" size="large" placeholder="搜索" @change="search" :suffix-icon="Search" />
+          </div>
+        </el-col>
+        <el-col :span="24" class="two">
+          <el-table :data="list" style="width: 100%" size="large" :header-cell-style="{ backgroundColor: '#edf3ff' }">
+            <template #empty>
+              <el-empty description="暂无数据" />
+            </template>
+            <el-table-column prop="name" align="center" label="服务名称" />
+            <el-table-column prop="time" align="center" label="登记时间" width="180" />
+            <el-table-column prop="status" align="center" label="状态" width="180">
+              <template #default="scope">
+                <div>{{ getDict(scope.row.status, 'status') }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="操作" width="180">
+              <template #default="{ row }">
+                <el-link v-if="row.status == '-2'" :underline="false" type="warning" size="mini" @click="toExam(row)" style="margin-right: 10px">提交审核</el-link>
+                <el-link :underline="false" type="primary" size="mini" @click="toEdit(row)" style="margin-right: 10px">修改</el-link>
+                <el-link :underline="false" type="danger" size="mini" @click="toDelete(row)"> 删除 </el-link>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+        <el-col :span="24" class="thr">
+          <el-pagination background layout="prev, pager, next" :total="total" :page-size="limit" v-model:current-page="currentPage" @current-change="changePage" @size-change="sizeChange" />
+        </el-col>
+      </el-col>
+    </el-row>
+    <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
+      <el-row>
+        <el-col :span="24" v-if="dialog.type == '1'">
+          <custom-form v-model="form" :fields="formFields" :rules="rules" @save="toSave" @draftSave="toDraftSave">
+            <template #file>
+              <custom-upload model="file" :list="form.file" :limit="3" listType="picture-card" url="/files/web/cxyy_support/upload" @change="onUpload"></custom-upload>
+            </template>
+            <template #is_use>
+              <el-radio v-for="i in isUseList" :key="i.id" :label="i.value">{{ i.label }}</el-radio>
+            </template>
+            <template #industry>
+              <el-option v-for="i in sectorList" :key="i.id" :label="i.title" :value="i.title"></el-option>
+            </template>
+            <template #area>
+              <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" style="width: 100%" />
+            </template>
+            <template #tags>
+              <el-select v-model="form.tags" multiple filterable allow-create default-first-option :reserve-keyword="false" placeholder="请选择标签" style="width: 100%">
+                <el-option v-for="item in tagsList" :key="item.id" :label="item.title" :value="item.title" />
+              </el-select>
+            </template>
+          </custom-form>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { Search } from '@element-plus/icons-vue'
+import { cloneDeep, get } from 'lodash-es'
+const $checkRes = inject('$checkRes')
+import { UserStore } from '@/store/user'
+const userStore = UserStore()
+const user = computed(() => userStore.user)
+// 接口
+import { SupportStore } from '@/store/api/platform/support'
+import { DictDataStore } from '@/store/api/system/dictData'
+import { TagsStore } from '@/store/api/system/tags'
+import { SectorStore } from '@/store/api/platform/sector'
+import { RegionStore } from '@/store/api/system/region'
+const regionStore = RegionStore()
+const store = SupportStore()
+const dictDataStore = DictDataStore()
+const tagsStore = TagsStore()
+const sectorStore = SectorStore()
+// 加载中
+const loading = ref(false)
+
+const searchForm = ref({})
+// 列表
+const list = ref([])
+let skip = 0
+let limit = inject('limit')
+const total = ref(0)
+const currentPage = ref(1)
+// 字典表
+const isUseList = ref([])
+const statusList = ref([])
+const cityList = ref([])
+const tagsList = ref([])
+const sectorList = ref([])
+
+const form = ref({ file: [] })
+const dialog = ref({ type: '1', show: false, title: '发布服务' })
+const formFields = ref([
+  { label: '封面', model: 'file', custom: true },
+  { label: '名称', model: 'name' },
+  { label: '标签', model: 'tags', custom: true },
+  { label: '所属产业', model: 'industry', type: 'select' },
+  { label: '服务领域', model: 'field' },
+  { label: '登记时间', model: 'time', type: 'date' },
+  { label: '所在地区', model: 'area', custom: true },
+  { label: '地址', model: 'address', type: 'textarea' },
+  { label: '联系人', model: 'contacts' },
+  { label: '联系电话', model: 'phone' },
+  { label: '是否启用', model: 'is_use', type: 'radio' },
+  { label: '简介', model: 'brief', type: 'textarea' }
+])
+const rules = reactive({ name: [{ required: true, message: '请输入服务名称', trigger: 'blur' }] })
+// 请求
+onMounted(async () => {
+  loading.value = true
+  await searchOther()
+  await search()
+  loading.value = false
+})
+const search = async (query = { skip, limit }) => {
+  skip = query.skip
+  limit = query.limit
+  const info = {
+    skip: query.skip,
+    limit: query.limit,
+    user: user.value.id,
+    ...searchForm.value
+  }
+  const res = await store.query(info)
+  if (res.errcode == '0') {
+    list.value = res.data
+    total.value = res.total
+  }
+}
+const searchOther = async () => {
+  let result
+  // 是否使用
+  result = await dictDataStore.query({ code: 'isUse', is_use: '0' })
+  if ($checkRes(result)) isUseList.value = result.data
+  // 状态
+  result = await dictDataStore.query({ code: 'examStatus', is_use: '0' })
+  if ($checkRes(result)) statusList.value = result.data
+  // 标签
+  result = await tagsStore.query({ is_use: '0' })
+  if ($checkRes(result)) tagsList.value = result.data
+  // 行业
+  result = await sectorStore.query({ is_use: '0' })
+  if ($checkRes(result)) sectorList.value = result.data
+  // 城市
+  result = await regionStore.area({ level: 'province', code: 22 })
+  if ($checkRes(result)) cityList.value = result.data
+}
+// 字典数据转换
+const getDict = (data, model) => {
+  if (data) {
+    let res
+    if (model == 'status') res = statusList.value.find((f) => f.value == data)
+    return get(res, 'label')
+  }
+}
+// 添加
+const toAdd = () => {
+  dialog.value = { type: '1', show: true, title: '发布服务' }
+}
+// 修改
+const toEdit = (data) => {
+  form.value = data
+  dialog.value = { type: '1', show: true, title: '修改服务' }
+}
+// 删除
+const toDelete = (data) => {
+  ElMessageBox.confirm(`您确认删除${data.name}该数据?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' })
+    .then(async () => {
+      const res = await store.del(data.id)
+      if ($checkRes(res, true)) {
+        search({ skip, limit })
+      }
+    })
+    .catch(() => {})
+}
+const toSave = async () => {
+  const data = cloneDeep(form.value)
+  const other = { status: '0', user: user.value.id }
+  let res
+  if (get(data, 'id')) res = await store.update({ ...data, ...other })
+  else res = await store.create({ ...data, ...other })
+  if ($checkRes(res, true)) {
+    search({ skip, limit })
+    toClose()
+  }
+}
+const toDraftSave = async () => {
+  const data = cloneDeep(form.value)
+  const other = { status: '-2', user: user.value.id }
+  let res
+  if (get(data, 'id')) res = await store.update({ ...data, ...other })
+  else res = await store.create({ ...data, ...other })
+  if ($checkRes(res, true)) {
+    search({ skip, limit })
+    toClose()
+  }
+}
+// 审核保存
+const toExam = async (row) => {
+  ElMessageBox.confirm(`您确认保存并提交审核该数据?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' })
+    .then(async () => {
+      const data = cloneDeep(row)
+      let res = await store.update({ id: data.id, status: '0', user: user.value.id })
+      if ($checkRes(res, true)) {
+        search({ skip, limit })
+        toClose()
+      }
+    })
+    .catch(() => {})
+}
+// 上传图片
+const onUpload = (e) => {
+  const { model, value } = e
+  form.value[model] = value
+}
+const toClose = () => {
+  form.value = { file: [] }
+  dialog.value = { show: false }
+}
+// 分页
+const changePage = (page = currentPage.value) => {
+  search({ skip: (page - 1) * limit, limit: limit })
+}
+const sizeChange = (limits) => {
+  limit = limits
+  currentPage.value = 1
+  search({ skip: 0, limit: limit })
+}
+</script>
+<style scoped lang="scss">
+.main {
+  .one {
+    height: 50px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 0 0 10px 0;
+    .one_left {
+      background: #1875df;
+      padding: 0 10px;
+      height: 30px;
+      color: #fff;
+      line-height: 30px;
+      text-align: center;
+      font-size: 16px;
+      cursor: default;
+    }
+  }
+  .thr {
+    display: flex;
+    justify-content: center;
+    margin: 20px 0 0 0;
+  }
+}
+</style>

src/views/detail/news.vue

@@ -42,6 +42,9 @@
                   </el-col>
                 </el-col>
               </el-col>
+              <el-col :span="24" class="pager">
+                <el-pagination background layout="total, prev, pager, next" :page-sizes="[10, 20, 50, 100, 200]" :total="total" :page-size="limit" v-model:current-page="currentPage" @current-change="changePage" @size-change="sizeChange"> </el-pagination>
+              </el-col>
             </el-col>
             <el-col :span="6" class="right">
               <el-col :span="24" class="title">
@@ -70,9 +73,6 @@
               </el-col>
             </el-col>
           </el-col>
-          <el-col :span="24" class="one_2_thr">
-            <el-pagination background layout="total, prev, pager, next" :page-sizes="[10, 20, 50, 100, 200]" :total="total" :page-size="limit" v-model:current-page="currentPage" @current-change="changePage" @size-change="sizeChange"> </el-pagination>
-          </el-col>
         </el-col>
       </div>
     </el-col>
@@ -299,6 +299,11 @@ const getUrl = (item) => {
               }
             }
           }
+          .pager {
+            display: flex;
+            flex-direction: row-reverse;
+            padding: 20px;
+          }
         }
         .right {
           .title {
@@ -359,11 +364,6 @@ const getUrl = (item) => {
           }
         }
       }
-      .one_2_thr {
-        display: flex;
-        flex-direction: row-reverse;
-        padding: 20px;
-      }
     }
   }
 }

src/views/login/parts/register.vue

@@ -14,12 +14,12 @@
             <el-checkbox v-for="(item, index) in roleList" :key="index" :value="item.code">{{ item.name }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="板块选择" prop="plate">
-          <el-checkbox-group v-model="form.plate">
+        <el-form-item label="板块选择" prop="industry">
+          <el-checkbox-group v-model="form.industry">
             <el-checkbox v-for="(item, index) in plateList" :key="index" :value="item.title">{{ item.title }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="姓名" prop="nick_name">
+        <el-form-item label="账号" prop="nick_name">
           <el-input size="large" clearable v-model="form.nick_name" placeholder="请输入姓名/单位名称">
             <template #prefix>
               <el-icon>
@@ -118,7 +118,7 @@ const rules = reactive({
   password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
   type: [{ required: true, message: '请选择注册类型', trigger: 'blur' }],
   role: [{ required: true, message: '请选择角色', trigger: 'blur' }],
-  plate: [{ required: true, message: '请选择板块', trigger: 'blur' }],
+  industry: [{ required: true, message: '请选择板块', trigger: 'blur' }],
   checkCode: [{ required: true, message: '请输入验证码', trigger: 'blur' }]
 })
 // 注册
@@ -137,11 +137,9 @@ const submitForm = async (formEl) => {
       const user = await store.query({ account: data.nick_name })
       if (user.total === 0) {
         data.account = data.nick_name
-        if (data.plate && data.plate.length > 0) data.industry = data.plate[0]
         data.gender = '0'
         delete data.refpassword
         delete data.checkCode
-        delete data.plate
         delete data.type
         const res = await store.create(data)
         if (res.errcode === 0) {
@@ -151,7 +149,7 @@ const submitForm = async (formEl) => {
           })
           form.value = { role: ['User'] }
           router.push({ path: '/login' })
-        }
+        } else ElMessage({ message: res.errmsg, type: 'warning' })
       } else {
         ElMessage({
           message: '已有相同姓名或实验室名称 请重新输入！',

src/views/one/index.vue

@@ -2,17 +2,17 @@
   <custom-layout v-loading="loading" :is_carousel="true" :carouselList="carouselList">
     <el-col :span="24" class="two">
       <div class="two_left">
-        <div class="left_more left_1" @click="toComon('/nine')">
+        <div class="left_more left_1" @click="toComon('/nine', '1')">
           <div class="name">成果中心</div>
           <div class="english">ACHIEVEMENT CENTER</div>
           <div class="remark">成果征集入口</div>
         </div>
-        <div class="left_more left_2" @click="toComon('/two')">
-          <div class="name">信息发布</div>
-          <div class="english">INFORMATION RELEASE</div>
-          <div class="remark">需求供给发布入口</div>
+        <div class="left_more left_2" @click="toComon('/center/basic', '0')">
+          <div class="name">个人中心</div>
+          <div class="english">PERSONAL CENTER</div>
+          <div class="remark">个人信息入口</div>
         </div>
-        <div class="left_more left_3" @click="toComon('/four')">
+        <div class="left_more left_3" @click="toComon('/four', '1')">
           <div class="name">信息检索</div>
           <div class="english">INFORMATION RETRIEVAL</div>
           <div class="remark">信息检索入口</div>
@@ -33,7 +33,7 @@
         </div>
       </div>
       <div class="two_right">
-        <div class="right_more right_1" @click="toComon('/expert')">
+        <div class="right_more right_1" @click="toComon('/expert', '1')">
           <div class="right_left">
             <el-image class="image" :src="home_1" fit="fill" />
             <div class="right_name">
@@ -43,7 +43,7 @@
           </div>
           <div class="right_right">点击进入>></div>
         </div>
-        <div class="right_more right_2" @click="toComon('/company')">
+        <div class="right_more right_2" @click="toComon('/company', '1')">
           <div class="right_left">
             <el-image class="image" :src="home_2" fit="fill" />
             <div class="right_name">
@@ -53,7 +53,7 @@
           </div>
           <div class="right_right">点击进入>></div>
         </div>
-        <div class="right_more right_3" @click="toComon('/project')">
+        <div class="right_more right_3" @click="toComon('/project', '1')">
           <div class="right_left">
             <el-image class="image" :src="home_3" fit="fill" />
             <div class="right_name">
@@ -144,6 +144,11 @@ import home_3 from '/images/home_3.png'
 import time1 from '/images/time-dary.png'
 import match_3 from '/images/match_3.jpg'
 const $checkRes = inject('$checkRes')
+
+import { UserStore } from '@/store/user'
+const userStore = UserStore()
+const user = computed(() => userStore.user)
+
 // 接口
 import { NewsStore } from '@/store/api/platform/news'
 import { MatchStore } from '@/store/api/platform/match'
@@ -234,8 +239,12 @@ const toMore = () => {
   router.push({ path: '/news' })
 }
 // 查看
-const toComon = (route) => {
-  router.push({ path: route })
+const toComon = (route, type) => {
+  if (user.value.id || type == '1') {
+    router.push({ path: route })
+  } else {
+    router.push({ path: '/login', query: { status: '1' } })
+  }
 }
 const removeHtmlStyle = (html) => {
   let relStyle = /style\s*?=\s*?([‘"])[\s\S]*?\1/g //去除样式