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

src/components/PersonInfor.vue

@@ -62,7 +62,17 @@
                         i.label
                       }}</span>
                       <span
-                        v-if="item.objStr"
+                        v-if="i.prop == 'spflwsfjssss' || i.prop == 'zpflwsfjssss' "
+                      >
+                      <div v-for="(itemss, indexss) in item1[i.props]" :key="indexss">
+                          <div style="margin-left: 146px;" class="fj_name">
+                        <i class="iconfont iconfujian-wenjian"></i>
+                        <span>{{ itemss.xsfjDzwjbt }}</span>
+                      </div>
+                      </div>
+                      </span>
+                      <span
+                        v-if="item.objStr && (i.prop != 'spflwsfjssss' || i.prop != 'zpflwsfjssss')"
                         class="cont"
                         :style="{ width: `calc(100% - ${labelWidth})` }"
                         >{{
@@ -209,6 +219,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+i.iconfont.iconfujian-wenjian {
+  color: #ffa456;
+  margin-right: 9px;
+}
 @mixin pageStyle() {
   padding: 13px 50px;
 }

src/components/ptCxForm_components.vue

@@ -1758,6 +1758,7 @@
                 pageBs != 'queryZdssydtxsb' &&
                 pageBs != 'queryZj' &&
                 pageBs != 'queryZjShow' &&
+                pageBs != 'queryXsxx' &&
                 pageBs != 'qyeryrlqbxsGl'
               "
               >删除</span

src/components/zdxx/form.vue

@@ -1705,7 +1705,7 @@ export default {
     "formLabelAligns.editing": {
       handler() {
         var self = this;
-        // debugger;
+        debugger;
         self.propFormField.forEach((val) => {
           val.data.forEach((val2) => {
             if (val2.childrenAsAdd) {
@@ -1716,6 +1716,7 @@ export default {
                       self.$set(self.fileLists, val3.id, []);
                       self.formLabelAligns[val3.id].forEach((val6, jIndex) => {
                         let obj = new Object();
+                        debugger
                         obj[val5.id] =
                           self.formLabelAligns[val3.id][jIndex][val5.id];
                         self.$set(self.fileLists[val3.id], jIndex, obj);

src/router/index.js

@@ -90,7 +90,7 @@ const mainRouters = [
   grxnpgRoutes,
   dwxnpgRoutes,
   ...hbyprwRoutes,
-  shseRoutes,
+  ...shseRoutes,
   ...ajxscxbdRoutes,
   bjzycxRoutes,
   ...ywgzxnpgRoutes,

src/router/modules/shse.js

@@ -25,14 +25,6 @@ const menuLayouts = [
     component: () => import("@/views/shse/fzth/queryFzth.vue")
   },
   {
-    path: "/xq",
-    name: "xq",
-    meta: {
-      title: '犯罪团伙信息详情'
-    },
-    component: () => import("@/views/shse/fzth/xq.vue")
-  },
-  {
     path: "/queryXsxx",
     name: "queryXsxx",
     meta: {
@@ -40,18 +32,28 @@ const menuLayouts = [
     },
     component: () => import("@/views/shse/shsexs/queryXsxx.vue")
   },
-  {
-    path: "/xsxq",
-    name: "xsxq",
-    meta: {
-      title: '涉黑涉恶线索信息详情'
-    },
-    component: () => import("@/views/shse/shsexs/xsxq.vue")
-  },
+
 ];
 
-export default {
+export default [{
   path: "/right",
   component: menuLayout,
   children: [...menuLayouts]
-};
\ No newline at end of file
+},
+{
+  path: "/xq",
+  name: "xq",
+  meta: {
+    title: '犯罪团伙信息详情'
+  },
+  component: () => import("@/views/shse/fzth/xq.vue")
+},
+{
+  path: "/xsxq",
+  name: "xsxq",
+  meta: {
+    title: '涉黑涉恶线索信息详情'
+  },
+  component: () => import("@/views/shse/shsexs/xsxq.vue")
+},
+];
\ No newline at end of file

src/views/shse/shsexs/xsxxxz.vue

@@ -1276,7 +1276,9 @@ export default {
               debugger;
               this.loading = false;
               this.loadingFk = false;
-              this.$router.go(-1);
+              // this.$router.go(-1);
+               window.opener.location.reload();
+              window.close();
             },
           });
         }
@@ -1293,7 +1295,9 @@ export default {
               debugger;
               this.loading = false;
               this.loadingFk = false;
-              this.$router.go(-1);
+              // this.$router.go(-1);
+               window.opener.location.reload();
+              window.close();
             },
           });
         }

src/views/zdxx/zdjyhd/detailZdjyhd.vue

@@ -509,6 +509,56 @@ export default {
             },
           ],
         },
+                {
+          title: "图片", //如果不分小模块就删除title
+          id: 2,
+          objStr: "zpxx", //对象中的对应字段
+          applyType: "list",
+          data: [
+            {
+              label: "文件名称:",
+              prop: "wjmc",
+              col: "3",
+            },
+            {
+              label: "备注信息:",
+              prop: "bzxx",
+              col: "3",
+            },
+            {
+              label: "图片:",
+              prop: "zpflwsfjssss",
+              col: "10",
+              props: 'zpfjfhxx'
+            },
+
+          ],
+        },
+                        {
+          title: "视频", //如果不分小模块就删除title
+          id: 2,
+          objStr: "spxx", //对象中的对应字段
+          applyType: "list",
+          data: [
+            {
+              label: "文件名称:",
+              prop: "wjmc",
+              col: "3",
+            },
+            {
+              label: "备注信息:",
+              prop: "bzxx",
+              col: "3",
+            },
+            {
+              label: "视频:",
+              prop: "spflwsfjssss",
+              col: "10",
+              props: 'spfjfhxx'
+            },
+
+          ],
+        },
       ],
 
       pageObject: {},
@@ -946,6 +996,7 @@ export default {
       });
       infoZdjyhd({ xxzjbh: this.xxzjbh }).then((res) => {
         if (res.success && res.code == 200) {
+          debugger
           this.pageObject = res.data.rows;
           loading.close();
         }