master V1.0.2
yujialong 4 months ago
parent e1c1cddf9c
commit b6b0fdc88f
  1. 4
      src/layouts/navbar/index.vue
  2. 9
      src/mixins/page/index.js
  3. 4
      src/pages/contactUs/index.vue
  4. 6
      src/pages/devHistory/index.vue

@ -53,12 +53,13 @@ export default {
}, },
watch: { watch: {
'$route' () { '$route' () {
const { siteId } = this.$route.query const { siteId, id } = this.$route.query
// siteIdstore // siteIdstore
if (siteId && (siteId != this.site || this.lastSite != this.site)) { if (siteId && (siteId != this.site || this.lastSite != this.site)) {
this.getColumn() this.getColumn()
this.setSite(siteId) this.setSite(siteId)
} }
if (id) this.active = id
this.lastSite = siteId this.lastSite = siteId
this.handleColor() this.handleColor()
}, },
@ -150,7 +151,6 @@ export default {
// //
jump (id) { jump (id) {
id = id || this.otherMenus[0].id id = id || this.otherMenus[0].id
this.active = id
this.getPath(this.otherMenus, id) this.getPath(this.otherMenus, id)
this.getPath(this.menus, id) this.getPath(this.menus, id)
this.columnTo(this.toItem) this.columnTo(this.toItem)

@ -14,6 +14,15 @@ export default {
return this.$route.query.siteId || this.$store.state.content.site return this.$route.query.siteId || this.$store.state.content.site
} }
}, },
watch: {
'$route.query' () {
const { id } = this.$route.query
if (id) {
this.id = id
this.getInfo()
}
}
},
mounted () { mounted () {
this.getInfo && this.id && this.getColumnInfo() this.getInfo && this.id && this.getColumnInfo()
}, },

@ -18,8 +18,8 @@
</div> </div>
<img :src="modules[2].form.pic" alt="" class="pic"> <img :src="modules[2].form.pic" alt="" class="pic">
<el-table :data="modules[3].list" class="patent-table" ref="table" stripe header-align="center"> <el-table :data="modules[3].list" class="patent-table" ref="table" stripe header-align="center">
<el-table-column prop="dep" label="部门" align="center" min-width="250"></el-table-column> <el-table-column prop="dep" label="部门" align="center" min-width="150"></el-table-column>
<el-table-column prop="contacts" label="联系人" align="center" min-width="100"></el-table-column> <!-- <el-table-column prop="contacts" label="联系人" align="center" min-width="100"></el-table-column> -->
<el-table-column prop="phone" align="center" min-width="150"> <el-table-column prop="phone" align="center" min-width="150">
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<img src="@/assets/images/tel1.png" alt=""> 电话 <img src="@/assets/images/tel1.png" alt=""> 电话

@ -31,12 +31,6 @@ export default {
}; };
}, },
watch: {
'$route.query' () {
this.id = this.$route.query.id
this.getInfo()
}
},
mounted () { mounted () {
new WOW().init(); new WOW().init();
}, },

Loading…
Cancel
Save