Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

src/components/compareInfo.vue

@@ -273,7 +273,7 @@ export default {
     }
     .right{
       padding-left: 35px;
-      height: 270px;
+      height: 280px;
       overflow-y: scroll;
       ul{
         overflow: hidden;
@@ -305,13 +305,13 @@ export default {
           }
           .rd{
             width: 130px;
-            height: 30px;
+            height: 28px;
             background: #FFFFFF;
             border: 1px solid #C4C4C4;
             opacity: 1;
             border-radius: 4px;
             text-align: center;
-            line-height: 30px;
+            line-height: 28px;
             cursor: pointer;
           }
         }

src/router/index.js

@@ -99,7 +99,7 @@ const mainRouters = [
   zczlRoutes,
   ajbzRoutes,
   xnpgRoutes,
-  ryxscxbdRoutes,
+  ...ryxscxbdRoutes,
   yzzfzxsypRoutes,
   ajzbRoutes,
   dswtzxxRoutes,

src/router/modules/ryxscxbd.js

@@ -9,14 +9,6 @@ const menuLayouts = [
     component: () => import("@/views/ryxscxbd/queryRxhc.vue")
   },
   {
-    path: "/addRxhc",
-    name: "addRxhc",
-    meta: {
-      title: '人像身份核查'
-    },
-    component: () => import("@/views/ryxscxbd/add/addRxhc.vue")
-  },
-  {
     path: "/queryNyzzhc",
     name: "queryNyzzhc",
     meta: {
@@ -25,14 +17,6 @@ const menuLayouts = [
     component: () => import("@/views/ryxscxbd/queryNyzzhc.vue")
   },
   {
-    path: "/addNyzzhc",
-    name: "addNyzzhc",
-    meta: {
-      title: '捺印指掌纹身份核查'
-    },
-    component: () => import("@/views/ryxscxbd/add/addNyzzhc.vue")
-  },
-  {
     path: "/queryDnahc",
     name: "queryDnahc",
     meta: {
@@ -41,14 +25,6 @@ const menuLayouts = [
     component: () => import("@/views/ryxscxbd/queryDnahc.vue")
   },
   {
-    path: "/addDnahc",
-    name: "addDnahc",
-    meta: {
-      title: '人员DNA身份核查'
-    },
-    component: () => import("@/views/ryxscxbd/add/addDnahc.vue")
-  },
-  {
     path: "/queryYstrhc",
     name: "queryYstrhc",
     meta: {
@@ -57,14 +33,6 @@ const menuLayouts = [
     component: () => import("@/views/ryxscxbd/queryYstrhc.vue")
   },
   {
-    path: "/addYstrhc",
-    name: "addYstrhc",
-    meta: {
-      title: '人员YSTR身份核查'
-    },
-    component: () => import("@/views/ryxscxbd/add/addYstrhc.vue")
-  },
-  {
     path: "/queryNyzzdc",
     name: "queryNyzzdc",
     meta: {
@@ -73,6 +41,53 @@ const menuLayouts = [
     component: () => import("@/views/ryxscxbd/queryNyzzdc.vue")
   },
   {
+    path: "/queryDnadc",
+    name: "queryDnadc",
+    meta: {
+      title: '人员DNA涉案倒查'
+    },
+    component: () => import("@/views/ryxscxbd/queryDnadc.vue")
+  },
+  {
+    path: "/queryYstrdc",
+    name: "queryYstrdc",
+    meta: {
+      title: '人员YSTR身份涉案倒查'
+    },
+    component: () => import("@/views/ryxscxbd/queryYstrdc.vue")
+  },
+  {
+    path: "/queryZjdc",
+    name: "queryZjdc",
+    meta: {
+      title: '人员足迹涉案倒查'
+    },
+    component: () => import("@/views/ryxscxbd/queryZjdc.vue")
+  },
+];
+export default [
+  {
+    path: "/right",
+    component: menuLayout,
+    children: [...menuLayouts]
+  },
+  {
+    path: "/addRxhc",
+    name: "addRxhc",
+    meta: {
+      title: '人像身份核查'
+    },
+    component: () => import("@/views/ryxscxbd/add/addRxhc.vue")
+  },
+  {
+    path: "/addNyzzhc",
+    name: "addNyzzhc",
+    meta: {
+      title: '捺印指掌纹身份核查'
+    },
+    component: () => import("@/views/ryxscxbd/add/addNyzzhc.vue")
+  },
+  {
     path: "/addNyzzdc",
     name: "addNyzzdc",
     meta: {
@@ -81,28 +96,28 @@ const menuLayouts = [
     component: () => import("@/views/ryxscxbd/add/addNyzzdc.vue")
   },
   {
-    path: "/queryDnadc",
-    name: "queryDnadc",
+    path: "/addDnahc",
+    name: "addDnahc",
     meta: {
-      title: '人员DNA涉案倒查'
+      title: '人员DNA身份核查'
     },
-    component: () => import("@/views/ryxscxbd/queryDnadc.vue")
+    component: () => import("@/views/ryxscxbd/add/addDnahc.vue")
   },
   {
-    path: "/addDnadc",
-    name: "addDnadc",
+    path: "/addYstrhc",
+    name: "addYstrhc",
     meta: {
-      title: '人员DNA涉案倒查'
+      title: '人员YSTR身份核查'
     },
-    component: () => import("@/views/ryxscxbd/add/addDnadc.vue")
+    component: () => import("@/views/ryxscxbd/add/addYstrhc.vue")
   },
   {
-    path: "/queryYstrdc",
-    name: "queryYstrdc",
+    path: "/addDnadc",
+    name: "addDnadc",
     meta: {
-      title: '人员YSTR身份涉案倒查'
+      title: '人员DNA涉案倒查'
     },
-    component: () => import("@/views/ryxscxbd/queryYstrdc.vue")
+    component: () => import("@/views/ryxscxbd/add/addDnadc.vue")
   },
   {
     path: "/addYstrdc",
@@ -113,14 +128,6 @@ const menuLayouts = [
     component: () => import("@/views/ryxscxbd/add/addYstrdc.vue")
   },
   {
-    path: "/queryZjdc",
-    name: "queryZjdc",
-    meta: {
-      title: '人员足迹涉案倒查'
-    },
-    component: () => import("@/views/ryxscxbd/queryZjdc.vue")
-  },
-  {
     path: "/addZjdc",
     name: "addZjdc",
     meta: {
@@ -136,9 +143,4 @@ const menuLayouts = [
     },
     component: () => import("@/views/ryxscxbd/rxhcDetail.vue")
   },
-];
-export default {
+]
\ No newline at end of file
-  path: "/right",
-  component: menuLayout,
-  children: [...menuLayouts]
-};
\ No newline at end of file

src/views/ajxscxbd/ajjs/queryAjlb.vue

@@ -34,7 +34,7 @@
         table: false,
         tableOperation:true,
         tableOperationWidth:200,
-        header: "案件检索",
+        header: "线索查询比对",
         pageBs: "dswtzxxlbxx",
         cxFormData: {
           page:'1',
@@ -74,9 +74,9 @@
             col: "3",
             codeOptions: [],
             codeTree: "CODE_ZCJDDM",
-          },
+          }, 
           {
-            name: "立案单位",
+            name: "立案单位", 
             id: "ladwGajgjgdm",
             type: "codeTreeDialog",
             value: "",

src/views/dswtz/swxx/detailSwxx.vue

@@ -20,11 +20,11 @@
         </div>
 
         <div class="swtzxxbd text-cont">
-          <h1>生物特征信息比对</h1>
+          <h1>多生物特征信息</h1>
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-            <el-tab-pane label="人像信息比对" name="first"><rxbd :rybh="rybh"></rxbd></el-tab-pane>
-            <el-tab-pane label="指纹信息比对" name="second"><zwbd :rybh="rybh"></zwbd></el-tab-pane>
-            <el-tab-pane label="足迹信息比对" name="third"><zjbd :rybh="rybh"></zjbd></el-tab-pane>
+            <el-tab-pane label="人像信息" name="first"><rxbd :rybh="rybh"></rxbd></el-tab-pane>
+            <el-tab-pane label="指纹信息" name="second"><zwbd :rybh="rybh"></zwbd></el-tab-pane>
+            <el-tab-pane label="足迹信息" name="third"><zjbd :rybh="rybh"></zjbd></el-tab-pane>
             <el-tab-pane label="DNA信息" name="fourth"><dnabd :rybh="rybh"></dnabd></el-tab-pane>
             <el-tab-pane label="虹膜信息" name="five"><hmbd :rybh="rybh"></hmbd></el-tab-pane>
           </el-tabs>

src/views/dswtzxx/jbxx/lbxx.vue

@@ -15,7 +15,7 @@
                 ref="rightContent"
         >
             <template #btnGroup="scope">
-                <el-button @click="dele(scope.scope)" type="text">删除</el-button>
+                <!-- <el-button @click="dele(scope.scope)" type="text">删除</el-button> -->
                 <el-button @click="modelList(scope.scope)" type="text">修改</el-button>
                 <el-button @click="RouteName(scope.scope,'swtzxxgl')" type="text">生物特征信息管理</el-button>
             </template>
@@ -35,7 +35,7 @@
     data() {
       return {
         tableOperation:true,
-        tableOperationWidth:300,
+        tableOperationWidth:200,
         header: "多生物特征信息",
         pageBs: "dswtzxxlbxx",
         cxFormData: {