处理冲突

wulitaotao

2023-02-22 bf99ec236026dd66f860d1c05acfc55a318a186d

处理冲突

 src/assets/lang/zh.js

@@ -98,7 +98,7 @@
      storageDirectory: '存储目录',
      dataVersion: '数据版本',
      selectData: '选择数据',
      selectMetadata: '选择元数据',
      selectMetadata: '选择源数据',
      entryName: '项目名称',
      selectWBSData: '选择WBS数据',
      coordinateSystem: '坐标系',
@@ -530,7 +530,7 @@
  downlog: {
    type1: 'Shp文件',
    type2: '专题图',
    type3: '元数据',
    type3: '源数据',
    type4: '业务数据',
    type5: '管道分析',
    type6: '统计报告',

 src/components/MyBread.vue

@@ -27,7 +27,7 @@
  position: relative;
  top: 10px;
  // margin-top: 24px;
  width: 500px;
  // width: 500px;
  margin-left: 10px;
}
</style>

 src/components/Screen/bottom.vue

@@ -171,6 +171,7 @@
  },
  created() {
    this.getCountProjectDisplay()
    this.getCountProjectTour()
  },
  methods: {
    ChangeBaseLayer() {
@@ -210,56 +211,17 @@
      const position = line.coordinates[0]
      const result = []
      position.forEach(pos => {
        pos.push(50)
        // 添加漫游高度，后续修改SDK源码可以适配为地面高程
        pos.push(1000)
        result.push(...pos)
      })
      //
      console.log("line", position)
      // 西气东输二线西段干线
      // console.log("PipeLine", PipeLine)
      const features = PipeLine.features
      // features.forEach(item => {
      //   const name = item.properties.pipename
      //   const rawArr = item.geometry.coordinates
      // })
      // const pipeline = features.find(
      //   item => item.properties.pipename == "西气东输一线"
      // )
      // const name = pipeline.properties.pipename
      // const rawArr = pipeline.geometry.coordinates[0]
      // const result = []
      // rawArr.forEach(pos => {
      //   pos.push(50)
      //   result.push(...pos)
      // })
      // console.log("result", result);
      // sgworld.Command.execute(2, 3, "", data => {
      //   data.showPoint = false
      //   data.showLine = true
      //   data.mode = 1
      //   // 弹窗数据
      //   window.PathAnimationData = {
      //     flyData: data,
      //   }
      //   window.PathAnimationData.winIndex = layer.open({
      //     type: 2,
      //     title: "路径动画",
      //     shade: false,
      //     area: ["352px", "690px"],
      //     offset: "r",
      //     skin: "other-class",
      //     content: SmartEarthRootUrl + "Workers/path/Path.html",
      //     end: function () {
      //       PathAnimationData.fly && PathAnimationData.fly.exit()
      //     },
      //   })
      // })

      window.sgworld.Creator.getFlyData(result, data => {
        data.showPoint = false
        data.showLine = true
        data.mode = 1
        data.height = 2000
        data.height = 5000

        // 弹窗数据
        window.PathAnimationData = {
@@ -267,12 +229,12 @@
        }
        window.PathAnimationData.winIndex = layer.open({
          type: 2,
          title: "路径动画",
          title: "工程巡视",
          shade: false,
          area: ["352px", "690px"],
          offset: "r",
          skin: "other-class",
          content: SmartEarthRootUrl + "Workers/path/Path.html",
          content: SmartEarthRootUrl + "Workers/path/ProjectPath.html",
          end: function () {
            PathAnimationData.fly && PathAnimationData.fly.exit()
          },

 src/views/AuthorizationManagement/menuRoleAuthorization.vue

@@ -8,16 +8,16 @@
      ]"
    ></My-bread>
    <el-divider /> -->
    <div class="menuSettings_tree subpage_Div menuRoleAuthorization_left">
    <div class="menuSettings_tree subpage_Div menuRoleAuthorization_left" style="padding-top:10px;width: 23%;overflow-y: auto;">
      <My-bread
        :list="[
          `${$t('operatManage.operatManage')}`,
          `${$t('operatManage.UserRoleAuthorization')}`,
          `${$t('operatManage.MenuRoleAuthorization')}`,
        ]"
      ></My-bread>

      <el-divider />
      <div class="menuTreeBox">
      <div>
        <div class="card_tree">
          <el-tree
            :data="depList"
@@ -35,7 +35,7 @@
      </div>
    </div>
    <!-- <div class="menuRoleAuthorization_resize" title="收缩侧边栏">⋮</div> -->
    <div class="menuTreeBox menuRoleAuthorization_mid">
  
      <!-- <div class="left_tree subpage_Div">
        <el-tree
          :data="depList"
@@ -57,8 +57,6 @@
            color: #409eff;
            line-height: 1;
            cursor: text;
            position: relative;
            top: 5px;
            margin-left: 10px;
            display: flex;
            align-items: center;
@@ -129,7 +127,6 @@
          </el-pagination>
        </div>
      </div>
    </div>

    <!-- <div class="menuSettings">

@@ -531,13 +528,11 @@
  border-radius: 10px;
  position: relative;
  display: flex;
  // justify-content: space-between;
  justify-content: space-between;

  .menuTreeBox {
    width: 100%;
    height: 98%;

    .left_tree {
      width: 29%;
      width: 23%;
      height: 92%;
      padding: 10px;

@@ -548,14 +543,14 @@
    }
    .right_menu {
      border-radius: 10px;
      width: 97%;
      height: 100%;
      width: 75%;
      // height: 92%;
      padding: 10px;

      border-radius: 5px;
      // padding-top:0;
      border-radius: 10px;
      float: right;
    }
  }
  

  .divider {
    margin-top: 8px;

 src/views/AuthorizationManagement/roleResAuthorization.vue

@@ -710,4 +710,5 @@
.el-table /deep/ tr {
  background-color: transparent !important;
} 

</style>

 src/views/Tools/LayerTree.vue

@@ -1,79 +1,61 @@
<template>
  <div class="lalala tree-container">
    <el-input
      placeholder="输入关键字进行过滤"
      v-model="filterText"
      class="search"
    >
    <el-input placeholder="输入关键字进行过滤"
              v-model="filterText"
              class="search">
    </el-input>
    <el-tree
      :data="treeData"
      node-key="id"
      default-expand-all
      show-checkbox
      @node-click="handleLeftclick"
      @node-contextmenu="rightClick"
      @check-change="handleCheckChange"
      :default-checked-keys="handleTreeCheck"
      ref="tree"
    >
      <span
        class="slot-t-node"
        slot-scope="{ node, data }"
        @dblclick="editNode(data)"
      >
    <el-tree :data="treeData"
             node-key="id"
             default-expand-all
             show-checkbox
             @node-click="handleLeftclick"
             @node-contextmenu="rightClick"
             @check-change="handleCheckChange"
             :default-checked-keys="handleTreeCheck"
             ref="tree">
      <span class="slot-t-node"
            slot-scope="{ node, data }"
            @dblclick="editNode(data)">
        <span v-show="!data.isEdit">
          <span :class="[data.id >= 99 ? 'slot-t-node--label' : '']">{{
            node.label
          }}</span>
        </span>
        <span v-show="data.isEdit">
          <el-input
            class="slot-t-input"
            size="mini"
            autofocus
            v-model="data.label"
            :ref="'slotTreeInput' + data.id"
            @blur.stop="NodeBlur(node, data)"
            @keydown.native.enter="NodeBlur(node, data)"
          ></el-input>
          <el-input class="slot-t-input"
                    size="mini"
                    autofocus
                    v-model="data.label"
                    :ref="'slotTreeInput' + data.id"
                    @blur.stop="NodeBlur(node, data)"
                    @keydown.native.enter="NodeBlur(node, data)"></el-input>
        </span>
      </span>

    </el-tree>

    <el-card
      class="box-card"
      ref="card"
      :style="{ ...rightClickMenuStyle }"
      v-show="menuVisible"
    >
    <el-card class="box-card"
             ref="card"
             :style="{ ...rightClickMenuStyle }"
             v-show="menuVisible">
      <div @click="addSameLevelNode()">
        <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;添加图层组
      </div>
      <div
        class="add"
        @click="addChildNode()"
        v-show="firstLevel"
      >
      <div class="add"
           @click="addChildNode()"
           v-show="firstLevel">
        <i class="el-icon-circle-plus-outline"></i>&nbsp;&nbsp;添加图层
      </div>
      <div
        class="delete"
        @click="deleteNode()"
      >
      <div class="delete"
           @click="deleteNode()">
        <i class="el-icon-remove-outline"></i>&nbsp;&nbsp;删除节点
      </div>
      <div
        class="edit"
        @click="editNode()"
      >
      <div class="edit"
           @click="editNode()">
        <i class="el-icon-edit"></i>&nbsp;&nbsp;修改节点
      </div>
      <div
        class="edit"
        @click="showLayerAttribute()"
      >
      <div class="edit"
           @click="showLayerAttribute()">
        <i class="el-icon-edit"></i>&nbsp;&nbsp;属性
      </div>
      <!-- <div
@@ -89,33 +71,25 @@
        <i class="el-icon-bottom"></i>&nbsp;&nbsp;下移
      </div> -->
    </el-card>
    <el-dialog
      :title="appendNodetitle"
      :visible.sync="dialogVisible"
      width="30%"
      top="20vh"
      :modal="false"
      :before-close="handleClose"
    >
      <el-form
        ref="form"
        :model="addFormServer"
        label-width="100px"
      >
    <el-dialog :title="appendNodetitle"
               :visible.sync="dialogVisible"
               width="30%"
               top="20vh"
               :modal="false"
               :before-close="handleClose">
      <el-form ref="form"
               :model="addFormServer"
               label-width="100px">
        <el-form-item label="服务类型">
          <!-- <el-input v-model="addFormServer.type"></el-input> -->
          <el-select
            style="width:100%"
            :popper-append-to-body="false"
            v-model="addFormServer.layerType"
            placeholder="请选择"
          >
            <el-option
              v-for="item in options"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            >
          <el-select style="width:100%"
                     :popper-append-to-body="false"
                     v-model="addFormServer.layerType"
                     placeholder="请选择">
            <el-option v-for="item in options"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value">
            </el-option>
          </el-select>
        </el-form-item>
@@ -133,17 +107,13 @@
          <el-slider v-model="addFormServer.opacity"></el-slider>
        </el-form-item>
      </el-form>
      <span
        slot="footer"
        class="dialog-footer"
      >
        <el-button
          type="primary"
          @click="setAddServer"
        >确 定</el-button>
      <span slot="footer"
            class="dialog-footer">
        <el-button type="primary"
                   @click="setAddServer">确 定</el-button>
      </span>
    </el-dialog>
     <queryinfo ref="queryinfo" />
    <queryinfo ref="queryinfo" />
  </div>
</template>

@@ -162,8 +132,8 @@
import { perms_selectLayers } from '../../api/api.js'
export default {
  name: 'tree',
    components: {  queryinfo },
  data() {
  components: { queryinfo },
  data () {
    return {
      eleId: '',
      isShow: false,
@@ -206,7 +176,7 @@
    };
  },
  methods: {
    NodeBlur(Node, data) {
    NodeBlur (Node, data) {
      if (data.label.length === 0) {
        this.$message.error('菜单名不可为空！');
        return false;
@@ -220,23 +190,23 @@
      }
    },
    // 查询
    filterNode(value, data) {
    filterNode (value, data) {
      if (!value) return true;
      return data.label.indexOf(value) !== -1;
    },

    allowDrop(draggingNode, dropNode, type) {
    allowDrop (draggingNode, dropNode, type) {
      if (dropNode.data.label === '二级 3-1') {
        return type !== 'inner';
      } else {
        return true;
      }
    },
    allowDrag(draggingNode) {
    allowDrag (draggingNode) {
      return draggingNode.data.label.indexOf('三级 3-2-2') === -1;
    },
    // 鼠标右击事件
    rightClick(event, object, Node, element) {
    rightClick (event, object, Node, element) {

      this.currentData = object;
      this.currentNode = Node;
@@ -251,7 +221,7 @@
      this.$refs.card.$el.style.top = event.pageY + 'px';
    },
    // 鼠标左击事件
    handleLeftclick(data, node) {
    handleLeftclick (data, node) {
      this.foo();
      if (node.checked == true) {
        for (var i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
@@ -264,13 +234,13 @@
      }
    },
    //  取消鼠标监听事件 菜单栏
    foo() {
    foo () {
      this.menuVisible = false;
      //  要及时关掉监听，不关掉的是一个坑，不信你试试，虽然前台显示的时候没有啥毛病，加一个alert你就知道了
      document.removeEventListener('click', this.foo);
    },
    // 增加同级节点事件
    addSameLevelNode() {
    addSameLevelNode () {

      this.foo();
      if (this.currentNode.level == 2) {
@@ -283,7 +253,7 @@
      }
    },
    // 增加子级节点事件
    addChildNode() {
    addChildNode () {
      this.foo();
      if (this.currentNode.level >= 2) {
        this.$message.error('最多只支两级！');
@@ -292,7 +262,7 @@
      this.appendNodetitle = this.currentData.label;
      this.dialogVisible = true;
    },
    handleClose() {
    handleClose () {
      this.dialogVisible = false;
      this.addFormServer = {
        opacity: 100,
@@ -300,7 +270,7 @@
        type: 2,
      };
    },
    setAddServer() {
    setAddServer () {
      var val = this.currentNode;
      if (this.currentNode.level == 2) {
        val = this.currentNode.parent;
@@ -311,7 +281,7 @@
      this.handleClose();
    },
    // 删除节点
    deleteNode() {
    deleteNode () {

      this.foo();
      var label = this.currentNode.data.label;
@@ -341,7 +311,7 @@
      this.$refs.tree.remove(this.currentNode);
    },
    //属性显示
    showLayerAttribute(data) {
    showLayerAttribute (data) {
      this.foo();
      this.currentData = data ? data : this.currentData;
      var layer = this.currentData.layer.replaceAll('_', "");
@@ -364,7 +334,7 @@
      });
    },
    // 编辑节点
    editNode(data) {
    editNode (data) {

      this.foo();
      this.currentData = data ? data : this.currentData;
@@ -379,7 +349,7 @@



    menuMoveF(type) {
    menuMoveF (type) {
      // 将变动之前的node备份
      var node = this.currentNode;
      var data = this.currentData;
@@ -417,22 +387,22 @@
    },


    handleDragStart(node, ev) {
    handleDragStart (node, ev) {
      console.log('drag start', node);
    },
    handleDragEnter(draggingNode, dropNode, ev) {
    handleDragEnter (draggingNode, dropNode, ev) {
      console.log('tree drag enter: ', dropNode.label);
    },
    handleDragLeave(draggingNode, dropNode, ev) {
    handleDragLeave (draggingNode, dropNode, ev) {
      console.log('tree drag leave: ', dropNode.label);
    },
    handleDragOver(draggingNode, dropNode, ev) {
    handleDragOver (draggingNode, dropNode, ev) {
      console.log('tree drag over: ', dropNode.label);
    },
    handleDragEnd(draggingNode, dropNode, dropType, ev) {
    handleDragEnd (draggingNode, dropNode, dropType, ev) {
      console.log('tree drag end: ', dropNode && dropNode.label, dropType);
    },
    handleDrop(draggingNode, dropNode, dropType, ev) {
    handleDrop (draggingNode, dropNode, dropType, ev) {
      console.log('tree drop: ', dropNode.label, dropType);
    },
    handleCheckChange(data, checked, indeterminate) {
@@ -495,26 +465,26 @@
    },
    setAddLayers(res) {
      if (res.layerType == 'WMS') {

        var url = geoServerURl;
        if (res.url != null && res.url != undefined) {
          url = res.url
        }
        var width = $("#mapdiv").width() +5 ;
        var height = $("#mapdiv").height()+5  ;
     

        //var width = $("#mapdiv").width();
        //var height = $("#mapdiv").height();

        var imageryLayers = window.Viewer.scene.imageryLayers;
        let layerWMS = new Cesium.WebMapServiceImageryProvider({
          url: url,
          layers: res.resource,
          parameters: {
        transparent: true,
                format: "image/png",
                srs: "EPSG:4490",
                styles: "",
            transparent: true,
            format: "image/png",
            srs: "EPSG:4490",
            styles: "",
          },
          tileWidth: width,
            tileHeight: height
          tileWidth: 512,
          tileHeight: 512
        });
        layerWMS.name = res.label;
        //透明度
@@ -527,7 +497,6 @@
          source: new ImageWMS({
            crossOrigin: 'anonymous',
            url: url,

            params: {
              FORMAT: 'image/png',
              VERSION: '1.1.1',
@@ -577,7 +546,7 @@
        window.map.addLayer(vectorLayer);
      }
    },
    async layersStart() {
    async layersStart () {
      const data = await perms_selectLayers();
      if (data.code != 200) {
        return this.$message.error("图层列表查询失败");
@@ -638,7 +607,7 @@
      this.treeData = layer_groups;
      this.$refs.tree.setCheckedKeys(std);
    },
    async treelayersStart() {
    async treelayersStart () {
      const data = await perms_selectLayers();
      if (data.code != 200) {
        return this.$message.error("图层列表查询失败");
@@ -701,12 +670,12 @@
    }
  },
  watch: {
    filterText(val) {
    filterText (val) {
      this.$refs.tree.filter(val);

    },
  },
  mounted() {
  mounted () {
    this.$bus.$on("treeDataCopy", (res) => {
      this.$store.state.treeData = this.treeData;
      this.$store.state.checkedKeys = this.$refs.tree.getCheckedKeys()

 src/views/datamanage/metadataManage.vue

@@ -203,7 +203,7 @@
          <el-table-column  :label="$t('dataManage.vmobj.name')"  >      
            <template slot-scope="scope">
              <span v-if="scope.row.ismeta > 0 ">
                  <el-link  title="元数据查询" @click="setQueryMetaData(scope.row)"   target="_blank">{{ scope.row.name }}</el-link>
                  <el-link  title="源数据查询" @click="setQueryMetaData(scope.row)"   target="_blank">{{ scope.row.name }}</el-link>
              </span>
              <span v-else>{{ scope.row.name }}</span>
            </template>
@@ -846,18 +846,18 @@
         
      this.startQueryMetaData();
    },
    //元数据页面切换
    //源数据页面切换
    handleMetaSizeChange(val){
      this.listMetaData.pageIndex = 1;
     this.listMetaData.pageSize = val;
     this.startQueryMetaData();
    },
     //元数据页面切换
     //源数据页面切换
    handMetaCurrentChange(val){
      this.listMetaData.pageIndex = val;
      this.startQueryMetaData();
    },
  //元数据查询
  //源数据查询
 setQueryMetaData(row){
  this.fromQueryMeta.title = row.name
  this.listMetaData = {

 src/views/maintenance/tokentool.vue

@@ -169,7 +169,7 @@
          </template>
        </el-table-column>
      </el-table>
      <div style="margin-top: 10px">
      <div style="margin-top: 25px">
        <el-pagination
          @size-change="handleSizeChange"
          @current-change="handleCurrentChange"