Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

src/components/ajbz/bshChildrenQuery.vue

@@ -432,7 +432,6 @@
                 v-else-if="columnTitle.prop == 'xszmc'"
                 style="
                   cursor: pointer;
-                  color: #096cc9;
                   font-size: 13px !important;
                   white-space: nowrap;
                   overflow: hidden;
@@ -476,7 +475,7 @@
                 style="cursor: pointer; color: #096cc9"
                 @click="turnToEdit(scope.row, 'add')"
               >
-                <i class="el-icon-edit-outline"></i> 登记为串并案
+                <i class="el-icon-edit-outline"></i> 确认串并线索
               </span>
               <span
                 style="cursor: pointer; color: #096cc9; margin-left: 20px"

src/components/ajbz/rgcb_wdxl/ptCxForm_components.vue

@@ -579,7 +579,6 @@
             </template>
           </el-table-column>
           <el-table-column
-            fixed="right"
             label="操作"
             width="100"
             align="center"
@@ -686,7 +685,11 @@ export default {
       tableDataLength: 0, //表格总数
       talbeBhgCount: "", // 不合格
       talbehgCount: "", // 合格
-      tableData: [], //表格数据
+      tableData: [
+        // {
+        //   asjbh: '111111111111'
+        // }
+      ], //表格数据
       propdefaultFormThead: utils.deepClone(this.cxDefaultFormThead), //表格表头
       excelHeader: "案件标注",
       tableSelectItem: [],

src/layout/menuLayout.vue

@@ -2,50 +2,59 @@
   <!--左侧导航-->
   <div>
     <div class="headerTitle">
-      <img src="../assets/img/login/jinhui.png"
-           alt="" /><span>{{
+      <img src="../assets/img/login/jinhui.png" alt="" /><span>{{
         topHeader
       }}</span>
     </div>
-    <div style="display: flex"
-         class="queryContent">
-      <div class="leftMenu"
-           :style="{ width: isCollapse == true ? '72px' : '240px' }">
+    <div style="display: flex" class="queryContent">
+      <div
+        class="leftMenu"
+        :style="{ width: isCollapse == true ? '72px' : '240px' }"
+      >
         <el-scrollbar style="height: 100%">
-          <el-menu @select="changeSidebar"
-                   :default-active="activeIndex"
-                   @open="handleMenuOpen"
-                   @close="handleMenuClose"
-                   :collapse="isCollapse"
-                   :unique-opened="isOpenOnly"
-                   active-text-color="#007AFF"
-                   background-color="#ffffff"
-                   text-color="rgba(90, 93, 103, 1)"
-                   ref="menu">
-            <div class="menu_wrap"
-                 v-for="item in leftMenus"
-                 :key="item.index"
-                 v-permission="item.roles">
-              <el-menu-item :index="item.index"
-                            v-if="item.hasChildren == false"
-                            @click="goDetail(item)"><i :class="item.className"></i>{{ item.label }}
+          <el-menu
+            @select="changeSidebar"
+            :default-active="activeIndex"
+            @open="handleMenuOpen"
+            @close="handleMenuClose"
+            :collapse="isCollapse"
+            :unique-opened="isOpenOnly"
+            active-text-color="#007AFF"
+            background-color="#ffffff"
+            text-color="rgba(90, 93, 103, 1)"
+            ref="menu"
+          >
+            <div
+              class="menu_wrap"
+              v-for="item in leftMenus"
+              :key="item.index"
+              v-permission="item.roles"
+            >
+              <el-menu-item
+                :index="item.index"
+                v-if="item.hasChildren == false"
+                @click="goDetail(item)"
+                ><i :class="item.className"></i>{{ item.label }}
               </el-menu-item>
-              <el-submenu :index="item.index"
-                          v-if="item.hasChildren == true">
+              <el-submenu :index="item.index" v-if="item.hasChildren == true">
                 <template slot="title">
                   <i :class="item.className"></i>
-                  <span slot="title"
-                        style="color: #343a3f !important">{{
+                  <span slot="title" style="color: #343a3f !important">{{
                     item.label
                   }}</span>
                 </template>
-                <el-menu-item :index="subitem.index"
-                              v-for="(subitem, index) in item.children"
-                              :key="index"
-                              @click="goDetail(subitem)"
-                              v-permission="subitem.roles">
-                  <i class="iconfont iconquanxianjiesuo"
-                     v-show="subitem.disabled"></i>{{ subitem.label }}
+                <el-menu-item
+                  :index="subitem.index"
+                  v-for="(subitem, index) in item.children"
+                  :key="index"
+                  @click="goDetail(subitem)"
+                  v-permission="subitem.roles"
+                >
+                  <i
+                    class="iconfont iconquanxianjiesuo"
+                    v-show="subitem.disabled"
+                  ></i
+                  >{{ subitem.label }}
                 </el-menu-item>
               </el-submenu>
             </div>
@@ -54,13 +63,17 @@
       </div>
       <div class="rightContent">
         <div v-if="!$route.meta.isAdd">
-          <el-tabs v-model="activeName"
-                   @tab-click="handleClick"
-                   class="topMenu">
-            <el-tab-pane :label="item.label"
-                         :name="item.id"
-                         v-for="item in topMenus"
-                         :key="item.id">
+          <el-tabs
+            v-model="activeName"
+            @tab-click="handleClick"
+            class="topMenu"
+          >
+            <el-tab-pane
+              :label="item.label"
+              :name="item.id"
+              v-for="item in topMenus"
+              :key="item.id"
+            >
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -80,7 +93,7 @@ export default {
   props: {
     isCollapseP: Boolean,
   },
-  data () {
+  data() {
     return {
       isOpenOnly: true,
       isCollapse: this.isCollapseP,
@@ -96,7 +109,7 @@ export default {
   computed: {
     ...mapGetters(["topMenu", "Breadcrumbs", "leftMenu", "header"]),
   },
-  created () {
+  created() {
     this.navList = JSON.parse(sessionStorage.getItem("navList"));
     this.topMenus = this.topMenu;
     this.breadcrumbList = this.Breadcrumbs;
@@ -108,24 +121,24 @@ export default {
     });
   },
   watch: {
-    isCollapseP (val) {
+    isCollapseP(val) {
       this.isCollapse = val;
     },
-    topMenu (val) {
+    topMenu(val) {
       this.topMenus = val;
       this.activeName = val[0].id;
     },
-    breadcrumbList (val) {
+    breadcrumbList(val) {
       this.breadcrumbList = val;
     },
-    leftMenu (val) {
+    leftMenu(val) {
       this.leftMenus = val;
     },
-    header (val) {
+    header(val) {
       this.topHeader = val;
       // this.header = val;
     },
-    $route (val) {
+    $route(val) {
       this.activeIndex = this.$route.name;
       debugger;
       let index = this.topMenus.findIndex((i) => i.id == val.name);
@@ -135,7 +148,7 @@ export default {
     },
   },
   methods: {
-    goDetail (item) {
+    goDetail(item) {
       let Base64 = require("js-base64").Base64;
       debugger;
       if (item.id == "dwcx") {
@@ -146,14 +159,19 @@ export default {
             JSON.stringify(JSON.parse(sessionStorage.getItem("userInfo")))
           )
         );
-        let path = `${this.$baseUrl.alyIP14
-          }/#/jump?token=${base}&path=/jccxIndex&zjhm=${JSON.parse(sessionStorage.getItem("userInfo")).identitycard
-          }`;
+        let path = `${
+          this.$baseUrl.alyIP14
+        }/#/jump?token=${base}&path=/jccxIndex&zjhm=${
+          JSON.parse(sessionStorage.getItem("userInfo")).identitycard
+        }`;
         console.log(path);
         window.open(path, "_blank");
       } else if (item.id == "cbypTxxxfx") {
-        let obj = JSON.parse(sessionStorage.getItem("userInfo"));
-        let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${obj.identitycard}`;
+        let rxtoken = sessionStorage.getItem("rxtoken")
+          ? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
+          : "";
+        let path = `http://xzxt-zhyy.dsj.xz/telephone/#/jump?token=${rxtoken}&path=/queryHdfx`;
+
         window.open(path, "_blank");
       } else if (item.id == "brainDzajSP") {
         // let obj = JSON.parse(sessionStorage.getItem("userInfo"));
@@ -169,21 +187,17 @@ export default {
         item.id == "zcajfl" ||
         item.id == "zczbgctj"
       ) {
-        let userToken = sessionStorage.getItem('userToken')
-        let appToken = sessionStorage.getItem('appToken')
-        let path = `${this.$baseUrl.alyIP10}?zjhm=${JSON.parse(sessionStorage.getItem("userInfo")).identitycard
-          }&path=/ajzbIndex&userToken=${userToken}&appToken=${appToken}`;
+        let userToken = sessionStorage.getItem("userToken");
+        let appToken = sessionStorage.getItem("appToken");
+        let path = `${this.$baseUrl.alyIP10}?zjhm=${
+          JSON.parse(sessionStorage.getItem("userInfo")).identitycard
+        }&path=/ajzbIndex&userToken=${userToken}&appToken=${appToken}`;
         window.open(path, "_blank");
       } else if (item.id == "zdryGl") {
         this.$router.pushToTab({
           path: "zdryGl",
         });
       } else if (item.id == "queryHd") {
-        // let obj = JSON.parse(sessionStorage.getItem("userInfo"));
-        // let account = Base64.encode(obj.identitycard);
-        // debugger;
-        // let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${account}`;
-        // window.open(path, "_blank");
         this.$router.push({
           path: "/queryHd",
         });
@@ -201,9 +215,27 @@ export default {
         let skjm = encrypt.skEncrypt(identitycard, key.trim(), vi.trim());
         let path = `${this.$baseUrl.alyIP9}/#/jumplogin?idcard=${skjm}`;
         window.open(path, "_blank");
-      } else if (item.id == "kjdzxxbd") {
+      } else if (item.id == "sckjdzxx" || item.id == "kjdzxxbd") {
         let path = "http://xzxt-zhyy.dsj.xz/gps/#/home";
         window.open(path, "_blank");
+      } else if (item.id == "zhcbfx") {
+        this.$router.pushToTab({
+          path: "/bshcb",
+        });
+      } else if (item.id == "tqajdzkjxx") {
+        let key =
+          "maplogin" +
+          encrypt.creattimeBumderNYR(new Date()).split("-").join("");
+        let vi =
+          "map_vues" +
+          encrypt.creattimeBumderNYR(new Date()).split("-").join("");
+        let skjm = encrypt.skEncrypt(
+          JSON.parse(sessionStorage.getItem("userInfo")).identitycard,
+          key.trim(),
+          vi.trim()
+        );
+        let path = `${this.$baseUrl.alyIP9}/#/jumplogin?idcard=${skjm}&menuTop=yazc&toType=yazc`;
+        window.open(path, "_blank");
       } else if (item.id == "dgjzhfx") {
         let key =
           "maplogin" +
@@ -251,7 +283,7 @@ export default {
         this.$router.push(item.index);
       }
     },
-    navAuth () {
+    navAuth() {
       var self = this;
       if (self.navList.length > 0) {
         self.leftMenu.forEach((item) => {
@@ -281,21 +313,21 @@ export default {
         });
       }
     },
-    handleClick (tab) {
+    handleClick(tab) {
       this.activeName = tab.name;
       this.$router.push(tab.name);
     },
-    handleMenuOpen (key, keyPath) {
+    handleMenuOpen(key, keyPath) {
       // if(key!=this.$route.name&&key.indexOf("basicServer")==0){
       //   this.$router.push("/"+key)
       // }
     },
-    handleMenuClose (key, keyPath) {
+    handleMenuClose(key, keyPath) {
       // if(key!=this.$route.name&&key.indexOf("basicServer")==0){
       //   this.$router.push("/"+key)
       // }
     },
-    changeSidebar (index) {
+    changeSidebar(index) {
       sessionStorage.setItem("routerPath", index);
     },
   },

src/layout/menuLayouts.vue

@@ -54,7 +54,11 @@
                   >
 
                   <!-- 判断二级菜单（有三级菜单）-->
-                  <el-submenu :index="items.index" v-if="items.hasChildren" style="padding-left:18px !important">
+                  <el-submenu
+                    :index="items.index"
+                    v-if="items.hasChildren"
+                    style="padding-left: 18px !important"
+                  >
                     <template slot="title">{{ items.label }}</template>
                     <el-menu-item
                       @click="goDetail(j)"
@@ -177,8 +181,11 @@ export default {
         console.log(path);
         window.open(path, "_blank");
       } else if (item.id == "cbypTxxxfx") {
-        let obj = JSON.parse(sessionStorage.getItem("userInfo"));
-        let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${obj.identitycard}`;
+        let rxtoken = sessionStorage.getItem("rxtoken")
+          ? sessionStorage.getItem("rxtoken").replace(/\+/g, "%2B")
+          : "";
+        let path = `http://xzxt-zhyy.dsj.xz/telephone/#/jump?token=${rxtoken}&path=/queryHdfx`;
+
         window.open(path, "_blank");
       } else if (item.id == "brainDzajSP") {
         // let obj = JSON.parse(sessionStorage.getItem("userInfo"));
@@ -194,21 +201,17 @@ export default {
         item.id == "zcajfl" ||
         item.id == "zczbgctj"
       ) {
-        let userToken = sessionStorage.getItem('userToken')
-        let appToken = sessionStorage.getItem('appToken')
-        let path = `${this.$baseUrl.alyIP10}?zjhm=${JSON.parse(sessionStorage.getItem("userInfo")).identitycard
-          }&path=/ajzbIndex&userToken=${userToken}&appToken=${appToken}`;
+        let userToken = sessionStorage.getItem("userToken");
+        let appToken = sessionStorage.getItem("appToken");
+        let path = `${this.$baseUrl.alyIP10}?zjhm=${
+          JSON.parse(sessionStorage.getItem("userInfo")).identitycard
+        }&path=/ajzbIndex&userToken=${userToken}&appToken=${appToken}`;
         window.open(path, "_blank");
       } else if (item.id == "zdryGl") {
         this.$router.pushToTab({
           path: "zdryGl",
         });
       } else if (item.id == "queryHd") {
-        // let obj = JSON.parse(sessionStorage.getItem("userInfo"));
-        // let account = Base64.encode(obj.identitycard);
-        // debugger;
-        // let path = `${this.$baseUrl.alyIP11}/hdfx/hdfx/toIframe?drrZjhm=${account}`;
-        // window.open(path, "_blank");
         this.$router.push({
           path: "/queryHd",
         });

src/router/modules/ajbz.js

@@ -39,7 +39,7 @@ const menuLayouts = [
     path: "/bshcb",
     name: "bshcb",
     meta: {
-      title: '标识号串并'
+      title: '综合串并线索汇集'
     },
     component: () => import("@/views/cbyp/bshcb.vue")
   },
@@ -116,7 +116,7 @@ const menuLayouts = [
     path: "/cbaAdd",
     name: "cbaAdd",
     meta: {
-      title: "登记为串并案",
+      title: "确认串并线索",
       auth: 5
     },
     component: () => import("@/views/cbyp/cbaAdd.vue")

src/router/modules/index.js

@@ -202,7 +202,7 @@ export default [
     name: "djwzba",
     redirect: '/djwzba/xgaj',
     meta: {
-      title: "登记为串并案",
+      title: "确认串并线索",
       auth: 5
     },
     component: () => import("@/views/cbyp/cba/djwzba.vue"),

src/utils/util.js

 
 
 export default {
+
+  dateToStr(from) {
+    let date = new Date();
+    date.setTime(from);
+    let y = date.getFullYear();
+    let m = date.getMonth() + 1;
+    m = m < 10 ? "0" + m : m;
+    let d = date.getDate();
+    d = d < 10 ? "0" + d : d;
+
+    return y + '-' + m + '-' + d;
+  },
+
   /**
    * 时间戳转日期格式
    * @param {Object} timeStamp

src/views/cbyp/bshcb.vue

@@ -290,7 +290,7 @@ export default {
       Menu: [
         {
           id: "bshcb",
-          label: "标识号串并",
+          label: "综合串并线索汇集",
           index: "bshcb",
           auth: "M0101",
           className: "iconfont iconrizhi",
@@ -309,7 +309,7 @@ export default {
           children: [
             {
               id: "bshcb",
-              label: "标识号串并",
+              label: "综合串并线索汇集",
               index: "bshcb",
               auth: "M0101",
               className: "iconfont iconrizhi",
@@ -317,7 +317,7 @@ export default {
             },
             {
               id: "rgcb",
-              label: "人工串并",
+              label: "扩串研判",
               index: "rgcb",
               auth: "M0101",
               className: "iconfont iconrizhi",

src/views/cbyp/rgcb.vue

@@ -214,7 +214,7 @@ export default {
       Menu: [
         {
           id: "rgcb",
-          label: "人工串并",
+          label: "扩串研判",
           index: "rgcb",
           auth: "M0101",
           className: "iconfont iconrizhi",

src/views/cbyp/xzrgcb.vue

@@ -232,6 +232,22 @@ export default {
           placeholder: "请输入",
           col: "15",
         },
+           {
+          name: "痕迹物证",
+          id: "jyaq",
+          type: "text",
+          value: "",
+          placeholder: "请输入",
+          col: "15",
+        },
+             {
+          name: "人员轨迹",
+          id: "jyaq",
+          type: "text",
+          value: "",
+          placeholder: "请输入",
+          col: "15",
+        },
       ],
       cxDefaultFormThead: [
         {

src/views/xnpgbg/dwxnfx.vue

@@ -267,20 +267,20 @@ export default {
       this.initDate(this.unitList[index]);
     },
     goDetail(row, type) {
-      console.log(row)
-      console.log(type)
       if (type == "unitName") {
+        this.formData.unitCode = row.unitCode;
+        this.initDate();
         // this.initDate(row.unitCode);
         // this.unitList.push(row.unitCode)
-        this.$router.pushToTab({
-          path: '/queryDwcztj',
-          query: {
-            unitCode: row.unitCode,
-            yymcdm: row.yymcdm ?? '',
-            djsjKssj: this.formData.djsjKssj ? util.dateToStr(this.formData.djsjKssj) : '',
-            djsjJssj: this.formData.djsjJssj ? util.dateToStr(this.formData.djsjJssj) : ''
-          }
-        })
+        // this.$router.pushToTab({
+        //   path: '/queryDwcztj',
+        //   query: {
+        //     unitCode: row.unitCode,
+        //     yymcdm: row.yymcdm ?? '',
+        //     djsjKssj: this.formData.djsjKssj ? util.dateToStr(this.formData.djsjKssj) : '',
+        //     djsjJssj: this.formData.djsjJssj ? util.dateToStr(this.formData.djsjJssj) : ''
+        //   }
+        // })
       } else {
         let yymcdm = '';
         for (let i in this.queryTypeList) {

src/views/ztyp/queryQt.vue

@@ -43,10 +43,7 @@
           <el-button slot="trigger" size="mini" type="primary" v-if="show"
             >选取文件</el-button
           >
-          <el-button
-            size="mini"
-            v-if="show"
-            @click="submitUpload(scope.scope)"
+          <el-button size="mini" v-if="show" @click="submitUpload(scope.scope)"
             >上传</el-button
           >
           <el-button
@@ -145,7 +142,7 @@ export default {
       pageBs: "queryZj",
       pageASs: "queryZjQt",
       cxFormData: {
-        username: JSON.parse(window.sessionStorage.getItem("userInfo"))
+    username: JSON.parse(window.sessionStorage.getItem("userInfo"))
           .userName,
         endTime: "",
         startTime: "",
@@ -294,10 +291,44 @@ export default {
           hasChildren: false,
         },
         {
-          id: "kjdzxxbd",
+          id: "kjdzxxbdNew",
           label: "空间电子信息比对",
           newAuth: "M01",
-          index: "kjdzxxbd",
+          index: "kjdzxxbdNew",
+          className: "iconfont icongongnengfuwu",
+          hasChildren: true,
+          children: [
+            {
+              id: "tqajdzkjxx",
+              label: "提取案件电子空间信息",
+              index: "tqajdzkjxx",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "sckjdzxx",
+              label: "上传空间电子信息",
+              index: "sckjdzxx",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+            {
+              id: "kjdzxxbd",
+              label: "空间电子信息比对",
+              index: "kjdzxxbd",
+              auth: "M0101",
+              className: "iconfont iconrizhi",
+              disabled: false,
+            },
+          ],
+        },
+        {
+          id: "zhcbfx",
+          label: "综合串并分析",
+          newAuth: "M01",
+          index: "zhcbfx",
           className: "iconfont icongongnengfuwu",
           hasChildren: false,
         },