档案更改

lijinlong
李劲龙 10 months ago
parent a2744331e5
commit 86ad954f5e

@ -33,7 +33,7 @@ export default {
// renderDom: "#app", // renderDom: "#app",
// resize: true // resize: true
// }, false) // // }, false) //
//! getselfInfo //! external getselfInfo
/* npm run build:prod /* npm run build:prod
sudo mv ggfw-dangan.zip /usr/share/nginx/html/ggfw-dangan MSSM-Dev 文件夹下 移动压缩包到 ggfw文件夹下 sudo mv ggfw-dangan.zip /usr/share/nginx/html/ggfw-dangan MSSM-Dev 文件夹下 移动压缩包到 ggfw文件夹下
@ -41,6 +41,13 @@ export default {
cd /usr/share/nginx/html/ggfw-dangan 移动到文件夹下 cd /usr/share/nginx/html/ggfw-dangan 移动到文件夹下
unzip ggfw-dangan.zip 解压 unzip ggfw-dangan.zip 解压
*/ */
}, },
}; };

@ -34,6 +34,14 @@ router.beforeEach((to, from, next) => {
// from.meta.keepAlive = true // from.meta.keepAlive = true
// } // }
if(JSON.stringify(to.query) != '{}'){ if(JSON.stringify(to.query) != '{}'){
console.log(777,to.query);
for (const key in to.query) {
if(key == "cpbq"){
if(to.query[key]){
to.query[key] = to.query[key].split(",")
}
}
}
store.commit('ADD_QUERY',to.query) store.commit('ADD_QUERY',to.query)
} }
if (to.query.token) { if (to.query.token) {

@ -0,0 +1,20 @@
export const isCpbqhunru = {
created() {
console.log('标签混入');
},
methods: {
isCpbqhunru() {
console.log(123, this.$store.state.tags.myquery);
if (JSON.stringify(this.$store.state.tags.myquery) != '{}') {
for (let i in this.form1) {
if (this.form1[i] == "") {
console.log("this.form1[i]",i);
console.log("this.$store.state.tags.myquery[i]",this.$store.state.tags.myquery[i]);
this.form1[i] = this.$store.state.tags.myquery[i] || "";
}
}
this.$store.commit('ADD_QUERY', {})
}
}
}
};

@ -15,8 +15,8 @@
</div> </div>
<el-form ref="form1" :model="form1"> <el-form ref="form1" :model="form1">
<qixie :form1="form1" @reset="reset" @searchList="searchList" <qixie :form1="form1" @reset="reset" @searchList="searchList" @collapsechange="collapsechange"
@collapsechange="collapsechange" @isclear="isclear" @mydataFn="mydataFn" ref="mydata"></qixie> @isclear="isclear" @mydataFn="mydataFn" ref="mydata"></qixie>
<el-row> <el-row>
<div class="footBox" v-show="bthshow"> <div class="footBox" v-show="bthshow">
<el-button icon="el-icon-refresh-left" @click="reset"></el-button> <el-button icon="el-icon-refresh-left" @click="reset"></el-button>
@ -122,7 +122,7 @@ import qixie from "@/views/components/AdvancedSearch/qixie.vue";
export default { export default {
components: { MapCars, AdvancedSearch,qixie }, components: { MapCars, AdvancedSearch, qixie },
mixins: [mySortChange], mixins: [mySortChange],
data() { data() {
return { return {
@ -205,7 +205,7 @@ export default {
jgjzccf: "",// jgjzccf: "",//
cplx: "", cplx: "",
zcrszshi: "",// zcrszshi: "",//
cpbq:"",// cpbq: "",//
area: this.$store.getters.usersort area: this.$store.getters.usersort
}, },
@ -284,7 +284,6 @@ export default {
created() { created() {
}, },
methods: { methods: {
// mySortChange(e) { // mySortChange(e) {
// this.sortableshowDaty = e // this.sortableshowDaty = e
// this.form1.pzrqSort = "" // this.form1.pzrqSort = ""
@ -425,7 +424,6 @@ export default {
syhcrq: "", syhcrq: "",
// / // /
ppztDm: 1,// / ppztDm: 1,// /
ylqxjgtz: '', // 1 2 ylqxjgtz: '', // 1 2
sfCxcp: '',// 1 2 sfCxcp: '',// 1 2
sfYxz: "",// 1 2 sfYxz: "",// 1 2
@ -434,7 +432,7 @@ export default {
jgjzccf: "",// jgjzccf: "",//
cplx: "", cplx: "",
zcrszshi: "",// zcrszshi: "",//
cpbq:"",// cpbq: "",//
area: this.$store.getters.usersort area: this.$store.getters.usersort
}; };
this.form = { this.form = {

@ -43,13 +43,13 @@ export default {
}, },
activated() { activated() {
this.$nextTick(() => { this.$nextTick(() => {
this.Url = `${location.origin}/ggfw-iframe/#/productinformation?type=${this.$route.query.type // this.Url = `${location.origin}/ggfw-iframe/#/productinformation?type=${this.$route.query.type
}&flag=${this.$route.query.flag}&data=${this.$route.query.data
}&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}`
// this.Url = `http://localhost:81?type=${this.$route.query.type
// }&flag=${this.$route.query.flag}&data=${this.$route.query.data // }&flag=${this.$route.query.flag}&data=${this.$route.query.data
// }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}` // }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}`
this.Url = `http://localhost:81?type=${this.$route.query.type
}&flag=${this.$route.query.flag}&data=${this.$route.query.data
}&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}`
let dom = document.getElementsByClassName("ifram-view"); let dom = document.getElementsByClassName("ifram-view");
let height = dom[0].getBoundingClientRect(); let height = dom[0].getBoundingClientRect();

@ -42,16 +42,16 @@ module.exports = {
open: true, open: true,
proxy: { proxy: {
"/configApi": { "/configApi": {
target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api", // target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api",
// target: "http://192.168.0.107:9023/ggfw-api", target: "http://172.24.21.7/ggfw-api",
// target: "http://192.168.0.111:9023/ggfw-api",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/configApi": "", "^/configApi": "",
}, },
}, },
"/api": { "/api": {
target: "https://dev-mssm-liaoning.lesdev.cn", // target: "https://dev-mssm-liaoning.lesdev.cn",
target: "http://172.24.21.7",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
["api"]: "", ["api"]: "",

Loading…
Cancel
Save