Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW

Surpriseplus

2023-02-22 853873ddb35e8eeb42b1b1b9fdb247ba5b1f19d1

Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW

 package.json

@@ -25,12 +25,11 @@
    "install": "^0.13.0",
    "jquery": "^3.6.0",
    "moment": "^2.29.4",
    "node-sass": "^7.0.3",
    "node-sass": "^4.14.1",
    "npm": "^8.15.1",
    "object-assign": "^4.1.1",
    "ol": "^6.15.1",
    "sql.js": "^1.5.0",
    "sqlite3": "^5.0.2",
    "sass-loader": "^8.0.0",
    "terraformer-wkt-parser": "^1.2.1",
    "theme-vue": "0.0.8",
    "vant": "^2.12.25",
@@ -57,7 +56,6 @@
    "lint-staged": "^9.5.0",
    "postcss-pxtorem": "^5.1.1",
    "prettier": "^2.2.1",
    "sass-loader": "^10.3.1",
    "vue-particles": "^1.0.9",
    "vue-template-compiler": "^2.6.11"
  },

 public/globle/globle.js

@@ -18,3 +18,10 @@
    window.TSExcavation = null;
  }
}

window.XZOutlie="dlg_100w_boua"; //1:100万行政面layer名称
window.ImageLayer3=null;//1:100万行政面图层





 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/components/mapsdk.vue

@@ -415,6 +415,8 @@
        })
      )

      window.ImageLayer3=this.layer3;

      // for (var i in gaoDeBaseUrl) {
      //   sgworld.Creator.createUrlTemplateImageryProvider(
      //     gaoDeBaseUrl[i].label,

 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/Synthesis/LeftMenu.vue

@@ -1214,9 +1214,7 @@
                },
                function (entity) {
                    let   positions = entity.polygon.hierarchy.getValue().positions;
                    console.log(positions);
                    sgworld.Creator.SimpleGraphic.remove(entity.id);
                    
                    window.DXTerrainFlattening = sgworld.Creator.createTerrainModifier("地形压平", positions, 10, {});
                }
            );
@@ -1368,7 +1366,7 @@
          window.sgworld.Command.execute(2, 3, '', (data) => {
            data.showPoint = false;
            data.showLine = true;
            data.mode = 1;
            data.mode = 0;
            // 弹窗数据
            window.PathAnimationData = {
              flyData: data,

 src/views/Tools/LayerTree.vue

@@ -405,9 +405,20 @@
    handleDrop (draggingNode, dropNode, dropType, ev) {
      console.log('tree drop: ', dropNode.label, dropType);
    },
    handleCheckChange (data, checked, indeterminate) {
    handleCheckChange(data, checked, indeterminate) {
      



      if (data.type != 2) return;
      //做判断是否是1：100万行政界面
      if(data.layer==window.XZOutlie&&checked){
        window.ImageLayer3.show=false;
      }else{
        window.ImageLayer3.show=true;
      }


      var std = [];
      if (data.layerType == 'WMS') {
        var layers_ol = window.map.getAllLayers();
@@ -452,7 +463,7 @@
        }
      }
    },
    setAddLayers (res) {
    setAddLayers(res) {
      if (res.layerType == 'WMS') {
        var url = geoServerURl;
        if (res.url != null && res.url != undefined) {

 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"