Merge branch 'dev'

@@ -11,6 +11,7 @@
     "@antv/g2": "^4.2.8",
     "@antv/g2": "^4.2.8",
     "@babel/polyfill": "^7.12.1",
     "@babel/polyfill": "^7.12.1",
     "@riophae/vue-treeselect": "^0.4.0",
     "@riophae/vue-treeselect": "^0.4.0",
+    "@union/gis-sdk": "^1.1.0",
     "axios": "^0.21.1",
     "axios": "^0.21.1",
     "bpmn-js": "^7.4.0",
     "bpmn-js": "^7.4.0",
     "bpmn-js-properties-panel": "^0.37.2",
     "bpmn-js-properties-panel": "^0.37.2",
@@ -30,8 +31,7 @@
     "vue-router": "3.0.2",
     "vue-router": "3.0.2",
     "vue-seamless-scroll": "^1.1.23",
     "vue-seamless-scroll": "^1.1.23",
     "vuex": "3.1.0",
     "vuex": "3.1.0",
-    "x2js": "^3.4.4",
-    "@union/gis-sdk": "1.1.0"
+    "x2js": "^3.4.4"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.4",
     "@vue/cli-plugin-babel": "4.4.4",

 <template>
 <template>
   <div class="gis">
   <div class="gis">
-    <div class="main-container" ref="main">
+    <div class="gis-container" ref="main">
       <div class="flex-transverse" ref="transverse">
       <div class="flex-transverse" ref="transverse">
         <div id="arcgisMap0" class="flex-single"></div>
         <div id="arcgisMap0" class="flex-single"></div>
       </div>
       </div>
@@ -46,7 +46,7 @@
     mounted () {
     mounted () {
       let doc = document.querySelector('.gis');
       let doc = document.querySelector('.gis');
       this.$nextTick(() => {
       this.$nextTick(() => {
-        Object.assign(doc.style, { width: doc.clientWidth + 'px', height: '700px' });
+        Object.assign(doc.style, { width: + doc.clientWidth + 'px', height: '700px' });
       })
       })
     },
     },
     created () {
     created () {
@@ -89,8 +89,8 @@
 
 
 </script>
 </script>
 
 
-<style>
-  .main-container {
+<style scoped lang="scss">
+  .gis-container {
     display: -webkit-flex;
     display: -webkit-flex;
     display: flex;
     display: flex;
     -webkit-flex-wrap: wrap;
     -webkit-flex-wrap: wrap;

@@ -227,7 +227,7 @@
         <qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="!ableOperation"
         <qlrCommonTable @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" :disabled="!ableOperation"
           :gyfs="ruleForm.slsq.gyfs" />
           :gyfs="ruleForm.slsq.gyfs" />
 
 
-        <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
+        <div v-if="ruleForm.ywrList && ruleForm.qlxx.djlx == '200'">
           <div class="slxx_title title-block">
           <div class="slxx_title title-block">
             义务人信息
             义务人信息
             <div class="triangle"></div>
             <div class="triangle"></div>

@@ -222,16 +222,16 @@ class data extends filter {
           )
           )
         }
         }
       },
       },
-      {
-        prop: "zcs",
-        label: "总层数",
-        width: '70',
-      },
-      {
-        prop: "zts",
-        label: "总套数",
-        width: '70',
-      },
+      // {
+      //   prop: "zcs",
+      //   label: "总层数",
+      //   width: '70',
+      // },
+      // {
+      //   prop: "zts",
+      //   label: "总套数",
+      //   width: '70',
+      // },
       {
       {
         prop: "zl",
         prop: "zl",
         label: "多幢坐落",
         label: "多幢坐落",