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 551 additions and 29 deletions
package-lock.json
......@@ -1884,7 +1884,7 @@
"dev": true
},
"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",
"integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=",
"dev": true,
......@@ -7120,10 +7120,9 @@
}
},
"js-base64": {
"version": "2.6.4",
"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",
"integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=",
"dev": true
"version": "3.7.2",
"resolved": "https://registry.npmmirror.com/js-base64/download/js-base64-3.7.2.tgz",
"integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
},
"js-cookie": {
"version": "2.2.1",
......@@ -10424,7 +10423,6 @@
"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
"dev": true,
"requires": {
"js-base64": "^2.1.8",
"source-map": "^0.4.2"
},
"dependencies": {
......
src/api/base.js
......@@ -32,6 +32,7 @@ if (
base.alyIP8 = 'http://39.99.155.173:9003' //
base.alyIP9 = 'http://47.92.225.109:8347' //
base.alyIP13 = '/apiXssp' // 线索审批管理平台
......@@ -46,6 +47,7 @@ if (
// base.alyIP9 = 'http://10.184.14.193:9005'
// base.alyIP10 = 'http://10.184.14.193:9001'
// base.alyIP11 = 'http://74.6.54.153:8004'
base.alyIP12 = 'http://xzxt-zhyy.dsj.xz:8052'
}
export default base;
src/components/SearchGraph.vue
......@@ -238,19 +238,19 @@ export default {
if (boo) {
if (this.pages == "ajhx") {
//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");
} else if (this.pages == "hxgc") {
//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");
} else if (this.pages == "clhx") {
// 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");
} else if (this.pages == "queryTdyp") {
// 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");
} else if (this.pages == "querySdtdyp") {
// let path = `http://39.99.155.173:9003/#/ajbzDetail?asjbh=${this.form.asjbh}`;
......@@ -258,7 +258,7 @@ export default {
window.open(path, "_blank");
} else if (this.pages == "queryXsyp") {
// 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");
} else {
let newParams = this.objectAssignment(this.newParams);
......
src/router/index.js
......@@ -49,6 +49,7 @@ import brainPhotoXxxxRoutes from "./modules/brainPhotoXxxx";
import zdsswpRoutes from "./modules/zdsswp";
import tjpgRoutes from "./modules/tjpg";
import jcyjzxt from "./modules/jcyjzxt";
import xsspPtRoutes from "./modules/xsspPt";
import rwddRoutes from "./modules/rwddzx";
......@@ -76,6 +77,7 @@ const mainRouters = [
...indexRoutes,
...zdxxRoutes,
...zdsswpRoutes,
...xsspPtRoutes,
sfRoutes,
...xxtkRoutes,
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 {
},
],
},
// {
// id: "queryXswj",
// label: "线索挖掘",
// newAuth: "M01",
// index: "queryXswj",
// className: "iconfont icongongnengfuwu",
// hasChildren: false,
// },
{
id: "queryXswj",
label: "线索挖掘",
newAuth: "M01",
index: "queryXswj",
className: "iconfont icongongnengfuwu",
hasChildren: false,
},
// {
// id: "queryYpzl",
// label: "研判指令",
......
src/views/queryRyhx/queryAjhx.vue
......@@ -28,7 +28,7 @@ export default {
placeholder: "请输入案件编号",
col: "3",
rules: [
{ required: true, message: "请输入证件号码", trigger: "blur" },
{ required: true, message: "请输入案件编号", trigger: "blur" },
],
},
],
......
src/views/xshb/xsbk/adjustXsbks.vue
......@@ -342,7 +342,7 @@ export default {
this.propFormField[0].data.forEach((el) => {
let value = "";
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 == "sqrXm") value = userInfo.realname;
if (el.id == "bkdxLxdm") value = this.$route.query.bkdxLxdm ? this.$route.query.bkdxLxdm : '';
......
src/views/xsspPt/jzLb/queryJzlb.vue 0 → 100644
<template>
<div class="Content">
<right-content
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData"
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
ref="rightContent"
>
<!-- <template #listOperation="scope">
<span class="hbyps" @click="add(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="toXdzl(scope.scope)">下达指令</span>
<span
v-if="scope.scope.row.sfkxg == 1"
class="hbyp"
@click="edit(scope.scope)"
>修改</span
>
<span
v-if="scope.scope.row.sfksc == 1"
class="hbyp"
@click="dele(scope.scope)"
>删除</span
>
</template> -->
</right-content>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
export default {
name: "queryHbyp",
components: {
rightContent,
},
data() {
return {
header: "线索审批管理平台",
pageBs: "queryJz",
cxFormData: {
limit: 10,
page: 1,
},
cxQueryField: [
{
name: "研判任务分类",
id: "yprwfldm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
value: "",
col: "3",
codeOptions: [],
codeTree: "CODE_YPRWFLDM",
},
{
name: "截止日期",
id: "jzrqStart",
id2: "jzrqEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "是否分配",
id: "sffpPdbz",
type: "radio",
value: "1",
placeholder: "",
col: "3",
radioData: [
{ label: "否", val: "0" },
{ label: "是", val: "1" },
],
},
{
name: "分配时间",
id: "fpsjStart",
id2: "fpsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "接收人姓名",
id: "jsrXm",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
{
name: "是否认领",
id: "sfrlPdbz",
type: "radio",
value: "1",
placeholder: "",
col: "3",
radioData: [
{ label: "未认领", val: "0" },
{ label: "认领", val: "1" },
{ label: "退回", val: "2" },
],
},
{
name: "认领时间",
id: "rlsjStart",
id2: "rlsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "主办人姓名",
id: "zbrXm",
type: "text",
value: "",
placeholder: "请输入",
col: "3",
},
{
name: "交接时间",
id: "jjsjStart",
id2: "jjsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "是否办结",
id: "sfbjPdbz",
type: "radio",
value: "1",
placeholder: "",
col: "3",
radioData: [
{ label: "否", val: "0" },
{ label: "是", val: "1" },
],
},
{
name: "办结时间",
id: "bjsjStart",
id2: "bjsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "登记时间",
id: "djsjStart",
id2: "djsjEnd",
type: "zdyDate",
value: "",
col: "3",
},
],
cxDefaultFormThead: [
{
label: "信息主键编号",
toInfor: true,
prop: "xxzjbh",
width: "250",
},
{
label: "研判任务分类",
prop: "yprwfldmStr",
width: "200",
},
{
label: "当前工作简要情况",
prop: "dqgzJyqk",
width: "200",
},
{
label: "工作要求简要情况",
prop: "gzyqJyqk",
width: "200",
},
{
label: "工作目标简要情况",
prop: "gzmbJyqk",
width: "200",
},
{
label: "工作期限",
prop: "gzsx",
width: "200",
},
{
label: "截止日期",
prop: "jzrq",
width: "200",
},
// {
// label: "是否分配",
// prop: "sffpStr",
// width: "200",
// },
// {
// label: "分配时间",
// prop: "fpsj",
// width: "200",
// },
// {
// label: "接收人姓名",
// prop: "jsrXm",
// width: "200",
// },
{
label: "是否专业研判",
prop: "sfzyypStr",
width: "200",
},
{
label: "是否快速审批",
prop: "sfksspStr1",
width: "200",
},
// {
// label: "接收人身份证号",
// prop: "jsrGmsfhm",
// width: "200",
// },
// {
// label: "接收人用户组号",
// prop: "jsrYhz",
// width: "200",
// },
// {
// label: "是否认领",
// prop: "sfrlStr",
// width: "200",
// },
// {
// label: "认领时间",
// prop: "rlsj",
// width: "200",
// },
{
label: "主办人姓名",
prop: "zbrXm",
width: "200",
},
{
label: "主办人身份证号",
prop: "zbrGmsfhm",
width: "200",
},
{
label: "主办人用户组号",
prop: "zbrYhz",
width: "200",
},
{
label: "退回原因",
prop: "thyyJyqk",
width: "200",
},
// {
// label: "是否交接",
// prop: "sfjjStr",
// width: "200",
// },
// {
// label: "交接原因",
// prop: "jjyyJyqk",
// width: "200",
// },
// {
// label: "交接时间",
// prop: "jjsj",
// width: "200",
// },
// {
// label: "交接时工作简要情况",
// prop: "jjsGzJyqk",
// width: "200",
// },
// {
// label: "交接后工作要求",
// prop: "jjhGzyqJyqk",
// width: "200",
// },
// {
// label: "前主办人姓名",
// prop: "qzbrXm",
// width: "200",
// },
{
label: "是否办结",
prop: "sfbjStr",
width: "200",
},
{
label: "办结时间",
prop: "bjsj",
width: "200",
},
{
label: "办结简要情况",
prop: "bjJyqk",
width: "200",
},
// {
// label: "是否督办",
// prop: "sfdbStr",
// width: "200",
// },
// {
// label: "是否反馈",
// prop: "sffkStr",
// width: "200",
// },
// {
// label: "督办内容",
// prop: "dbnrJyqk",
// width: "200",
// },
{
label: "反馈结果",
prop: "fkjgJyqk",
width: "200",
},
{
label: "反馈时间",
prop: "fksj",
width: "200",
},
{
label: "登记时间",
prop: "dbsj",
width: "200",
},
// {
// label: "督办人姓名",
// prop: "dbrXm",
// width: "200",
// },
{
label: "反馈人姓名",
prop: "fkrXm",
width: "200",
},
],
cxUrl: "/hcyprw/queryListByParam",
Menu: [
// zylx:"asj",
{
id: "queryJz",
label: "卷宗列表",
index: "queryJz",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
],
leftMenus: [
//左侧导航(模块第一个页面需要)
{
id: "queryHbyp",
label: "卷宗列表",
newAuth: "M01",
index: "2",
className: "iconfont icongongnengfuwu",
hasChildren: false,
},
],
};
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
this.$store.commit("user/SET_LeftMenu", this.leftMenus);
this.$store.commit("user/SET_Header", this.header);
},
methods: {
},
watch: {
// "examineInfoRl.sfrlPdbz": {
// handler: function (val, oldval) {
// },
// deep: true,
// },
},
};
</script>
<style>
.el-dialog__body {
padding: 10px 15px !important;
}
.rightContent .el-input__inner,
#formCommonPage .el-input__inner {
height: 32px;
line-height: 32px;
font-family: inherit;
}
.el-table__header-wrapper th,
.el-table__header-wrapper tr {
background: #f4f6f7;
}
.rightContent .el-input__icon,
#formCommonPage .el-input__icon,
.el-input__suffix-inner {
line-height: 36px;
}
.rightContent .el-range-separator {
position: relative;
top: -4px;
}
.rightContent .el-textarea__inner,
#formCommonPage .el-textarea__inner {
width: 100%;
font-family: inherit;
}
.rightContent .el-range-input,
#formCommonPage .el-range-input {
vertical-align: top;
}
.rightContent .el-date-editor .el-range__close-icon {
margin-top: -4px;
}
.rightContent .el-form-item__error {
left: calc(66% - 27px);
top: 12px;
}
.success-row {
background-color: #fbf9f4 !important;
}
.Content .el-input,
.Content .el-date-editor--daterange.el-input__inner {
width: 100% !important;
}
</style>
<style scoped lang="scss">
.el-form-item {
margin: 15px 0 20px 0;
}
.red {
color: red;
}
.black {
color: black;
}
@import "@/assets/styles/rightContent.scss";
.hbyp {
font-size: 14px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #007aff;
margin-right: 16px;
cursor: pointer;
}
.reds {
color: red;
}
.black {
color: black;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
}
</style>
src/views/ztyp/qzlb.vue
......@@ -89,7 +89,8 @@ export default {
disabled: false,
},
],
obj: '',
obj: "",
objLength: [],
};
},
created() {
......@@ -99,19 +100,26 @@ export default {
},
methods: {
selectionChange(row) {
debugger
debugger;
// let obj = ''
this.obj = row.map( item => {
return item.qzbh
}).join(',')
this.objLength = row;
this.obj = row
.map((item) => {
return item.qzbh;
})
.join(",");
},
ksh() {
this.toInfor(this.obj)
if (this.objLength.length >= 2) {
this.toInfor(this.obj);
} else {
this.$message.error("请选择两条数据或者两条以上数据!");
}
},
toInfor(data) {
let params = {
qzbhs: data,
type: '1',
type: "1",
};
let obj = {
childrenXhrStr: "/apiXzxtGaw/ksh/getQzByQzbhs",
......@@ -187,7 +195,7 @@ export default {
<style scoped lang="scss">
@import "@/assets/styles/rightContent.scss";
.hbyp {
margin-left: 15px;
margin-left: 15px;
font-size: 14px;
font-family: Source Han Sans CN;
font-weight: 400;
......
vue.config.js
......@@ -59,6 +59,7 @@ module.exports = {
proxy: {
"/apialy": {
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,
changeOrigin: true,
secure: false,
......@@ -106,6 +107,14 @@ module.exports = {
'^/apiXzxtGaw': '/'
}
},
"/apiXssp": {
target: "https://39.99.155.173:8006/", // 线索审批管理平台
changeOrigin: true,
secure: false,
pathRewrite: {
"^/apiXssp": "/"
}
},
},
},
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