Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -9,7 +9,7 @@
       <el-row>
       <el-row>
         <el-col :span="6">
         <el-col :span="6">
           <span>业务报文ID：</span>
           <span>业务报文ID：</span>
-          <div>{{ dataReport.bizmsgid }}</div>
+          <div>{{ dataReport.bizMsgid }}</div>
         </el-col>
         </el-col>
         <el-col :span="6">
         <el-col :span="6">
           <span>接入报文ID：</span>
           <span>接入报文ID：</span>
@@ -45,7 +45,7 @@
       <el-row>
       <el-row>
         <el-col :span="6">
         <el-col :span="6">
           <span>创建时间：</span>
           <span>创建时间：</span>
-          <div>{{ dataReport.syscreatedate }}</div>
+          <div>{{ dataReport.createdate }}</div>
         </el-col>
         </el-col>
         <el-col :span="6">
         <el-col :span="6">
           <span>业务流水号：</span>
           <span>业务流水号：</span>
@@ -91,7 +91,7 @@
     </el-tabs>
     </el-tabs>
     <div class="edit-content">
     <div class="edit-content">
       <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" :bsmYwsjb="bsmYwsjb"
       <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" :bsmYwsjb="bsmYwsjb"
-        :bsmSjsb="dataReport.bizmsgid" />
+        :bsmSjsb="dataReport.bsmReport" />
     </div>
     </div>
     <div slot="footer" class="dialog_footer" ref="dialogFooter">
     <div slot="footer" class="dialog_footer" ref="dialogFooter">
       <div class="dialog_button">
       <div class="dialog_button">
@@ -107,116 +107,128 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { mapGetters } from 'vuex'
-import dataReporting from '@/api/dataReporting'
-import { getDetail } from '@/api/sbbwcx.js'
-import { MessageBox } from 'element-ui'
+import { mapGetters } from "vuex";
+import dataReporting from "@/api/dataReporting";
+import { getDetail } from "@/api/sbbwcx.js";
+import { MessageBox } from "element-ui";
 export default {
 export default {
   computed: {
   computed: {
-    ...mapGetters(['dicData'])
+    ...mapGetters(["dicData"]),
   },
   },
-  props: {
-  },
-  data () {
+  props: {},
+  data() {
     return {
     return {
       dataReport: {},
       dataReport: {},
       index: 0,
       index: 0,
-      bsmYwsjb: '',
+      bsmYwsjb: "",
       ruleFormList: {
       ruleFormList: {
-        bizMsgID: '',
-        asid: '',
-        areaCode: '',
-        preestateNum: '',
-        recType: '',
-        rightType: '',
-        regType: '',
-        certCount: '',
-        createDate: '',
-        recFlowID: '',
-        regOrgID: '',
-        prllfCount: '',
-        parcelID: '',
-        estateNum: '',
-        preCertID: '',
-        digitalSign: ''
+        bizMsgID: "",
+        asid: "",
+        areaCode: "",
+        preestateNum: "",
+        recType: "",
+        rightType: "",
+        regType: "",
+        certCount: "",
+        createDate: "",
+        recFlowID: "",
+        regOrgID: "",
+        prllfCount: "",
+        parcelID: "",
+        estateNum: "",
+        preCertID: "",
+        digitalSign: "",
       },
       },
-      images: require('./images/success.gif'),
+      images: require("./images/success.gif"),
       saveloding: false,
       saveloding: false,
       dialogVisible: false,
       dialogVisible: false,
       activeName: undefined,
       activeName: undefined,
-      editItem: '',
-      title: '',
+      editItem: "",
+      title: "",
       headerList: [],
       headerList: [],
-      dataTable: ''
-    }
+      dataTable: "",
+    };
   },
   },
   methods: {
   methods: {
-    isShow (item) {
+    isShow(item) {
       this.dataReport = item;
       this.dataReport = item;
-      this.dialogVisible = true
+      this.dialogVisible = true;
       //获取表头列表
       //获取表头列表
-      getDetail({ bizmsgid: this.dataReport.bizmsgid }).then(res => {
+      getDetail({ bsmReport: this.dataReport.bsmReport }).then((res) => {
         if (res.code == 200) {
         if (res.code == 200) {
-          this.headerList = res.result
+          this.headerList = res.result;
         }
         }
-      })
+      });
     },
     },
-    changeList (val) {
-      let _index = val.index
+    changeList(val) {
+      let _index = val.index;
       if (_index > this.index) {
       if (_index > this.index) {
-
       }
       }
-      this.index = _index
-      this.bsmYwsjb = this.headerList[val.index].bsmYwsjb
-      this.editItem = this.loadView(this.activeName)
+      this.index = _index;
+      this.bsmYwsjb = this.headerList[val.index].bsmYwsjb;
+      this.editItem = this.loadView(this.activeName);
       this.diaData.list.forEach((item) => {
       this.diaData.list.forEach((item) => {
         if (item.soleurl == this.activeName) {
         if (item.soleurl == this.activeName) {
-          this.dataTable = item.dataTable
+          this.dataTable = item.dataTable;
         }
         }
       });
       });
     },
     },
-    loadView (view) {
-      return r => require.ensure([], () => r(require(`@/components/business/${view}`)))
+    loadView(view) {
+      return (r) =>
+        require.ensure([], () => r(require(`@/components/business/${view}`)));
     },
     },
-    closeDialog () {
-      this.dialogVisible = false
+    closeDialog() {
+      this.dialogVisible = false;
     },
     },
-    submitForm () {
-      let _this = this
-      this.$store.dispatch('business/setRules', this.$store.state.business.subRules)
+    submitForm() {
+      let _this = this;
+      this.$store.dispatch(
+        "business/setRules",
+        this.$store.state.business.subRules
+      );
       this.$nextTick(() => {
       this.$nextTick(() => {
-        this.$refs['editItem'] && this.$refs['editItem'].verificationForm().then(res => {
-          if (!res) {
-            _this.$message({
-              message: '请检查表单必填项是否完整',
-              type: 'warning'
-            })
-            return false
-          } else {
-            _this.saveloding = true
-            _this.$refs['editItem'].handleUpdateForm().then(res => {
-              if (res == 200) {
-                _this.$alert('<p><img class="success-images" src="' + this.images + '"/>编辑成功！</p>', '提示', {
-                  showConfirmButton: false,
-                  dangerouslyUseHTMLString: true
+        this.$refs["editItem"] &&
+          this.$refs["editItem"].verificationForm().then((res) => {
+            if (!res) {
+              _this.$message({
+                message: "请检查表单必填项是否完整",
+                type: "warning",
+              });
+              return false;
+            } else {
+              _this.saveloding = true;
+              _this.$refs["editItem"]
+                .handleUpdateForm()
+                .then((res) => {
+                  if (res == 200) {
+                    _this.$alert(
+                      '<p><img class="success-images" src="' +
+                        this.images +
+                        '"/>编辑成功！</p>',
+                      "提示",
+                      {
+                        showConfirmButton: false,
+                        dangerouslyUseHTMLString: true,
+                      }
+                    );
+                    setTimeout(() => {
+                      MessageBox.close(false);
+                    }, 1500);
+                  }
                 })
                 })
-                setTimeout(() => {
-                  MessageBox.close(false)
-                }, 1500)
-              }
-            }).catch(function (error) {
-              _this.$alert(error, '提示', {
-                confirmButtonText: '确定',
-                type: 'error'
-              })
-            });
-            _this.saveloding = false
-          }
-        })
-      })
-    }
-  }
-}
+                .catch(function (error) {
+                  _this.$alert(error, "提示", {
+                    confirmButtonText: "确定",
+                    type: "error",
+                  });
+                });
+              _this.saveloding = false;
+            }
+          });
+      });
+    },
+  },
+};
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
 @import "~@/styles/mixin.scss";
 @import "~@/styles/mixin.scss";

@@ -109,7 +109,7 @@ export default {
           visualMap: {
           visualMap: {
             min: 0,
             min: 0,
             max: _this.max,
             max: _this.max,
-            bottom: '0%',
+            bottom: '5%',
             right: 30,
             right: 30,
             splitNumber: 6,
             splitNumber: 6,
             seriesIndex: [0],
             seriesIndex: [0],

@@ -245,4 +245,42 @@ table td {
     position: relative;
     position: relative;
     top: 2px;
     top: 2px;
   }
   }
+}
+
+
+// element 下拉框样式
+.el-menu--popup,
+.el-select-dropdown {
+  background-color: #031A46 !important;
+  padding: 10px;
+  border: none;
+}
+
+.el-popper[x-placement^="bottom"] .popper__arrow::after {
+  border-bottom-color: #074487 !important;
+}
+
+.el-popper[x-placement^="bottom"] .popper__arrow {
+  border-bottom-color: #074487 !important;
+}
+
+
+
+.el-menu--horizontal .el-menu .el-menu-item,
+.el-select-dropdown__item,
+.el-menu--horizontal .el-menu .el-submenu__title {
+  background: #074487 !important;
+  margin: 5px 0;
+  border: 1px solid #074487;
+  color: #02D9FD !important;
+}
+
+.el-menu--horizontal .el-menu-item:not(.is-disabled):hover,
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover,
+.el-menu--horizontal .el-menu-item:not(.is-disabled):focus {
+  background: #074487;
+  border: 1px solid #02D9FD;
+  color: #FFFFFF !important;
+  font-weight: 700;
 }
 }
\ No newline at end of file

@@ -9,8 +9,8 @@
 
 
         }
         }
 
 
-        .cell {
-            color: #02D9FD !important;
+        .el-table__row .cell {
+            color: #ACEFFA !important;
         }
         }
 
 
         .el-table__row {
         .el-table__row {
@@ -27,6 +27,7 @@
                 //transparent：默认。背景颜色为透明。
                 //transparent：默认。背景颜色为透明。
                 // background-color: inherit !important;
                 // background-color: inherit !important;
                 background-color: transparent;
                 background-color: transparent;
+                color: #02D9FD;
             }
             }
 
 
             & tr {
             & tr {

@@ -27,7 +27,7 @@ export default {
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .centercard {
 .centercard {
-  width: 48%;
+  width: 44%;
   height: calc(100vh - 114px);
   height: calc(100vh - 114px);
   box-sizing: border-box;
   box-sizing: border-box;
   padding: 0 10px;
   padding: 0 10px;
@@ -39,7 +39,7 @@ export default {
     background: url("~@/image/mapcenter.png") no-repeat;
     background: url("~@/image/mapcenter.png") no-repeat;
     background-size: 100% 100%;
     background-size: 100% 100%;
     position: relative;
     position: relative;
-    height: 510px;
+    height: 485px;
 
 
     .title {
     .title {
       position: absolute;
       position: absolute;

@@ -76,7 +76,7 @@ export default {
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .leftcard {
 .leftcard {
-  width: 30%;
+  width: 32%;
   height: calc(100% -94px);
   height: calc(100% -94px);
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;

@@ -51,7 +51,7 @@ export default {
 }
 }
 
 
 .rightcard {
 .rightcard {
-  width: 30%;
+  width: 32%;
   display: flex;
   display: flex;
   height: calc(100% -94px);
   height: calc(100% -94px);
   flex-direction: column;
   flex-direction: column;