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

src/components/table_components.vue

@@ -249,7 +249,7 @@
                 {{ scope.row[columnTitle.prop]
                 }}<i
                   class="iconfont iconxiangqing moreAJ"
-                  v-show="scope.row['flag'] == '1'"
+                  v-show="scope.row['flag'] == '1' && scope.row.zhfzxyrCyzjZjhm"
                   @click="moreDialog(scope.row)"
                 ></i>
                 <el-popover

src/router/modules/index.js

@@ -70,7 +70,7 @@ export default [
     path: "/jccxIndex",
     name: "jccxIndex",
     meta: {
-      title: '案件查询',
+      title: '多维查询',
       auth: 5
     },
     component: () => import("@/views/jccx/index.vue")
@@ -79,7 +79,7 @@ export default [
     path: "/qgjcxx",
     name: "qgjcxx",
     meta: {
-      title: '案件查询',
+      title: '多维查询',
       auth: 5
     },
     component: () => import("@/views/jccx/qgjcxx.vue")
@@ -88,7 +88,7 @@ export default [
     path: "/qsjccx",
     name: "qsjccx",
     meta: {
-      title: '案件查询',
+      title: '多维查询',
       auth: 5
     },
     component: () => import("@/views/jccx/qsjccx.vue")

src/utils/jccx.js

@@ -647,9 +647,9 @@ let jccxAjxxDefaultFormField = {
           col: '1',
           radioData: [
               { name: '全部', value: '' },
-              { name: '未标注', value: '0' },
+              { name: '未标注', value: '2' },
               { name: '已标注', value: '1' },
-              { name: '待标注', value: '2' }
+              { name: '待标注', value: '0' }
           ]
       }
   ]
@@ -913,9 +913,9 @@ let jccxAjxxFormField = {
           col: '1',
           radioData: [
               { name: '全部', value: '' },
-              { name: '未标注', value: '0' },
+              { name: '未标注', value: '2' },
               { name: '已标注', value: '1' },
-              { name: '待标注', value: '2' }
+              { name: '待标注', value: '0' }
           ]
       },
       {
@@ -3867,10 +3867,10 @@ let cxXyrDefaultFormThead = [
       label: '案件编号',
       prop: 'asjbh'
   },
-  {
-      label: '简要案情',
-      prop: 'jyaq'
-  }
+//   {
+//       label: '简要案情',
+//       prop: 'jyaq'
+//   }
 ]
 let AllXyrformThead = [
   {
@@ -3981,10 +3981,10 @@ let AllXyrformThead = [
       label: '案件编号',
       prop: 'asjbh'
   },
-  {
-      label: '简要案情',
-      prop: 'jyaq'
-  },
+//   {
+//       label: '简要案情',
+//       prop: 'jyaq'
+//   },
   {
       label: '案事件发生地经度',
       prop: 'asjfsddDqjd'
@@ -4020,10 +4020,10 @@ let cxShrDefaultFormThead = [
       label: '案件编号',
       prop: 'asjbh'
   },
-  {
-      label: '简要案情',
-      prop: 'jyaq'
-  }
+//   {
+//       label: '简要案情',
+//       prop: 'jyaq'
+//   }
 ]
 let AllShrformThead = [
   {
@@ -4094,10 +4094,10 @@ let AllShrformThead = [
       label: '案件编号',
       prop: 'asjbh'
   },
-  {
-      label: '简要案情',
-      prop: 'jyaq'
-  },
+//   {
+//       label: '简要案情',
+//       prop: 'jyaq'
+//   },
   {
       label: '案事件发生地经度',
       prop: 'asjfsddDqjd'

src/utils/params.js

@@ -677,9 +677,9 @@ let jccxAjxxDefaultFormField = {
       col: '1',
       radioData: [
         { name: '全部', value: '' },
-        { name: '未标注', value: '0' },
+        { name: '未标注', value: '2' },
         { name: '已标注', value: '1' },
-        { name: '待标注', value: '2' }
+        { name: '待标注', value: '0' }
       ]
     }
   ]
@@ -933,9 +933,9 @@ let jccxAjxxFormField = {
       col: '1',
       radioData: [
         { name: '全部', value: '' },
-        { name: '未标注', value: '0' },
+        { name: '未标注', value: '2' },
         { name: '已标注', value: '1' },
-        { name: '待标注', value: '2' }
+        { name: '待标注', value: '0' }
       ]
     },
     
@@ -3942,10 +3942,10 @@ let cxXyrDefaultFormThead = [
     label: '案件编号',
     prop: 'asjbh'
   },
-  {
-    label: '简要案情',
-    prop: 'jyaq'
-  }
+  // {
+  //   label: '简要案情',
+  //   prop: 'jyaq'
+  // }
 ]
 let AllXyrformThead = [
   {
@@ -4056,10 +4056,10 @@ let AllXyrformThead = [
     label: '案件编号',
     prop: 'asjbh'
   },
-  {
-    label: '简要案情',
-    prop: 'jyaq'
-  },
+  // {
+  //   label: '简要案情',
+  //   prop: 'jyaq'
+  // },
   {
     label: '案事件发生地经度',
     prop: 'asjfsddDqjd'
@@ -4095,10 +4095,10 @@ let cxShrDefaultFormThead = [
     label: '案件编号',
     prop: 'asjbh'
   },
-  {
-    label: '简要案情',
-    prop: 'jyaq'
-  }
+  // {
+  //   label: '简要案情',
+  //   prop: 'jyaq'
+  // }
 ]
 let AllShrformThead = [
   {
@@ -4169,10 +4169,10 @@ let AllShrformThead = [
     label: '案件编号',
     prop: 'asjbh'
   },
-  {
-    label: '简要案情',
-    prop: 'jyaq'
-  },
+  // {
+  //   label: '简要案情',
+  //   prop: 'jyaq'
+  // },
   {
     label: '案事件发生地经度',
     prop: 'asjfsddDqjd'

src/views/jccx/index.vue

@@ -4,7 +4,7 @@
     <div class="headerAjcx">
       <div class="headerContent">
         <!-- <img src="@/assets/img/imageTitle.png" alt="/" /> -->
-        <span class="headerTitle">案件查询</span>
+        <span class="headerTitle">多维查询</span>
         <span
           :style="{
             'font-weight': qsShow ? '700' : '500',

src/views/jccx/qgjcxx.vue

@@ -270,7 +270,7 @@ export default {
       let self = this;
       self.ajTableVisi = true;
       self.cxcsAjQuery.page = 1;
-      self.cxcsAjQuery.zhfzxyrCyzjZjhm = zjhm;
+      self.cxcsAjQuery.zhfzxyrCyzjZjhm = zjhm.zhfzxyrCyzjZjhm;
       self.zacsAjDoQuery();
     },
     closeLoading(data) {

src/views/jccx/qsjccx.vue

@@ -269,7 +269,7 @@ export default {
       let self = this;
       self.ajTableVisi = true;
       self.cxcsAjQuery.page = 1;
-      self.cxcsAjQuery.zhfzxyrCyzjZjhm = zjhm;
+      self.cxcsAjQuery.zhfzxyrCyzjZjhm = zjhm.zhfzxyrCyzjZjhm;
       self.zacsAjDoQuery();
     },
     closeLoading(data) {