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

f28b03aa · 林永鑫 · e67de79a · 172c3f82 · f28b03aa · f28b03aa
Commit f28b03aa authored Apr 25, 2021 by 林永鑫
23 changed files
--- a/public/JsonData/CODE_AJXZ.json
+++ b/public/JsonData/CODE_AJXZ.json
--- a/public/JsonData/CODE_BHRGX.json
+++ b/public/JsonData/CODE_BHRGX.json
+{
+	"code":200,
+	"data":{
+		"rows":[
+			{
+				"ids":"19996",
+				"label":"社会交往关系",
+				"codeType":"CODE_BHRGX",
+				"text":"社会交往关系",
+				"pId":null,
+				"id":"01",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"19997",
+				"label":"亲属关系",
+				"codeType":"CODE_BHRGX",
+				"text":"亲属关系",
+				"pId":null,
+				"id":"02",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"19998",
+				"label":"陌生人",
+				"codeType":"CODE_BHRGX",
+				"text":"陌生人",
+				"pId":null,
+				"id":"03",
+				"isParent":false,
+				"children":[]
+			},
+                                               {
+				"ids":"19999",
+				"label":"其他",
+				"codeType":"CODE_BHRGX",
+				"text":"其他",
+				"pId":null,
+				"id":"99",
+				"isParent":false,
+				"children":[]
+			}
+		]
+	},
+	"success":true,
+	"message":"成功"
+}
\ No newline at end of file
--- a/public/JsonData/CODE_DYLB.json
+++ b/public/JsonData/CODE_DYLB.json
+{
+	"code":200,
+	"data":{
+		"rows":[
+			{
+				"ids":"1831",
+				"label":"城市",
+				"codeType":"CODE_DYLB",
+				"text":"城市",
+				"pId":null,
+				"id":"1010",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"1832",
+				"label":"农村",
+				"codeType":"CODE_DYLB",
+				"text":"农村",
+				"pId":null,
+				"id":"1020",
+				"isParent":false,
+				"children":[]
+			}
+		]
+	},
+	"success":true,
+	"message":"成功"
+}
\ No newline at end of file
--- a/public/JsonData/CODE_HJLX.json
+++ b/public/JsonData/CODE_HJLX.json
+{
+	"code":200,
+	"data":{
+		"rows":[
+			{
+				"ids":"20000",
+				"label":"城镇户口",
+				"codeType":"CODE_HJLX",
+				"text":"城镇户口",
+				"pId":null,
+				"id":"01",
+				"isParent":false,
+				"children":[]
+			},
+			{
+				"ids":"20001",
+				"label":"农村户口",
+				"codeType":"CODE_HJLX",
+				"text":"农村户口",
+				"pId":null,
+				"id":"02",
+				"isParent":false,
+				"children":[]
+			}
+		]
+	},
+	"success":true,
+	"message":"成功"
+}
\ No newline at end of file
--- a/public/JsonData/CODE_HYZK.json
+++ b/public/JsonData/CODE_HYZK.json
 {
-  "success": true,
+	"code":200,
-  "code": 200,
+	"data":{
-  "message": "成功",
+		"rows":[
-  "data": {
+			{
-    "rows": [
+				"ids":"4354",
-      {
+				"label":"已婚",
-        "ids": "4352",
+				"codeType":"CODE_HYZK",
-        "label": "未婚",
+				"text":"已婚",
-        "codeType": "CODE_HYZK",
+				"pId":null,
-        "text": "未婚",
+				"id":"10",
-        "id": "10",
+				"isParent":false,
-        "isParent": false,
+				"children":[]
-        "children": []
+			},
-      },
+			{
-      {
+				"ids":"4355",
-        "ids": "4353",
+				"label":"未婚",
-        "label": "已婚",
+				"codeType":"CODE_HYZK",
-        "codeType": "CODE_HYZK",
+				"text":"未婚",
-        "text": "已婚",
+				"pId":null,
-        "id": "20",
+				"id":"20",
-        "isParent": false,
+				"isParent":false,
-        "children": []
+				"children":[]
-      },
+			},
-      {
+			{
-        "ids": "4354",
+				"ids":"4356",
-        "label": "初婚",
+				"label":"丧偶",
-        "codeType": "CODE_HYZK",
+				"codeType":"CODE_HYZK",
-        "text": "初婚",
+				"text":"丧偶",
-        "id": "21",
+				"pId":null,
-        "isParent": false,
+				"id":"30",
-        "children": []
+				"isParent":false,
-      },
+				"children":[]
-      {
+			},
-        "ids": "4355",
+                                                {
-        "label": "再婚",
+				"ids":"4357",
-        "codeType": "CODE_HYZK",
+				"label":"离异",
-        "text": "再婚",
+				"codeType":"CODE_HYZK",
-        "id": "22",
+				"text":"离异",
-        "isParent": false,
+				"pId":null,
-        "children": []
+				"id":"40",
-      },
+				"isParent":false,
-      {
+				"children":[]
-        "ids": "4356",
+			}
-        "label": "复婚",
+		]
-        "codeType": "CODE_HYZK",
+	},
-        "text": "复婚",
+	"success":true,
-        "id": "23",
+	"message":"成功"
-        "isParent": false,
+}
-        "children": []
\ No newline at end of file
-      },
-      {
-        "ids": "4357",
-        "label": "丧偶",
-        "codeType": "CODE_HYZK",
-        "text": "丧偶",
-        "id": "30",
-        "isParent": false,
-        "children": []
-      },
-      {
-        "ids": "4358",
-        "label": "离婚",
-        "codeType": "CODE_HYZK",
-        "text": "离婚",
-        "id": "40",
-        "isParent": false,
-        "children": []
-      },
-      {
-        "ids": "4359",
-        "label": "未说明的婚姻状况",
-        "codeType": "CODE_HYZK",
-        "text": "未说明的婚姻状况",
-        "id": "90",
-        "isParent": false,
-        "children": []
-      }
-    ]
-  }
-}
--- a/public/JsonData/CODE_RSSHCD.json
+++ b/public/JsonData/CODE_RSSHCD.json
 {
-  "success": true,
+	"code":200,
-  "code": 200,
+	"data":{
-  "message": "成功",
+		"rows":[
-  "data": {
+			{
-    "rows": [
+				"ids":"17424",
-      {
+				"label":"死亡",
-        "ids": "17424",
+				"codeType":"CODE_RSSHCD",
-        "label": "死亡",
+				"text":"死亡",
-        "codeType": "CODE_RSSHCD",
+				"pId":null,
-        "text": "死亡",
+				"id":"1",
-        "id": "1",
+				"isParent":false,
-        "isParent": false,
+				"children":[]
-        "children": []
+			},
-      },
+			{
-      {
+				"ids":"17425",
-        "ids": "17425",
+				"label":"重伤",
-        "label": "重伤",
+				"codeType":"CODE_RSSHCD",
-        "codeType": "CODE_RSSHCD",
+				"text":"重伤",
-        "text": "重伤",
+				"pId":null,
-        "id": "2",
+				"id":"2",
-        "isParent": false,
+				"isParent":false,
-        "children": []
+				"children":[]
-      },
+			},
-      {
+			{
-        "ids": "17426",
+				"ids":"17426",
-        "label": "轻伤",
+				"label":"轻伤",
-        "codeType": "CODE_RSSHCD",
+				"codeType":"CODE_RSSHCD",
-        "text": "轻伤",
+				"text":"轻伤",
-        "id": "3",
+				"pId":null,
-        "isParent": false,
+				"id":"3",
-        "children": []
+				"isParent":false,
-      },
+				"children":[]
-      {
+			},
-        "ids": "17427",
+			{
-        "label": "轻微伤",
+				"ids":"17427",
-        "codeType": "CODE_RSSHCD",
+				"label":"轻微伤",
-        "text": "轻微伤",
+				"codeType":"CODE_RSSHCD",
-        "id": "4",
+				"text":"轻微伤",
-        "isParent": false,
+				"pId":null,
-        "children": []
+				"id":"4",
-      },
+				"isParent":false,
-      {
+				"children":[]
-        "ids": "17428",
+			},
-        "label": "无伤",
+                                                {
-        "codeType": "CODE_RSSHCD",
+				"ids":"17428",
-        "text": "无伤",
+				"label":"无伤",
-        "id": "5",
+				"codeType":"CODE_RSSHCD",
-        "isParent": false,
+				"text":"无伤",
-        "children": []
+				"pId":null,
-      },
+				"id":"5",
-      {
+				"isParent":false,
-        "ids": "17429",
+				"children":[]
-        "label": "不明",
+			}
-        "codeType": "CODE_RSSHCD",
+		]
-        "text": "不明",
+	},
-        "id": "6",
+	"success":true,
-        "isParent": false,
+	"message":"成功"
-        "children": []
+}
-      }
\ No newline at end of file
-    ]
-  }
-}
--- a/public/JsonData/CODE_SACS.json
+++ b/public/JsonData/CODE_SACS.json
@@ -3,257 +3,7 @@
 	"data":{
 		"rows":[
 			{
-				"ids":"114042",
+				"ids":"17563",
-				"label":"医疗卫生场所",
-				"codeType":"CODE_SACS",
-				"text":"医疗卫生场所",
-				"pId":null,
-				"id":"1800",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114027",
-				"label":"宗教场所",
-				"codeType":"CODE_SACS",
-				"text":"宗教场所",
-				"pId":null,
-				"id":"1100",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114021",
-				"label":"看守所",
-				"codeType":"CODE_SACS",
-				"text":"看守所",
-				"pId":null,
-				"id":"0500",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"104993",
-				"label":"交通运输场所",
-				"codeType":"CODE_SACS",
-				"text":"交通运输场所",
-				"pId":null,
-				"id":"2400",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114041",
-				"label":"体育场馆",
-				"codeType":"CODE_SACS",
-				"text":"体育场馆",
-				"pId":null,
-				"id":"1700",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"112596",
-				"label":"生产场所",
-				"codeType":"CODE_SACS",
-				"text":"生产场所",
-				"pId":null,
-				"id":"0300",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"111374",
-				"label":"存车处",
-				"codeType":"CODE_SACS",
-				"text":"存车处",
-				"pId":null,
-				"id":"3600",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114037",
-				"label":"文化场所",
-				"codeType":"CODE_SACS",
-				"text":"文化场所",
-				"pId":null,
-				"id":"1600",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114062",
-				"label":"金融服务场所",
-				"codeType":"CODE_SACS",
-				"text":"金融服务场所",
-				"pId":null,
-				"id":"1900",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114024",
-				"label":"劳改场所",
-				"codeType":"CODE_SACS",
-				"text":"劳改场所",
-				"pId":null,
-				"id":"0800",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114028",
-				"label":"电力场所",
-				"codeType":"CODE_SACS",
-				"text":"电力场所",
-				"pId":null,
-				"id":"1200",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"105682",
-				"label":"桥梁",
-				"codeType":"CODE_SACS",
-				"text":"桥梁",
-				"pId":null,
-				"id":"2500",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114026",
-				"label":"军事场所",
-				"codeType":"CODE_SACS",
-				"text":"军事场所",
-				"pId":null,
-				"id":"1000",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"104985",
-				"label":"城市交通",
-				"codeType":"CODE_SACS",
-				"text":"城市交通",
-				"pId":null,
-				"id":"2300",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"115687",
-				"label":"仓储场所",
-				"codeType":"CODE_SACS",
-				"text":"仓储场所",
-				"pId":null,
-				"id":"2600",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"111370",
-				"label":"电磁信号发射塔",
-				"codeType":"CODE_SACS",
-				"text":"电磁信号发射塔",
-				"pId":null,
-				"id":"3200",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"107267",
-				"label":"商品交易场所",
-				"codeType":"CODE_SACS",
-				"text":"商品交易场所",
-				"pId":null,
-				"id":"2000",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114023",
-				"label":"监狱",
-				"codeType":"CODE_SACS",
-				"text":"监狱",
-				"pId":null,
-				"id":"0700",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"105568",
-				"label":"洗浴美容场所",
-				"codeType":"CODE_SACS",
-				"text":"洗浴美容场所",
-				"pId":null,
-				"id":"2100",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"115693",
-				"label":"建筑工地",
-				"codeType":"CODE_SACS",
-				"text":"建筑工地",
-				"pId":null,
-				"id":"2900",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"116297",
-				"label":"餐饮及娱乐场所",
-				"codeType":"CODE_SACS",
-				"text":"餐饮及娱乐场所",
-				"pId":null,
-				"id":"2200",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114031",
-				"label":"科教场所",
-				"codeType":"CODE_SACS",
-				"text":"科教场所",
-				"pId":null,
-				"id":"1500",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114029",
-				"label":"邮电通信场所",
-				"codeType":"CODE_SACS",
-				"text":"邮电通信场所",
-				"pId":null,
-				"id":"1300",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114022",
-				"label":"拘留所",
-				"codeType":"CODE_SACS",
-				"text":"拘留所",
-				"pId":null,
-				"id":"0600",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"114030",
-				"label":"新闻出版场所",
-				"codeType":"CODE_SACS",
-				"text":"新闻出版场所",
-				"pId":null,
-				"id":"1400",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"112589",
 				"label":"居住场所",
 				"codeType":"CODE_SACS",
 				"text":"居住场所",
@@ -262,103 +12,93 @@
 				"isParent":false,
 				"children":[]
 			},
-			{
+                                                {
-				"ids":"111372",
+				"ids":"17564",
-				"label":"公厕",
+				"label":"餐饮及娱乐场所",
-				"codeType":"CODE_SACS",
-				"text":"公厕",
-				"pId":null,
-				"id":"3400",
-				"isParent":false,
-				"children":[]
-			},
-			{
-				"ids":"111369",
-				"label":"废品收购站",
 				"codeType":"CODE_SACS",
-				"text":"废品收购站",
+				"text":"餐饮及娱乐场所",
 				"pId":null,
-				"id":"3100",
+				"id":"0101",
 				"isParent":false,
 				"children":[]
 			},
-			{
+                                                 {
-				"ids":"115691",
+				"ids":"17565",
-				"label":"公共交通工具",
+				"label":"学校教育场所",
 				"codeType":"CODE_SACS",
-				"text":"公共交通工具",
+				"text":"学校教育场所",
 				"pId":null,
-				"id":"2700",
+				"id":"0102",
 				"isParent":false,
 				"children":[]
 			},
-			{
+                                                {
-				"ids":"111371",
+				"ids":"17566",
-				"label":"地下人行通道",
+				"label":"学校教育场所",
 				"codeType":"CODE_SACS",
-				"text":"地下人行通道",
+				"text":"学校教育场所",
 				"pId":null,
-				"id":"3300",
+				"id":"0103",
 				"isParent":false,
 				"children":[]
 			},
-			{
+                                                {
-				"ids":"114025",
+				"ids":"17567",
-				"label":"强制戒毒场所",
+				"label":"党政机关办公场所",
 				"codeType":"CODE_SACS",
-				"text":"强制戒毒场所",
+				"text":"党政机关办公场所",
 				"pId":null,
-				"id":"0900",
+				"id":"0104",
 				"isParent":false,
 				"children":[]
 			},
-			{
+                                                {
-				"ids":"112595",
+				"ids":"17568",
-				"label":"办公场所",
+				"label":"农林牧渔生成场所",
 				"codeType":"CODE_SACS",
-				"text":"办公场所",
+				"text":"农林牧渔生成场所",
 				"pId":null,
-				"id":"0200",
+				"id":"0105",
 				"isParent":false,
 				"children":[]
 			},
 			{
-				"ids":"115692",
+				"ids":"17569",
-				"label":"殡葬服务场所",
+				"label":"工矿企业生产场所",
 				"codeType":"CODE_SACS",
-				"text":"殡葬服务场所",
+				"text":"工矿企业生产场所",
 				"pId":null,
-				"id":"2800",
+				"id":"0106",
 				"isParent":false,
 				"children":[]
 			},
 			{
-				"ids":"115830",
+				"ids":"17570",
-				"label":"维修场所",
+				"label":"交通道路",
 				"codeType":"CODE_SACS",
-				"text":"维修场所",
+				"text":"交通道路",
 				"pId":null,
-				"id":"3000",
+				"id":"0107",
 				"isParent":false,
 				"children":[]
 			},
-			{
+                                                {
-				"ids":"111373",
+				"ids":"17571",
-				"label":"垃圾场",
+				"label":"交通工具",
 				"codeType":"CODE_SACS",
-				"text":"垃圾场",
+				"text":"交通工具",
 				"pId":null,
-				"id":"3500",
+				"id":"0108",
 				"isParent":false,
 				"children":[]
 			},
 			{
-				"ids":"114020",
+				"ids":"17572",
-				"label":"法庭",
+				"label":"其他",
 				"codeType":"CODE_SACS",
-				"text":"法庭",
+				"text":"其他",
 				"pId":null,
-				"id":"0400",
+				"id":"0199",
 				"isParent":false,
 				"children":[]
 			}

--- a/public/JsonData/CODE_SF.json
+++ b/public/JsonData/CODE_SF.json
--- a/public/JsonData/CODE_WHCD.json
+++ b/public/JsonData/CODE_WHCD.json
--- a/src/api/base.js
+++ b/src/api/base.js
@@ -16,10 +16,10 @@ if (relUrlIp == "133.8.5.1" ||
  relUrlIp == "68.174.25.98" ||
  relUrlIp == "26.8.175.240" ||
  relUrlIp == "133.8.5.67" ||
-  relUrlIp == "26.3.5.101") {
+  relUrlIp == "26.3.14.61") {
  //------------------------------命案管理后台IP**公安网**--------------------------------
  base.BaseURL = "/apiMaxtGaw";
-  base.qdLink = 'http:26.3.5.101:9101/';
+  base.qdLink = 'http:26.3.14.61:9101/';
  base.xzxt = 'http://26.3.13.120:8051/#';
  base.tjbh = 'http://80.2.21.62:8080/WebReport/ReportServer?reportlet=scjwzh%5B5b9a%5D%5B65f6%5D%2Fsc073_%5B5211%5D%5B4fa6%5D_%5B547d%5D%5B6848%5D%5B7edf%5D%5B8ba1%5D%5B62a5%5D%5B8868%5D%2Fsc073_xz_matj.cpt&op=view&tjdw=150000000000';
  base.sjksh = 'http://68.174.69.46:8052/#/SpaceTimeCombat/HomicideCase/';

--- a/src/components/ptCxForm_components.vue
+++ b/src/components/ptCxForm_components.vue
@@ -610,7 +610,7 @@ export default {
    header: String,
    pageFlag: String,
  },
-  data() {
+  data () {
    return {
      dialogVisible: false,
      ychyData: cxYchyData,
@@ -630,24 +630,24 @@ export default {
    };
  },
  methods: {
-    showCfTable(asjbh, type) {
+    showCfTable (asjbh, type) {
      this.$emit('showCfTable', asjbh, type)
    },
-    openSjl() {
+    openSjl () {
      /*this.dialogVisible=true;*/
      let routeData = this.$router.resolve({
        path: "/shj"
      });
      window.open(routeData.href, "_blank");
    },
-    toXq(asjbh) {
+    toXq (asjbh) {
      let routeData = this.$router.resolve({
        path: "/asjDetail",
        query: { asjbh: asjbh }
      });
      window.open(routeData.href, "_blank");
    },
-    ychyLink(id, asjbh) {
+    ychyLink (id, asjbh) {
      if (id == 'ajxq') {
        let routeData = this.$router.resolve({
          path: "/asjDetail",
@@ -656,74 +656,75 @@ export default {
        window.open(routeData.href, "_blank");
      }
    },
-    toXg(item) {
+    toXg (item) {
      let routeData = this.$router.resolve({
        path: "/malamodify",
        query: { asjbh: item.asjbh }
      });
      window.open(routeData.href, "_blank");
    },
-    toZczjBccj(item) {
+    toZczjBccj (item) {
+      debugger
      let routeData = this.$router.resolve({
        path: "/zczjsx",
-        query: { asjbh: item.asjbh }
+        query: { asjbh: item.asjbh, xxzjbh: item.zczjXxzjbh }
      });
      window.open(routeData.href, "_blank");
    },
-    toZczjBccjs(item) {
+    toZczjBccjs (item) {
      let routeData = this.$router.resolve({
        path: "/zczjsxcj",
-        query: { asjbh: item.asjbh }
+        query: { asjbh: item.asjbh, xxzjbh: item.zczjXxzjbh }
      });
      window.open(routeData.href, "_blank");
    },
-    toCjcxsq() {
+    toCjcxsq () {
      let routeData = this.$router.resolve({
        path: "/caseInfoApply",
      });
      window.open(routeData.href, "_blank");
    },
-    toXq(asjbh) {
+    toXq (asjbh) {
      let routeData = this.$router.resolve({
        path: "/asjDetail",
        query: { asjbh: asjbh }
      });
      window.open(routeData.href, "_blank");
    },
-    toXqBj(item, spType) {
+    toXqBj (item, spType) {
      let routeData = this.$router.resolve({
        path: "/asjDetail",
        query: { asjbh: item.asjbh, spType: spType }
      });
      window.open(routeData.href, "_blank");
    },
-    toLasxxg(asjbh) {
+    toLasxxg (asjbh) {
      let routeData = this.$router.resolve({
        path: "/malasxmodify",
        query: { asjbh: asjbh, type: 'sxxg' }
      });
      window.open(routeData.href, "_blank");
    },
-    enter(obj, path) {
+    enter (obj, path) {
      this.$router.push({
        name: path,
        params: obj
      });
    },
-    closeLoading() {
+    closeLoading () {
      this.tableLoading = false;
    },
-    showLoading() {
+    showLoading () {
      this.tableLoading = true;
    },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
      this.page_size = val;
      this.formData.rows = val;
      this.doQuery('yes');
    },
-    clearData() {
+    clearData () {
      let self = this;
      for (let i in self.formData) {
        if (i != "rows" && i != "page" && i != "typeFlag" && i != "unitcode" && i != "grade") {
@@ -733,7 +734,7 @@ export default {
      self.formData["rows"] = 10;
      self.formData["page"] = 1;
    },
-    formatJson(filterVal, jsonData) {
+    formatJson (filterVal, jsonData) {
      let arr = [];
      jsonData.map(v => {
        let arr1 = [];
@@ -757,7 +758,7 @@ export default {
    /**
     * 导出案件
     */
-    export2Excel() {
+    export2Excel () {
      /*导出*/
      let self = this,
        tHeader = [],
@@ -817,7 +818,7 @@ export default {
    /**
     * 导出犯罪嫌疑人
     */
-    exportCriminalSuspect() {
+    exportCriminalSuspect () {
      /*导出*/
      let self = this,
        tHeader = [],
@@ -877,7 +878,7 @@ export default {
    /**
     * 导出伤亡人员
     */
-    exportCasualties() {
+    exportCasualties () {
      /*导出*/
      let self = this,
        tHeader = [],
@@ -933,12 +934,12 @@ export default {
        });
      }
    },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
      this.currentPage1 = val;
      this.formData.page = val;
      this.doQuery("yes");
    },
-    doQueryRequest(form, relurl) {/*post方法*/
+    doQueryRequest (form, relurl) {/*post方法*/
      var currentUrl = relurl ? relurl : this.cxUrl;
      return Http({
        url: url.BaseURL + currentUrl,
@@ -953,7 +954,7 @@ export default {
    /**
     * 获取文件请求
     */
-    getGileRequest(form, relurl) {/*post方法*/
+    getGileRequest (form, relurl) {/*post方法*/
      var currentUrl = relurl ? relurl : this.cxUrl;
      return Http({
        url: url.BaseURL + currentUrl,
@@ -965,21 +966,21 @@ export default {
        }
      });
    },
-    tableRowClassName({ rowIndex }) {
+    tableRowClassName ({ rowIndex }) {
      if (rowIndex % 2 == 0) {
        return "";
      } else {
        return "success-row";
      }
    },
-    orderBy(column) {
+    orderBy (column) {
      console.log(column);
    },
-    doQueryBtn() {
+    doQueryBtn () {
      this.formData.page = 1;
      this.doQuery('yes');
    },
-    doQuery(flag) {
+    doQuery (flag) {
      this.showLoading();
      let self = this, json = {};
      for (let i in self.formData) {
@@ -1006,7 +1007,7 @@ export default {
      }
    }
  },
-  mounted() {
+  mounted () {
    let self = this;
    /*获取字典*/
    self.propQueryField.forEach(val => {

--- a/src/components/syTable.vue
+++ b/src/components/syTable.vue
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -334,4 +334,12 @@ export default [
                title: "研判报告"
              }
            },
+  {
+    path: "/jump",
+    name: "jump",
+    meta: {
+      title: "jimp",
+    },
+    component: () => import("@/views/jump/jump.vue")
+  },
 ]
--- a/src/utils/axiosHttp.js
+++ b/src/utils/axiosHttp.js
@@ -45,7 +45,7 @@ service.interceptors.response.use(
      if (data.code == 401) {
          if (!window.tiplock) {
              window.tiplock = true;
-              if(relUrlIp=='26.3.5.101'||relUrlIp=='39.99.155.173'){
+              if(relUrlIp=='26.3.14.61'||relUrlIp=='39.99.155.173'){
                  window.open(url.qdLink,'_self');
              }else{
                  window.open('http://localhost:8080/','_self');

--- a/src/views/datav/index.vue
+++ b/src/views/datav/index.vue
@@ -2,11 +2,13 @@
  <div id="bigScreen">
    <div class="main-header">
-      <div style="position:absolute;right:40px;top:10px;color: #9FBCDA;
+      <div style="position:absolute;right:40px;top:13px;color: #9FBCDA;">
-    font-size: 18px;">
+        <span style="padding-right: 20px; font-family: 'DIN';font-size: 18px;">{{dateTime}}</span>
-        <span style="padding-right: 10px;">{{dateTime}}</span>
+        <span style="padding-right: 20px;font-size: 18px;">|</span>
-        <span style="padding-right: 10px;">|</span>
+        <span @click="toIndex" style="cursor: pointer;font-size: 15px;">
-        <span @click="toIndex" style="cursor: pointer;font-size: 14px;"><i style="padding-right: 10px;" class="el-icon-s-home"></i>系统首页</span>
+          <i style="padding-right: 10px;" class="el-icon-s-home"></i>
+          <span style="font-size: 16px;">系统首页</span>
+        </span>
      </div>
    </div>

--- a/src/views/jump/jump.vue
+++ b/src/views/jump/jump.vue
+<template>
+</template>
+<script>
+import Http from '@/utils/axiosHttp.js'
+import url from '@/api/base'
+export default {
+  name: 'jump',
+  data() {
+    return {
+      xz_token: '',
+      ruleForm2: {
+        account: '',
+        password: ''
+      }
+    }
+  },
+  created() {
+    const queryParam = this.$route.query
+    this.xz_token = queryParam.b_token
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      const self = this
+      Http.get(url.BaseURL + '/dddl/xzLogin', {
+        params: {
+          xz_token: self.xz_token
+        }
+      }).then(res => {
+        if (res.code == 200) {
+          self.ruleForm2.account = res.data.user.account
+          // self.ruleForm2.password = res.data.user.password
+          self.ruleForm2.password = '0'
+          self.$store.dispatch('user/login', self.ruleForm2).then((res) => {
+            if (res.success == true) {
+              sessionStorage.setItem('baseUrl', url.BaseURL)
+              self.$router.push({ path: '/dataV' })
+            } else {
+              self.$alert(res.msg, '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+              })
+            }
+          }).catch(() => {
+          })
+        } else {
+          self.$router.push('/login')
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
--- a/src/views/magl/bndfasTs.vue
+++ b/src/views/magl/bndfasTs.vue
--- a/src/views/magl/dataPicker.vue
+++ b/src/views/magl/dataPicker.vue
--- a/src/views/magl/sjfx.vue
+++ b/src/views/magl/sjfx.vue
--- a/src/views/magl/ypbg.vue
+++ b/src/views/magl/ypbg.vue
@@ -9,17 +9,17 @@
          <div class="query_name">选择时间：</div>
          <div class="query_time">
            <el-date-picker v-model="queryTime1"
-                            type="month"
+                            type="date"
                            align="right"
                            unlink-panels
-                            value-format="yyyy-MM">
+                            value-format="yyyy-MM-dd">
            </el-date-picker>
            <span>至</span>
            <el-date-picker v-model="queryTime2"
-                            type="month"
+                            type="date"
                            align="right"
                            unlink-panels
-                            value-format="yyyy-MM">
+                            value-format="yyyy-MM-dd">
            </el-date-picker>
          </div>
        </div>
@@ -55,8 +55,8 @@ export default {
  },
  data () {
    return {
-      queryTime1: new Date().getMonth() - 1 > 9 ? `${new Date().getFullYear()}-${new Date().getMonth() - 1}` : `${new Date().getFullYear()}-0${new Date().getMonth() - 1}`,
+      queryTime1: new Date().getMonth() + 1 > 9 ? `${new Date().getFullYear()}-${new Date().getMonth()}-${new Date().getDate()}` : `${new Date().getFullYear()}-0${new Date().getMonth()}-${new Date().getDate()}`,
-      queryTime2: new Date().getMonth() > 9 ? `${new Date().getFullYear()}-${new Date().getMonth()}` : `${new Date().getFullYear()}-0${new Date().getMonth()}`,
+      queryTime2: new Date().getMonth() + 1 > 9 ? `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}` : `${new Date().getFullYear()}-0${new Date().getMonth() + 1}-${new Date().getDate()}`,
      str1: '',
      str2: '',
      str3: '',
@@ -83,12 +83,14 @@ export default {
        lasjQssj: this.queryTime1,
        lasjJssj: this.queryTime2,
      }
      var year1 = this.queryTime1.substring(0, 4)
-      var mounth1 = this.queryTime1.substring(5, 6) == 0 ? this.queryTime1.substring(6) : this.queryTime1.substring(5)
+      var mounth1 = this.queryTime1.substring(5, 6) == 0 ? this.queryTime1.substring(6, 7) : this.queryTime1.substring(5, 7)
      var year2 = this.queryTime2.substring(0, 4)
-      var mounth2 = this.queryTime2.substring(5, 6) == 0 ? this.queryTime2.substring(6) : this.queryTime2.substring(5)
+      var mounth2 = this.queryTime2.substring(5, 6) == 0 ? this.queryTime2.substring(6, 7) : this.queryTime2.substring(5, 7)
      this.timeStr = `${year1}年${mounth1}月 至 ${year2}年${mounth2}月`
-      self.doQueryRequest(JSON.stringify(ajxxForm), 'maTjfx/getMatjJyqk').then(res => {
+      debugger
+      self.doQueryRequest(JSON.stringify(ajxxForm), '/maTjfx/getMatjJyqk').then(res => {
        this.str1 = res.data.data.resultStr
      })
    },
@@ -98,7 +100,7 @@ export default {
        lasjQssj: this.queryTime1,
        lasjJssj: this.queryTime2,
      }
-      self.doQueryRequest(JSON.stringify(ajxxForm), 'maTjfx/getMaqxTj').then(res => {
+      self.doQueryRequest(JSON.stringify(ajxxForm), '/maTjfx/getMaqxTj').then(res => {
        this.str2 = res.data.data.resultStr
      })
    },
@@ -108,7 +110,7 @@ export default {
        lasjQssj: this.queryTime1,
        lasjJssj: this.queryTime2,
      }
-      self.doQueryRequest(JSON.stringify(ajxxForm), 'maTjfx/getYsdraTj').then(res => {
+      self.doQueryRequest(JSON.stringify(ajxxForm), '/maTjfx/getYsdraTj').then(res => {
        this.str3 = res.data.data.resultStr
      })
    },
@@ -118,7 +120,7 @@ export default {
        lasjQssj: this.queryTime1,
        lasjJssj: this.queryTime2,
      }
-      self.doQueryRequest(JSON.stringify(ajxxForm), 'matj/getFzxyrBb').then(res => {
+      self.doQueryRequest(JSON.stringify(ajxxForm), '/matj/getFzxyrBb').then(res => {
        this.str4 = res.data.data.fzxyrYpbg
      })
    },
@@ -128,7 +130,7 @@ export default {
        lasjQssj: this.queryTime1,
        lasjJssj: this.queryTime2,
      }
-      self.doQueryRequest(JSON.stringify(ajxxForm), 'asjtj/queryAsjtj').then(res => {
+      self.doQueryRequest(JSON.stringify(ajxxForm), '/asjtj/queryAsjtj').then(res => {
        this.str5 = res.data.data.rows
      })
    },
@@ -138,7 +140,7 @@ export default {
        lasjQssj: this.queryTime1,
        lasjJssj: this.queryTime2,
      }
-      self.doQueryRequest(JSON.stringify(ajxxForm), 'asjtj/queryZagj').then(res => {
+      self.doQueryRequest(JSON.stringify(ajxxForm), '/asjtj/queryZagj').then(res => {
        this.str6 = res.data.data.rows
        self.loading = false
      })

--- a/src/views/magl/zczjsx.vue
+++ b/src/views/magl/zczjsx.vue
@@ -711,11 +711,14 @@ export default {
  methods: {
    toEdit (item) {
      debugger
-      let routeData = this.$router.resolve({
+      this.$showMessage.showMessage({
-        path: "/xyrEdit",
+        dialogVisible: true,
-        query: { xxzjbh: item.xxzjbh }
+      })
-      });
+      // let routeData = this.$router.resolve({
-      window.open(routeData.href, "_blank");
+      //   path: "/xyrEdit",
+      //   query: { xxzjbh: item.xxzjbh }
+      // });
+      // window.open(routeData.href, "_blank");
    },
    inint () {
      var self = this
@@ -837,12 +840,11 @@ export default {
          self.propFormField.forEach(val => {
            val.data.forEach(val2 => {
              if (!val2.childrenAsAdd) {
-                if (self.oldData[val2.id] != self.formLabelAlign[val2.id]) {
+                if (val2.type != 'file' && self.oldData[val2.id] != self.formLabelAlign[val2.id]) {
                  let arr = []
                  arr.push(self.oldData[val2.id])
                  arr.push(self.formLabelAlign[val2.id])
                  self.$set(self.rzObj, val2.id, arr)
                }
                if (val2.id != '' && val2.id != null && val2.type != 'file') {
                  let id = val2.id;
@@ -859,7 +861,7 @@ export default {
              }
            })
          })
-          self.doQueryRequests(JSON.stringify(ajxxForm)).then(res => {
+          self.doQueryRequests(JSON.stringify(ajxxForm), 'tbstAsj/stasjCj/update').then(res => {
            if (res.data.data.stasj == true) {
              self.$confirm('保存成功!', '提示', {
                confirmButtonText: '确定',
@@ -871,6 +873,7 @@ export default {
              });
            }
          })
+          this.recordUpdateValue()
        } else {
          setTimeout(() => {
            this.$message("请填写必填字段");
@@ -879,9 +882,31 @@ export default {
        }
      });
    },
-    doQueryRequests (form) {/*post方法*/
+    recordUpdateValue () {
+      let sysRecordLog = {
+        colunmname: 'xxzjbh',
+        gnmc: '侦查终结受限修改',
+        keyvalue: this.$route.query.xxzjbh,
+        tablename: 'tb_xw_zczj',
+        updaterecords: JSON.stringify(this.rzObj)
+      }
+      this.doQueryRequests(JSON.stringify(sysRecordLog), 'sysRecordLog/recordUpdateValue').then(res => {
+        debugger
+      })
+    },
+    // doQueryRequests (form) {/*post方法*/
+    //   return Http({
+    //     url: url.BaseURL + '/tbstAsj/stasjCj/update',
+    //     data: JSON.parse(form),
+    //     method: "post",
+    //     headers: {
+    //       'blade-auth': sessionStorage.getItem("token")
+    //     }
+    //   });
+    // },
+    doQueryRequests (form, path) {/*post方法*/
      return Http({
-        url: url.BaseURL + '/tbstAsj/stasjCj/update',
+        url: url.BaseURL + path,
        data: JSON.parse(form),
        method: "post",
        headers: {

--- a/src/views/magl/zczjsxcj.vue
+++ b/src/views/magl/zczjsxcj.vue
@@ -477,7 +477,7 @@ export default {
        spyjJyqk: ""
      },
      tqspUrl: '/ajsp/ajsp',
-      header: '侦查终结受限采集',
+      header: '侦查终结补充采集',
      headerIcon: zczjsxIcon,
      propFormField: [
        {
@@ -838,7 +838,6 @@ export default {
                  arr.push(self.oldData[val2.id])
                  arr.push(self.formLabelAlign[val2.id])
                  self.$set(self.rzObj, val2.id, arr)
                }
                if (val2.id != '' && val2.id != null && val2.type != 'file') {
                  let id = val2.id;
@@ -855,7 +854,7 @@ export default {
              }
            })
          })
-          self.doQueryRequests(JSON.stringify(ajxxForm)).then(res => {
+          self.doQueryRequests(JSON.stringify(ajxxForm), 'tbstAsj/stasjCj/update').then(res => {
            if (res.data.data.stasj == true) {
              self.$confirm('保存成功!', '提示', {
                confirmButtonText: '确定',
@@ -867,6 +866,7 @@ export default {
              });
            }
          })
+          this.recordUpdateValue()
        } else {
          setTimeout(() => {
            this.$message("请填写必填字段");
@@ -875,9 +875,21 @@ export default {
        }
      });
    },
-    doQueryRequests (form) {/*post方法*/
+    recordUpdateValue () {
+      let sysRecordLog = {
+        colunmname: 'xxzjbh',
+        gnmc: '侦查终结受限修改',
+        keyvalue: this.$route.query.xxzjbh,
+        tablename: 'tb_xw_zczj',
+        updaterecords: JSON.stringify(this.rzObj)
+      }
+      this.doQueryRequests(JSON.stringify(sysRecordLog), 'sysRecordLog/recordUpdateValue').then(res => {
+        debugger
+      })
+    },
+    doQueryRequests (form, path) {/*post方法*/
      return Http({
-        url: url.BaseURL + '/tbstAsj/stasjCj/update',
+        url: url.BaseURL + path,
        data: JSON.parse(form),
        method: "post",
        headers: {

--- a/vue.config.js
+++ b/vue.config.js
@@ -70,7 +70,7 @@ module.exports = {
        }
      },
      "/apiMaxtGaw": {
-        target: "http://10.100.17.114:9022/", //公安网案件侦办地址
+        target: "http://26.3.14.61:9101", //公安网案件侦办地址
        ws: true,
        changeOrigin: true,
        pathRewrite: {