diff --git a/src/App.vue b/src/App.vue index 63caa01..543e6f3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ export default { // renderDom: "#app", // resize: true // }, false) // 可关闭控制台运行提示输出 - //! 检查 getselfInfo + //! 检查 external的 getselfInfo /* npm run build:prod 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 移动到文件夹下 unzip ggfw-dangan.zip 解压 + + + + + + + */ }, }; diff --git a/src/permission.js b/src/permission.js index 4794a00..6c6d268 100644 --- a/src/permission.js +++ b/src/permission.js @@ -34,6 +34,14 @@ router.beforeEach((to, from, next) => { // from.meta.keepAlive = true // } 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) } if (to.query.token) { diff --git a/src/utils/isCpbqhunru.js b/src/utils/isCpbqhunru.js new file mode 100644 index 0000000..74f6896 --- /dev/null +++ b/src/utils/isCpbqhunru.js @@ -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', {}) + } + } + } +}; \ No newline at end of file diff --git a/src/views/productsMsg/components/healthSon/health.vue b/src/views/productsMsg/components/healthSon/health.vue index f3a3456..b40936f 100644 --- a/src/views/productsMsg/components/healthSon/health.vue +++ b/src/views/productsMsg/components/healthSon/health.vue @@ -15,8 +15,8 @@ - +
重置 @@ -122,7 +122,7 @@ import qixie from "@/views/components/AdvancedSearch/qixie.vue"; export default { - components: { MapCars, AdvancedSearch,qixie }, + components: { MapCars, AdvancedSearch, qixie }, mixins: [mySortChange], data() { return { @@ -205,7 +205,7 @@ export default { jgjzccf: "",//结构及组成或主要组成部 cplx: "", zcrszshi: "",//所在地市 - cpbq:"",//标签 + cpbq: "",//标签 area: this.$store.getters.usersort }, @@ -284,7 +284,6 @@ export default { created() { }, methods: { - // mySortChange(e) { // this.sortableshowDaty = e // this.form1.pzrqSort = "" @@ -425,7 +424,6 @@ export default { syhcrq: "", // 注册证状态/备案凭证状态 ppztDm: 1,// 注册证状态/备案凭证状态 - ylqxjgtz: '', //结构特征 1有源 2 无源 sfCxcp: '',// 是否为创新产品 1是 2 否 sfYxz: "",// 是否为优先注册产品 1是 2 否 @@ -434,7 +432,7 @@ export default { jgjzccf: "",//结构及组成或主要组成部 cplx: "", zcrszshi: "",//所在地市 - cpbq:"",//标签 + cpbq: "",//标签 area: this.$store.getters.usersort }; this.form = { diff --git a/src/views/productsMsg/components/productInfo.vue b/src/views/productsMsg/components/productInfo.vue index c321c91..05f1046 100644 --- a/src/views/productsMsg/components/productInfo.vue +++ b/src/views/productsMsg/components/productInfo.vue @@ -43,13 +43,13 @@ export default { }, activated() { this.$nextTick(() => { - 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 + // 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 + }&token=${localStorage.getItem("MSSM-LIAONING__TOKEN")}&bah=${this.$route.query.bah}` let dom = document.getElementsByClassName("ifram-view"); let height = dom[0].getBoundingClientRect(); diff --git a/vue.config.js b/vue.config.js index f2f5557..8932084 100644 --- a/vue.config.js +++ b/vue.config.js @@ -42,16 +42,16 @@ module.exports = { open: true, proxy: { "/configApi": { - target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api", - // target: "http://192.168.0.107:9023/ggfw-api", - // target: "http://192.168.0.111:9023/ggfw-api", + // target: "https://dev-mssm-liaoning.lesdev.cn/ggfw-api", + target: "http://172.24.21.7/ggfw-api", changeOrigin: true, pathRewrite: { "^/configApi": "", }, }, "/api": { - target: "https://dev-mssm-liaoning.lesdev.cn", + // target: "https://dev-mssm-liaoning.lesdev.cn", + target: "http://172.24.21.7", changeOrigin: true, pathRewrite: { ["api"]: "",