合并

wulitaotao

2023-02-09 5ca6c8792edf5f2cfe5a59ff61139a9dc20aace2

合并

 public/SmartEarthSDK/SmartEarth.min.js

ÎļþÌ«´ó

 src/assets/lang/zh.js

@@ -479,7 +479,8 @@
    flatterrain: '地形平整',
    terrainexcavation: '地形开挖',
    removepaint: '清除绘制',
    addlabel:'文字',
    addlabel: "文字",
    textLabel: "文本点",
    openFile: '打开',
    saveFile: '保存',
    synthobj: {
@@ -491,11 +492,15 @@
      m6: '平面面积',
      m7: '体积',
      m8: '角度',
      m9: "高程量测",
    },
    more: '更多',
    Multiplechoice: '多选',
    Singlechoice: '单选',
    undergroundMode: '地下模式'
    undergroundMode: '地下模式',
    visibilityAnalysis: "通视分析",
    circularViewAnalysis: "圆形视域分析",
    viewAnalysis: "视域分析",
  },
  dataApply: {
    type1: '作废',

 src/views/Synthesis/LeftMenu.vue

@@ -195,6 +195,26 @@
            name: '地形开挖',
            css: 'twoMenu_imge411',
          },
           {
            id: "d12",
            label: "synthesis.visibilityAnalysis",
            name: "通视分析",
            css: "twoMenu_imge412",
          },
          {
            id: "d13",
            label: "synthesis.viewAnalysis",
            name: "视域分析",
            css: "twoMenu_imge413",
          },
          {
            id: "d14",
            label: "synthesis.circularViewAnalysis",
            name: "圆形视域分析",
            css: "twoMenu_imge414",
          },


        ],
        [
          {
@@ -260,6 +280,12 @@
            label: 'synthesis.synthobj.m2',
            name: '空间距离',
            css: 'twoMenu_imge76',
          },
          {
            id: "j7",
            label: "synthesis.synthobj.m9",
            name: "高程量测",
            css: "twoMenu_imge77",
          },
        ],
        [
@@ -573,26 +599,17 @@
            }
          );
          break;
        case 'j3':
          // var measure = window.sgworld.Command.execute(
          //   1,
          //   11,
          //   this.colorAll,
          //   (data) => {
          //     data.id = window.sgworld.Core.getuid();
          //     this.measureData.set(data.id, measure);
          //     this.openMeasureResultInfo('海拔高度', data);
          //   }
          // );
          var measure = window.sgworld.Command.execute(0, 3, this.colorAll, (data) => {
            data.id = window.sgworld.Core.getuid();
            this.measureData.set(data.id, measure);
            this.openMeasureResultInfo('平面面积', data);
        // case 'j3':

        //   var measure = window.sgworld.Command.execute(0, 3, this.colorAll, (data) => {
        //     data.id = window.sgworld.Core.getuid();
        //     this.measureData.set(data.id, measure);
        //     this.openMeasureResultInfo('平面面积', data);


          });
        //   });

          break;
        //   break;
        case 'j2':
          var measure = window.sgworld.Command.execute(
            0,
@@ -664,6 +681,18 @@
            }
          );
          break;
          case "j7":
          var measure = window.sgworld.Command.execute(
            1,
            11,
            this.colorAll,
            data => {
              data.id = window.sgworld.Core.getuid()
              this.measureData.set(data.id, measure)
              this.openMeasureResultInfo("海拔高度", data)
            }
          )
          break
      }
    },
    openMeasureResultInfo(name, data) {
@@ -867,6 +896,48 @@
            );
          }
          break;

          case "d12":
          if (window.Excavation) {
            window.Excavation.deleteObject()
            window.Excavation = null
          } else {
            window.Excavation = sgworld.Analysis.createSightLine({
              type: "default",
            })
          }
          break
        case "d13":
          if (window.Excavation) {
            window.Excavation.destroy()
            window.Excavation = null
          } else {
            window.Excavation = sgworld.Analysis.create3DViewshedPoss({
              height: 1.8,
            })
          }
          break
        case "d14":
          if (window.Excavation) {
            window.Excavation.close()
            window.Excavation = null
          } else {
            var SYFX_visible_color = { r: 0.0, g: 1.0, b: 0.0 },
              SYFX_notVisible_color = { r: 1.0, g: 0.0, b: 0.0 }
            window.Excavation = sgworld.Analysis.create3DViewshed({
              name: "Viewshed On Frederick",
              height: 1.8,
              color: {
                Back: SYFX_notVisible_color,
                Fore: SYFX_visible_color,
              },
              isSpherical: "spherical",
            })
          }

          break


      }
    },
    setclippingModel() {
@@ -1094,7 +1165,8 @@
.menu_Box {
  width: 100%;
  height: 100%;

  background: #303030;
  color: white;
  margin: 0;
  padding: 0;
  overflow-y: auto;
@@ -1233,6 +1305,23 @@
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat
      center;
  }
 // é€šè§†åˆ†æžã€è§†åŸŸåˆ†æž é¢„ç•™
 .twoMenu_imge412 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat
      center;
  }
  .twoMenu_imge413 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat
      center;
  }
  .twoMenu_imge414 {
    background: url("../../assets/img/synthesis/矩形 14 æ‹·è´ 7.png") no-repeat
      center;
  }




  //查询
  .twoMenu_imge51 {
    background: url("../../assets/img/synthesis/图层 23.png") no-repeat center;
@@ -1269,6 +1358,15 @@
  .twoMenu_imge76 {
    background: url("../../assets/img/synthesis/空间测距.png") no-repeat center;
  }

    // é«˜å±‚量测图标
    .twoMenu_imge77 {
    background: url("../../assets/img/synthesis/图层 31 æ‹·è´.png") no-repeat
      center;
  }



  //标绘
  .twoMenu_imge81 {
    background: url("../../assets/img/synthesis/椭圆 5 æ‹·è´ 3.png") no-repeat
@@ -1298,5 +1396,6 @@
  .twoMenu_imge88 {
    background: url("../../assets/img/synthesis/图层 32.png") no-repeat center;
  }

}
</style>