gengxin

src/layout/achievement/cooperation.vue

@@ -23,7 +23,7 @@ export default {
     menuIndex: '',
     color: '',
     src: require('@/assets/achieveCenter.png'),
-    liebiaoList: [{ title: '超算联盟' }, { title: '国家网格' }, { title: '教学中心' }, { title: '创业基地' }, { title: '软件中心' }],
+    liebiaoList: [{ title: '超算联盟' }, { title: '国家网格' }, { title: '数学中心' }, { title: '创新基地' }, { title: '软件中心' }],
   }),
   created() {},
   computed: {},
@@ -35,10 +35,10 @@ export default {
       } else if (title == '国家网格') {
         this.menuIndex = index;
         this.color = '#054982';
-      } else if (title == '教学中心') {
+      } else if (title == '数学中心') {
         this.menuIndex = index;
         this.color = '#054982';
-      } else if (title == '创业基地') {
+      } else if (title == '创新基地') {
         this.menuIndex = index;
         this.color = '#054982';
       } else if (title == '软件中心') {

src/layout/achievement/seminar.vue

@@ -23,7 +23,7 @@ export default {
     menuIndex: '0',
     color: '#054982',
     src: require('@/assets/achieveCenter.png'),
-    liebiaoList: [{ title: '平台建设' }, { title: '项目成果' }, { title: '知识产权' }, { title: '科技合作' }],
+    liebiaoList: [{ title: '平台建设' }, { title: '项目成果' }, { title: '知识产权' }, { title: '科技支撑' }],
   }),
   created() {
     this.search();
@@ -36,7 +36,7 @@ export default {
   methods: {
     async search() {
       let title = this.col_name;
-      if (title == '科技合作') {
+      if (title == '科技支撑') {
         let index = 3;
         this.clickUrl(title, index);
       }
@@ -48,7 +48,7 @@ export default {
         this.menuIndex = index;
       } else if (title == '知识产权') {
         this.menuIndex = index;
-      } else if (title == '科技合作') {
+      } else if (title == '科技支撑') {
         this.menuIndex = index;
       }
       this.$emit('leftdaohang', title);

src/layout/index/jobs.vue

@@ -2,7 +2,7 @@
   <div id="jobs">
     <el-col :span="24" class="maintoplefttitle">
       <div style="border-bottom: 1px solid  #ccc;height: 40px;">
-        <span></span><span>工作动态</span><span @click="morejob()"><i class="el-icon-more"></i></span>
+        <span></span><span>工作动态</span><span @click="morejob()" style="cursor:pointer;"><i class="el-icon-more"></i></span>
       </div>
     </el-col>
     <el-col :span="24">

src/layout/index/notice.vue

@@ -2,7 +2,7 @@
   <div id="notice">
     <el-col :span="24" class="maintoplefttitle">
       <div style="border-bottom: 1px solid #ccc;height: 40px;">
-        <span></span><span>通知通告</span><span @click="mortongzhi()"><i class="el-icon-more"></i></span>
+        <span></span><span>通知通告</span><span @click="mortongzhi()" style="cursor:pointer;"><i class="el-icon-more"></i></span>
       </div>
     </el-col>
     <el-col :span="24">

src/layout/index/service.vue

@@ -2,7 +2,7 @@
   <div id="service">
     <el-col :span="24" class="maintoplefttitle">
       <div style="border-bottom: 1px solid #ccc;height: 40px;">
-        <span></span><span>科技合作</span><span @click="morekeji()"><i class="el-icon-more"></i></span>
+        <span></span><span>科技支撑</span><span @click="morekeji()" style="cursor:pointer;"><i class="el-icon-more"></i></span>
       </div>
     </el-col>
     <el-col :span="24">
@@ -26,14 +26,14 @@ export default {
   computed: {},
   methods: {
     morekeji() {
-      this.$router.push({ path: '/achievement/index', query: { col_name: '科技合作', display: '0' } });
+      this.$router.push({ path: '/achievement/index', query: { col_name: '科技支撑', display: '0' } });
     },
 
     async keji(item) {
       if (item.url) {
         window.open(item.url);
       } else {
-        this.$router.push({ path: '/achievement/index', query: { col_name: '科技合作', id: item.id, display: '1' } });
+        this.$router.push({ path: '/achievement/index', query: { col_name: '科技支撑', id: item.id, display: '1' } });
       }
     },
   },

src/layout/index/technology.vue

@@ -2,7 +2,7 @@
   <div id="technology">
     <el-col :span="24" class="maintoplefttitle">
       <div style="border-bottom: 1px solid #ccc;height: 40px;">
-        <span></span><span>技术问答</span><span @click="morekeji()"><i class="el-icon-more"></i></span>
+        <span></span><span>技术问答</span><span @click="morekeji()" style="cursor:pointer;"><i class="el-icon-more"></i></span>
       </div>
     </el-col>
     <el-col :span="24">

src/layout/index/top-right.vue

@@ -39,6 +39,7 @@ export default {
         this.myChart = echarts.init(document.getElementById('chart'));
         const option = {
           title: { text: '运行动态', left: 'center' },
+
           tooltip: { trigger: 'axis' },
           legend: {
             data: ['活跃用户', '活跃节点', '活跃应用'],
@@ -66,6 +67,10 @@ export default {
           ],
         };
         this.myChart.setOption(option);
+
+        this.myChart.on('click', function(params) {
+          self.location.href = '/service/detail?title=运行动态';
+        });
       }
     },
   },

src/views/achievement/index.vue

@@ -37,7 +37,7 @@
                     <span v-else-if="columnName == '知识产权'">
                       <knowledgeList :list="list" :total="total" :limit="limit" @detailBtn="detailBtn" @query="searchinfo"></knowledgeList>
                     </span>
-                    <span v-else-if="columnName == '科技合作'">
+                    <span v-else-if="columnName == '科技支撑'">
                       <technologyList :list="list" :total="total" :limit="limit" @detailBtn="detailBtn" @query="searchinfo"></technologyList>
                     </span>
                     <span v-else-if="columnName == '超算联盟'">
@@ -46,10 +46,10 @@
                     <span v-else-if="columnName == '国家网格'">
                       <countryList :list="list" :total="total" @detailBtn="detailBtn" @query="searchinfo"></countryList>
                     </span>
-                    <span v-else-if="columnName == '教学中心'">
+                    <span v-else-if="columnName == '数学中心'">
                       <teachingList :list="list" :total="total" :limit="limit" @detailBtn="detailBtn" @query="searchinfo"></teachingList>
                     </span>
-                    <span v-else-if="columnName == '创业基地'">
+                    <span v-else-if="columnName == '创新基地'">
                       <entrepreneurshipList :list="list" :total="total" :limit="limit" @detailBtn="detailBtn" @query="searchinfo"></entrepreneurshipList>
                     </span>
                     <span v-else-if="columnName == '软件中心'">
@@ -68,7 +68,7 @@
                     <span v-else-if="columnName == '知识产权'">
                       <knowledgeDetail :details="details"></knowledgeDetail>
                     </span>
-                    <span v-else-if="columnName == '科技合作'">
+                    <span v-else-if="columnName == '科技支撑'">
                       <technologyDetail :details="details"></technologyDetail>
                     </span>
                     <span v-else-if="columnName == '超算联盟'">
@@ -77,10 +77,10 @@
                     <span v-else-if="columnName == '国家网格'">
                       <countryDetail :details="details"></countryDetail>
                     </span>
-                    <span v-else-if="columnName == '教学中心'">
+                    <span v-else-if="columnName == '中心'">
                       <teachingDetail :details="details"></teachingDetail>
                     </span>
-                    <span v-else-if="columnName == '创业基地'">
+                    <span v-else-if="columnName == '创新基地'">
                       <entrepreneurshipDetail :details="details"></entrepreneurshipDetail>
                     </span>
                     <span v-else-if="columnName == '软件中心'">

src/views/communication/list.vue

@@ -121,7 +121,7 @@ export default {
         },
       ],
       // 总数
-      total: 10,
+      total: 0,
       limit: 14,
       newsid: '',
       // 详情
@@ -244,6 +244,7 @@ export default {
         text-align: center;
       }
       .menuList {
+        cursor: pointer;
         height: 50px;
         line-height: 50px;
         text-align: center;

src/views/communication/parts/demand.vue

@@ -12,7 +12,7 @@
           <span>{{ item.meta | getDate }}</span>
         </el-col>
       </el-col>
-      <el-col :span="24" class="anniu"> <el-button type="primary" round @click="onclick()"> 我要发布</el-button></el-col>
+      <el-col :span="24" class="marketPublish" @click.native="onclick()"> <span @onclick="fabu()">我要发布</span></el-col>
     </el-col>
   </div>
 </template>
@@ -42,7 +42,9 @@ export default {
     },
 
     xuqiu(item) {
-      this.$router.push({ path: '/demand/index', query: { id: item.id } });
+      // this.$router.push({ path: '/demand/index', query: { id: item.id } });
+      let id = item.id;
+      window.open('/demand/index?id' + id);
     },
     async onclick() {
       if (this.user) {
@@ -92,6 +94,7 @@ export default {
 }
 
 .list {
+  cursor: pointer;
   padding: 5px 10px 5px 10px;
 
   span:first-child {
@@ -123,8 +126,24 @@ export default {
   }
 }
 
-.anniu {
+.marketPublish {
+  position: fixed;
+  background: #0279d5;
+  width: 100px;
+  height: 70px;
+  z-index: 999;
+  left: 2%;
+  top: 50%;
+  border-radius: 20px;
+  box-shadow: 2px 2px 2px #055c9f;
   text-align: center;
-  padding: 20px 0;
+  line-height: 75px;
+  font-size: 16px;
+  color: #fff;
+  font-weight: bold;
+}
+.marketPublish:hover {
+  background: #f60;
+  cursor: pointer;
 }
 </style>

src/views/communication/parts/topicDetail.vue

@@ -45,7 +45,7 @@
                   <el-col :span="24" class="leftDown">
                     <el-image :src="squareImage"></el-image>
                     <el-col :span="24" class="jobname">
-                      {{ item.publish_unit }}
+                      {{ item.uname }}
                     </el-col>
                   </el-col>
                 </el-col>
@@ -137,11 +137,20 @@ export default {
         this.$set(this, `detail`, res.data);
       }
     },
-    async search({ skip = 0, limit = this.limit, newsid = this.newsid } = { skip: 0, limit: this.limit }) {
-      let res = await this.commentquery({ skip, limit, newsid, status: 1 });
-      console.log(res);
-      this.$set(this, `list`, res.data);
-      this.$set(this, `total`, res.total);
+    async search({ skip = 0, limit = this.limit, newsid } = { skip: 0, limit: this.limit }) {
+      if (this.id) {
+        newsid = this.id;
+        let res = await this.commentquery({ skip, limit, newsid, status: 1 });
+        console.log(res);
+        this.$set(this, `list`, res.data);
+        this.$set(this, `total`, res.total);
+      } else {
+        newsid = this.newsid;
+        let res = await this.commentquery({ skip, limit, newsid, status: 1 });
+        console.log(res);
+        this.$set(this, `list`, res.data);
+        this.$set(this, `total`, res.total);
+      }
     },
     async submit() {
       if (!this.user.uid) {
@@ -289,7 +298,7 @@ export default {
   padding: 20px;
 }
 .main .two .twoInfo .right .info p {
-  font-size: 20px;
+  font-size: 17px;
   overflow: hidden;
   height: 160px;
 }

src/views/news/listDetail.vue

@@ -219,6 +219,7 @@ export default {
         text-align: center;
       }
       .menuList {
+        cursor: pointer;
         height: 50px;
         line-height: 50px;
         text-align: center;

src/views/partisan/index.vue

@@ -21,7 +21,7 @@
                 @click.native="$router.push({ path: '/partisan/listDetail', query: { col_name: '图片新闻', id: item.id, display: '1' } })"
                 class="ruleList"
               >
-                <el-image :src="item.img_url" v-if="item.img_url"></el-image>
+                <el-image :src="item.img_url[0]" v-if="item.img_url[0]"></el-image>
                 <el-image :src="noImg" v-else></el-image>
                 <p class="textOver">{{ item.title }}</p>
               </el-carousel-item>
@@ -30,7 +30,7 @@
           <el-col :span="12" class="right">
             <el-col :span="24" class="infoTop">
               <span>|</span><span>党建工作</span
-              ><span @click="$router.push({ path: '/partisan/listDetail', query: { col_name: '党建工作', display: '0' } })">MORE</span>
+              ><span @click="$router.push({ path: '/partisan/listDetail', query: { col_name: '党建工作', display: '0' } })" style="cursor:pointer;">MORE</span>
             </el-col>
             <el-col
               :span="24"
@@ -46,7 +46,7 @@
           <el-col :span="12" class="left">
             <el-col :span="24" class="infoTop">
               <span>|</span><span>学习园地</span
-              ><span @click="$router.push({ path: '/partisan/listDetail', query: { col_name: '学习园地', display: '0' } })">MORE</span>
+              ><span @click="$router.push({ path: '/partisan/listDetail', query: { col_name: '学习园地', display: '0' } })" style="cursor:pointer;">MORE</span>
             </el-col>
             <el-col
               :span="24"
@@ -62,7 +62,7 @@
           <el-col :span="12" class="right">
             <el-col :span="24" class="infoTop">
               <span>|</span><span>党风廉政</span
-              ><span @click="$router.push({ path: '/partisan/listDetail', query: { col_name: '党风廉政', display: '0' } })">MORE</span>
+              ><span @click="$router.push({ path: '/partisan/listDetail', query: { col_name: '党风廉政', display: '0' } })" style="cursor:pointer;">MORE</span>
             </el-col>
             <el-col
               :span="24"
@@ -206,6 +206,7 @@ export default {
   margin: 10px 0;
 }
 .images {
+  cursor: pointer;
   height: 390px;
   width: 590px;
   margin: 10px auto;

src/views/partisan/listDetail.vue

@@ -246,6 +246,7 @@ export default {
         height: 50px;
         line-height: 50px;
         text-align: center;
+        cursor: pointer;
         border-bottom: 1px solid #ccc;
         p {
           font-size: 20px;

src/views/service/detail.vue

@@ -180,6 +180,7 @@ export default {
         text-align: center;
       }
       .menuList {
+        cursor: pointer;
         height: 50px;
         line-height: 50px;
         text-align: center;