解决冲突

TreeWish

2023-02-09 22fcbf0a9ed8e0a2df9695859d7a52d1dd55b386

 src/components/MapView/mapMenuPop.vue

@@ -140,7 +140,7 @@
          <el-form-item label="审核单位">
            <div>
              <ul>
                <li v-for="item in ruleForm.depname">
                <li v-for="item in ruleForm.depid">
                  {{item.name}}
                </li>
              </ul>
@@ -208,6 +208,7 @@
  dataQuery_selectDbOverflowDep,
  apply_insertApply,
  decr, encr,
  dataLib_selectDepsByIds,
} from "../../api/api.js";
import { getToken } from "@/utils/auth";
import $ from "jquery";
@@ -339,11 +340,21 @@
        this.insertFlag = 2;
        var std = [];
        this.insertOption.ids = data.result;
        var val = "";
        for (var i in data.result) {
          if (val == "") {
            val += "ids=" + data.result[i]
          } else {
            val += "&ids=" + data.result[i]
          }

          std.push({
            name: data.result[i]
          })
        }
        const data1 = await dataLib_selectDepsByIds(val);

        this.ruleForm.depid = data1.result;
        this.ruleForm.depname = std;
        this.ruleForm.wkt = decr(this.listdata.wkt)
        this.ruleForm.tabs = this.option;
@@ -410,7 +421,7 @@
          message: '数据申请成功',
          type: 'success'
        });
      

        this.closeDown();
      }

@@ -656,7 +667,7 @@
          var val = Cesium.Cartesian3.fromDegrees(
            res.coordinates[0],
            res.coordinates[1],
            1000
            200
          );
          this.$store.state.primitLayer.add({
            position: val,
@@ -890,14 +901,9 @@
  }
}
li {
  color: white;
  line-height: 20px;
  border-bottom: 1px solid white;
  border-bottom: 1px solid gray;
  padding: 5px;
}
/deep/.el-textarea .el-input__count {
  background: transparent;
}
</style>
<style lang="less"></style>
<style scoped lang="less"></style>