内蒙 人员档案 概览修改对接 登记注释 行为规矩修改对接

src/assets/styles/ryda.scss

@@ -24,6 +24,34 @@
         margin:0 8px 0 0;
         padding:0 12px;
       }
+      /deep/ .el-form-item{
+        margin-bottom: 0px;
+      }
+      /deep/ .el-carousel__button {
+        display: block;
+        width: 12px;
+        height: 12px;
+        background: #d9d9d9;
+        border-radius: 50%;
+        opacity: 0.7;
+        border: 0 !important;
+        border-radius: 50%;
+        border: none;
+        outline: 0;
+        padding: 0;
+        margin: 0;
+        cursor: pointer;
+        transition: 0.3s;
+      }
+      /deep/ .el-carousel__indicator.is-active button {
+        width: 24px;
+        height: 12px;
+        background: #4d4dd9;
+        opacity: 1;
+        border-radius: 12px;
+      }
+
+
       .zdyTabs{
         /deep/ .el-select:nth-child(2){
           margin-left:24px;
@@ -122,6 +150,7 @@
       }
       .padding24{
         padding:0 24px;
+        overflow: unset;
       }
       .pTitle{
         font-size: 16px;
@@ -201,10 +230,12 @@
     }
     .wrapAuto2{
       width:calc(100% - 634px);display: inline-block;height:416px;
+      overflow: auto;
     }
     .wrap614{
       width:614px;display: inline-block;
       height:416px;margin-right:16px;
+      overflow: auto;
     }
     .wrap606{
       width:606px;display: inline-block;
@@ -212,6 +243,7 @@
     }
     .wrapAuto3{
       width:calc(100% - 626px);margin-right:16px;display: inline-block;height:416px;
+      overflow: auto;
     }
     .xtips{
       font-size: 14px;

src/components/qxda_compontents.vue

@@ -236,12 +236,17 @@ export default {
         json[i] = self.queryData[i];
       }
       if (self.cxSj) {
-        json["cxSj"] =
+        /*json["cxSj"] =
           self.cxSj != "" && self.cxSj != null
             ? `${window.util.timeStampTurnTime(
                 self.cxSj[0]
               )} - ${window.util.timeStampTurnTime(self.cxSj[1])}`
-            : "";
+            : "";*/
+        if(self.cxSj != "" && self.cxSj != null){
+          json["timeStart"] = self.cxSj[0];
+          json["timeEnd"] = self.cxSj[1];
+        }
+
       }
       if (flag) {
         self

src/router/index.js

@@ -69,6 +69,7 @@ router.afterEach((to) => {
       request.getYhxx("").then(res => {
         if (res.success === true) {
           Watermark.set(res.data.rows.trueName==null?'':res.data.rows.trueName,res.data.rows.identitycard==null?'':res.data.rows.identitycard,res.data.rows.unitname==null?'':res.data.rows.unitname,res.data.rows.policemanid==null?'':res.data.rows.policemanid,res.data.rows.ip==null?'':res.data.rows.ip)
+          sessionStorage.setItem("userInfo",JSON.stringify(res.data.rows));
         }
       });
     }

src/utils/params.js

@@ -11966,58 +11966,58 @@ let rydaPropLeftMenu = [
     index: '1',
     className: ''
   },
-  {
+  /*{
     id: 'ryDj',
     label: '登记',
     index: '2',
     className: ''
-  },
+  },*/
   {
     id: 'ryXwgj',
     label: '行为轨迹',
-    index: '3',
+    index: '2',
     className: ''
   },
   {
     id: 'ryGx',
     label: '关系',
-    index: '4',
+    index: '3',
     className: ''
   },
   {
     id: 'ryAsj',
     label: '案事件',
-    index: '5',
+    index: '4',
     className: ''
   },
   {
     id: 'ryFwDwDz',
     label: '房屋/单位/地址',
-    index: '6',
+    index: '5',
     className: ''
   },
   {
     id: 'ryClCz',
     label: '车辆/船只',
-    index: '7',
+    index: '6',
     className: ''
   },
   {
     id: 'ryDhZd',
     label: '电话/终端',
-    index: '8',
+    index: '7',
     className: ''
   },
   {
     id: 'ryJstx',
     label: '即时通讯',
-    index: '9',
+    index: '8',
     className: ''
   },
   {
     id: 'ryHlw',
     label: '互联网',
-    index: '10',
+    index: '9',
     className: ''
   }
   /*{