Merge branch 'master' into dev

@@ -118,11 +118,11 @@
         </div>
       </div>
     </div>
-    <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'">
+    <div class="d-center" v-show="!$store.state.business.Edit && titleName == 'sjmx'">
       <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
       <btn nativeType="cx" @click="submitForm">保 存</btn>
     </div>
-    <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
+    <div class="d-center" v-show="!$store.state.business.Edit && titleName == 'xml'">
       <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
     </div>
   </el-dialog>

@@ -10,10 +10,9 @@
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">Close</li>
-      <li @click="closeOthersTags">Close Others</li>
-      <li @click="closeAllTags(selectedTag)">Close All</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
+      <li @click="closeOthersTags">关闭其他</li>
+      <li @click="closeAllTags(selectedTag)">关闭全部</li>
     </ul>
   </div>
 </template>
@@ -165,7 +164,7 @@ export default {
     },
     openMenu (tag, e) {
       const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
+      const offsetLeft = this.$el.getBoundingClientRect().left - 210 // container margin left
       const offsetWidth = this.$el.offsetWidth // container width
       const maxLeft = offsetWidth - menuMinWidth // left boundary
       const left = e.clientX - offsetLeft + 15 // 15: margin right

@@ -258,7 +258,7 @@
 // 登簿日志弹出框
 .commonDialog {
   .el-textarea.is-disabled .el-textarea__inner {
-    @include borderColor("border");
+    background-color: none !important;
     color: #4a4a4a;
   }
 
@@ -302,6 +302,12 @@
     .JsonEditor {
       height: 73vh;
 
+      .el-textarea.is-disabled .el-textarea__inner {
+        @include borderColor("border");
+        background-color: none !important;
+        color: #4a4a4a;
+      }
+
       .editXML {
         height: 100%;
 
@@ -320,7 +326,7 @@
 
     // 响应结果
     .xyjg {
-      height: 78vh;
+      height: 80vh;
 
       .result-con {
         height: 49%;
@@ -547,7 +553,7 @@
     padding: 15px;
     height: 100%;
 
-    /deep/.el-textarea__inner {
+    .el-textarea__inner {
       height: 50%;
       color: #ffffff;
       border: none !important;
@@ -834,7 +840,7 @@
 
   .el-textarea__inner {
     margin: 5px;
-    background: none;
+    background: transparent;
     color: #FFFFFF;
     border-radius: 2px;
   }
@@ -844,7 +850,6 @@
   }
 
   .el-input-number__increase {
-    // background: #05275B;
     color: #FFFFFF;
     border: none;
     right: 7px;
@@ -852,7 +857,6 @@
   }
 
   .el-input-number__decrease {
-    // background: #05275B;
     color: #FFFFFF;
     border: none;
     right: 7px;

@@ -2,8 +2,8 @@
   <div class="Cfdj from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :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>
@@ -113,6 +113,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,9 +2,8 @@
   <div class="dyaq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-       <!-- 判断进入监管还是上报系统 -->
-        <el-form-item v-if="BASE_API.THEME=='jg'">
-          
+        <!-- 判断进入监管还是上报系统 -->
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
@@ -121,6 +120,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -3,7 +3,7 @@
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="150px">
         <!-- 判断进入监管还是上报系统 -->
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
@@ -88,82 +88,83 @@
 </template>
 
 <script>
-  // 地役权登记
-  import data from "./data"
-  import qlfQlDyiq from '@/api/qlfQlDyiq'
-  import tableMixin from '@/mixins/tableMixin.js'
-  import treeSelect from '@/components/TreeSelect.vue'
-  export default {
-    name: "dyiq",
-    mixins: [tableMixin],
-    components: {
-      treeSelect
-    },
-    data () {
-      return {
-        form: {
-          XZQDM: '',
-          QSZT: '',
-          ZL: '',
-          BDCQZH: '',
-          QLR: '',
-          BDCDYH: '',
-          // 供役地不动产单元号
-          GYDBDCDYH: '',
-          // 需役地不动产单元号
-          XYDBDCDYH: '',
-          ZJH: '',
-          currentPage: 1
-        },
-        tableData: {
-          columns: [{
-            label: '序号',
-            type: 'index',
-            width: '50',
-            index: this.indexMethod,
-          }].concat(data.columns()).concat([
-            {
-              label: "操作",
-              width: 80,
-              render: (h, scope) => {
-                return (
-                  <div>
-                    <el-button
-                      type="text"
-                      class='btnColor'
-                      onClick={() => { this.handleEdit(scope.row) }}
-                    >
-                      详情
-                    </el-button>
-                  </div>
-                )
-              }
+// 地役权登记
+import data from "./data"
+import qlfQlDyiq from '@/api/qlfQlDyiq'
+import tableMixin from '@/mixins/tableMixin.js'
+import treeSelect from '@/components/TreeSelect.vue'
+export default {
+  name: "dyiq",
+  mixins: [tableMixin],
+  components: {
+    treeSelect
+  },
+  data () {
+    return {
+      form: {
+        XZQDM: '',
+        QSZT: '',
+        ZL: '',
+        BDCQZH: '',
+        QLR: '',
+        BDCDYH: '',
+        // 供役地不动产单元号
+        GYDBDCDYH: '',
+        // 需役地不动产单元号
+        XYDBDCDYH: '',
+        ZJH: '',
+        currentPage: 1
+      },
+      tableData: {
+        columns: [{
+          label: '序号',
+          type: 'index',
+          width: '50',
+          index: this.indexMethod,
+        }].concat(data.columns()).concat([
+          {
+            label: "操作",
+            width: 80,
+            fixed: "right",
+            render: (h, scope) => {
+              return (
+                <div>
+                  <el-button
+                    type="text"
+                    class='btnColor'
+                    onClick={() => { this.handleEdit(scope.row) }}
+                  >
+                    详情
+                  </el-button>
+                </div>
+              )
             }
-          ]),
-          data: []
-        },
-        pageData: {
-          total: 0,
-          pageSize: 15,
-          current: 1,
-        }
-      }
-    },
-    methods: {
-      async featchData () {
-        try {
-          this.form = Object.assign(this.form, this.formData)
-          let { result: { list, total, pages: pageSize, pageNum: current }
-          } = await qlfQlDyiq.getQlfQlDyiqList(this.form)
-          this.tableData.data = list
-          this.pageData = {
-            pageSize,
-            current,
-            total
           }
-        } catch (error) {
+        ]),
+        data: []
+      },
+      pageData: {
+        total: 0,
+        pageSize: 15,
+        current: 1,
+      }
+    }
+  },
+  methods: {
+    async featchData () {
+      try {
+        this.form = Object.assign(this.form, this.formData)
+        let { result: { list, total, pages: pageSize, pageNum: current }
+        } = await qlfQlDyiq.getQlfQlDyiqList(this.form)
+        this.tableData.data = list
+        this.pageData = {
+          pageSize,
+          current,
+          total
         }
+      } catch (error) {
       }
     }
   }
+}
 </script>

@@ -2,7 +2,7 @@
   <div class="fdcqdz from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
@@ -115,6 +115,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="fdcqqfsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :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 class="mb-5">
@@ -79,6 +79,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="fdcqyz from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
@@ -115,6 +115,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="gzwsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
@@ -109,6 +109,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="hysyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
@@ -114,6 +114,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -95,7 +95,8 @@ class data extends filter {
       },
       {
         label: "登记机构",
-        prop: "DJJG"
+        prop: "DJJG",
+        minWidth: 150,
       }
     ]
   }

@@ -2,7 +2,7 @@
   <div class="jsydzjdsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
@@ -107,6 +107,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="lq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
@@ -103,6 +103,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
@@ -109,6 +109,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="tdsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
@@ -105,6 +105,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="110px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row class="mb-5">
@@ -109,6 +109,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
@@ -105,6 +105,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>

@@ -2,7 +2,7 @@
   <div class="cancellationReg from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
-        <el-form-item v-if="BASE_API.THEME=='jg'">
+        <el-form-item v-if="BASE_API.THEME == 'jg'">
           <Breadcrumb />
         </el-form-item>
         <el-row>
@@ -93,6 +93,7 @@ export default {
           {
             label: "操作",
             width: 80,
+            fixed: "right",
             render: (h, scope) => {
               return (
                 <div>