guhongwei před 5 roky
rodič
revize
e2a6d01437

+ 6 - 2
src/layout/government/columnDetail.vue

@@ -17,8 +17,12 @@
             </el-form-item>
             <el-form-item label="所在位置">
               <el-select v-model="form.site" placeholder="请选择所在位置">
-                <el-option label="最新资讯" value="zixun"></el-option>
-                <el-option label="通知公告" value="tonggao"></el-option>
+                <el-option label="图片新闻" value="tpxw"></el-option>
+                <el-option label="创新吉林" value="cxjl"></el-option>
+                <el-option label="国内动态" value="gndt"></el-option>
+                <el-option label="政务活动" value="zwhd"></el-option>
+                <el-option label="媒体聚焦" value="mtjj"></el-option>
+                <el-option label="通知公告" value="tzgg"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>

+ 3 - 0
src/layout/layout-part/menus.vue

@@ -4,8 +4,11 @@
       <el-menu-item index="/"> <i class="el-icon-s-grid"></i>首页 </el-menu-item>
       <el-menu-item index="/government/index"> <i class="el-icon-s-grid"></i>科技政务</el-menu-item>
       <el-menu-item index="/policy/index"> <i class="el-icon-s-grid"></i>科技政策</el-menu-item>
+      <el-menu-item index="/supermaket/index"> <i class="el-icon-s-grid"></i>科技超市</el-menu-item>
       <el-menu-item index="/record/index"> <i class="el-icon-s-grid"></i>科技数据</el-menu-item>
       <el-menu-item index="/serve/index"> <i class="el-icon-s-grid"></i>科技服务</el-menu-item>
+      <el-menu-item index="/resource/index"> <i class="el-icon-s-grid"></i>科技资源</el-menu-item>
+      <el-menu-item index="/personnel/index"> <i class="el-icon-s-grid"></i>科技人才</el-menu-item>
       <el-menu-item index="/site/index"> <i class="el-icon-s-grid"></i>站点信息管理</el-menu-item>
       <el-menu-item index="/links/index"> <i class="el-icon-attract"></i>友情链接管理</el-menu-item>
     </el-menu>

+ 10 - 2
src/layout/policy/columnDetail.vue

@@ -17,8 +17,16 @@
             </el-form-item>
             <el-form-item label="所在位置">
               <el-select v-model="form.site" placeholder="请选择所在位置">
-                <el-option label="综合政策指导" value="zhidao"></el-option>
-                <el-option label="科技成果转化" value="zhuanhua"></el-option>
+                <el-option label="综合政策指导" value="zhzczd"></el-option>
+                <el-option label="科技成果转化" value="kjcgzh"></el-option>
+                <el-option label="科技人才" value="kjrc"></el-option>
+                <el-option label="知识产权" value="zscq"></el-option>
+                <el-option label="税收与金融" value="ssyjr"></el-option>
+                <el-option label="创新平台园区" value="cxptyq"></el-option>
+                <el-option label="政策解读" value="zcjd"></el-option>
+                <el-option label="政策书籍" value="zcsj"></el-option>
+                <el-option label="政策报告" value="zcbg"></el-option>
+                <el-option label="政策卡片" value="zckp"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>

+ 10 - 2
src/layout/record/columnDetail.vue

@@ -17,8 +17,16 @@
             </el-form-item>
             <el-form-item label="所在位置">
               <el-select v-model="form.site" placeholder="请选择所在位置">
-                <el-option label="科技文献" value="zhidao"></el-option>
-                <el-option label="科技报告" value="zhuanhua"></el-option>
+                <el-option label="科技文献" value="kjwx"></el-option>
+                <el-option label="科技报告" value="kjbg"></el-option>
+                <el-option label="科技期刊" value="kjqk"></el-option>
+                <el-option label="科技智库" value="kjzk"></el-option>
+                <el-option label="科技成果" value="kjcg"></el-option>
+                <el-option label="科技交易" value="kjjy"></el-option>
+                <el-option label="数据展示" value="sjzs"></el-option>
+                <el-option label="通知通告" value="tztg"></el-option>
+                <el-option label="通知公告" value="tzgg"></el-option>
+                <el-option label="上报通知" value="sbtz"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>

+ 5 - 2
src/layout/serve/columnDetail.vue

@@ -17,8 +17,11 @@
             </el-form-item>
             <el-form-item label="所在位置">
               <el-select v-model="form.site" placeholder="请选择所在位置">
-                <el-option label="视频会议中心" value="zhidao"></el-option>
-                <el-option label="专题研讨" value="zhuanhua"></el-option>
+                <el-option label="视频会议中心" value="sphyzx"></el-option>
+                <el-option label="专题研讨" value="ztyt"></el-option>
+                <el-option label="技术问答" value="jswd"></el-option>
+                <el-option label="行业研究" value="hyyj"></el-option>
+                <el-option label="科技培训" value="kjpx"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>

+ 15 - 0
src/router/index.js

@@ -41,6 +41,11 @@ export default new Router({
       path: '/policy/messageInfoDetail',
       component: () => import('../views/policy/messageInfoDetail.vue'),
     },
+    // 科技超市
+    {
+      path: '/supermaket/index',
+      component: () => import('../views/supermaket/index.vue'),
+    },
     // 科技数据
     {
       path: '/record/index',
@@ -71,6 +76,16 @@ export default new Router({
       path: '/serve/messageInfoDetail',
       component: () => import('../views/serve/messageInfoDetail.vue'),
     },
+    // 科技资源
+    {
+      path: '/resource/index',
+      component: () => import('../views/resource/index.vue'),
+    },
+    // 科技人才
+    {
+      path: '/personnel/index',
+      component: () => import('../views/personnel/index.vue'),
+    },
     // 站点信息
     {
       path: '/site/index',

+ 19 - 0
src/views/personnel/index.vue

@@ -0,0 +1,19 @@
+<template>
+  <div id="index">
+    <p>科技人才暂未开通</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'index',
+  props: {},
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped></style>

+ 19 - 0
src/views/resource/index.vue

@@ -0,0 +1,19 @@
+<template>
+  <div id="index">
+    <p>科技资源暂未开通</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'index',
+  props: {},
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped></style>

+ 7 - 5
src/views/site/index.vue

@@ -26,7 +26,7 @@ export default {
   data: () => ({
     topTitle: '站点信息管理',
     form: {},
-    loading: true,
+    loading: false,
   }),
   created() {
     this.search();
@@ -41,10 +41,12 @@ export default {
   methods: {
     ...mapActions(['showInfo', 'create', 'update']),
     async search() {
-      this.loading = false;
-      const res = await this.showInfo();
-      this.$set(this, `form`, res.data);
-      this.loading = true;
+      let res = await this.showInfo();
+      let object = JSON.parse(JSON.stringify(res.data));
+      if (object) {
+        this.$set(this, `form`, res.data);
+      }
+      this.$set(this, `loading`, true);
     },
     async submit({ id, data }) {
       let res;

+ 19 - 0
src/views/supermaket/index.vue

@@ -0,0 +1,19 @@
+<template>
+  <div id="index">
+    <p>科技超市暂未开通</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'index',
+  props: {},
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped></style>