Skip to content

F
founder_vue
Commit 1b36f1e6 by lp784568205
Options

Merge branch 'dev_xzeq_xz' of http://47.92.108.28/changchao/founder_vue into dev_xzeq_xz

parents 74043371 b6ef47f3
Showing with 67 additions and 29 deletions
package-lock.json
...@@ -1884,7 +1884,7 @@ ...@@ -1884,7 +1884,7 @@
"dev": true "dev": true
}, },
"vue-loader-v16": { "vue-loader-v16": {
"version": "npm:vue-loader@16.8.3", "version": "npm:vue-loader-v16@16.8.3",
"resolved": "https://r.cnpmjs.org/vue-loader/download/vue-loader-16.8.3.tgz", "resolved": "https://r.cnpmjs.org/vue-loader/download/vue-loader-16.8.3.tgz",
"integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=", "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=",
"dev": true, "dev": true,
...@@ -7120,10 +7120,9 @@ ...@@ -7120,10 +7120,9 @@
} }
}, },
"js-base64": { "js-base64": {
"version": "2.6.4", "version": "3.7.2",
"resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1599897523811&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz", "resolved": "https://registry.npmmirror.com/js-base64/download/js-base64-3.7.2.tgz",
"integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=", "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
"dev": true
}, },
"js-cookie": { "js-cookie": {
"version": "2.2.1", "version": "2.2.1",
...@@ -10424,7 +10423,6 @@ ...@@ -10424,7 +10423,6 @@
"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
"dev": true, "dev": true,
"requires": { "requires": {
"js-base64": "^2.1.8",
"source-map": "^0.4.2" "source-map": "^0.4.2"
}, },
"dependencies": { "dependencies": {
......
src/api/base.js
...@@ -32,6 +32,7 @@ if ( ...@@ -32,6 +32,7 @@ if (
base.alyIP8 = 'http://39.99.155.173:9003' // base.alyIP8 = 'http://39.99.155.173:9003' //
base.alyIP9 = 'http://47.92.225.109:8347' // base.alyIP9 = 'http://47.92.225.109:8347' //
base.alyIP13 = '/apiXssp' // 线索审批管理平台
...@@ -46,6 +47,7 @@ if ( ...@@ -46,6 +47,7 @@ if (
// base.alyIP9 = 'http://10.184.14.193:9005' // base.alyIP9 = 'http://10.184.14.193:9005'
// base.alyIP10 = 'http://10.184.14.193:9001' // base.alyIP10 = 'http://10.184.14.193:9001'
// base.alyIP11 = 'http://74.6.54.153:8004' // base.alyIP11 = 'http://74.6.54.153:8004'
base.alyIP12 = 'http://xzxt-zhyy.dsj.xz:8052'
} }
export default base; export default base;
src/components/SearchGraph.vue
...@@ -238,19 +238,19 @@ export default { ...@@ -238,19 +238,19 @@ export default {
if (boo) { if (boo) {
if (this.pages == "ajhx") { if (this.pages == "ajhx") {
//let path = `http://39.99.155.173:8003/queryAjdaxxs?asjbh=${this.form.zjhm}`; //let path = `http://39.99.155.173:8003/queryAjdaxxs?asjbh=${this.form.zjhm}`;
let path = `${base.alyIP5}/queryAjdaxxs?asjbh=${this.form.zjhm}`; let path = `${base.alyIP12}/queryAjdaxxs?asjbh=${this.form.zjhm}`;
window.open(path, "_blank"); window.open(path, "_blank");
} else if (this.pages == "hxgc") { } else if (this.pages == "hxgc") {
//let path = `http://39.99.155.173:9002/#/rydaIndex/ryGl?zjhm=${this.form.asjbh}`; //let path = `http://39.99.155.173:9002/#/rydaIndex/ryGl?zjhm=${this.form.asjbh}`;
let path = `${base.alyIP6}/#/rydaIndex/ryGl?zjhm=${this.form.asjbh}`; let path = `${base.alyIP12}/#/rydaIndex/ryGl?zjhm=${this.form.asjbh}`;
window.open(path, "_blank"); window.open(path, "_blank");
} else if (this.pages == "clhx") { } else if (this.pages == "clhx") {
// let path = `http://39.99.155.173:9002/#/cardaIndex?cphm=${this.form.cphm}`; // let path = `http://39.99.155.173:9002/#/cardaIndex?cphm=${this.form.cphm}`;
let path = `${base.alyIP6}/#/cardaIndex?cphm=${this.form.cphm}`; let path = `${base.alyIP12}/#/cardaIndex?cphm=${this.form.cphm}`;
window.open(path, "_blank"); window.open(path, "_blank");
} else if (this.pages == "queryTdyp") { } else if (this.pages == "queryTdyp") {
// let path = `http://39.99.155.173:9003/#/ajbzDetail?asjbh=${this.form.asjbh}`; // let path = `http://39.99.155.173:9003/#/ajbzDetail?asjbh=${this.form.asjbh}`;
let path = `${base.alyIP8}/#/ajbzDetail?asjbh=${this.form.asjbh}`; let path = `${base.alyIP12}/#/ajbzDetail?asjbh=${this.form.asjbh}`;
window.open(path, "_blank"); window.open(path, "_blank");
} else if (this.pages == "querySdtdyp") { } else if (this.pages == "querySdtdyp") {
// let path = `http://39.99.155.173:9003/#/ajbzDetail?asjbh=${this.form.asjbh}`; // let path = `http://39.99.155.173:9003/#/ajbzDetail?asjbh=${this.form.asjbh}`;
...@@ -258,7 +258,7 @@ export default { ...@@ -258,7 +258,7 @@ export default {
window.open(path, "_blank"); window.open(path, "_blank");
} else if (this.pages == "queryXsyp") { } else if (this.pages == "queryXsyp") {
// let path = `http://47.92.225.109:8347/#/JumpPage/admin/admin/${this.form.asjbh}`; // let path = `http://47.92.225.109:8347/#/JumpPage/admin/admin/${this.form.asjbh}`;
let path = `${base.alyIP9}/#/JumpPage/admin/admin/${this.form.asjbh}`; let path = `${base.alyIP12}/#/jumppage/${this.form.asjbh}`;
window.open(path, "_blank"); window.open(path, "_blank");
} else { } else {
let newParams = this.objectAssignment(this.newParams); let newParams = this.objectAssignment(this.newParams);
......
src/router/index.js
...@@ -49,6 +49,7 @@ import brainPhotoXxxxRoutes from "./modules/brainPhotoXxxx"; ...@@ -49,6 +49,7 @@ import brainPhotoXxxxRoutes from "./modules/brainPhotoXxxx";
import zdsswpRoutes from "./modules/zdsswp"; import zdsswpRoutes from "./modules/zdsswp";
import tjpgRoutes from "./modules/tjpg"; import tjpgRoutes from "./modules/tjpg";
import jcyjzxt from "./modules/jcyjzxt"; import jcyjzxt from "./modules/jcyjzxt";
import xsspPtRoutes from "./modules/xsspPt";
import rwddRoutes from "./modules/rwddzx"; import rwddRoutes from "./modules/rwddzx";
...@@ -76,6 +77,7 @@ const mainRouters = [ ...@@ -76,6 +77,7 @@ const mainRouters = [
...indexRoutes, ...indexRoutes,
...zdxxRoutes, ...zdxxRoutes,
...zdsswpRoutes, ...zdsswpRoutes,
...xsspPtRoutes,
sfRoutes, sfRoutes,
...xxtkRoutes, ...xxtkRoutes,
hxgcRoutes, hxgcRoutes,
......
src/router/modules/xsspPt.js 0 → 100644
import menuLayout from "@/layout/menuLayout.vue";
const menuLayouts = [
{
path: "/queryJz",
name: "queryJz",
meta: {
title: '卷宗列表'
},
component: () => import("@/views/xsspPt/jzLb/queryJzlb.vue")
},
];
export default [{
path: "/right",
component: menuLayout,
children: [...menuLayouts]
},
];
\ No newline at end of file
src/views/hbyprw/hbyprw/queryHbyp.vue
...@@ -812,14 +812,14 @@ export default { ...@@ -812,14 +812,14 @@ export default {
}, },
], ],
}, },
// { {
// id: "queryXswj", id: "queryXswj",
// label: "线索挖掘", label: "线索挖掘",
// newAuth: "M01", newAuth: "M01",
// index: "queryXswj", index: "queryXswj",
// className: "iconfont icongongnengfuwu", className: "iconfont icongongnengfuwu",
// hasChildren: false, hasChildren: false,
// }, },
// { // {
// id: "queryYpzl", // id: "queryYpzl",
// label: "研判指令", // label: "研判指令",
......
src/views/queryRyhx/queryAjhx.vue
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
placeholder: "请输入案件编号", placeholder: "请输入案件编号",
col: "3", col: "3",
rules: [ rules: [
{ required: true, message: "请输入证件号码", trigger: "blur" }, { required: true, message: "请输入案件编号", trigger: "blur" },
], ],
}, },
], ],
......
src/views/xshb/xsbk/adjustXsbks.vue
...@@ -342,7 +342,7 @@ export default { ...@@ -342,7 +342,7 @@ export default {
this.propFormField[0].data.forEach((el) => { this.propFormField[0].data.forEach((el) => {
let value = ""; let value = "";
if (el.id == "sqrLxdh") value = userInfo.phone; if (el.id == "sqrLxdh") value = userInfo.phone;
if (el.id == "sqrJh") value = userInfo.account; if (el.id == "sqrJh") value = userInfo.policemanid;
if (el.id == "sqrZjhm") value = userInfo.identitycard; if (el.id == "sqrZjhm") value = userInfo.identitycard;
if (el.id == "sqrXm") value = userInfo.realname; if (el.id == "sqrXm") value = userInfo.realname;
if (el.id == "bkdxLxdm") value = this.$route.query.bkdxLxdm ? this.$route.query.bkdxLxdm : ''; if (el.id == "bkdxLxdm") value = this.$route.query.bkdxLxdm ? this.$route.query.bkdxLxdm : '';
......
src/views/ztyp/qzlb.vue
...@@ -89,7 +89,8 @@ export default { ...@@ -89,7 +89,8 @@ export default {
disabled: false, disabled: false,
}, },
], ],
obj: '', obj: "",
objLength: [],
}; };
}, },
created() { created() {
...@@ -99,19 +100,26 @@ export default { ...@@ -99,19 +100,26 @@ export default {
}, },
methods: { methods: {
selectionChange(row) { selectionChange(row) {
debugger debugger;
// let obj = '' // let obj = ''
this.obj = row.map( item => { this.objLength = row;
return item.qzbh this.obj = row
}).join(',') .map((item) => {
return item.qzbh;
})
.join(",");
}, },
ksh() { ksh() {
this.toInfor(this.obj) if (this.objLength.length >= 2) {
this.toInfor(this.obj);
} else {
this.$message.error("请选择两条数据或者两条以上数据!");
}
}, },
toInfor(data) { toInfor(data) {
let params = { let params = {
qzbhs: data, qzbhs: data,
type: '1', type: "1",
}; };
let obj = { let obj = {
childrenXhrStr: "/apiXzxtGaw/ksh/getQzByQzbhs", childrenXhrStr: "/apiXzxtGaw/ksh/getQzByQzbhs",
...@@ -187,7 +195,7 @@ export default { ...@@ -187,7 +195,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/assets/styles/rightContent.scss"; @import "@/assets/styles/rightContent.scss";
.hbyp { .hbyp {
margin-left: 15px; margin-left: 15px;
font-size: 14px; font-size: 14px;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
......
vue.config.js
...@@ -59,6 +59,7 @@ module.exports = { ...@@ -59,6 +59,7 @@ module.exports = {
proxy: { proxy: {
"/apialy": { "/apialy": {
target: "http://39.99.155.173:9022", //西藏: https://155.1.33.10:20010/ 阿里云：http://39.99.155.173:9022 target: "http://39.99.155.173:9022", //西藏: https://155.1.33.10:20010/ 阿里云：http://39.99.155.173:9022
// target: "http://192.168.1.108:8762", //西藏: https://155.1.33.10:20010/ 阿里云：http://39.99.155.173:9022
// ws: true, // ws: true,
changeOrigin: true, changeOrigin: true,
secure: false, secure: false,
...@@ -106,6 +107,14 @@ module.exports = { ...@@ -106,6 +107,14 @@ module.exports = {
'^/apiXzxtGaw': '/' '^/apiXzxtGaw': '/'
} }
}, },
"/apiXssp": {
target: "https://39.99.155.173:8006/", // 线索审批管理平台
changeOrigin: true,
secure: false,
pathRewrite: {
"^/apiXssp": "/"
}
},
}, },
}, },
css: { css: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment