Merge remote-tracking branch 'origin/master'

src/api/data.js

@@ -1,5 +1,6 @@
 import axios from '@/libs/api.request'
 import qs from "qs";
+import axiosNew from 'axios'
 
 
 export const createDictionary = (p) => {
@@ -884,3 +885,40 @@ export const getPositionRequest = () => {
       method: 'get'
     })
   }
+
+  export const getProcess = (p) => {
+    return axios.request({
+      url: 'api/form/open/api/process/next/flow/node?flowKey=HuiYuanRuHuiLiuCheng',
+      method: 'post',
+      data: p
+    })
+  }
+
+  export const sendProcess = (p) => {
+    return axios.request({
+      url: 'api/form/open/api/process/sendProcess',
+      method: 'post',
+      data: p
+    })
+  }
+
+  export const moduleDataSave = (p) => {
+    return axios.request({
+      url: 'api/form/open/api/module/moduleDataSave',
+      method: 'post',
+      data: p
+    })
+  }
+
+  export const uploadFileAction = (file) => {
+    var forms = new FormData()
+    forms.append('file',file)
+    return axios.request({
+      url: 'api/form/common/api/uploadFile',
+      method: 'post',
+      headers: {
+        'Content-Type':'multipart/form-data'
+      },
+      data:forms
+    })
+  }

src/config/index.js

@@ -1,4 +1,13 @@
-export default {
+var path = require('path')
+
+module.exports = {
+    // build: {
+    //     index: path.resolve(__dirname, '../dist/index.html'),
+    //     assetsRoot: path.resolve(__dirname, '../dist'),
+    //     assetsSubDirectory: 'static',
+    //     assetsPublicPath: '../',
+    //     productionSourceMap: true
+    //    },
   /**
    * @description token在Cookie中存储的天数，默认1天
    */
@@ -31,7 +40,7 @@ export default {
    * @description api请求基础路径
    */
   baseUrl: {
-    dev: 'http://183.162.252.100:9012',
-    pro: 'https://oss.console.ingenuity.top'
+    dev: 'http://47.100.188.195:7006',
+    pro: 'http://47.100.188.195:7006'
   }
 }

src/libs/api.request.js

@@ -1,7 +1,6 @@
 import HttpRequest from '@/libs/axios'
 import config from '@/config'
-// const baseUrl = process.env.NODE_ENV === 'development' ? config.baseUrl.dev : config.baseUrl.pro
-const baseUrl = '/api'
+const baseUrl = process.env.NODE_ENV === 'development' ? '/api' : config.baseUrl.pro
 
 const axios = new HttpRequest(baseUrl)
 export default axios

src/main.js

@@ -23,8 +23,9 @@ import Moment from 'moment'
 // Vue.filter('formatDate', function(value) {
 //     return Moment(value).format('MM-DD')
 //   })
-  Vue.prototype.$moment = Moment;//赋值使用  
-
+  Vue.prototype.$moment = Moment;//赋值使用 
+  Vue.use(Toast)
+  
 // import ElementUI from 'element-ui'
 // import { ElementTiptapPlugin } from 'element-tiptap'
 // import ElementUI's styles

src/router/index.js

@@ -12,7 +12,7 @@ import config from '@/config'
 Vue.use(Router)
 const router = new Router({
   routes,
-  mode: 'history'
+  mode: 'hash'
 })
 const LOGIN_PAGE_NAME = process.env.NODE_ENV === 'development' ? config.sso.dev : config.sso.pro
 

src/view/company.vue

@@ -75,7 +75,7 @@ export default {
           let res = await getChannelInformationsRequest({channelId: id})
           if(res.code == 200){
               this.dataList = res.data.records
-              this.total = res.data.total
+              this.total = Number(res.data.total)
               this.dataList.map((item) => {
                   item.publishTime = this.$moment().format("YYYY-MM-DD")
               })

src/view/data.vue

@@ -42,7 +42,8 @@ export default {
     return {
         titleList: [],
         activeIndex: 0,
-        dataList: []
+        dataList: [],
+        total: 0
     }
   },
   methods: {
@@ -62,7 +63,7 @@ export default {
           if(res.code == 200){
             //   console.log(JSON.stringify(res.data))
               this.titleList = res.data
-              if(this.titleList){
+              if(this.titleList && this.titleList[0]){
                 this.getChannelInformationsRequest(this.titleList[0].id)
               }
               
@@ -73,7 +74,10 @@ export default {
           let res = await getChannelInformationsRequest({channelId: id})
           if(res.code == 200){
               this.dataList = res.data.records
-              console.log("this.dataList:"+JSON.stringify(this.dataList))
+              this.total = Number(res.data.total)
+              this.dataList.map((item,index) => {
+                  item.publishTime = this.$moment(Number(item.publishTime)).format("YYYY-MM-DD")
+              })
           }
       },
 

src/view/exchange.vue

@@ -48,7 +48,7 @@
 
 <script>
 import {getChannelInformationsRequest, getChannelsRequest, 
-        getDetailRequest} from "../api/data";
+        getChannelSecond} from "../api/data";
 
 export default {
   data () {
@@ -86,7 +86,7 @@ export default {
           let res = await getChannelInformationsRequest({channelId: id})
           if(res.code == 200){
               this.dataList = res.data.records
-              this.total = res.data.total
+              this.total = Number(res.data.total)
           }
       },
 

src/view/km.vue

@@ -66,7 +66,7 @@ export default {
           if(res.code == 200){
               this.titleList = res.data
               console.log("this.titleList:"+JSON.stringify(res.data))
-              if(this.titleList){
+              if(this.titleList && this.titleList[0]){
                 this.getChannelInformationsRequest(this.titleList[0].id)
               }
               
@@ -77,7 +77,7 @@ export default {
           let res = await getChannelInformationsRequest({channelId: id})
           if(res.code == 200){
               this.dataList = res.data.records
-              this.total = res.data.total
+              this.total = Number(res.data.total)
           }
       },
 

src/view/main/main.vue

@@ -120,7 +120,7 @@ export default {
       'handleLogin'
     ]),
     clickItem(index){
-        this.activeIndex = index + 1
+        this.activeIndex = index + 1 + ""
         this.$router.push(this.menuList[index].path)
         this.$forceUpdate()
     },
@@ -168,7 +168,13 @@ export default {
   },
   watch: {
     '$route' (newRoute) {
-      console.log(newRoute)
+    //   console.log(newRoute)
+      this.menuLists.map((item, index) => {
+          if(newRoute.path.indexOf(item.path) > -1){
+              this.activeIndex = index+1+""
+        }
+      })
+      
       this.setBreadCrumb(newRoute)
     }
   },
@@ -220,7 +226,6 @@ export default {
     if(path.indexOf('data')>=0){
       this.activeIndex = '12';
     }
-
   }
 }
 </script>

src/view/member.vue

@@ -42,7 +42,8 @@ export default {
     return {
         titleList: [],
         activeIndex: 0,
-        dataList: []
+        dataList: [],
+        total: 0
     }
   },
   methods: {
@@ -62,7 +63,7 @@ export default {
           if(res.code == 200){
             //   console.log(JSON.stringify(res.data))
               this.titleList = res.data
-              if(this.titleList){
+              if(this.titleList && this.titleList[0]){
                 this.getChannelInformationsRequest(this.titleList[0].id)
               }
               
@@ -73,7 +74,10 @@ export default {
           let res = await getChannelInformationsRequest({channelId: id})
           if(res.code == 200){
               this.dataList = res.data.records
-              console.log("this.dataList:"+JSON.stringify(this.dataList))
+              this.total = Number(res.data.total)
+              this.dataList.map((item,index) => {
+                  item.publishTime = this.$moment(Number(item.publishTime)).format("YYYY-MM-DD")
+              })
           }
       },
 

src/view/news.vue

@@ -64,7 +64,7 @@ export default {
           if(res.code == 200){
             //   console.log(JSON.stringify(res.data))
               this.titleList = res.data
-              if(this.titleList){
+              if(this.titleList && this.titleList[0]){
                 this.getChannelInformationsRequest(this.titleList[0].id)
               }
               

src/view/overview.vue

@@ -22,7 +22,7 @@
           <el-card class="box-card" shadow="never" style="margin: 0 10px; position: relative;" :body-style="{ padding: '0px',height:'418px' }">
             <img :src="imgObj.aboutImg"/>
             <div class="img_info">
-                <span class="img_text">2021中国国际汽车电子高峰论坛将于11月25日在上海举行</span>
+                <span class="img_text">{{imgObj.title}}</span>
             </div>
           </el-card>
         </el-col>
@@ -30,7 +30,7 @@
           <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
             <div slot="header">
               <span><el-divider direction="vertical"></el-divider>新闻资讯</span>
-              <el-button style="float: right; padding: 3px 0;color: #fff;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+              <router-link to="/news" style="float: right; padding: 3px 0;color: #fff;font-size: 12px" type="text">更多&gt;&gt;</router-link>
             </div>
             <div v-for="(item, index) in newsList" :key="index" class="text item">
               {{index+1}}、{{item.title}}
@@ -44,7 +44,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>行业动态</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/trode" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
               <h2>{{hangDamic.title}}</h2>
               <p v-html="hangDamic.content"></p>
@@ -55,7 +55,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>产业政策</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/policy" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
               <div class="list" v-for="(item, index) in chanList" :key="index">
                 <h2 style="display: flex; flex-direction: row">
@@ -74,7 +74,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>合作交流</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/exchange" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
             </el-card>
             <el-card class="box-card" shadow="never" v-for="(item, index) in hezuoList" :key="index"
@@ -88,7 +88,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>知识产权</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/km" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
               <!-- <h2>半导体产业的分工，芯片设计服务公司大有可为</h2>
               <p>回顾历史，半导体产业模式在不断随着市场需求而变化。像一个帝国模式的演变，以1980年作为分界线，往前则是IDM（Integra</p>
@@ -105,7 +105,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>会员产品</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/member" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
               <!-- <h2>半导体产业的分工，芯片设计服务公司大有可为</h2>
               <p>回顾历史，半导体产业模式在不断随着市场需求而变化。像一个帝国模式的演变，以1980年作为分界线，往前则是IDM（Integra</p>
@@ -126,7 +126,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>合作交流</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/exchange" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
               <div class="list" v-for="(item, index) in hezuoList" :key="index">
                 <h2 style="display: flex; flex-direction: row">
@@ -142,7 +142,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>企业认定</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/company" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
               <div class="list" v-for="(item, index) in qiyeList" :key="index">
                 <h2 style="display: flex; flex-direction: row">
@@ -162,7 +162,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>行业管理</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/trode" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
               <div class="list" v-for="(item, index) in hangyeList" :key="index">
                 <h2 style="display: flex; flex-direction: row">
@@ -178,7 +178,7 @@
             <el-card class="box-card" shadow="never" :body-style="{ padding: '0px 20px' }">
               <div slot="header">
                 <span><el-divider direction="vertical"></el-divider>人力资源</span>
-                <el-button style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</el-button>
+                <router-link to="/people" style="float: right; padding: 3px 0;color: #999999;font-size: 12px" type="text">更多&gt;&gt;</router-link>
               </div>
               <div class="list" v-for="(item, index) in renliList" :key="index">
                 <h2 style="display: flex; flex-direction: row">
@@ -284,13 +284,13 @@ export default {
                       // 产业政策
                       this.chanList = res.data.records.slice(0, 4)
                       this.chanList.map((ite) => {
-                          ite.publishTime = this.$moment().format("MM-DD")
+                          ite.publishTime = this.$moment(Number(ite.publishTime)).format("MM-DD")
                       })
                   }else if(weizhi == "E"){
                       // 合作交流
                       this.hezuoList = res.data.records.slice(0, 4)
                     this.hezuoList.map((ite) => {
-                          ite.publishTime = this.$moment().format("MM-DD")
+                          ite.publishTime = this.$moment(Number(ite.publishTime)).format("MM-DD")
                       })
                   }else if(weizhi == "F"){
                       // 知识产权
@@ -304,7 +304,7 @@ export default {
                       // 企业认定
                       this.qiyeList = res.data.records.slice(0, 4)
                       this.qiyeList.map((ite) => {
-                          ite.publishTime = this.$moment().format("MM-DD")
+                          ite.publishTime = this.$moment(Number(ite.publishTime)).format("MM-DD")
                       })
                   }else if(weizhi == "J"){
                       // 行业管理

src/view/people.vue

@@ -42,7 +42,8 @@ export default {
     return {
         titleList: [],
         activeIndex: 0,
-        dataList: []
+        dataList: [],
+        total: 0
     }
   },
   methods: {
@@ -62,7 +63,7 @@ export default {
           if(res.code == 200){
             //   console.log(JSON.stringify(res.data))
               this.titleList = res.data
-              if(this.titleList){
+              if(this.titleList && this.titleList[0]){
                 this.getChannelInformationsRequest(this.titleList[0].id)
               }
               
@@ -73,7 +74,10 @@ export default {
           let res = await getChannelInformationsRequest({channelId: id})
           if(res.code == 200){
               this.dataList = res.data.records
-              console.log("this.dataList:"+JSON.stringify(this.dataList))
+              this.total = Number(res.data.total)
+              this.dataList.map((item,index) => {
+                  item.publishTime = this.$moment(Number(item.publishTime)).format("YYYY-MM-DD")
+              })
           }
       },
 

src/view/policy.vue

@@ -64,7 +64,7 @@ export default {
           if(res.code == 200){
             //   console.log(JSON.stringify(res.data))
               this.titleList = res.data
-              if(this.titleList){
+              if(this.titleList && this.titleList[0]){
                 this.getChannelInformationsRequest(this.titleList[0].id)
               }
               

src/view/trode.vue

@@ -64,7 +64,7 @@ export default {
           if(res.code == 200){
             //   console.log(JSON.stringify(res.data))
               this.titleList = res.data
-              if(this.titleList){
+              if(this.titleList && this.titleList[0]){
                 this.getChannelInformationsRequest(this.titleList[0].id)
               }
               

vue.config.js

@@ -14,6 +14,7 @@ const resolve = dir => {
 const BASE_URL = process.env.NODE_ENV === 'production' ? '/' : '/'
 
 module.exports = {
+    publicPath: './',
   // Project deployment base
   // By default we assume your app will be deployed at the root of a domain,
   // e.g. https://www.my-app.com/