Merge branch 'release-sy-v1.0.0' into 'dev'

Release sy v1.0.0

See merge request project/water/shuili-vue!136

src/main.js

@@ -42,9 +42,9 @@ import DictData from '@/components/DictData'
 // const m = detectZoom()
 // document.body.style.zoom = 100 / Number(m);
 
-import DevicePixelRatio from "@/utils/deviceRatio";
+// import DevicePixelRatio from "@/utils/deviceRatio";
 
-new DevicePixelRatio().init();
+// new DevicePixelRatio().init();
 
 // 全局下载文件方法
 import {downloadFile,showFile} from '@/api/common'

src/views/components/SyMixMap.vue

@@ -104,6 +104,7 @@ export default {
   data() {
     return {
       defaultHeight: 50000,
+      defaultLineWidth: 6,
       isFullScreen: false,
       long: '',
       lat: '',
@@ -161,17 +162,18 @@ export default {
       layer = new sycim.EntityLayer('layer');
       viewer.addLayer(layer);
       plot = new sycim.Plot(viewer);
-      viewer.on(
-        sycim.SceneEventType.CAMERA_CHANGED,
-        () => {
-          viewer.setOptions({
-            globe: {
-              depthTestAgainstTerrain: viewer.cameraPosition.alt > 10000 ? false : true
-            }
-          });
-        },
-        viewer
-      );
+      // 三维模型才需要
+      // viewer.on(
+      //   sycim.SceneEventType.CAMERA_CHANGED,
+      //   () => {
+      //     viewer.setOptions({
+      //       globe: {
+      //         depthTestAgainstTerrain: viewer.cameraPosition.alt > 10000 ? false : true
+      //       }
+      //     });
+      //   },
+      //   viewer
+      // );
       setTimeout(() => {
         viewer.scene.camera.setView({
         destination: new Cesium.Cartesian3.fromDegrees(113.27, 23.13, this.defaultHeight),
@@ -250,21 +252,13 @@ export default {
             graphicItem = new sycim.Polyline(item.positions);
             graphicItem.setStyle({
               canEdit: this.canEdit,
-              width: 16,
+              width: this.defaultLineWidth,
               clampToGround: true,
               lineType: '1',
               speed_s: 2,
               horizontalOrigin: sycim.HorizontalOrigin.CENTER,
               verticalOrigin: sycim.VerticalOrigin.BOTTOM,
-
-              material: new sycim.PolylineImageTrailMaterialProperty({
-                speed: 2,
-                image: `/icons/${item.icon}`,
-                repeat: {
-                  x: 50,
-                  y: 1
-                }
-              })
+              material: sycim.Cesium.Color.fromCssColorString('#36B29E')
             })
           }
           if(graphicItem){
@@ -292,11 +286,12 @@ export default {
       let plotOptions = {
         scale: 1,
         image: `/icons/${iconName}`,
+        material: sycim.Cesium.Color.fromCssColorString('#36B29E'),
         horizontalOrigin: sycim.HorizontalOrigin.CENTER,
         verticalOrigin: sycim.VerticalOrigin.BOTTOM,
       }
       if(type === 'polyline'){
-        plotOptions.width = 16
+        plotOptions.width = 4
       }
       if(plot) plot.stop()
       plot.draw(
@@ -310,25 +305,19 @@ export default {
                 canEdit: true,
                 horizontalOrigin: sycim.HorizontalOrigin.CENTER,
                 verticalOrigin: sycim.VerticalOrigin.BOTTOM,
+                //disableDepthTestDistance: 5000,
               })
             }else if(type === 'polyline'){
               graphicItem = new sycim.Polyline(graphic.positions);
               graphicItem.setStyle({
                 canEdit: true,
-                width: 16,
+                width: this.defaultLineWidth,
                 clampToGround: true,
                 lineType: '1',
                 speed_s: 2,
                 horizontalOrigin: sycim.HorizontalOrigin.CENTER,
                 verticalOrigin: sycim.VerticalOrigin.BOTTOM,
-                material: new sycim.PolylineImageTrailMaterialProperty({
-                  speed: 2,
-                  image: `/icons/${iconName}`,
-                  repeat: {
-                    x: 50,
-                    y: 1
-                  }
-                })
+                material: sycim.Cesium.Color.fromCssColorString('#36B29E')
               })
             }
             if(graphicItem){

src/views/dike/runManage/enginerring/inspectionPlan/index.vue

@@ -142,7 +142,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           let user = [];
-          this.ruleForm.otherConfig.selectUser.forEach((element) => {
+          this.ruleForm.otherConfig.selectUser?.forEach((element) => {
             let a = {
               name: element.nickName,
               uid: element.id,

src/views/dike/runManage/enginerring/inspectionRecords/index.vue

@@ -108,6 +108,10 @@ export default {
           console.log("取消删除");
         });
     },
+    calcHours(start, end) {
+      if (!start || !end) return "-";
+      return dayjs(end).diff(dayjs(start), "hour");
+    },
     getTreeData() {
       getAreasData().then((items) => {
         // console.log("getAreasData", items.data);
@@ -541,14 +545,16 @@ export default {
           label="巡查开始时间/结束时间"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.startDate }}/{{ scope.row.endDate }}</span>
+            <span
+              >{{ scope.row.startDate || "-" }}/{{
+                scope.row.endDate || "-"
+              }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column align="center" label="巡查时长/小时">
           <template slot-scope="scope">
-            <span>{{
-              dayjs(scope.row.endDate).diff(dayjs(scope.row.startDate), "hours")
-            }}</span>
+            <span>{{ calcHours(scope.row.startDate, scope.row.endDate) }}</span>
           </template>
         </el-table-column>
 

src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue

@@ -121,9 +121,9 @@
                 <div
                   class="tool-item cursor-pointer"
                   :class="{ 'cursor-not-allowed': !canEdit }"
-                  @click="handleDraw('polyline', 'line_path.svg')"
+                  @click="handleDraw('polyline', '')"
                 >
-                  <img class="icon" src="/icons/line_path.svg" alt="" />
+                  <div class="line-path"></div>
                   路线方向
                 </div>
               </div>
@@ -580,6 +580,11 @@ export default {
         border: 1px solid #dcdcdc;
         margin-right: 16px;
         margin-bottom: 16px;
+        .line-path {
+          width: 16px;
+          height: 6px;
+          background: #36b29e;
+        }
         .icon {
           width: 16px;
           height: 16px;