Explorar el Código

init

newStyle
lancer hace 3 años
padre
commit
b3c869ee64
Se han modificado 8 ficheros con 17 adiciones y 6 borrados
  1. +1
    -0
      package.json
  2. +5
    -1
      src/api/modules/api.js
  3. +0
    -1
      src/main.js
  4. +2
    -0
      src/page/check/chose.vue
  5. +2
    -1
      src/page/check/index.vue
  6. +4
    -1
      src/page/index/tags.vue
  7. +1
    -0
      src/page/login/userlogin.vue
  8. +2
    -2
      vue.config.js

+ 1
- 0
package.json Ver fichero

@@ -35,6 +35,7 @@
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-audio-player": "0.0.2", "vue-audio-player": "0.0.2",
"vue-axios": "^2.1.2", "vue-axios": "^2.1.2",
"vue-bus": "^1.2.1",
"vue-clipboard2": "^0.3.0", "vue-clipboard2": "^0.3.0",
"vue-cron": "^1.0.9", "vue-cron": "^1.0.9",
"vue-echarts": "^4.0.1", "vue-echarts": "^4.0.1",


+ 5
- 1
src/api/modules/api.js Ver fichero

@@ -306,7 +306,11 @@ export function findHouseByUser(query) {
return request({ return request({
url: '/autoSR/zkhouse/findHouseByUser', url: '/autoSR/zkhouse/findHouseByUser',
method:'get', method:'get',
params:query
params:{
agentId:localStorage.getItem('agentId'),
orgCode:localStorage.getItem('orgCode'),
...query
}
}) })
} }
// 楼盘绑定 // 楼盘绑定


+ 0
- 1
src/main.js Ver fichero

@@ -44,7 +44,6 @@ Vue.use(AVUE, {
size: 'small', size: 'small',
menuType: 'text' menuType: 'text'
}) })

// 注册全局容器 // 注册全局容器
Vue.component('basicContainer', basicContainer) Vue.component('basicContainer', basicContainer)




+ 2
- 0
src/page/check/chose.vue Ver fichero

@@ -355,9 +355,11 @@ export default {
localStorage.setItem("houseId", item.id); localStorage.setItem("houseId", item.id);
} }
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
localStorage.setItem('allClose',true)
}, },
goback() { goback() {
this.$router.back(); this.$router.back();
localStorage.setItem('allClose',false)
}, },
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);


+ 2
- 1
src/page/check/index.vue Ver fichero

@@ -87,6 +87,7 @@ export default {
// 对此进行判断,获取this.$route的参数,如果没有则退出登陆,有的话就返回之前的页面 // 对此进行判断,获取this.$route的参数,如果没有则退出登陆,有的话就返回之前的页面
if (this.backFlag) { if (this.backFlag) {
this.$router.back(); this.$router.back();
localStorage.setItem('allClose',false)
} else { } else {
this.$confirm("是否退出系统, 是否继续?", "提示", { this.$confirm("是否退出系统, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@@ -240,7 +241,7 @@ export default {
// 楼盘后台 // 楼盘后台
// this.$router.push({ path: "/chose", query: { flag: 3 } }); // this.$router.push({ path: "/chose", query: { flag: 3 } });
} }
localStorage.setItem('allClose',true)
// this.$router.push({ path: "/chose" }); // this.$router.push({ path: "/chose" });
}, },
}, },


+ 4
- 1
src/page/index/tags.vue Ver fichero

@@ -69,12 +69,15 @@
}, },
contextmenuFlag() { contextmenuFlag() {
window.addEventListener('mousedown', this.watchContextmenu) window.addEventListener('mousedown', this.watchContextmenu)
}
},
}, },
created() { created() {
}, },
mounted() { mounted() {
this.setActive() this.setActive()
if(localStorage.getItem('allClose')){
this.closeAllTags()
}
}, },
computed: { computed: {
...mapGetters(['tagWel', 'tagList', 'tag', 'website']), ...mapGetters(['tagWel', 'tagList', 'tag', 'website']),


+ 1
- 0
src/page/login/userlogin.vue Ver fichero

@@ -119,6 +119,7 @@ export default {
this.$store.dispatch("LoginByUsername", this.loginForm).then(() => { this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
// this.$router.push({ path: this.tagWel.value }); // this.$router.push({ path: this.tagWel.value });
this.info = getStore({ name: "userInfo" }); this.info = getStore({ name: "userInfo" });
localStorage.setItem('allClose',false)
that.$api.api.getTab().then((res) => { that.$api.api.getTab().then((res) => {
// console.log(res) // console.log(res)
// 循环数组,给定各种标志 // 循环数组,给定各种标志


+ 2
- 2
vue.config.js Ver fichero

@@ -3,11 +3,11 @@
* https://cli.vuejs.org/zh/config/ * https://cli.vuejs.org/zh/config/
*/ */
// const url = 'http://pigx-gateway' // const url = 'http://pigx-gateway'
const url = 'http://39.97.167.65:9999' //测试
// const url = 'http://39.97.167.65:9999' //测试
// const url = 'http://192.168.31.169:9999' //长龙 // const url = 'http://192.168.31.169:9999' //长龙
// const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.134:9999' //嘉豪
// const url = 'http://192.168.31.100:9999' //王笑 // const url = 'http://192.168.31.100:9999' //王笑
// const url = 'http://jrcd6b.natappfree.cc' //王笑
const url = 'http://jrcd6b.natappfree.cc' //王笑


const CompressionWebpackPlugin = require('compression-webpack-plugin') const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = ['js', 'css'] const productionGzipExtensions = ['js', 'css']


Cargando…
Cancelar
Guardar