Skip to content

F
founder_vue
Commit ecaec25a by liupeng
Options

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

parents 4646e282 e3c8780d
Showing with 405 additions and 59 deletions
src/api/base.js
......@@ -24,7 +24,7 @@ if (
}else {
//------------------------------服务器路径**测试**----------------------------------
base.alyIP = "/apialy";
base.alyIP2 = "/api2";
base.alyIP2 = "/apiAjzbXzGaw";
}
export default base;
src/api/zdry/yjrwGl.js
......@@ -3,13 +3,15 @@ import base from "@/api/base";
//任务结果
export const getTaskResult = params =>
post(`${base.alyIP}/ryyj/getTaskResult`, params);
post(`${base.alyIP2}/ryyj/getTaskResult`, params);
//任务新增
export const addYjgkTask = params =>
postform(`${base.alyIP}/ryyj/addYjgkTask`, params);
postform(`${base.alyIP2}/ryyj/addYjgkTask`, params);
//轨迹查询
export const getRygjxxByAsjbh = params =>
post(`${base.alyIP}/ryyj/getRygjxxByAsjbh`, params);
src/components/form.vue
......@@ -8,7 +8,7 @@
<el-form
ref="formLabelAlign"
label-position="right"
label-width="120px"
label-width="120px"
:model="formLabelAlign"
style="margin-bottom: 40px"
>
......@@ -903,7 +903,7 @@ export default {
},
submit() {
var self = this;
debugger
// debugger;
this.$refs.formLabelAlign.validate((valid) => {
if (valid) {
//使用FormData构造函数创建一个空对象
......@@ -911,13 +911,19 @@ export default {
this.propFormField.forEach((itemData) => {
let objStr = itemData.objStr ? `${itemData.objStr}.` : "";
itemData.data.forEach((item) => {
if (self.formLabelAlign[item.id] || self.formLabelAlign[item.id_1] ) {
debugger
if (
self.formLabelAlign[item.id] ||
self.formLabelAlign[item.id_1]
) {
// debugger;
if (item.type !== "file") {
//1.1二级字典处理
if (item.type == "lazyCodeTree" || item.type == "codeTree") {
if (item.multiple) {
let str = `#${self.formLabelAlign[item.id].join("#")}`;
if (item.id == "zljsdwdm") {
str = self.formLabelAlign[item.id].join(",");
}
params.append(objStr + item.id, str);
} else {
params.append(
......@@ -965,8 +971,8 @@ export default {
}
}
} else if (item.type == "datetime") {
params.append(item['id_1'],this.formLabelAlign[item.id_1])
params.append(item['id_2'],this.formLabelAlign[item.id_2])
params.append(item["id_1"], this.formLabelAlign[item.id_1]);
params.append(item["id_2"], this.formLabelAlign[item.id_2]);
}
//1.2普通字段处理
else {
......@@ -1250,7 +1256,7 @@ export default {
const isJPG = /^.*\.(jpg|jpeg|png|mp4|pdf|docx|doc)$/i.test(
file.name.substring(index)
);
debugger;
// debugger;
if (item.type == "photo") {
if (isJPG) {
this.$set(self.imageUrl, item.id, file.raw);
......
src/components/ptCxForm_components.vue
......@@ -1668,9 +1668,15 @@ export default {
},
doQueryRequest(form, relurl) {
/*post方法*/
var currentUrl = relurl ? relurl : this.cxUrl;
let currentUrl = ''
if(this.pageBs == 'yjrwGl'){
currentUrl = `${url.alyIP2}${this.cxUrl}`
}else{
currentUrl = `${url.alyIP}${this.cxUrl}`
}
return Http({
url: url.alyIP + currentUrl,
url: currentUrl,
data: qs.stringify(form),
method: "post",
headers: {
......
src/router/modules/zczl.js
/*
* @Author: your name
* @Date: 2021-10-14 15:35:19
* @LastEditTime: 2021-10-22 11:39:26
* @LastEditTime: 2021-10-28 09:47:24
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\zczl.js
......@@ -25,6 +25,14 @@ const menuLayouts = [
component: () => import("@/views/zczl/zczl/wfqdzczl.vue")
},
{
path: "/jszls",
name: "jszls",
meta: {
title: '接受指令数'
},
component: () => import("@/views/zczl/zczl/jszls.vue")
},
{
path: "/xywspdzczl",
name: "xywspdzczl",
meta: {
......
src/utils/params.js
/*
* @Author: your name
* @Date: 2021-09-07 15:09:40
* @LastEditTime: 2021-10-27 16:50:43
* @LastEditTime: 2021-10-28 13:09:19
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\utils\params.js
......@@ -7821,7 +7821,6 @@ const ssww_jbxx = [
placeholder: "请输入",
col: "2",
},
{
name: "文物价值(元):",
id: "",
......@@ -8238,7 +8237,6 @@ const sszj_jbxx = [
placeholder: "请输入",
col: "18",
},
]
//损失非机动车基本信息
const ssfjdc_jbxx = [
......@@ -8399,7 +8397,7 @@ const ssfjdc_syrxx = [
const ssydtxsb_jbxx = [
{
name: "案事件编号:",
id: "",
id: "asjbh",
type: "text",
value: "",
placeholder: "请输入",
......@@ -8407,7 +8405,7 @@ const ssydtxsb_jbxx = [
},
{
name: "手机使用状态:",
id: "",
id: "sjsyzt",
type: "codeTree",
codeTree: "CODE_IF",
codeOptions: [],
......@@ -8418,7 +8416,7 @@ const ssydtxsb_jbxx = [
},
{
name: "品牌型号:",
id: "",
id: "ssydtxsbPpxh",
type: "codeTree",
codeTree: "CODE_DXZP_FWBSHS",
codeOptions: [],
......@@ -8429,7 +8427,7 @@ const ssydtxsb_jbxx = [
},
{
name: "电话号码:",
id: "",
id: "ssydtxsbYddh",
type: "text",
value: "",
placeholder: "请输入",
......@@ -8438,7 +8436,7 @@ const ssydtxsb_jbxx = [
},
{
name: "机主提供串码:",
id: "",
id: "ssydtxsbImeiWpbzh",
type: "text",
value: "",
placeholder: "请输入",
......@@ -8446,23 +8444,23 @@ const ssydtxsb_jbxx = [
},
{
name: "IMSI(串号):",
id: "",
type: "text",
id: "ssydtxsbImsiFwbzh",
type: "dates",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "ICCID(SIM卡号):",
id: "",
type: "text",
id: "ssydtxsbIccidWpbzh",
type: "dates",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "物品颜色:",
id: "",
id: "ssydtxsbWpysdm",
type: "codeTree",
codeTree: "CODE_YS",
codeOptions: [],
......@@ -8472,8 +8470,10 @@ const ssydtxsb_jbxx = [
},
{
name: "物品价值（元）:",
id: "",
type: "text",
id: "ssydtxsbWpjzrmby",
type: "codeTree",
codeTree: "CODE_IF",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
......@@ -8481,15 +8481,15 @@ const ssydtxsb_jbxx = [
},
{
name: "购置日期:",
id: "",
id: "ssydtxsbWpgzrq",
type: "dates",
value: "",
placeholder: "请输入",
col: "2",
col: "18",
},
{
name: "涉案时间:",
id: "",
id: "sasj",
type: "DateVal",
value: "",
placeholder: "请输入",
......@@ -8498,7 +8498,7 @@ const ssydtxsb_jbxx = [
},
{
name: "网综串码:",
id: "",
id: "wzimei",
type: "text",
value: "",
placeholder: "请输入",
......@@ -8506,7 +8506,7 @@ const ssydtxsb_jbxx = [
},
{
name: "特征描述:",
id: "",
id: "ssydtxsbWptzms",
type: "textarea",
value: "",
placeholder: "请输入",
......@@ -8518,7 +8518,7 @@ const ssydtxsb_jbxx = [
const ssydtxsb_syrxx = [
{
name: "姓名:",
id: "",
id: "ssydtxsbSoyrXm",
type: "text",
value: "",
placeholder: "请输入",
......@@ -8526,7 +8526,7 @@ const ssydtxsb_syrxx = [
},
{
name: "证件类型:",
id: "",
id: "ssydtxsbSoyrCyzjdm",
type: "codeTree",
codeTree: "CODE_ZJ",
codeOptions: [],
......@@ -8537,7 +8537,7 @@ const ssydtxsb_syrxx = [
},
{
name: "证件号码:",
id: "",
id: "ssydtxsbSoyrZjhm",
type: "text",
value: "",
placeholder: "请输入",
......@@ -8546,11 +8546,11 @@ const ssydtxsb_syrxx = [
},
{
name: "联系电话:",
id: "",
type: "text",
id: "ssydtxsbSoyrLxdh",
type: "textarea",
value: "",
placeholder: "请输入",
col: "2",
col: "18",
},
]
//损失其他物品基本信息
......@@ -11478,7 +11478,6 @@ const zbfzxyr_flws = [
export {
//可疑线索
kysscj,
......
src/views/qgncj/sswp/ssydtxsb/addssydtxb.vue
<!--
* @Author: your name
* @Date: 2021-09-08 17:35:31
* @LastEditTime: 2021-10-27 16:50:14
* @LastEditTime: 2021-10-28 12:59:36
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\xxtk\case\addCase.vue
......@@ -76,7 +76,6 @@ export default {
},
methods: {
submit(params) {
params.append("glxxXxzjbh", this.glxxXxzjbh);
let loading = this.$loading({
lock: true,
text: "正在保存...",
......@@ -90,8 +89,8 @@ export default {
}
},
windowRefresh() {
window.opener.location.reload();
window.close();
window.opener.location.reload();
},
addSubmit(params, loading) {
insertssydtxsb(params).then((res) => {
......@@ -101,7 +100,7 @@ export default {
type: "success",
callback: () => {
loading.close();
this.$router.push("queryCase");
this.windowRefresh();
},
});
} else {
......@@ -119,7 +118,7 @@ export default {
type: "success",
callback: () => {
loading.close();
this.$router.push("queryCase");
this.windowRefresh();
},
});
} else {
......@@ -165,6 +164,8 @@ export default {
this.title = "修改损失移动通讯设备";
this.xxzjbh = this.$route.query.xxzjbh;
this.getshuju();
} else {
this.$set(this.formLabelAlign, "asjbh", this.$route.query.asjbh);
}
},
};
......
src/views/qgncj/sswp/ssydtxsb/detailssydtxsb.vue
<!--
* @Author: your name
* @Date: 2021-08-31 09:52:33
* @LastEditTime: 2021-10-27 16:45:17
* @LastEditTime: 2021-10-28 11:18:46
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\hnksh\ceshi.vue
......@@ -20,7 +20,11 @@
<script>
import rightContent from "@c/PersonInfor.vue";
import { selectSaById } from "@/api/xxtk/rysa.js";
import {
insertssydtxsb,
updatessydtxsb,
queryByXxzjbh,
} from "@/api/qgccj/ssydtxsb.js";
import axios from "@/utils/http.js";
export default {
name: "queryAj",
......@@ -167,7 +171,7 @@ export default {
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
selectSaById({
queryByXxzjbh({
xxzjbh: _this.xxzjbh,
}).then((res) => {
var result = res.data.rows;
......
src/views/qgncj/sswp/ssydtxsb/querysstxsb.vue
......@@ -57,7 +57,7 @@ export default {
prop: "ssydtxsbWptzms",
},
],
cxUrl: "/gzryFwbzhgj/selectFwbzhgj",
cxUrl: "/ssydtxsb/queryAll",
query: {},
};
},
......@@ -99,7 +99,7 @@ export default {
});
},
toInfor(obj) {
this.$router.push({
this.$router.pushToTab({
path: "/detailssydtxsb",
query: {
xxzjbh: obj.xxzjbh,
......@@ -111,7 +111,6 @@ export default {
path: "/addssydtxb",
query: {
xxzjbh: obj.row.xxzjbh,
glxxXxzjbh: obj.row.glxxXxzjbh,
},
});
},
......
src/views/zczl/zczl/addsqfbzl.vue
......@@ -84,6 +84,7 @@ export default {
codeOptions: [],
value: "",
placeholder: "请输入",
multiple: true,
prop: "checkEmpty",
col: "2",
},
......@@ -136,7 +137,7 @@ export default {
return;
}
queryLlys({ unitcodes: params.get("zljsdwdm") }).then((res) => {
console.log(res);
});
// params.append("glxxXxzjbh", this.glxxXxzjbh);
......
src/views/zczl/zczl/jszls.vue 0 → 100644
<template>
<div class="Content">
<right-content
:pageBs="pageBs"
:header="header"
:cxFormData="cxFormData"
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@add="add"
@edit="edit"
@dele="dele"
@toInfor="toInfor"
ref="rightContent"
></right-content>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
import { deleteKyxsxx } from "@/api/rlqbxs.js";
export default {
name: "rlqbxsxx",
components: {
rightContent,
},
data() {
return {
header: "本辖区接受的侦查指令",
pageBs: "bxqjsdzczl",
cxFormData: {
zlwh: "",
zllx: "",
ywlx: "",
fbsj_s: "",
fbsj_e: "",
ywbh: "",
zljsdwdm: "",
zlsy: "",
spsftg: "",
zlsffp: "",
zlsfhb: "",
limit: 10,
page: 1,
},
cxQueryField: [
{
name: "侦察指令编号",
id: "qszt",
placeholder: "请输入",
type: "text",
value: "",
col: "3",
},
{
name: "发布时间",
id: "fbsh_s",
id2: "fbsh_e",
placeholder: "请选择",
type: "zdyDate",
value: "",
col: "3",
},
{
name: "签收状态",
id: "qszt",
placeholder: "请输入",
selectData: [
{
name: "已签收",
value: "0",
},
{
name: "超期签收",
value: "1",
},
{
name: "未签收",
value: "2",
},
{
name: "超期未签收",
value: "3",
},
],
type: "select",
value: "",
col: "3",
},
{
name: "回报状态",
id: "hbzt",
placeholder: "请输入",
selectData: [
{
name: "已回报",
value: "0",
},
{
name: "超期回报",
value: "1",
},
{
name: "未回报",
value: "2",
},
{
name: "超期未回报",
value: "3",
},
],
type: "select",
value: "",
col: "3",
},
{
name: "评价等级",
id: "pjdj",
placeholder: "请输入",
selectData: [
{
name: "不合格",
value: "0",
},
{
name: "合格",
value: "1",
},
{
name: "优秀",
value: "2",
},
],
type: "select",
value: "",
col: "3",
},
],
cxDefaultFormThead: [
{
label: "信息编号",
prop: "zlsy",
},
{
label: "姓名",
prop: "ywmc",
},
{
label: "指令回报个数",
prop: "zlhbcs",
},
{
label: "回报期限",
prop: "hbqx",
},
{
label: "指令类型",
prop: "zllx_str",
},
{
label: "指令签收个数",
prop: "zlqsgs",
},
{
label: "指令分派个数",
prop: "zlfpgs",
},
{
label: "指令文号",
prop: "zlwh",
},
{
label: "侦查指令编号",
prop: "zczlbh",
},
{
label: "业务类型",
prop: "ywlx_str",
},
{
label: "工作要求",
prop: "gzyq",
},
{
label: "发布时间",
prop: "fbsj",
},
{
label: "审批是否通过",
prop: "spsftg",
},
],
cxUrl: "/zczl/getJszlCountList",
Menu: [
{
id: "bxqjsdzczl",
label: "本辖区接受的侦查指令",
index: "bxqjsdzczl",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
],
};
},
created() {
this.$store.commit("user/SET_Menu", this.Menu);
},
methods: {
add() {
this.$router.push("adjustRlqbxs");
},
edit(scope) {
this.$router.push({
path: "adjustRlqbxs",
query: { xxzjbh: scope.row.xxzjbh },
});
},
dele(scope) {
console.log(scope);
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deleteKyxsxx({
xxzjbh: scope.row.xxzjbh,
}).then((res) => {
if (res.success && res.code == 200) {
this.$message({
type: "success",
message: "删除成功",
});
this.$refs.rightContent.doQuery("yes");
}
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
toInfor(scope) {
this.$router.push({
path: "/detailRlqbxs",
query: {
xxzjbh: scope.xxzjbh,
},
});
},
},
mounted() {},
};
</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">
@import "@/assets/styles/rightContent.scss";
</style>
src/views/zczl/zczl/wfzdzczl.vue
......@@ -302,6 +302,14 @@ export default {
className: "iconfont icongongnengfuwu",
disabled: false,
},
{
id: "jszls",
label: "接收指令数",
index: "jszls",
auth: "M0102",
className: "iconfont icongongnengfuwu",
disabled: false,
},
],
},
{
......
src/views/zdry/yjrwGl.vue
......@@ -28,7 +28,7 @@
<el-table-column prop="ckcm" label="核查结论"> </el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="名航信息" name="mh" v-if="taskType == '02'">
<el-tab-pane label="民航信息" name="mh" v-if="taskType == '02'">
<el-table :data="resultData['mh']" style="width: 100%" max-height="350">
<el-table-column prop="nm" label="姓名"> </el-table-column>
<el-table-column prop="cety" label="证件类型"> </el-table-column>
......
vue.config.js
......@@ -58,17 +58,22 @@ module.exports = {
},
proxy: {
"/apialy": {
// http://192.168.0.107:8762/
// http://192.168.0.101:8762/
// http://47.92.225.109:9022
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
// ws: true,
changeOrigin: true,
secure: false,
// secure: false,
pathRewrite: {
'^/apialy': '/'
}
},
"/apiAjzbXzGaw": {
target: "https://155.1.33.10:20002/", // 基础查询、案件侦办
changeOrigin: true,
secure: false,
pathRewrite: {
"^/apiAjzbXzGaw": "/"
}
},
},
},
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