guhongwei 3 năm trước cách đây
mục cha
commit
cb3d14c849
49 tập tin đã thay đổi với 261 bổ sung173 xóa
  1. 0 0
      src/layout - 副本/achievement/info-1.vue
  2. 0 0
      src/layout - 副本/achievement/list-1.vue
  3. 0 0
      src/layout - 副本/equipment/equipment-total.vue
  4. 0 0
      src/layout - 副本/equipment/info-1.vue
  5. 0 0
      src/layout - 副本/equipment/list-1.vue
  6. 0 0
      src/layout - 副本/laboratory/info-1.vue
  7. 0 0
      src/layout - 副本/laboratory/list-1.vue
  8. 0 0
      src/layout - 副本/research/info-1.vue
  9. 0 0
      src/layout - 副本/research/list-1.vue
  10. 0 0
      src/layout - 副本/scientific/award/info-1.vue
  11. 0 0
      src/layout - 副本/scientific/award/list-1.vue
  12. 0 0
      src/layout - 副本/scientific/award/search-1.vue
  13. 0 0
      src/layout - 副本/scientific/learning/info-1.vue
  14. 0 0
      src/layout - 副本/scientific/learning/list-1.vue
  15. 0 0
      src/layout - 副本/scientific/learning/search-1.vue
  16. 0 0
      src/layout - 副本/scientific/paper/info-1.vue
  17. 0 0
      src/layout - 副本/scientific/paper/list-1.vue
  18. 0 0
      src/layout - 副本/scientific/paper/search-1.vue
  19. 0 0
      src/layout - 副本/scientific/personnel/info-1.vue
  20. 0 0
      src/layout - 副本/scientific/personnel/list-1.vue
  21. 0 0
      src/layout - 副本/scientific/personnel/search-1.vue
  22. 0 0
      src/layout - 副本/scientific/task/info-1.vue
  23. 0 0
      src/layout - 副本/scientific/task/list-1.vue
  24. 0 0
      src/layout - 副本/scientific/task/search-1.vue
  25. 171 0
      src/router/index copy.js
  26. 0 135
      src/router/index.js
  27. 0 0
      src/views - 副本/activity-time/index.vue
  28. 89 0
      src/views - 副本/index.vue
  29. 0 0
      src/views - 副本/infoview-achievement/index.vue
  30. 0 0
      src/views - 副本/infoview-equipment/index.vue
  31. 0 0
      src/views - 副本/infoview-laboratory/index.vue
  32. 0 0
      src/views - 副本/infoview-research/index.vue
  33. 0 0
      src/views - 副本/learning/index.vue
  34. 0 0
      src/views - 副本/learning/report/index.vue
  35. 0 0
      src/views - 副本/learning/science/index.vue
  36. 0 0
      src/views - 副本/learning/sociology/index.vue
  37. 0 0
      src/views - 副本/learning/technology/index.vue
  38. 0 0
      src/views - 副本/ranks/boshuo/index.vue
  39. 0 0
      src/views - 副本/ranks/index.vue
  40. 0 0
      src/views - 副本/ranks/personnel/index.vue
  41. 0 0
      src/views - 副本/ranks/title/index.vue
  42. 0 0
      src/views - 副本/scientific/award/index.vue
  43. 1 2
      src/views/scientific/index.vue
  44. 0 0
      src/views - 副本/scientific/learning/index.vue
  45. 0 0
      src/views - 副本/scientific/otherachieve/index.vue
  46. 0 0
      src/views - 副本/scientific/paper/index.vue
  47. 0 0
      src/views - 副本/scientific/personnel/index.vue
  48. 0 0
      src/views - 副本/scientific/task/index.vue
  49. 0 36
      src/views/scientific/otherachieve/index.vue

src/layout/achievement/info-1.vue → src/layout - 副本/achievement/info-1.vue


src/layout/achievement/list-1.vue → src/layout - 副本/achievement/list-1.vue


src/layout/equipment/equipment-total.vue → src/layout - 副本/equipment/equipment-total.vue


src/layout/equipment/info-1.vue → src/layout - 副本/equipment/info-1.vue


src/layout/equipment/list-1.vue → src/layout - 副本/equipment/list-1.vue


src/layout/laboratory/info-1.vue → src/layout - 副本/laboratory/info-1.vue


src/layout/laboratory/list-1.vue → src/layout - 副本/laboratory/list-1.vue


src/layout/research/info-1.vue → src/layout - 副本/research/info-1.vue


src/layout/research/list-1.vue → src/layout - 副本/research/list-1.vue


src/layout/scientific/award/info-1.vue → src/layout - 副本/scientific/award/info-1.vue


src/layout/scientific/award/list-1.vue → src/layout - 副本/scientific/award/list-1.vue


src/layout/scientific/award/search-1.vue → src/layout - 副本/scientific/award/search-1.vue


src/layout/scientific/learning/info-1.vue → src/layout - 副本/scientific/learning/info-1.vue


src/layout/scientific/learning/list-1.vue → src/layout - 副本/scientific/learning/list-1.vue


src/layout/scientific/learning/search-1.vue → src/layout - 副本/scientific/learning/search-1.vue


src/layout/scientific/paper/info-1.vue → src/layout - 副本/scientific/paper/info-1.vue


src/layout/scientific/paper/list-1.vue → src/layout - 副本/scientific/paper/list-1.vue


src/layout/scientific/paper/search-1.vue → src/layout - 副本/scientific/paper/search-1.vue


src/layout/scientific/personnel/info-1.vue → src/layout - 副本/scientific/personnel/info-1.vue


src/layout/scientific/personnel/list-1.vue → src/layout - 副本/scientific/personnel/list-1.vue


src/layout/scientific/personnel/search-1.vue → src/layout - 副本/scientific/personnel/search-1.vue


src/layout/scientific/task/info-1.vue → src/layout - 副本/scientific/task/info-1.vue


src/layout/scientific/task/list-1.vue → src/layout - 副本/scientific/task/list-1.vue


src/layout/scientific/task/search-1.vue → src/layout - 副本/scientific/task/search-1.vue


+ 171 - 0
src/router/index copy.js

@@ -0,0 +1,171 @@
+import Vue from 'vue';
+import VueRouter from 'vue-router';
+const originalPush = VueRouter.prototype.push;
+VueRouter.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch((err) => err);
+};
+Vue.use(VueRouter);
+// 信息展示
+const infoview = [
+  {
+    path: '/infoview-laboratory/index',
+    meta: { title: '重点实验室信息展示' },
+    component: () => import('../views/infoview-laboratory/index.vue'),
+  },
+  {
+    path: '/infoview-research/index',
+    meta: { title: '研究方向信息展示' },
+    component: () => import('../views/infoview-research/index.vue'),
+  },
+  {
+    path: '/infoview-equipment/index',
+    meta: { title: '设备信息展示' },
+    component: () => import('../views/infoview-equipment/index.vue'),
+  },
+  {
+    path: '/infoview-achievement/index',
+    meta: { title: '重要成果信息展示' },
+    component: () => import('../views/infoview-achievement/index.vue'),
+  },
+];
+// 科研信息
+const scientific = [
+  {
+    path: '/scientific/index',
+    meta: { title: '科研信息' },
+    component: () => import('../views/scientific/index.vue'),
+  },
+  {
+    path: '/scientific/personnel/index',
+    meta: { title: '主任及科研助理信息列表' },
+    component: () => import('../views/scientific/personnel/index.vue'),
+  },
+  {
+    path: '/scientific/learning/index',
+    meta: { title: '学术委员会' },
+    component: () => import('../views/scientific/learning/index.vue'),
+  },
+  {
+    path: '/scientific/task/index',
+    meta: { title: '实验室建设期内承担项目明细' },
+    component: () => import('../views/scientific/task/index.vue'),
+  },
+  {
+    path: '/scientific/award/index',
+    meta: { title: '实验室建设期内获奖明细' },
+    component: () => import('../views/scientific/award/index.vue'),
+  },
+  {
+    path: '/scientific/paper/index',
+    meta: { title: '实验室建设期内发表学术论文明细' },
+    component: () => import('../views/scientific/paper/index.vue'),
+  },
+  {
+    path: '/scientific/otherachieve/index',
+    meta: { title: '其他成果' },
+    component: () => import('../views/scientific/otherachieve/index.vue'),
+  },
+];
+// 学术交流
+const learning = [
+  {
+    path: '/learning/index',
+    meta: { title: '学术交流' },
+    component: () => import('../views/learning/index.vue'),
+  },
+  {
+    path: '/learning/sociology/index',
+    meta: { title: '社会服务活动' },
+    component: () => import('../views/learning/sociology/index.vue'),
+  },
+  {
+    path: '/learning/technology/index',
+    meta: { title: '技术服务活动' },
+    component: () => import('../views/learning/technology/index.vue'),
+  },
+  {
+    path: '/learning/science/index',
+    meta: { title: '科普活动' },
+    component: () => import('../views/learning/science/index.vue'),
+  },
+  {
+    path: '/learning/report/index',
+    meta: { title: '分析/建议/决策/咨询报告' },
+    component: () => import('../views/learning/report/index.vue'),
+  },
+];
+// 队伍建设与人才培养;
+const ranks = [
+  {
+    path: '/ranks/index',
+    meta: { title: '队伍建设与人才培养' },
+    component: () => import('../views/ranks/index.vue'),
+  },
+  {
+    path: '/ranks/personnel/index',
+    meta: { title: '人才称号' },
+    component: () => import('../views/ranks/personnel/index.vue'),
+  },
+  {
+    path: '/ranks/title/index',
+    meta: { title: '职称晋升' },
+    component: () => import('../views/ranks/title/index.vue'),
+  },
+  {
+    path: '/ranks/boshuo/index',
+    meta: { title: '博硕培养' },
+    component: () => import('../views/ranks/boshuo/index.vue'),
+  },
+];
+// 平台活动时间段公式;
+const activity = [
+  {
+    path: '/activity-time/index',
+    meta: { title: '平台活动时间段公示' },
+    component: () => import('../views/activity-time/index.vue'),
+  },
+];
+
+const web = [
+  {
+    path: '/',
+    meta: { title: '网站首页' },
+    component: () => import('../views/index.vue'),
+  },
+  // 信息展示
+  ...infoview,
+  // 科研信息
+  ...scientific,
+  // 学术交流
+  ...learning,
+  // 队伍建设与人才培养
+  ...ranks,
+  // 平台活动时间段公式
+  ...activity,
+];
+const routes = [...web];
+const router = new VueRouter({
+  mode: 'history',
+  base: process.env.VUE_APP_ROUTER,
+  routes,
+});
+// router.beforeEach((to, from, next) => {
+//   document.title = `${to.meta.title} `;
+//   const token = localStorage.getItem('token');
+//   // 不带参数
+//   if (to.path == '/work/userCenter/index') {
+//     if (!token) {
+//       next(`/login?path=${to.path}&&type=2`);
+//     } else {
+//       let user = jwt.decode(token);
+//       store.commit('setUser', user, { root: true });
+//       next();
+//     }
+//   } else {
+//     let user = jwt.decode(token);
+//     store.commit('setUser', user, { root: true });
+//     next();
+//   }
+// });
+
+export default router;

+ 0 - 135
src/router/index.js

@@ -5,131 +5,6 @@ VueRouter.prototype.push = function push(location) {
   return originalPush.call(this, location).catch((err) => err);
 };
 Vue.use(VueRouter);
-// 信息展示
-const infoview = [
-  {
-    path: '/infoview-laboratory/index',
-    meta: { title: '重点实验室信息展示' },
-    component: () => import('../views/infoview-laboratory/index.vue'),
-  },
-  {
-    path: '/infoview-research/index',
-    meta: { title: '研究方向信息展示' },
-    component: () => import('../views/infoview-research/index.vue'),
-  },
-  {
-    path: '/infoview-equipment/index',
-    meta: { title: '设备信息展示' },
-    component: () => import('../views/infoview-equipment/index.vue'),
-  },
-  {
-    path: '/infoview-achievement/index',
-    meta: { title: '重要成果信息展示' },
-    component: () => import('../views/infoview-achievement/index.vue'),
-  },
-];
-// 科研信息
-const scientific = [
-  {
-    path: '/scientific/index',
-    meta: { title: '科研信息' },
-    component: () => import('../views/scientific/index.vue'),
-  },
-  {
-    path: '/scientific/personnel/index',
-    meta: { title: '主任及科研助理信息列表' },
-    component: () => import('../views/scientific/personnel/index.vue'),
-  },
-  {
-    path: '/scientific/learning/index',
-    meta: { title: '学术委员会' },
-    component: () => import('../views/scientific/learning/index.vue'),
-  },
-  {
-    path: '/scientific/task/index',
-    meta: { title: '实验室建设期内承担项目明细' },
-    component: () => import('../views/scientific/task/index.vue'),
-  },
-  {
-    path: '/scientific/award/index',
-    meta: { title: '实验室建设期内获奖明细' },
-    component: () => import('../views/scientific/award/index.vue'),
-  },
-  {
-    path: '/scientific/paper/index',
-    meta: { title: '实验室建设期内发表学术论文明细' },
-    component: () => import('../views/scientific/paper/index.vue'),
-  },
-  {
-    path: '/scientific/achieve/index',
-    meta: { title: '成果展示' },
-    component: () => import('../views/scientific/achieve/index.vue'),
-  },
-  {
-    path: '/scientific/otherachieve/index',
-    meta: { title: '其他成果' },
-    component: () => import('../views/scientific/otherachieve/index.vue'),
-  },
-];
-// 学术交流
-const learning = [
-  {
-    path: '/learning/index',
-    meta: { title: '学术交流' },
-    component: () => import('../views/learning/index.vue'),
-  },
-  {
-    path: '/learning/sociology/index',
-    meta: { title: '社会服务活动' },
-    component: () => import('../views/learning/sociology/index.vue'),
-  },
-  {
-    path: '/learning/technology/index',
-    meta: { title: '技术服务活动' },
-    component: () => import('../views/learning/technology/index.vue'),
-  },
-  {
-    path: '/learning/science/index',
-    meta: { title: '科普活动' },
-    component: () => import('../views/learning/science/index.vue'),
-  },
-  {
-    path: '/learning/report/index',
-    meta: { title: '分析/建议/决策/咨询报告' },
-    component: () => import('../views/learning/report/index.vue'),
-  },
-];
-// 队伍建设与人才培养;
-const ranks = [
-  {
-    path: '/ranks/index',
-    meta: { title: '队伍建设与人才培养' },
-    component: () => import('../views/ranks/index.vue'),
-  },
-  {
-    path: '/ranks/personnel/index',
-    meta: { title: '人才称号' },
-    component: () => import('../views/ranks/personnel/index.vue'),
-  },
-  {
-    path: '/ranks/title/index',
-    meta: { title: '职称晋升' },
-    component: () => import('../views/ranks/title/index.vue'),
-  },
-  {
-    path: '/ranks/boshuo/index',
-    meta: { title: '博硕培养' },
-    component: () => import('../views/ranks/boshuo/index.vue'),
-  },
-];
-// 平台活动时间段公式;
-const activity = [
-  {
-    path: '/activity-time/index',
-    meta: { title: '平台活动时间段公示' },
-    component: () => import('../views/activity-time/index.vue'),
-  },
-];
 
 const web = [
   {
@@ -137,16 +12,6 @@ const web = [
     meta: { title: '网站首页' },
     component: () => import('../views/index.vue'),
   },
-  // 信息展示
-  ...infoview,
-  // 科研信息
-  ...scientific,
-  // 学术交流
-  ...learning,
-  // 队伍建设与人才培养
-  ...ranks,
-  // 平台活动时间段公式
-  ...activity,
 ];
 const routes = [...web];
 const router = new VueRouter({

src/views/activity-time/index.vue → src/views - 副本/activity-time/index.vue


+ 89 - 0
src/views - 副本/index.vue

@@ -0,0 +1,89 @@
+<template>
+  <div id="index">
+    <admin-frame :useTop="false" :usePage="false" :useNav="false">
+      <template v-slot:info>
+        <van-col span="24" class="menu" v-for="(i, index) in menu" :key="index" @click.native="$router.push(i.router)">
+          {{ i.label }}
+        </van-col>
+      </template>
+    </admin-frame>
+  </div>
+</template>
+
+<script>
+import adminFrame from '@common/src/components/mobile-frame/mobile-main.vue';
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  name: 'index',
+  props: {},
+  components: {
+    adminFrame,
+  },
+  data: function () {
+    return {
+      menu: [
+        // 信息展示
+        {
+          label: '信息展示-重点实验室信息展示',
+          router: '/infoview-laboratory/index',
+        },
+        {
+          label: '信息展示-研究方向信息展示',
+          router: '/infoview-research/index',
+        },
+        {
+          label: '信息展示-设备信息展示',
+          router: '/infoview-equipment/index',
+        },
+        {
+          label: '信息展示-重要成果信息展示',
+          router: '/infoview-achievement/index',
+        },
+        // 科研信息
+        {
+          label: '科研信息',
+          router: '/scientific/index',
+        },
+        // 学术交流
+        {
+          label: '学术交流',
+          router: '/learning/index',
+        },
+        // 队伍建设与人才培养
+        {
+          label: '队伍建设与人才培养',
+          router: '/ranks/index',
+        },
+        // 平台活动时间段公式
+        {
+          label: '平台活动时间段公示',
+          router: '/activity-time/index',
+        },
+      ],
+    };
+  },
+  async created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  watch: {
+    test: {
+      deep: true,
+      immediate: true,
+      handler(val) {},
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.menu {
+  border: 1px dashed #ccc;
+  margin: 0 0 10px 0;
+  padding: 10px;
+}
+</style>

src/views/infoview-achievement/index.vue → src/views - 副本/infoview-achievement/index.vue


src/views/infoview-equipment/index.vue → src/views - 副本/infoview-equipment/index.vue


src/views/infoview-laboratory/index.vue → src/views - 副本/infoview-laboratory/index.vue


src/views/infoview-research/index.vue → src/views - 副本/infoview-research/index.vue


src/views/learning/index.vue → src/views - 副本/learning/index.vue


src/views/learning/report/index.vue → src/views - 副本/learning/report/index.vue


src/views/learning/science/index.vue → src/views - 副本/learning/science/index.vue


src/views/learning/sociology/index.vue → src/views - 副本/learning/sociology/index.vue


src/views/learning/technology/index.vue → src/views - 副本/learning/technology/index.vue


src/views/ranks/boshuo/index.vue → src/views - 副本/ranks/boshuo/index.vue


src/views/ranks/index.vue → src/views - 副本/ranks/index.vue


src/views/ranks/personnel/index.vue → src/views - 副本/ranks/personnel/index.vue


src/views/ranks/title/index.vue → src/views - 副本/ranks/title/index.vue


src/views/scientific/award/index.vue → src/views - 副本/scientific/award/index.vue


+ 1 - 2
src/views/scientific/index.vue

@@ -10,7 +10,7 @@
           </van-swipe>
         </van-col>
         <van-col span="24" class="two">
-          <van-grid :gutter="5">
+          <van-grid :gutter="5" :column-num="3">
             <van-grid-item class="list" v-for="(item, index) in menu" :key="index" :to="item.router">
               <p>{{ item.label }}</p>
             </van-grid-item>
@@ -40,7 +40,6 @@ export default {
         { label: '科研任务', router: '/scientific/task/index' },
         { label: '获奖信息', router: '/scientific/award/index' },
         { label: '论文发表', router: '/scientific/paper/index' },
-        { label: '成果展示', router: '/scientific/achieve/index' },
         { label: '其他成果', router: '/scientific/otherachieve/index' },
       ],
     };

src/views/scientific/learning/index.vue → src/views - 副本/scientific/learning/index.vue


src/views/scientific/achieve/index.vue → src/views - 副本/scientific/otherachieve/index.vue


src/views/scientific/paper/index.vue → src/views - 副本/scientific/paper/index.vue


src/views/scientific/personnel/index.vue → src/views - 副本/scientific/personnel/index.vue


src/views/scientific/task/index.vue → src/views - 副本/scientific/task/index.vue


+ 0 - 36
src/views/scientific/otherachieve/index.vue

@@ -1,36 +0,0 @@
-<template>
-  <div id="index">
-    <van-row>
-      <van-col span="24" class="main"> test </van-col>
-    </van-row>
-  </div>
-</template>
-
-<script>
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'index',
-  props: {},
-  components: {},
-  data: function () {
-    return {};
-  },
-  created() {},
-  methods: {},
-  computed: {
-    ...mapState(['user']),
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped></style>