尾部导航

src/api/dataList/expert.js

@@ -1,45 +1,46 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
-// 专家列表
+// // 专家列表
-export function expertList(data) {
+// export function expertList(data) {
-	return request({
+//   return request({
-		url: '/admin/v1/manage/expert',
+//     url: "/admin/v1/manage/expert",
-		method: 'post',
+//     method: "post",
-		data,
+//     data,
-	})
+//   });
-}
+// }
-// 专家信息添加
+
-export function expertAdd(data) {
+// // 专家信息添加
-	return request({
+// export function expertAdd(data) {
-		url: '/admin/v1/manage/expert/add',
+//   return request({
-		method: 'post',
+//     url: "/admin/v1/manage/expert/add",
-		data,
+//     method: "post",
-	})
+//     data,
-}
+//   });
-// 专家详细信息
+// }
-export function expertDetail(data) {
+// // 专家详细信息
-	return request({
+// export function expertDetail(data) {
-		url: '/admin/v1/manage/expert/detail',
+//   return request({
-		method: 'post',
+//     url: "/admin/v1/manage/expert/detail",
-		data,
+//     method: "post",
-	})
+//     data,
-}
+//   });
-// 专家信息修改
+// }
-export function expertEdit(data) {
+// // 专家信息修改
-	return request({
+// export function expertEdit(data) {
-		url: '/admin/v1/manage/expert/edit',
+//   return request({
-		method: 'post',
+//     url: "/admin/v1/manage/expert/edit",
-		data,
+//     method: "post",
-	})
+//     data,
-}
+//   });
-// 专家审核操作
+// }
-export function expertExamine(data) {
+// // 专家审核操作
-	return request({
+// export function expertExamine(data) {
-		url: '/admin/v1/manage/expert/examine',
+//   return request({
-		method: 'post',
+//     url: "/admin/v1/manage/expert/examine",
-		data,
+//     method: "post",
-	})
+//     data,
-}
+//   });
+// }
 
 // 专家分配账号
 export function allocateAccount(data) {
@@ -65,3 +66,11 @@ export function restPassword(id, password) {
     method: "put",
   });
 }
+
+// 专家删除
+export function expertDelete(ids) {
+  return request({
+    url: `/business/casExpert/${ids}`,
+    method: "delete",
+  });
+}

src/api/website/solution.js

@@ -77,3 +77,46 @@ export function serviceCaseDelete(ids) {
     method: "delete",
   });
 }
+
+// 解决方案导航列表
+export function planCategoryList(params) {
+  return request({
+    url: `/business/planCategory/list`,
+    method: "get",
+    params,
+  });
+}
+
+// 解决方案导航新增
+export function planCategoryAdd(data) {
+  return request({
+    url: `/business/planCategory`,
+    method: "post",
+    data,
+  });
+}
+// 解决方案导航删除
+export function planCategoryDelete(ids) {
+  return request({
+    url: `/business/planCategory`,
+    method: "delete",
+    data: {
+      ids,
+    },
+  });
+}
+// 解决方案导航详情
+export function planCategoryDetail(id) {
+  return request({
+    url: `/business/planCategory/${id}`,
+    method: "get",
+  });
+}
+// 解决方案导航修改
+export function planCategoryUpdate(data) {
+  return request({
+    url: `/business/planCategory`,
+    method: "put",
+    data,
+  });
+}

src/components/ImageUpload/index copy.vue

@@ -1,206 +0,0 @@
-<template>
-  <div class="component-upload-image">
-    <el-upload
-      multiple
-      :action="uploadImgUrl"
-      list-type="picture-card"
-      :on-success="handleUploadSuccess"
-      :before-upload="handleBeforeUpload"
-      :limit="limit"
-      :on-error="handleUploadError"
-      :on-exceed="handleExceed"
-      name="file"
-      :on-remove="handleRemove"
-      :show-file-list="true"
-      :headers="headers"
-      :file-list="fileList"
-      :on-preview="handlePictureCardPreview"
-      :class="{ hide: fileList.length >= limit }"
-    >
-      <el-icon class="avatar-uploader-icon"><plus /></el-icon>
-    </el-upload>
-    <!-- 上传提示 -->
-    <div class="el-upload__tip" v-if="showTip">
-      请上传
-      <template v-if="fileSize">
-        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
-      </template>
-      <template v-if="fileType">
-        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
-      </template>
-      的文件
-    </div>
-
-    <el-dialog
-      v-model="dialogVisible"
-      title="预览"
-      width="800px"
-      append-to-body
-    >
-      <img
-        :src="dialogImageUrl"
-        style="display: block; max-width: 100%; margin: 0 auto"
-      />
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import { getToken } from "@/utils/auth";
-
-const props = defineProps({
-  modelValue: [String, Object, Array],
-  // 图片数量限制
-  limit: {
-    type: Number,
-    default: 5,
-  },
-  // 大小限制(MB)
-  fileSize: {
-    type: Number,
-    default: 5,
-  },
-  // 文件类型, 例如['png', 'jpg', 'jpeg']
-  fileType: {
-    type: Array,
-    default: () => ["png", "jpg", "jpeg"],
-  },
-  // 是否显示提示
-  isShowTip: {
-    type: Boolean,
-    default: true,
-  },
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const { proxy } = getCurrentInstance();
-const emit = defineEmits();
-const number = ref(0);
-const uploadList = ref([]);
-const dialogImageUrl = ref("");
-const dialogVisible = ref(false);
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadImgUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
-const headers = ref({ Authorization: "Bearer " + getToken() });
-const fileList = ref([]);
-const showTip = computed(
-  () => props.isShowTip && (props.fileType || props.fileSize)
-);
-
-watch(
-  () => props.modelValue,
-  (val) => {
-    if (val) {
-      // 首先将值转为数组
-      const list = Array.isArray(val) ? val : props.modelValue.split(",");
-      // 然后将数组转为对象数组
-      fileList.value = list.map((item) => {
-        if (typeof item === "string") {
-          if (item.indexOf(baseUrl) === -1) {
-            item = { name: baseUrl + item, url: baseUrl + item };
-          } else {
-            item = { name: item, url: item };
-          }
-        }
-        return item;
-      });
-    } else {
-      fileList.value = [];
-      return [];
-    }
-  },
-  { deep: true, immediate: true }
-);
-
-// 删除图片
-function handleRemove(file, files) {
-  emit("update:modelValue", listToString(fileList.value));
-}
-
-// 上传成功回调
-function handleUploadSuccess(res) {
-  uploadList.value.push({ name: res.fileName, url: res.url });
-  if (uploadList.value.length === number.value) {
-    fileList.value = fileList.value
-      .filter((f) => f.url !== undefined)
-      .concat(uploadList.value);
-    uploadList.value = [];
-    number.value = 0;
-    emit("update:modelValue", listToString(fileList.value));
-    proxy.$modal.closeLoading();
-  }
-}
-
-// 上传前loading加载
-function handleBeforeUpload(file) {
-  let isImg = false;
-  if (props.fileType.length) {
-    let fileExtension = "";
-    if (file.name.lastIndexOf(".") > -1) {
-      fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
-    }
-    isImg = props.fileType.some((type) => {
-      if (file.type.indexOf(type) > -1) return true;
-      if (fileExtension && fileExtension.indexOf(type) > -1) return true;
-      return false;
-    });
-  } else {
-    isImg = file.type.indexOf("image") > -1;
-  }
-  if (!isImg) {
-    proxy.$modal.msgError(
-      `文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!`
-    );
-    return false;
-  }
-  if (props.fileSize) {
-    const isLt = file.size / 1024 / 1024 < props.fileSize;
-    if (!isLt) {
-      proxy.$modal.msgError(`上传头像图片大小不能超过 ${props.fileSize} MB!`);
-      return false;
-    }
-  }
-  proxy.$modal.loading("正在上传图片，请稍候...");
-  number.value++;
-}
-
-// 文件个数超出
-function handleExceed() {
-  proxy.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
-}
-
-// 上传失败
-function handleUploadError() {
-  proxy.$modal.msgError("上传图片失败");
-  proxy.$modal.closeLoading();
-}
-
-// 预览
-function handlePictureCardPreview(file) {
-  dialogImageUrl.value = file.url;
-  dialogVisible.value = true;
-}
-
-// 对象转成指定字符串分隔
-function listToString(list, separator) {
-  let strs = "";
-  separator = separator || ",";
-  for (let i in list) {
-    if (undefined !== list[i].url && list[i].url.indexOf("blob:") !== 0) {
-      // strs += list[i].url.replace(baseUrl, "") + separator;
-      strs += list[i].url + separator;
-    }
-  }
-  return strs != "" ? strs.substr(0, strs.length - 1) : "";
-}
-</script>
-
-<style scoped lang="scss">
-// .el-upload--picture-card 控制加号部分
-:deep(.hide .el-upload--picture-card) {
-  display: none;
-}
-</style>

src/components/WangEditor/index.vue

@@ -1,5 +1,10 @@
 <template>
-  <div :style="`border: 1px solid #ccc; width: ${width}`">
+  <div
+    :style="`border: 1px solid #ccc; width: ${width}`"
+    :class="{
+      disabled: readOnly,
+    }"
+  >
     <Toolbar
       style="border-bottom: 1px solid #ccc"
       :editor="editorRef"
@@ -99,7 +104,7 @@ export default {
     const editorConfig = {
       placeholder: "请输入内容...",
       autoFocus: props.focus,
-      maxLength: 140,
+      // maxLength: 140,
       readOnly: props.readOnly,
       MENU_CONF: {
         uploadImage: {
@@ -157,3 +162,19 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.disabled {
+  background-color: #f5f7fa;
+  cursor: not-allowed;
+  :deep(.w-e-text-container) {
+    background-color: inherit;
+    // color: green;
+    opacity: 0.5;
+  }
+  :deep(.w-e-toolbar) {
+    user-select: none;
+    pointer-events: none;
+    background-color: inherit;
+  }
+}
+</style>

src/layout/components/Sidebar/SidebarItem.vue

@@ -1,18 +1,58 @@
 <template>
-  <div v-if="!item.hidden">
+  <el-badge
-    <template v-if="hasOneShowingChild(item.children, item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
+    v-if="!item.hidden"
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
+    :hidden="
-        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
+      ![`/approval/list`, `/approval/dataList/approval`].includes(basePath)
-          <svg-icon :icon-class="onlyOneChild.meta.icon || (item.meta && item.meta.icon)"/>
+    "
-          <template #title><span class="menu-title" :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span></template>
+    :value="getCount(basePath)"
+    class="count-badge"
+  >
+    <!-- <template #default>
+      <div>231</div>
+    </template> -->
+    <div>
+      <template
+        v-if="
+          hasOneShowingChild(item.children, item) &&
+          (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
+          !item.alwaysShow
+        "
+      >
+        <app-link
+          v-if="onlyOneChild.meta"
+          :to="resolvePath(onlyOneChild.path, onlyOneChild.query)"
+        >
+          <el-menu-item
+            :index="resolvePath(onlyOneChild.path)"
+            :class="{ 'submenu-title-noDropdown': !isNest }"
+          >
+            <svg-icon
+              :icon-class="
+                onlyOneChild.meta.icon || (item.meta && item.meta.icon)
+              "
+            />
+            <template #title
+              ><span
+                class="menu-title"
+                :title="hasTitle(onlyOneChild.meta.title)"
+                >{{ onlyOneChild.meta.title }}</span
+              ></template
+            >
           </el-menu-item>
         </app-link>
       </template>
 
-    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+      <el-sub-menu
+        v-else
+        ref="subMenu"
+        :index="resolvePath(item.path)"
+        popper-append-to-body
+      >
         <template v-if="item.meta" #title>
           <svg-icon :icon-class="item.meta && item.meta.icon" />
-        <span class="menu-title" :title="hasTitle(item.meta.title)">{{ item.meta.title }}</span>
+          <span class="menu-title" :title="hasTitle(item.meta.title)">{{
+            item.meta.title
+          }}</span>
         </template>
 
         <sidebar-item
@@ -25,71 +65,89 @@
         />
       </el-sub-menu>
     </div>
+  </el-badge>
 </template>
 
 <script setup>
-import { isExternal } from '@/utils/validate'
+import { isExternal } from "@/utils/validate";
-import AppLink from './Link'
+import AppLink from "./Link";
-import { getNormalPath } from '@/utils/ruoyi'
+import { getNormalPath } from "@/utils/ruoyi";
+import useUserStore from "@/store/modules/user";
 
 const props = defineProps({
   // route object
   item: {
     type: Object,
-    required: true
+    required: true,
   },
   isNest: {
     type: Boolean,
-    default: false
+    default: false,
   },
   basePath: {
     type: String,
-    default: ''
+    default: "",
-  }
+  },
-})
+});
-
+// console.log(props.basePath);
+// const userStore = useUserStore();
 const onlyOneChild = ref({});
+const userStore = useUserStore();
+
+const getCount = (basePath) => {
+  console.log(basePath);
+  if (basePath == "/approval/list") {
+    return userStore.unApprovedBusiness;
+  } else if (props.basePath == "/approval/dataList/approval") {
+    return userStore.unApprovedExpert;
+  } else {
+    return 0;
+  }
+};
 
 function hasOneShowingChild(children = [], parent) {
   if (!children) {
     children = [];
   }
-  const showingChildren = children.filter(item => {
+  const showingChildren = children.filter((item) => {
     if (item.hidden) {
-      return false
+      return false;
     } else {
       // Temp set(will be used if only has one showing child)
-      onlyOneChild.value = item
+      onlyOneChild.value = item;
-      return true
+      return true;
     }
-  })
+  });
 
   // When there is only one child router, the child router is displayed by default
   if (showingChildren.length === 1) {
-    return true
+    return true;
   }
 
   // Show parent if there are no child router to display
   if (showingChildren.length === 0) {
-    onlyOneChild.value = { ...parent, path: '', noShowingChildren: true }
+    onlyOneChild.value = { ...parent, path: "", noShowingChildren: true };
-    return true
+    return true;
   }
 
-  return false
+  return false;
-};
+}
 
 function resolvePath(routePath, routeQuery) {
   if (isExternal(routePath)) {
-    return routePath
+    return routePath;
   }
   if (isExternal(props.basePath)) {
-    return props.basePath
+    return props.basePath;
   }
   if (routeQuery) {
     let query = JSON.parse(routeQuery);
-    return { path: getNormalPath(props.basePath + '/' + routePath), query: query }
+    return {
+      path: getNormalPath(props.basePath + "/" + routePath),
+      query: query,
+    };
   }
-  return getNormalPath(props.basePath + '/' + routePath)
+  return getNormalPath(props.basePath + "/" + routePath);
 }
 
 function hasTitle(title) {
@@ -100,3 +158,13 @@ function hasTitle(title){
   }
 }
 </script>
+<style lang="scss">
+.count-badge {
+  width: 100%;
+  .el-badge__content {
+    // margin-right: 20px;
+    top: 8px !important;
+    right: 36px !important;
+  }
+}
+</style>

src/permission.js

@@ -1,63 +1,79 @@
-import router from './router'
+import router from "./router";
-import { ElMessage } from 'element-plus'
+import { ElMessage } from "element-plus";
-import NProgress from 'nprogress'
+import NProgress from "nprogress";
-import 'nprogress/nprogress.css'
+import "nprogress/nprogress.css";
-import { getToken } from '@/utils/auth'
+import { getToken } from "@/utils/auth";
-import { isHttp } from '@/utils/validate'
+import { isHttp } from "@/utils/validate";
-import { isRelogin } from '@/utils/request'
+import { isRelogin } from "@/utils/request";
-import useUserStore from '@/store/modules/user'
+import useUserStore from "@/store/modules/user";
-import useSettingsStore from '@/store/modules/settings'
+import useSettingsStore from "@/store/modules/settings";
-import usePermissionStore from '@/store/modules/permission'
+import usePermissionStore from "@/store/modules/permission";
+// import { expertList } from "./api/expert/expert";
+// import { companyList } from "./api/dataList/enterprise";
 
 NProgress.configure({ showSpinner: false });
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];
+const whiteList = ["/login", "/auth-redirect", "/bind", "/register"];
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getToken()) {
-    to.meta.title && useSettingsStore().setTitle(to.meta.title)
+    to.meta.title && useSettingsStore().setTitle(to.meta.title);
     /* has token*/
-    if (to.path === '/login') {
+    if (to.path === "/login") {
-      next({ path: '/' })
+      next({ path: "/" });
-      NProgress.done()
+      NProgress.done();
     } else {
       if (useUserStore().roles.length === 0) {
-        isRelogin.show = true
+        isRelogin.show = true;
         // 判断当前用户是否已拉取完user_info信息
-        useUserStore().getInfo().then(() => {
+        useUserStore()
-          isRelogin.show = false
+          .getInfo()
-          usePermissionStore().generateRoutes().then(accessRoutes => {
+          .then(() => {
+            isRelogin.show = false;
+            useUserStore().getApprovalCount();
+            usePermissionStore()
+              .generateRoutes()
+              .then((accessRoutes) => {
                 // 根据roles权限生成可访问的路由表
-            accessRoutes.forEach(route => {
+                accessRoutes.forEach((route) => {
                   if (!isHttp(route.path)) {
-                router.addRoute(route) // 动态添加可访问路由表
+                    router.addRoute(route); // 动态添加可访问路由表
                   }
+                });
+                next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
+              });
+            // 获取未审核的专家和企业数量
+            // useUserStore.getApprovalCount({
+            //   unApprovedBusiness: resps[0].total,
+            //   unApprovedExpert: resps[1].total,
+            // });
           })
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+          .catch((err) => {
-          })
+            console.log(err);
-        }).catch(err => {
+            useUserStore()
-          useUserStore().logOut().then(() => {
+              .logOut()
-            ElMessage.error(err)
+              .then(() => {
-            next({ path: '/' })
+                ElMessage.error(err);
-          })
+                next({ path: "/" });
-        })
+              });
+          });
       } else {
-        next()
+        next();
       }
     }
   } else {
     // 没有token
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录白名单，直接进入
-      next()
+      next();
     } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
-      NProgress.done()
+      NProgress.done();
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
+  NProgress.done();
-})
+});

src/store/modules/user.js

@@ -1,71 +1,104 @@
-import { login, logout, getInfo } from '@/api/login'
+import { login, logout, getInfo } from "@/api/login";
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { getToken, setToken, removeToken } from "@/utils/auth";
-import defAva from '@/assets/images/profile.jpg'
+import defAva from "@/assets/images/profile.jpg";
-import md5 from 'js-md5'
+import md5 from "js-md5";
+import { companyList } from "@/api/dataList/enterprise";
+import { expertList } from "@/api/expert/expert";
 
-const useUserStore = defineStore(
+const useUserStore = defineStore("user", {
-  'user',
-  {
   state: () => ({
     token: getToken(),
-      name: '',
+    name: "",
-      avatar: '',
+    avatar: "",
     roles: [],
-      permissions: []
+    permissions: [],
+    unApprovedBusiness: 10,
+    unApprovedExpert: 20,
   }),
   actions: {
     // 登录
     login(userInfo) {
-        const username = userInfo.username.trim()
+      const username = userInfo.username.trim();
-        const password = md5(userInfo.password)
+      const password = md5(userInfo.password);
-        const code = userInfo.code
+      const code = userInfo.code;
-        const uuid = userInfo.uuid
+      const uuid = userInfo.uuid;
       return new Promise((resolve, reject) => {
-          login(username, password, code, uuid).then(res => {
+        login(username, password, code, uuid)
-            setToken(res.token)
+          .then((res) => {
-            this.token = res.token
+            setToken(res.token);
-            resolve()
+            this.token = res.token;
-          }).catch(error => {
+            resolve();
-            reject(error)
-          })
           })
+          .catch((error) => {
+            reject(error);
+          });
+      });
     },
     // 获取用户信息
     getInfo() {
       return new Promise((resolve, reject) => {
-          getInfo().then(res => {
+        getInfo()
-            const user = res.user
+          .then((res) => {
-            const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
+            const user = res.user;
+            const avatar =
+              user.avatar == "" || user.avatar == null
+                ? defAva
+                : import.meta.env.VITE_APP_BASE_API + user.avatar;
 
-            if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+            if (res.roles && res.roles.length > 0) {
-              this.roles = res.roles
+              // 验证返回的roles是否是一个非空数组
-              this.permissions = res.permissions
+              this.roles = res.roles;
+              this.permissions = res.permissions;
             } else {
-              this.roles = ['ROLE_DEFAULT']
+              this.roles = ["ROLE_DEFAULT"];
             }
-            this.name = user.userName
+            this.name = user.userName;
             this.avatar = avatar;
-            resolve(res)
+            resolve(res);
-          }).catch(error => {
+            // return res;
-            reject(error)
-          })
           })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+
+    async getApprovalCount() {
+      const resps = await Promise.all([
+        companyList({
+          examineStatus: 0,
+          pageSize: 1,
+          pageNum: 10,
+        }),
+        expertList({
+          examineStatus: 0,
+          pageSize: 1,
+          pageNum: 10,
+        }),
+      ]);
+      this.unApprovedBusiness = resps[0].total;
+      this.unApprovedExpert = resps[1].total;
+    },
+    unApprovedBusinessPlus() {
+      this.unApprovedBusiness++;
     },
     // 退出系统
     logOut() {
       return new Promise((resolve, reject) => {
-          logout(this.token).then(() => {
+        logout(this.token)
-            this.token = ''
+          .then(() => {
-            this.roles = []
+            this.token = "";
-            this.permissions = []
+            this.roles = [];
-            removeToken()
+            this.permissions = [];
-            resolve()
+            removeToken();
-          }).catch(error => {
+            resolve();
-            reject(error)
-          })
-        })
-      }
-    }
           })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+  },
+});
 
-export default useUserStore
+export default useUserStore;

src/utils/parameter.js

@@ -28,10 +28,17 @@ export const educationOptions = [
   { key: 7, text: "博士" },
 ];
 // 企业类型
+// export const enterpriseOptions = [
+//   { key: "101", value: "上市企业" },
+//   { key: "102", value: "优质企业" },
+//   { key: "103", value: "普通企业" },
+// ];
 export const enterpriseOptions = [
   { key: "101", value: "上市企业" },
-  { key: "102", value: "优质企业" },
+  { key: "102", value: "独角兽企业" },
-  { key: "103", value: "普通企业" },
+  { key: "103", value: "国家级专精特新企业" },
+  { key: "104", value: "高新技术企业" },
+  { key: "105", value: "科技企业" },
 ];
 // 成果成熟度  技术
 export const maturityOptions = [

src/views/approval/dataList/add.vue

@@ -14,6 +14,7 @@
     <div :style="{ marginLeft: 140 + 'px' }">
       <el-button @click="submitForm('2')">审核拒绝</el-button>
       <el-button type="primary" @click="submitForm('1')">通过审核</el-button>
+      <el-button type="primary" @click="testCount">通过审核</el-button>
     </div>
   </div>
 </template>
@@ -29,6 +30,12 @@ import {
 import { reactive, toRefs } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
+import useUserStore from "@/store/modules/user";
+
+const testCount = () => {
+  useUserStore().unApprovedBusinessPlus();
+};
+
 const router = useRouter();
 const route = useRoute();
 const formType = ref(2);
@@ -55,21 +62,25 @@ const data = reactive({
     examineStatus: "",
   },
 });
+
 const { form } = toRefs(data);
 const cancel = () => {
   router.back();
   tab.closeOpenPage();
 };
+
 const submitForm = async (state) => {
   const valid = await expertFormRef.value.validateForm();
   if (valid) {
     if (form.value.id != undefined) {
       form.value.examineStatus = state;
       await companyEdit(form.value);
+      useUserStore().getApprovalCount();
       cancel();
       ElMessage.success("修改成功");
     } else {
       await companyAdd(form.value);
+      useUserStore().getApprovalCount();
       cancel();
       ElMessage.success("新增成功");
     }

src/views/approval/dataList/index.vue

@@ -57,7 +57,7 @@
     <!--表格区域-->
     <el-table :data="dataList" style="width: 100%" border>
       <el-table-column prop="name" label="企业名称" align="center" />
-      <el-table-column prop="code" label="统一社会信用代码" align="center" />
+      <!-- <el-table-column prop="code" label="统一社会信用代码" align="center" /> -->
       <el-table-column label="所属领域" align="center">
         <template #default="{ row }">
           <div>{{ row.industrys[row.industrys.length - 1] }}</div>
@@ -110,9 +110,15 @@
     <el-dialog title="设置企业类型" v-model="isShow">
       <el-row type="flex" justify="center" style="height: 100px">
         <el-radio-group v-model="radioList">
-          <el-radio label="101">上市企业</el-radio>
+          <el-radio
-          <el-radio label="102">优质企业</el-radio>
+            v-for="{ key, value } in enterpriseOptions"
-          <el-radio label="103">普通企业</el-radio>
+            :key="key"
+            :label="key"
+            >{{ value }}</el-radio
+          >
+          <!-- <el-radio label="101">上市企业</el-radio> -->
+          <!-- <el-radio label="102">优质企业</el-radio> -->
+          <!-- <el-radio label="103">普通企业</el-radio> -->
         </el-radio-group>
       </el-row>
       <el-row type="flex" justify="end">

src/views/components/ExpertForm/index.vue

@@ -31,7 +31,7 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="formType == 2">
+    <!-- <el-row v-if="formType == 2">
       <el-col :span="24">
         <el-form-item label="组织机构代码:" prop="code">
           <el-row type="flex" justify="space-between">
@@ -46,7 +46,7 @@
           </el-row>
         </el-form-item>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-row v-if="formType == 2">
       <el-col :span="24">

src/views/dataAuditList/serviceDemand/approval.vue

@@ -10,13 +10,13 @@
       >
         <p><b>基本信息</b></p>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="需求名称:" prop="title">
               <el-input v-model="form.title"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-col :span="24">
@@ -59,12 +59,12 @@
           </el-col>
         </el-row>
 
-        <CityOptions
+        <!-- <CityOptions
           disabled
           v-model="form"
           :labelWidth="labelWidth"
           ref="cityFormRef"
-        />
+        /> -->
 
         <el-row>
           <el-col :span="12">

src/views/dataList/enterprise/index.vue

@@ -75,7 +75,7 @@
     <el-table v-loading="loading" :data="dataList">
       <el-table-column label="数据编号" align="center" prop="id" />
       <el-table-column label="企业名称" align="center" prop="name" />
-      <el-table-column label="统一社会信用代码" align="center" prop="code" />
+      <!-- <el-table-column label="统一社会信用代码" align="center" prop="code" /> -->
       <el-table-column label="所属领域" align="center" show-overflow-tooltip>
         <template #default="{ row }">
           <div>{{ row.industrys[row.industrys.length - 1] }}</div>
@@ -270,6 +270,7 @@
       >
         <el-form-item label="会员类型" prop="vipType">
           <el-radio-group v-model="vipForm.vipType">
+            <el-radio label="0">普通会员</el-radio>
             <el-radio label="1">VIP</el-radio>
             <el-radio label="2">SVIP</el-radio>
           </el-radio-group>

src/views/dataList/expert/index.vue

@@ -92,6 +92,13 @@
             @click="handleDetail(row.id)"
             >修改</el-button
           >
+          <el-button
+            size="small"
+            type="text"
+            icon="edit"
+            @click="handleDelete(row.id)"
+            >删除</el-button
+          >
           <el-button
             size="small"
             type="text"
@@ -238,7 +245,7 @@
 </template>
 <script setup>
 import {
-  // companyDelete,
+  expertDelete,
   allocateAccount,
   getAccount,
   restPassword,
@@ -445,7 +452,8 @@ function submitFileForm() {
 const handleDelete = async (id) => {
   ElMessageBox.confirm(`是否确认删除编号为${id}的数据项？`)
     .then(async () => {
-      await companyDelete(id);
+      console.log(id);
+      await expertDelete(id);
       getList();
       ElMessage.success("删除成功");
     })

src/views/dataList/thesis/index.vue

@@ -30,7 +30,7 @@
     <!-- 表格区域 -->
     <el-table :data="dataList">
       <el-table-column prop="title" label="论文题目" align="center" />
-      <el-table-column prop="ext" label="引用格式" align="center" />
+      <el-table-column prop="ext" label="期刊名称" align="center" />
       <el-table-column prop="author" label="作者" align="center" />
       <el-table-column prop="tags" label="关键词" align="center">
         <template #default="{ row }">
@@ -72,10 +72,10 @@
             placeholder="请输入论文题目"
           ></el-input>
         </el-form-item>
-        <el-form-item label="引用格式">
+        <el-form-item label="期刊名称">
           <el-input
             v-model="formData.ext"
-            placeholder="请输入引用格式"
+            placeholder="请输入期刊名称"
           ></el-input>
         </el-form-item>
         <el-form-item label="作者">

src/views/expert/dataList/approval.vue

@@ -24,10 +24,12 @@ import { companyAdd, companyDetail, companyEdit } from "@/api/expert/expert";
 import { reactive, toRefs } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
+import useUserStore from "@/store/modules/user";
 const router = useRouter();
 const route = useRoute();
 const formType = ref(1);
 const expertFormRef = ref(null);
+const labelWidth = ref(140);
 const data = reactive({
   form: {
     image: undefined,
@@ -64,6 +66,7 @@ const submitForm = async (state) => {
       ElMessage.success("修改成功");
     } else {
       await companyAdd(form.value);
+      useUserStore().getApprovalCount();
       cancel();
       ElMessage.success("新增成功");
     }

src/views/website/siteSet/banner/index.vue

@@ -148,11 +148,11 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="所在位置:" prop="local">
+        <el-form-item label="所在位置:" prop="locals">
           <div style="display: flex">
             <el-autocomplete
               style="flex: 1"
-              v-model="form.local"
+              v-model="form.locals"
               :fetch-suggestions="querySearch"
               placeholder="请输入"
               value-key="title"
@@ -196,8 +196,8 @@
         <el-form-item label="图片名称:" prop="title">
           <el-input v-model="form.title" placeholder="请输入banner图名称" />
         </el-form-item>
-        <el-form-item label="建议尺寸:" prop="size">
+        <el-form-item label="建议尺寸:" prop="sizes">
-          <el-input v-model="form.size" placeholder="请输入图片建议尺寸" />
+          <el-input v-model="form.sizes" placeholder="请输入图片建议尺寸" />
         </el-form-item>
         <el-form-item label="图片:" prop="images">
           <ImageUpload v-model="form.images" :isShowTip="false" :limit="2" />
@@ -260,7 +260,7 @@ const data = reactive({
     ],
     local: [{ required: true, message: "所在位置不能为空", trigger: "change" }],
     title: [{ required: true, message: "数据名称不能为空", trigger: "blur" }],
-    size: [{ required: true, message: "建议尺寸不能为空", trigger: "blur" }],
+    sizes: [{ required: true, message: "建议尺寸不能为空", trigger: "blur" }],
     images: [
       {
         required: true,
@@ -374,6 +374,7 @@ const handleUpdate = (row) => {
   reset();
   form.value = Object.assign({}, form.value, row);
   let arr = form.value.locals.split(">");
+  // form.value.local = arr[0];
   form.value.locals = arr[0];
   for (let i = 1; i < arr.length; i++) {
     form.value.domains.push({ title: arr[i] });
@@ -385,7 +386,7 @@ const submitForm = async () => {
   let formData = Object.assign({}, form.value);
   for (let i = 0; i < formData.domains.length; i++) {
     const item = formData.domains[i];
-    formData.local += ">" + item.title;
+    formData.locals += ">" + item.title;
   }
   await formRef.value.validate();
   if (formData.id != undefined) {

src/views/website/solution/planCategory/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="plus"
+          size="default"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <!-- <right-toolbar
+        :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="name" align="center" />
+      <el-table-column label="操作" align="center">
+        <template #default="{ row }">
+          <el-button
+            round
+            type="primary"
+            size="small"
+            @click="handleUpdate(row)"
+            >修改</el-button
+          >
+          <el-button round type="danger" size="small" @click="handleDelete(row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改对话框 -->
+    <el-dialog :title="title" v-model="showEditDialog" width="500px">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="导航名称:" prop="name">
+          <el-input v-model="form.name" placeholder="请输入导航名称" />
+        </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 name="PlanCategory">
+import { reactive, ref } from "vue";
+import {
+  planCategoryList,
+  planCategoryAdd,
+  planCategoryDelete,
+  planCategoryDetail,
+  planCategoryUpdate,
+} from "@/api/website/solution";
+import { ElMessage, ElMessageBox } from "element-plus";
+
+const loading = ref(true);
+const dataList = ref([]);
+// const total = ref(0);
+const data = reactive({
+  form: {},
+  rules: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+  },
+});
+
+const { queryParams, form, rules } = toRefs(data);
+// 获取服务列表
+const getList = async () => {
+  loading.value = true;
+  const { data } = await planCategoryList(queryParams.value);
+  dataList.value = data;
+  //   total.value = resp.total;
+  loading.value = false;
+};
+getList();
+
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+const formRef = ref();
+const title = ref("");
+const showEditDialog = ref(false);
+// 表单重置
+const reset = () => {
+  form.value = {};
+  if (formRef.value) {
+    formRef.value.resetFields();
+  }
+};
+// 取消按钮
+const cancel = () => {
+  showEditDialog.value = false;
+  reset();
+};
+const handleAdd = () => {
+  reset();
+  showEditDialog.value = true;
+  title.value = "新增导航";
+};
+
+const handleUpdate = async (row) => {
+  reset();
+  const resp = await planCategoryDetail(row.id);
+  form.value = resp.data;
+  showEditDialog.value = true;
+  title.value = "修改导航";
+};
+
+/** 删除按钮操作 */
+const handleDelete = (row) => {
+  ElMessageBox.confirm(`是否确认删除名为${row.name}的数据项？`)
+    .then(async () => {
+      await planCategoryDelete([row.id]);
+      getList();
+      ElMessage.success("删除成功");
+    })
+    .catch(() => {});
+};
+
+const submitForm = async () => {
+  await formRef.value.validate();
+  if (form.value.id != undefined) {
+    planCategoryUpdate(form.value).then((response) => {
+      ElMessage.success("修改成功");
+      showEditDialog.value = false;
+      getList();
+    });
+  } else {
+    planCategoryAdd(form.value).then((response) => {
+      ElMessage.success("新增成功");
+      showEditDialog.value = false;
+      getList();
+    });
+  }
+};
+</script>

src/views/website/solution/service/index.vue

@@ -26,12 +26,19 @@
           clearable
           @clear="delete queryParams.mode"
         >
-          <el-option
+          <!-- <el-option
             v-for="item in modeOptions"
             :key="item.value"
             :label="item.label"
             :value="item.value"
           >
+          </el-option> -->
+          <el-option
+            v-for="item in categoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
@@ -91,7 +98,7 @@
 
       <el-table-column label="归属导航" align="center">
         <template #default="{ row }">
-          {{ modeOptions.find((item) => item.value == row.mode).label }}
+          {{ categoryList.find((item) => item.id == row.mode)?.name }}
         </template>
       </el-table-column>
       <el-table-column label="创建时间" prop="createTime" align="center">
@@ -143,12 +150,19 @@
         <el-form-item label="归属导航:" prop="mode">
           <el-select v-model="form.mode" placeholder="请选择">
             <el-option
+              v-for="item in categoryList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+            <!-- <el-option
               v-for="item in modeOptions"
               :key="item.value"
               :label="item.label"
               :value="item.value"
             >
-            </el-option>
+            </el-option> -->
           </el-select>
         </el-form-item>
         <el-form-item label="服务介绍:" prop="description">
@@ -189,6 +203,13 @@ import {
   serviceEdit,
   serviceDelete,
 } from "@/api/website/solution";
+import {
+  planCategoryList,
+  planCategoryAdd,
+  planCategoryDelete,
+  planCategoryDetail,
+  planCategoryUpdate,
+} from "@/api/website/solution";
 import { tenantSelect } from "@/api/subPlatform/tenant";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { cloneDeep } from "lodash";
@@ -309,6 +330,15 @@ const reset = () => {
     formRef.value.resetFields();
   }
 };
+const categoryList = ref([]);
+const getPlanCategoryList = async () => {
+  const { data } = await planCategoryList();
+  categoryList.value = data.map((el) => {
+    return { ...el, id: el.id.toString() };
+  });
+};
+getPlanCategoryList();
+
 const handleAdd = () => {
   reset();
   showEditDialog.value = true;

src/views/website/solution/serviceCase/index.vue

@@ -173,6 +173,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";
 
 const dataList = ref([]);
 const loading = ref(true);
@@ -253,6 +254,8 @@ const getSiteList = async () => {
 
 const getCaseKindList = async () => {
   const resp = await serviceCaseKindSelect();
+  // const resp = await planCategoryList();
+  // 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) };

vite.config.js

@@ -31,8 +31,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
-          target: 'http://192.168.110.10:1618',
+          // target: 'http://192.168.110.10:1618',
-          // target: "http://101.34.131.16:1618",
+          target: "http://101.34.131.16:1618",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },