Merge branch 'master' into dev

@@ -191,7 +191,6 @@ export default {
     padding: 10px 20px;
     line-height: 28px;
     border: 1px solid #ccc;
-    margin-right: 15px;
     border-radius: 3px;
   }
 

@@ -154,7 +154,6 @@ export default {
     padding: 10px 20px;
     line-height: 28px;
     border: 1px solid #ccc;
-    margin-right: 15px;
     border-radius: 3px;
   }
 

@@ -328,7 +328,7 @@ export default {
   components: {
     treeSelect,
   },
-  data() {
+  data () {
     return {
       obligeeForm: {
         obligeeList: [
@@ -364,18 +364,18 @@ export default {
     };
   },
   methods: {
-    async featchData() {
+    async featchData () {
       try {
         let { result: res } = await zttGyQlr.getZttGyQlrById(this.bsmSjsb);
         this.obligeeForm.obligeeList = res;
-      } catch (error) {}
+      } catch (error) { }
     },
-    handleUpdateForm() {
+    handleUpdateForm () {
       return new Promise(async (resolve) => {
         try {
           let res = await zttGyQlr.updateZttGyQlr(this.obligeeForm.obligeeList);
           resolve(res.code);
-        } catch (error) {}
+        } catch (error) { }
       });
     },
   },
@@ -398,7 +398,6 @@ export default {
     padding: 10px 20px;
     line-height: 28px;
     border: 1px solid #ccc;
-    margin-right: 15px;
     border-radius: 3px;
   }
 

@@ -94,6 +94,12 @@
             </el-col>
           </el-row>
         </div>
+        <div class="JsonEditor" v-if="titleName == 'xml'">
+          <JsonEditor class="editXML" :resultInfo="resultInfo" />
+        </div>
+        <div class="xyjg" v-if="titleName == 'xyjg'">
+          <Xyjg :form-data='dataReport'></Xyjg>
+        </div>
       </div>
       <div class="editDialogBox-box editDialogBox-con" v-if="titleName == 'sjmx'">
         <div class="sjmx">
@@ -111,11 +117,6 @@
           </div>
         </div>
       </div>
-      <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xml'">
-        <JsonEditor class="editXML"  :resultInfo="resultInfo" />
-      </div>
-      <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'">
-        <Xyjg :form-data='dataReport'></Xyjg>
     </div>
     <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'">
       <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
@@ -124,7 +125,6 @@
     <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
       <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
     </div>
-    </div>
   </el-dialog>
 </template>
 

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-04-04 09:52:39
+-->
 <template>
   <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
   </el-input>

@@ -140,6 +140,10 @@ ul li {
   margin-top: 10px !important;
 }
 
+.mt-10 {
+  margin-top: 10px;
+}
+
 .pr-5 {
   padding-right: 5px;
 }
@@ -148,10 +152,6 @@ ul li {
   padding-left: 5px;
 }
 
-.mt-10 {
-  margin-top: 20px !important;
-  margin-bottom: 5px !important;
-}
 
 //flex 公共样式
 .d-flex {

@@ -397,11 +397,6 @@
     border-bottom: 1px solid transparent;
   }
 
-  .el-tabs__header {
-    border: none;
-    margin-bottom: 0;
-  }
-
   .el-tabs__item.is-top:not(:last-child) {
     margin-right: 5px;
   }
@@ -566,7 +561,6 @@
   overflow: hidden;
   background: url("~@/image/dialogBg.png") no-repeat !important;
   background-size: 100% 100% !important;
-  // min-height: 90vh;
 
   .dialog_title {
     display: flex;
@@ -622,33 +616,82 @@
     box-shadow: inset 0px 0px 12px 0px #02D9FD;
     border-radius: 2px;
     border: 1px solid #6BC1FC;
-    margin: 0 18px 10px 18px;
-
-    // .el-form-item__label {
-    //   color: #fff;
-    // }
-
-    // .el-form-item__content {
-    //   color: #fff;
-    // }
+    margin: 0 18px 0 18px;
   }
 
   .item-content-input {
     .el-input__inner {
       border: none !important;
       text-align: right;
+      color: #A5CBDA !important;
     }
   }
 
   .regularHeight {
     display: flex;
     flex-direction: column;
-    height: 87vh;
+    height: 85vh;
 
-    .editDialogBox-con,
     .JsonEditor {
-      flex: 1;
+      height: 75vh;
+
+      .editXML {
+        height: 100%;
+        padding: 15px;
+
+        .el-textarea {
+          height: 100% !important;
+        }
+
+        .el-textarea__inner {
+          height: 100% !important;
+          background: #04275B;
+          border-radius: 2px;
+          border: none;
+        }
+      }
+    }
+
+    // 响应结果
+    .xyjg {
+      height: 78vh;
+      padding: 15px;
+
+      .result-con {
+        height: 49%;
+        background: #04275B;
+        border-radius: 2px;
+        box-sizing: border-box;
+        padding: 10px;
+
+        .el-textarea {
+          height: 90%;
+        }
+
+        .el-textarea__inner {
           height: 100%;
+          background: transparent;
+          border: none;
+        }
+
+        p {
+          color: #2188E3;
+          font-weight: 700;
+          font-size: 18px;
+          position: relative;
+          padding-left: 8px;
+        }
+
+        p:before {
+          content: '';
+          width: 3px;
+          height: 13px;
+          position: absolute;
+          left: 0;
+          top: 4px;
+          background-color: #2188E3;
+        }
+      }
     }
   }
 
@@ -656,6 +699,7 @@
     padding: 13px;
     border-radius: 2px;
     box-sizing: border-box;
+    margin-top: 10px;
 
     .el-row {
       display: flex;
@@ -678,7 +722,7 @@
         overflow: hidden;
         white-space: nowrap;
         text-align: left;
-        color: #02D9FD;
+        color: #0288B0;
       }
 
       p {
@@ -697,18 +741,15 @@
   }
 
   .el-textarea__inner {
-    border: 1px solid #224C7C;
-    margin: 0 0 10px 0 !important;
-    width: 100% !important;
-    color: #dadde3 !important;
-    background: transparent !important;
+    background: #04275B;
+    border-radius: 2px;
   }
 
   .el-input__inner {
     border: 1px solid #224C7C !important;
     margin: 0 !important;
     width: 100% !important;
-    color: #dadde3 !important;
+    color: #A5CBDA !important;
     background: transparent !important;
   }
 
@@ -769,6 +810,11 @@
   }
 }
 
+.el-tabs__header {
+  border: none !important;
+  margin-bottom: 0;
+}
+
 // 登簿日志弹出框
 .entryJournal {
   .el-textarea__inner {
@@ -779,13 +825,8 @@
     border: none !important;
   }
 
-  .el-tabs__header {
-    margin: 0;
-  }
-
-  .el-dialog {
-    display: flex;
-    flex-direction: column;
+  .el-col {
+    margin: 5px;
   }
 
   .el-dialog__body {
@@ -795,29 +836,11 @@
     height: 100%;
     flex: 1;
     position: relative;
-  }
-
-  .regularHeight {
-    display: flex;
-    flex-direction: column;
-    height: 87vh;
-    margin-bottom: 5px;
-
-    .editDialogBox-con,
-    .JsonEditor {
-      flex: 1;
-    }
-  }
-
-  .d-center {}
-
-  .dialog_title {
-    top: -6px
+    margin-top: 10px;
   }
 
   .el-tabs__item {
     color: #CEF8FF !important;
-
     display: flex;
     flex-direction: row;
     justify-content: center;
@@ -845,19 +868,14 @@
   }
 
   .from-clues-content {
-
-
     margin-top: 0;
     background: none;
     padding: 0;
-
-
   }
 
   .editDialogBox-box {
     position: relative;
-    top: 10px;
-    height: 100%;
+    height: 98.5%;
   }
 
   .dialog-from {
@@ -901,6 +919,7 @@
     display: flex;
     flex-direction: column;
     padding-bottom: 30px;
+    margin-top: 10px;
   }
 
   .el-tabs {
@@ -914,7 +933,7 @@
   .sjmx {
     display: flex;
     flex-direction: column;
-    height: 49vh;
+    height: 52vh;
 
     .el-tabs__item {
       height: 50px;
@@ -931,6 +950,7 @@
     flex: 1;
     height: 100%;
     overflow-y: hidden;
+    margin: 10px 18px;
   }
 
   .el-tabs__item {
@@ -966,11 +986,6 @@
     border-bottom: 1px solid transparent;
   }
 
-  .el-tabs__header {
-    border: none;
-    margin-bottom: 0;
-  }
-
   .el-tabs__item.is-top:not(:last-child) {
     margin-right: 5px;
   }
@@ -1404,3 +1419,11 @@
     }
   }
 }
+
+// 监管
+.editDialogBox-box {
+  .el-form-item__label {
+    color: #0288B0 !important;
+    line-height: 20px;
+  }
+}
\ No newline at end of file

@@ -258,12 +258,8 @@
 // 登簿日志弹出框
 .commonDialog {
   .el-textarea.is-disabled .el-textarea__inner {
-    margin-top: 20px;
     @include borderColor("border");
-  }
-
-  /deep/.dialog-from_header {
-    margin: 0 !important;
+    color: #4a4a4a;
   }
 
   .el-dialog__headerbtn .el-dialog__close {
@@ -303,16 +299,62 @@
     height: 80vh;
     margin-bottom: 5px;
 
-    .editDialogBox-con,
     .JsonEditor {
-      flex: 1;
-    }
+      height: 73vh;
 
       .editXML {
-      margin-top: 10px;
+        height: 100%;
+
+        .el-textarea {
+          height: 100% !important;
+        }
 
         .el-textarea__inner {
-        height: 68vh !important;
+          height: 100% !important;
+          border-radius: 2px;
+          border: none;
+        }
+      }
+    }
+
+
+    // 响应结果
+    .xyjg {
+      height: 78vh;
+
+      .result-con {
+        height: 49%;
+        border-radius: 2px;
+        box-sizing: border-box;
+        padding: 10px;
+
+        .el-textarea {
+          height: 90%;
+        }
+
+        .el-textarea__inner {
+          height: 100%;
+          background: transparent;
+          border: none;
+        }
+
+        p {
+          color: #2188E3;
+          font-weight: 700;
+          font-size: 18px;
+          position: relative;
+          padding-left: 8px;
+        }
+
+        p:before {
+          content: '';
+          width: 3px;
+          height: 13px;
+          position: absolute;
+          left: 0;
+          top: 4px;
+          background-color: #2188E3;
+        }
       }
     }
   }
@@ -373,11 +415,20 @@
   .dialog-from {
     padding-top: 0;
 
+    .el-row {
+      display: flex;
+      flex-wrap: nowrap;
+    }
+
     .el-col {
-      height: 40px;
-      line-height: 40px;
       display: flex;
       justify-content: space-between;
+      border: 1px solid #C0C4CC;
+      border-radius: 2px;
+      line-height: 36px;
+      height: 36px;
+      margin: 5px;
+      padding: 0 5px;
     }
 
     .bz {
@@ -391,10 +442,11 @@
       width: 100%;
     }
 
-
+    .el-input__inner {
+      border: none;
+    }
 
     .el-textarea__inner {
-
       margin: 0;
     }
 
@@ -411,23 +463,9 @@
   }
 }
 
-.entryJournal {
-  .el-textarea__inner {
-    height: 67vh !important;
-    border: none !important;
-    background-color: #ffffff !important;
-    color: #000000 !important;
-  }
-}
-
-// 上报日志弹出框
-.sbdialog {
-  .el-textarea__inner {
-    height: 30vh !important;
-    border: none !important;
-    background-color: #ffffff !important;
-    color: #000000 !important;
-  }
+.el-input-number__increase,
+.el-input-number__decrease {
+  display: none !important;
 }
 
 // 数据上报弹出框
@@ -440,7 +478,6 @@
     @include background("navbg");
 
     .dialog_title {
-
       color: white;
       margin-bottom: 10px;
     }
@@ -497,8 +534,6 @@
   }
 
   .obligee-item-name {
-    // background: url("~@/image/itembg.png") no-repeat;
-    // background-size: 100% 100%;
     @include background("btnBg");
     border-radius: 3px;
     @include borderColor("border");
@@ -521,8 +556,6 @@
 
     &-con {
       background: #ffffff;
-      // @include borderColor("border");
-      // border: 1px solid blue;
       border-radius: 2px;
       padding: 10px;
       box-sizing: border-box;
@@ -628,67 +661,8 @@
   .el-dialog__wrapper {
     overflow: hidden;
   }
-
-  .dialog-from {
-    padding-top: 0;
-
-    .el-col {
-      height: 40px;
-      line-height: 40px;
-      display: flex;
-      justify-content: space-between;
-    }
-
-    .bz {
-      height: 100%;
-      position: relative;
-      top: 3px;
-    }
-
-    .el-select {
-      padding-right: 15px;
-    }
-
-    .el-icon-circle-close {
-      display: none;
-    }
-
-    .el-input__suffix {
-      right: 0px !important;
-      top: -5px;
-    }
-
-    .el-select,
-    .el-input {
-      flex: 1;
-      width: 100%;
-    }
-
-    .el-textarea__inner {
-      border: none !important;
-      margin: 0;
-    }
-
-    &_header {
-      margin: 0 -5px !important;
-    }
-
-    &_title {
-      font-size: 18px;
-      color: #d7eaee;
-      margin: 3px 0;
-    }
-  }
 }
 
-// // 人员管理上下移动按钮样式
-// .el-button.is-disabled.el-button--text {
-//   width: 64px;
-//   height: 28px;
-//   background: rgba(255, 255, 255, 0.1);
-//   border-radius: 16px;
-// }
-
 // 人员管理角色管理菜单管理修改新增弹框样式
 .PersonnelDialog {
   .el-dialog__headerbtn .el-dialog__close {
@@ -715,24 +689,7 @@
     display: flex;
   }
 
-  .el-input__inner {
-    // background-color: #07388b;
-  }
-
-  .el-input__inner {
-    // background: #07388b;
-    // border-radius: 2px;
-    // border: 1px solid #6bc1fc;
-  }
-
-  .el-textarea__inner {
-    // background: #07388b;
-    // color: rgb(0, 0, 0);
-  }
-
   .el-dialog__header {
-
-
     .el-dialog__headerbtn {
       right: 20px !important;
       top: 23px !important;
@@ -877,7 +834,6 @@
 
   .el-textarea__inner {
     margin: 5px;
-    width: 96%;
     background: none;
     color: #FFFFFF;
     border-radius: 2px;
@@ -905,11 +861,8 @@
 
   .el-input__inner {
     margin: 5px;
-    width: 96%;
-    // background: #05275B;
     border-radius: 2px;
     text-align: left;
-
   }
 
   .el-form-item {

@@ -72,7 +72,7 @@ class data extends filter {
       {
         label: "不动产权证号",
         prop: "BDCQZH",
-        minWidth: 150,
+        minWidth: 180,
       },
       {
         label: "用途",

@@ -35,7 +35,7 @@
       <div id="myChart" class="chart" style="height:100%;width:100%;"></div>
       <div id="myChart-bar" class="chart-bar" style="height:100%;width:100%;"></div>
     </div>
-    <div class="from-clues-content center" v-else>暂无数据</div>
+    <div class="from-clues-content echarts-box center" v-else>暂无数据</div>
   </div>
 </template>
 <script>

@@ -177,9 +177,9 @@
             </lb-table>
           </div>
         </div>
+        <div class="JsonEditor" v-if="titleName == 'xml'">
+          <JsonEditor class="editXML" :resultInfo="resultInfo" :key="key" />
         </div>
-      <div class="editDialogBox-box" v-if="titleName == 'xml'">
-        <JsonEditor :resultInfo="resultInfo" :key="key" />
       </div>
     </div>
     <div class="d-center" v-if="titleName == 'sjmx'">

@@ -4,14 +4,16 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="80px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
         <!-- 判断进入监管还是上报系统 -->
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">
-              <el-select v-model="$store.state.user.userInfo.grade === 'county' ? form.areacode = $store.state.user.userInfo.areaCode : form.areacode" class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
+              <el-select
+                v-model="$store.state.user.userInfo.grade === 'county' ? form.areacode = $store.state.user.userInfo.areaCode : form.areacode"
+                class="width100" clearable placeholder="行政区" :disabled="$store.state.user.userInfo.grade === 'county'">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>