更新网站

src/components/service/servicedetail.vue

@@ -105,12 +105,12 @@ export default {
 }
 .leftDiao {
   background: #fff;
-  height: 370px;
+  height: 430px;
   overflow: hidden;
 }
 .leftTop {
   background: #fff;
-  height: 420px;
+  height: 360px;
   overflow: hidden;
   margin: 0 0 10px 0;
 }

src/components/supermaket/supermarket.vue

@@ -24,7 +24,7 @@
               <rightcont :jishuList="jishuList" :chanpinList="chanpinList" :serviceList="serviceList"></rightcont>
             </el-col>
             <el-col :span="24" class="fabu">
-              <fabu :fabuList="fabuList"></fabu>
+              <fabu :fabuList="chanpinList"></fabu>
             </el-col>
             <el-col :span="24" class="jiaoyi">
               <jiaoyi :tableData="tableData"></jiaoyi>
@@ -52,22 +52,22 @@
           </span>
           <span v-else-if="display === 'sixth'">
             <el-col :span="19" class="second">
-              <serve :serveList="serveList" :serveTotal="serveTotal"></serve>
+              <serve :serveList="serviceList" :serveTotal="serveTotal"></serve>
             </el-col>
           </span>
           <span v-else-if="display === 'seventh'">
             <el-col :span="19" class="second">
-              <technology :serveList="serveList" :serveTotal="serveTotal"></technology>
+              <technology :serveList="jishuList" :serveTotal="jishuTotal"></technology>
             </el-col>
           </span>
           <span v-else-if="display === 'eighth'">
             <el-col :span="19" class="second">
-              <product :serveList="serveList" :serveTotal="serveTotal"></product>
+              <product :serveList="chanpinList" :serveTotal="chanpinTotal"></product>
             </el-col>
           </span>
           <span v-else-if="display === 'nineth'">
             <el-col :span="19" class="second">
-              <infomate :serveList="serveList" :serveTotal="serveTotal"></infomate>
+              <infomate :serveList="serviceList" :serveTotal="serveTotal"></infomate>
             </el-col>
           </span>
         </div>
@@ -106,9 +106,11 @@ export default {
     nativeList: null, //商务分类
     display: { type: String, default: 'first' },
     jishuList: null, //技术供求
-    chanpinList: null, //产品供求
+    jishuTotal: null, //技术分页
+    chanpinList: null, //产品供求，最新发布
+    chanpinTotal: null, //产品分页
     serviceList: null, //服务供求
-    fabuList: null, //最新发布
+    serveTotal: null, //服务分页
     tableData: null, //交易展示
     schoolList: null, //高校院所
     schoolTotal: null, //分页
@@ -118,8 +120,6 @@ export default {
     companyTotal: null, //分页
     mechanismList: null, //机构团体
     mechanismTotal: null, //分页
-    serveList: null, //资讯服务
-    serveTotal: null, //分页
   },
   components: {
     top, //头部

src/layout/government/notice.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="topInfo">
           <el-col :span="20" class="left">{{ title }}</el-col>
           <el-col :span="4" class="more">
-            <el-link :underline="false"><el-image :src="more"></el-image></el-link>
+            <el-link :underline="false" @click="moreClick()"><el-image :src="more"></el-image></el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="list">
@@ -41,7 +41,11 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    moreClick() {
+      this.$router.push({ path: '/government/governmentList' });
+    },
+  },
 };
 </script>
 

src/layout/index/law.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="topInfo">
           <el-col :span="20" class="left">{{ title }}</el-col>
           <el-col :span="4" class="more">
-            <el-link :underline="false"><el-image :src="more"></el-image></el-link>
+            <el-link :underline="false" @click="moreClick()"><el-image :src="more"></el-image></el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="list">
@@ -36,7 +36,11 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    moreClick() {
+      this.$router.push({ path: '/policy/policy' });
+    },
+  },
 };
 </script>
 

src/layout/index/mapInfo.vue

@@ -2,7 +2,7 @@
   <div id="mapInfo">
     <el-row>
       <el-col :span="24" class="map">
-        <el-link :underline="false">
+        <el-link :underline="false" href="http://139.210.167.203/free-technological-management/mapApply/getMap" target="_blank">
           <el-image style="width:550px;height:360px;" :src="map"></el-image>
         </el-link>
       </el-col>

src/layout/index/notice.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="topInfo">
           <el-col :span="20" class="left">{{ title }}</el-col>
           <el-col :span="4" class="more">
-            <el-link :underline="false"><el-image :src="more"></el-image></el-link>
+            <el-link :underline="false" @click="moreClick()"><el-image :src="more"></el-image></el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="list">
@@ -41,7 +41,11 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    moreClick() {
+      this.$router.push({ path: '/government/governmentList' });
+    },
+  },
 };
 </script>
 

src/layout/index/zixun.vue

@@ -18,7 +18,7 @@
           <el-col :span="24" class="topInfo">
             <el-col :span="20" class="left">{{ title }}</el-col>
             <el-col :span="4" class="more">
-              <el-link :underline="false"><el-image :src="more"></el-image></el-link>
+              <el-link :underline="false" @click="moreClick()"><el-image :src="more"></el-image></el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="list">
@@ -58,7 +58,11 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    moreClick() {
+      this.$router.push({ path: '/government/governmentList' });
+    },
+  },
 };
 </script>
 

src/layout/personnel/mainInfo.vue

@@ -76,12 +76,12 @@
               <el-table-column prop="user_name" label="发布人" align="center"> </el-table-column>
             </el-table>
           </el-tab-pane>
-          <el-tab-pane label="找合作" name="fifth">
-            <el-carousel height="360px">
+          <el-tab-pane label="找合作" name="fifth" @click.native="hezuoClick()">
+            <!-- <el-carousel height="360px">
               <el-carousel-item @click.native="$router.push({ path: '/supermaket/supermarket' })">
                 <p class="title textOver">找合作</p>
               </el-carousel-item>
-            </el-carousel>
+            </el-carousel> -->
           </el-tab-pane>
         </el-tabs>
         <el-col :span="24" class="more">
@@ -109,7 +109,11 @@ export default {
   created() {},
   computed: {},
   methods: {
-    handleClick() {},
+    handleClick(tab, event) {
+      if (event.toElement.innerHTML === '找合作') {
+        this.$router.push({ path: '/supermaket/supermarket' });
+      }
+    },
     clickDetail(row) {
       this.$emit('detail', { data: row });
     },
@@ -123,6 +127,9 @@ export default {
     clickDetailcm(row) {
       this.$emit('detailcm', { data: row });
     },
+    hezuoClick() {
+      console.log('gengxun');
+    },
   },
 };
 </script>

src/layout/personnel/mainMenu.vue

@@ -7,7 +7,7 @@
     <el-col>
       <el-menu default-active="1" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose" text-color="#215299" active-text-color="#215299">
         <el-menu-item index="1" v-for="(item, index) in liebiaoList" :key="index"
-          ><span slot="title" @click="clickUrl(item.name)">{{ item.name }}</span></el-menu-item
+          ><span slot="title" @click="clickUrl(item.id)">{{ item.name }}</span></el-menu-item
         >
       </el-menu>
     </el-col>

src/layout/service/videos.vue

@@ -7,7 +7,7 @@
         </el-col>
         <el-col :span="24" class="list">
           <ul>
-            <li v-for="(item, index) in videosList" :key="index">
+            <li v-for="(item, index) in videosList" :key="index" @click="$router.push({ path: '/service/servicedetail', query: { id: item.id } })">
               <el-link :underline="false">
                 <span class="date textOver">{{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}</span>
                 <span class="title textOver">{{ item.title }}</span>
@@ -15,7 +15,7 @@
             </li>
           </ul>
           <el-col :span="24" class="more">
-            <el-link :underline="false">进入视频中心></el-link>
+            <el-link :underline="false" @click="moreClick()">进入视频中心></el-link>
           </el-col>
         </el-col>
       </el-col>
@@ -35,7 +35,11 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    moreClick() {
+      this.$router.push({ path: '/service/servicelist' });
+    },
+  },
 };
 </script>
 

src/layout/service/zhuanti.vue

@@ -19,7 +19,7 @@
                   }}</el-col>
                 </li>
               </ul>
-              <!-- <el-col class="more" :span="24"><el-link :underline="false">查看更多</el-link></el-col> -->
+              <el-col class="more" :span="24"><el-link :underline="false" @click="moreClick()">查看更多</el-link></el-col>
             </el-col>
           </el-tab-pane>
           <el-tab-pane>
@@ -38,7 +38,7 @@
                   }}</el-col>
                 </li>
               </ul>
-              <!-- <el-col class="more" :span="24"><el-link :underline="false">查看更多</el-link></el-col> -->
+              <el-col class="more" :span="24"><el-link :underline="false" @click="moreClick()">查看更多</el-link></el-col>
             </el-col>
           </el-tab-pane>
           <el-tab-pane>
@@ -57,7 +57,7 @@
                   }}</el-col>
                 </li>
               </ul>
-              <!-- <el-col class="more" :span="24"><el-link :underline="false">查看更多</el-link></el-col> -->
+              <el-col class="more" :span="24"><el-link :underline="false" @click="moreClick()">查看更多</el-link></el-col>
             </el-col>
           </el-tab-pane>
           <el-tab-pane>
@@ -76,7 +76,7 @@
                   }}</el-col>
                 </li>
               </ul>
-              <!-- <el-col class="more" :span="24"><el-link :underline="false">查看更多</el-link></el-col> -->
+              <el-col class="more" :span="24"><el-link :underline="false" @click="moreClick()">查看更多</el-link></el-col>
             </el-col>
           </el-tab-pane>
         </el-tabs>
@@ -98,7 +98,11 @@ export default {
   data: () => ({}),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    moreClick() {
+      this.$router.push({ path: '/service/servicelist' });
+    },
+  },
 };
 </script>
 

src/layout/shuju/shangbao.vue

@@ -5,12 +5,17 @@
         <el-col :span="24" class="topInfo">
           <el-col :span="20" class="left">{{ title }}</el-col>
           <el-col :span="4" class="more">
-            <el-link :underline="false"><el-image :src="more"></el-image></el-link>
+            <el-link :underline="false" @click="moreClick()"><el-image :src="more"></el-image></el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="list">
           <ul>
-            <li class="zixunList" v-for="(item, index) in shangbaoList" :key="index">
+            <li
+              class="zixunList"
+              v-for="(item, index) in shangbaoList"
+              :key="index"
+              @click="$router.push({ path: '/government/governmentDetail', query: { id: item.id } })"
+            >
               <el-link :underline="false">
                 <span class="title textOver">{{ item.title }}</span>
                 <span class="date textOver">{{ item.date }}</span>
@@ -36,7 +41,11 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    moreClick() {
+      this.$router.push({ path: '/government/governmentList' });
+    },
+  },
 };
 </script>
 

src/layout/shuju/tongzhi.vue

@@ -4,9 +4,8 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="topInfo">
           <el-col :span="20" class="left">通知公告</el-col>
-          <!-- {{ tongzhiList[0].column_name }} -->
           <el-col :span="4" class="more">
-            <el-link :underline="false"><el-image :src="more"></el-image></el-link>
+            <el-link :underline="false" @click="moreClick()"><el-image :src="more"></el-image></el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="list">
@@ -42,7 +41,11 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    moreClick() {
+      this.$router.push({ path: '/government/governmentList' });
+    },
+  },
 };
 </script>
 

src/views/index.vue

@@ -113,10 +113,18 @@ export default {
         this.$set(this, `${site}List`, res.data);
       }
     },
+    // 新品发布，创新服务
     async searchProduct({ skip = 0, limit = 6, ...info } = {}) {
       const res = await this.productList({ skip, limit, ...info });
-      this.$set(this, `xinpinList`, res.data);
-      this.$set(this, `chuangxinList`, res.data);
+      for (const val of res.data) {
+        if (val.totaltype === '1') {
+          var arr = res.data.filter(item => item.totaltype === '1');
+          this.$set(this, `xinpinList`, arr);
+        } else if (val.totaltype === '2') {
+          var arrs = res.data.filter(item => item.totaltype === '2');
+          this.$set(this, `chuangxinList`, arrs);
+        }
+      }
     },
   },
 };

src/views/personnel/adviserList.vue

@@ -58,16 +58,16 @@ export default {
     },
     async onsaveClick({ id }) {
       const res = await this.columnInfo(id);
-      if (res.data.name === '招聘信息') {
-        this.$router.push({ path: '/personnel/recruitList', query: { id: id } });
-      } else if (res.data.name === '就业指导') {
-        this.$router.push({ path: '/personnel/guidanceList', query: { id: id } });
-      } else if (res.data.name === '学习实践') {
-        this.$router.push({ path: '/personnel/practiceList', query: { id: id } });
-      } else if (res.data.name === '勤工俭学') {
-        this.$router.push({ path: '/personnel/diligenceList', query: { id: id } });
-      } else if (res.data.name === '工作顾问') {
-        this.$router.push({ path: '/personnel/adviserList', query: { id: id } });
+      if (res.data.site === 'zpxx') {
+        this.$router.push({ path: '/personnel/recruitList', query: { id: res.data.id } });
+      } else if (res.data.site === 'gzgw') {
+        this.$router.push({ path: '/personnel/guidanceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'qgjx') {
+        this.$router.push({ path: '/personnel/practiceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'xxsj') {
+        this.$router.push({ path: '/personnel/diligenceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'jyzd') {
+        this.$router.push({ path: '/personnel/adviserList', query: { id: res.data.id } });
       }
     },
     async searchName() {

src/views/personnel/diligenceList.vue

@@ -59,16 +59,16 @@ export default {
     },
     async onsaveClick({ id }) {
       const res = await this.columnInfo(id);
-      if (res.data.name === '招聘信息') {
-        this.$router.push({ path: '/personnel/recruitList', query: { id: id } });
-      } else if (res.data.name === '就业指导') {
-        this.$router.push({ path: '/personnel/guidanceList', query: { id: id } });
-      } else if (res.data.name === '学习实践') {
-        this.$router.push({ path: '/personnel/practiceList', query: { id: id } });
-      } else if (res.data.name === '勤工俭学') {
-        this.$router.push({ path: '/personnel/diligenceList', query: { id: id } });
-      } else if (res.data.name === '工作顾问') {
-        this.$router.push({ path: '/personnel/adviserList', query: { id: id } });
+      if (res.data.site === 'zpxx') {
+        this.$router.push({ path: '/personnel/recruitList', query: { id: res.data.id } });
+      } else if (res.data.site === 'gzgw') {
+        this.$router.push({ path: '/personnel/guidanceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'qgjx') {
+        this.$router.push({ path: '/personnel/practiceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'xxsj') {
+        this.$router.push({ path: '/personnel/diligenceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'jyzd') {
+        this.$router.push({ path: '/personnel/adviserList', query: { id: res.data.id } });
       }
     },
     async searchName() {

src/views/personnel/guidanceList.vue

@@ -59,16 +59,16 @@ export default {
     },
     async onsaveClick({ id }) {
       const res = await this.columnInfo(id);
-      if (res.data.name === '招聘信息') {
-        this.$router.push({ path: '/personnel/recruitList', query: { id: id } });
-      } else if (res.data.name === '就业指导') {
-        this.$router.push({ path: '/personnel/guidanceList', query: { id: id } });
-      } else if (res.data.name === '学习实践') {
-        this.$router.push({ path: '/personnel/practiceList', query: { id: id } });
-      } else if (res.data.name === '勤工俭学') {
-        this.$router.push({ path: '/personnel/diligenceList', query: { id: id } });
-      } else if (res.data.name === '工作顾问') {
-        this.$router.push({ path: '/personnel/adviserList', query: { id: id } });
+      if (res.data.site === 'zpxx') {
+        this.$router.push({ path: '/personnel/recruitList', query: { id: res.data.id } });
+      } else if (res.data.site === 'gzgw') {
+        this.$router.push({ path: '/personnel/guidanceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'qgjx') {
+        this.$router.push({ path: '/personnel/practiceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'xxsj') {
+        this.$router.push({ path: '/personnel/diligenceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'jyzd') {
+        this.$router.push({ path: '/personnel/adviserList', query: { id: res.data.id } });
       }
     },
     async searchName() {

src/views/personnel/personnel.vue

@@ -74,9 +74,6 @@ export default {
     this.searchSite();
     this.searchColumn();
     this.searchInfo();
-    this.searchInfojobs();
-    this.searchInfozhuanjia();
-    this.searchInfomapcanmou();
   },
   computed: {},
   methods: {
@@ -102,43 +99,18 @@ export default {
       const res = await this.columnList({ ...info });
       this.$set(this, `liebiaoList`, res.data);
     },
-    // 查询找人才-人才展示
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.newsList({ skip, limit, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `rencaiData`, res.data);
-        this.$set(this, `rencaiShowList`, res.data);
-      }
-    },
-    // 查询找工作
-    async searchInfojobs({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.xinxiList({ skip, limit, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `jobsData`, res.data);
-      }
-    },
-    // 查询找专家
-    async searchInfozhuanjia({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.zhuanjiaList({ skip, limit, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `zhuanjiaData`, res.data);
-      }
-    },
-    // 查询找参谋
-    async searchInfomapcanmou({ ...info } = {}) {
-      const res = await this.columnList({ ...info });
-      for (const val of res.data) {
-        if (val.site === 'jyzd') {
-          console.log(val.id);
-          this.$set(this, `canmouId`, val.id);
-          this.searchCanmou();
-        }
-      }
-    },
-    async searchCanmou({ skip = 0, limit = 10, column_id } = {}) {
-      const res = await this.canmouList({ skip, limit, column_id: this.canmouId });
-      if (this.$checkRes(res)) {
-        this.$set(this, `canmoData`, res.data);
+    async onsaveClick({ id }) {
+      const res = await this.columnInfo(id);
+      if (res.data.site === 'zpxx') {
+        this.$router.push({ path: '/personnel/recruitList', query: { id: res.data.id } });
+      } else if (res.data.site === 'gzgw') {
+        this.$router.push({ path: '/personnel/guidanceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'qgjx') {
+        this.$router.push({ path: '/personnel/practiceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'xxsj') {
+        this.$router.push({ path: '/personnel/diligenceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'jyzd') {
+        this.$router.push({ path: '/personnel/adviserList', query: { id: res.data.id } });
       }
     },
     // 人才详情
@@ -157,18 +129,37 @@ export default {
     clickDetailcm({ data }) {
       this.$router.push({ path: '/personnel/personnelcmdetail', query: { id: data.id } });
     },
-    async onsaveClick({ id }) {
-      const res = await this.columnInfo(id);
-      if (res.data.name === '招聘信息') {
-        this.$router.push({ path: '/personnel/recruitList', query: { id: id } });
-      } else if (res.data.name === '就业指导') {
-        this.$router.push({ path: '/personnel/guidanceList', query: { id: id } });
-      } else if (res.data.name === '学习实践') {
-        this.$router.push({ path: '/personnel/practiceList', query: { id: id } });
-      } else if (res.data.name === '勤工俭学') {
-        this.$router.push({ path: '/personnel/diligenceList', query: { id: id } });
-      } else if (res.data.name === '工作顾问') {
-        this.$router.push({ path: '/personnel/adviserList', query: { id: id } });
+    // 查询
+    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
+      // 人才
+      const res = await this.newsList({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `rencaiData`, res.data);
+        this.$set(this, `rencaiShowList`, res.data);
+      }
+      // 工作
+      const resJob = await this.xinxiList({ skip, limit, ...info });
+      if (this.$checkRes(resJob)) {
+        this.$set(this, `jobsData`, resJob.data);
+      }
+      // 专家
+      const resZhuanjia = await this.zhuanjiaList({ skip, limit, ...info });
+      if (this.$checkRes(resZhuanjia)) {
+        this.$set(this, `zhuanjiaData`, resZhuanjia.data);
+      }
+      //找参谋
+      const rescanmou = await this.columnList({ ...info });
+      for (const val of rescanmou.data) {
+        if (val.site === 'jyzd') {
+          this.$set(this, `canmouId`, val.id);
+          this.searchCanmou();
+        }
+      }
+    },
+    async searchCanmou({ skip = 0, limit = 10, column_id } = {}) {
+      const res = await this.canmouList({ skip, limit, column_id: this.canmouId });
+      if (this.$checkRes(res)) {
+        this.$set(this, `canmoData`, res.data);
       }
     },
   },

src/views/personnel/practiceList.vue

@@ -59,16 +59,16 @@ export default {
     },
     async onsaveClick({ id }) {
       const res = await this.columnInfo(id);
-      if (res.data.name === '招聘信息') {
-        this.$router.push({ path: '/personnel/recruitList', query: { id: id } });
-      } else if (res.data.name === '就业指导') {
-        this.$router.push({ path: '/personnel/guidanceList', query: { id: id } });
-      } else if (res.data.name === '学习实践') {
-        this.$router.push({ path: '/personnel/practiceList', query: { id: id } });
-      } else if (res.data.name === '勤工俭学') {
-        this.$router.push({ path: '/personnel/diligenceList', query: { id: id } });
-      } else if (res.data.name === '工作顾问') {
-        this.$router.push({ path: '/personnel/adviserList', query: { id: id } });
+      if (res.data.site === 'zpxx') {
+        this.$router.push({ path: '/personnel/recruitList', query: { id: res.data.id } });
+      } else if (res.data.site === 'gzgw') {
+        this.$router.push({ path: '/personnel/guidanceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'qgjx') {
+        this.$router.push({ path: '/personnel/practiceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'xxsj') {
+        this.$router.push({ path: '/personnel/diligenceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'jyzd') {
+        this.$router.push({ path: '/personnel/adviserList', query: { id: res.data.id } });
       }
     },
     async searchName() {

src/views/personnel/recruitList.vue

@@ -59,16 +59,16 @@ export default {
     },
     async onsaveClick({ id }) {
       const res = await this.columnInfo(id);
-      if (res.data.name === '招聘信息') {
-        this.$router.push({ path: '/personnel/recruitList', query: { id: id } });
-      } else if (res.data.name === '就业指导') {
-        this.$router.push({ path: '/personnel/guidanceList', query: { id: id } });
-      } else if (res.data.name === '学习实践') {
-        this.$router.push({ path: '/personnel/practiceList', query: { id: id } });
-      } else if (res.data.name === '勤工俭学') {
-        this.$router.push({ path: '/personnel/diligenceList', query: { id: id } });
-      } else if (res.data.name === '工作顾问') {
-        this.$router.push({ path: '/personnel/adviserList', query: { id: id } });
+      if (res.data.site === 'zpxx') {
+        this.$router.push({ path: '/personnel/recruitList', query: { id: res.data.id } });
+      } else if (res.data.site === 'gzgw') {
+        this.$router.push({ path: '/personnel/guidanceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'qgjx') {
+        this.$router.push({ path: '/personnel/practiceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'xxsj') {
+        this.$router.push({ path: '/personnel/diligenceList', query: { id: res.data.id } });
+      } else if (res.data.site === 'jyzd') {
+        this.$router.push({ path: '/personnel/adviserList', query: { id: res.data.id } });
       }
     },
     async searchName() {

src/views/shuju/shuju.vue

@@ -5,7 +5,7 @@
       :liebiaoList="liebiaoList"
       :imageList="imageList"
       :gonggaoList="tzggList"
-      :shangbaoList="shangbaoList"
+      :shangbaoList="tzggList"
       :tongzhiList="tzggList"
     ></shuju-detail>
   </div>
@@ -96,14 +96,14 @@ export default {
       }
     },
     async kjzwSearch({ skip = 0, limit = 10, column_id, site } = {}) {
-      console.log(column_id, site);
-      const res = await this.affairsList({ skip, limit, column_id: column_id });
-      for (const val of res.data) {
-        const result = await this.affairsInfo(val.column_id);
-        val.column_name = result.data.name;
+      if (site === 'tzgg') {
+        const res = await this.affairsList({ skip, limit, column_id: column_id });
+        for (const val of res.data) {
+          const result = await this.affairsInfo(val.column_id);
+          val.column_name = result.data.name;
+        }
+        this.$set(this, `${site}List`, res.data);
       }
-      this.$set(this, `${site}List`, res.data);
-      console.log(res.data);
     },
   },
 };

src/views/supermaket/supermarket.vue

@@ -6,9 +6,12 @@
       @onsave="nativeClick"
       :display="display"
       :jishuList="jishuList"
+      :jishuTotal="jishuTotal"
       :chanpinList="chanpinList"
+      :chanpinTotal="chanpinTotal"
       :serviceList="serviceList"
-      :fabuList="fabuList"
+      :serveTotal="serveTotal"
+      :fabuList="chanpinList"
       :tableData="tableData"
       :schoolList="schoolList"
       :scientificList="scientificList"
@@ -18,8 +21,6 @@
       :companyTotal="companyTotal"
       :mechanismList="mechanismList"
       :mechanismTotal="mechanismTotal"
-      :serveList="serveList"
-      :serveTotal="serveTotal"
     ></supermarket-detail>
   </div>
 </template>
@@ -67,34 +68,15 @@ export default {
       },
     ],
     display: 'first',
-    jishuList: [
-      {
-        title: '缩短贝类暂养吐沙净化时间',
-        type: '技术类',
-        date: '2019-12-26',
-        yen: '1000',
-      },
-      {
-        title: '八条数据',
-        type: '技术类',
-        date: '2019-12-26',
-        yen: '1000',
-      },
-    ],
-    chanpinList: [
-      {
-        pic: require('@/assets/chanpin1.jpg'),
-        title: '保护性耕作机械免耕精量播种机',
-        yen: '1000元/台',
-        type: '产品供求',
-      },
-      {
-        pic: require('@/assets/chanpin1.jpg'),
-        title: '八条数据',
-        yen: '1000元/台',
-        type: '产品供求',
-      },
-    ],
+    // 技术型
+    jishuList: [],
+    // 技术型分页
+    jishuTotal: 1,
+    // 产品型
+    chanpinList: [],
+    // 产品型分页
+    chanpinTotal: 1,
+    // 服务供求，研发服务
     serviceList: [
       {
         title: '标题',
@@ -109,7 +91,8 @@ export default {
         date: '2019-12-26',
       },
     ],
-    fabuList: [],
+    // 服务分页
+    serveTotal: 1,
     tableData: [
       {
         market: '系统管理员',
@@ -170,9 +153,6 @@ export default {
       },
     ],
     mechanismTotal: 1,
-    // 研发服务
-    serveList: [],
-    serveTotal: 1,
   }),
   created() {
     this.searchSite();
@@ -194,13 +174,21 @@ export default {
     },
     async searchInfo({ skip = 0, limit = 8, ...info } = {}) {
       const res = await this.ProductQuery({ skip, limit, ...info });
-      console.log(res.data);
-      this.$set(this, `fabuList`, res.data);
-      this.$set(this, `jishuList`, res.data);
-      this.$set(this, `chanpinList`, res.data);
-      this.$set(this, `serviceList`, res.data);
-      this.$set(this, `serveList`, res.data);
-      this.$set(this, `serveTotal`, res.total);
+      for (const val of res.data) {
+        if (val.totaltype === '0') {
+          var arr = res.data.filter(item => item.totaltype === '0');
+          this.$set(this, `jishuList`, arr);
+          this.$set(this, `jishuTotal`, arr.length);
+        } else if (val.totaltype === '1') {
+          var arrs = res.data.filter(item => item.totaltype === '1');
+          this.$set(this, `chanpinList`, arrs);
+          this.$set(this, `chanpinTotal`, arrs.length);
+        } else if (val.totaltype === '2') {
+          var arrss = res.data.filter(item => item.totaltype === '2');
+          this.$set(this, `serviceList`, arrss);
+          this.$set(this, `serveTotal`, arrss.length);
+        }
+      }
     },
     async nativeClick({ name }) {
       if (name === '高校院所') {