Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/complianceAnalysis/ghzc.scss

@@ -64,7 +64,7 @@
         }
 
         .el-tabs__item {
-            width: 104px;
+            // width: 104px;
             height: 32px;
             line-height: 32px;
             background: url("/static/images/ghzc/Tab_bg.png") no-repeat;

src/views/farmlandProtection/components/fzjcyp.vue

@@ -0,0 +1,86 @@
+<template>
+  <div class="fzjcyp ghzc">
+    <el-form
+      :model="ruleForm"
+      ref="ruleForm"
+      label-width="88px"
+      :rules="rules"
+      label-position="left"
+    >
+      <el-form-item label="选址范围:" prop="xzmj">
+        <range type="fzjcyp" :keys="['hx', 'sc']" class="range" ref="range" />
+      </el-form-item>
+      <el-form-item label="项目名称:" prop="xmmc">
+        <el-input
+          v-model="ruleForm.xmmc"
+          size="mini"
+          placeholder="请输入项目名称"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import range from "@/components/mapview/range.vue"; ///mapview/range
+import moment from "moment";
+export default {
+  components: {
+    range,
+  },
+  data() {
+    return {
+      ruleForm: {
+        xzmj: 0,
+        xmmc: "耕地保护项目_" + this.getCurrentDateTime(),
+      },
+      rules: {
+        xzmj: [{ required: true, message: "请填写范围的数据" }],
+        xmmc: [
+          { required: true, message: "请输入项目名称", trigger: "blur" },
+          {
+            min: 1,
+            message: "请输入至少为一个字符的项目名称",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    getCurrentDateTime() {
+      return moment(new Date()).format("YYYYMMDDHHmmss");
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = this.padNumber(now.getMonth() + 1); // 月份是从0开始的
+      const day = this.padNumber(now.getDate());
+      const hours = this.padNumber(now.getHours());
+      const minutes = this.padNumber(now.getMinutes());
+      const seconds = this.padNumber(now.getSeconds());
+      return `${year}-${month}-${day} ${hours}-${minutes}-${seconds}`;
+    },
+    padNumber(num) {
+      return num < 10 ? "0" + num : num;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.fzjcyp{
+  height: 100%;
+  line-height: 40px;
+  .range {
+    flex: 1;
+    width: 100%;
+  }
+
+  .XZtree {
+    width: 100%;
+    height: calc(100% - 400px);
+    // padding: 7px;
+    margin-bottom: 10px;
+    overflow-y: auto;
+  }
+}
+</style>

src/views/farmlandProtection/index.vue

@@ -0,0 +1,172 @@
+<!--合规性分析-->
+<template >
+    <div class="ghzc siteselection">
+      <div class="innerContainer leftPane" v-drag @click.native.stop>
+        <h2 class="Pangetitle darg-div">
+          <span class="pange_text">耕地保护</span>
+        </h2>
+        <el-tabs type="border-card" class="xz_box" v-model="activeTabs" stretch @tab-click="tabClick">
+          <el-tab-pane label="辅助监测研判" name="fzjcyp">
+            <FZJCYP v-loading="loading" @updateParent="changeData" ref="fzjcyp"></FZJCYP>
+          </el-tab-pane>
+          <el-tab-pane label="历史记录" name="lsju">
+            历史记录
+            <!-- <Lsjl :rzBsm="rzBsm" :activeTabs="activeTabs" @updateParent="changeData" type="ghxz" ref="lsju"></Lsjl> -->
+          </el-tab-pane>
+          <el-tab-pane label="分析结果" :disabled="activeTabs != 'scjg'" name="fxjg">
+            分析结果
+            <!-- <div v-drag style="height: 100%;">
+              <XZJG :activeTabs="activeTabs" :loading="loading" :rwBsm="rwBsm" :rzMc="nowObj.xmmc"
+                v-if="activeTabs == 'xzjg'"></XZJG>
+            </div> -->
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <!-- <RzDtails :rzBsm="rzBsm" :rzMc="nowObj.xmmc" @updateParent="changeData"></RzDtails> -->
+    </div>
+  </template>
+  
+  <script>
+  import FZJCYP from "./components/fzjcyp.vue";
+  export default {
+    name: "farmlandProtection",
+    components: {
+      FZJCYP
+    },
+    data() {
+      return {
+        activeTabs: "fzjcyp",
+        rzBsm: "",
+        rwBsm: "",
+        nowObj: {},
+        rzMc: "",
+        loading: false,
+      };
+    },
+    created() { },
+    methods: {
+      changeData(name, updata) {
+        this[name] = updata;
+      },
+      tabClick(evt) {
+        this.activeTabs = evt.name;
+      },
+    },
+    watch: {
+      activeTabs(newValue) {
+  
+        // if (newValue != "fzxz") this.$refs.fzxz.reset();
+        // if (newValue != "lsju") this.$refs.lsju.reset();
+  
+        // if (newValue == "lsju") {
+        //   this.$refs.lsju.reset();
+        //   this.$refs.lsju.changeForm();
+        // }
+      },
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  .siteselection {
+    .xz_box {
+      .title {
+        padding: 8px;
+        margin-bottom: 10px;
+  
+        span {
+          color: #605e5e;
+          padding-left: 8px;
+          border-left: 3px solid #3a8ee6;
+        }
+  
+        button {
+          padding: 0;
+          float: right;
+          margin-right: 5px;
+          min-height: unset;
+        }
+      }
+  
+      .el-form-item {
+        margin-bottom: 0;
+      }
+  
+      .xz_table {
+        height: 180px;
+  
+        /deep/.el-table__header-wrapper {
+          height: 40px;
+        }
+  
+        /deep/.el-table__body-wrapper {
+          height: calc(100% - 40px);
+          overflow-y: auto;
+        }
+      }
+  
+      .xz_type {
+        margin-bottom: 10px;
+        justify-content: space-evenly;
+  
+        div {
+          i {
+            font-size: 36px;
+          }
+        }
+      }
+  
+      .xz-btn {
+        width: 100%;
+        // background: #efefef;
+        position: absolute;
+        height: 55px;
+        z-index: 999;
+        bottom: 0;
+        right: 0;
+        display: flex;
+        align-items: center;
+      }
+  
+      .jg-box {
+        td {
+          padding-left: 15px;
+        }
+  
+        .el-collapse-item__header {
+          span {
+            position: absolute;
+            right: 40px;
+          }
+        }
+  
+        .el-collapse-item__content {
+          padding-bottom: 0;
+        }
+      }
+    }
+  
+    .tckz {
+      position: absolute;
+      left: auto;
+      right: 10px;
+      bottom: 100px;
+      text-align: center;
+      // background-color: rgba(255, 255, 255, 0.85);
+      padding-top: 5px;
+      padding-bottom: 5px;
+      padding-right: 5px;
+      padding-left: 5px;
+      border-radius: 5px;
+  
+      >div {
+        padding: 5px;
+        text-align: left;
+      }
+    }
+  }
+  </style>
+  <style lang="scss">
+  @import "../complianceAnalysis//ghzc.scss";
+  </style>
+  

src/views/siteselection/components/fzxz.vue

@@ -451,19 +451,13 @@ export default {
 .hgxsc {
   height: 100%;
   line-height: 40px;
-
   .rangDiv {
     width: 100%;
-    // height: 100px;
     display: flex;
     justify-content: space-between;
   }
 
   .range {
-    // flex: 1;
-    // width: calc(100% - 100px);
-    // position: absolute;
-    // left: 100px;
     flex: 1;
     width: 100%;
   }