Browse Source

中图代码更改

gushoubang 1 month ago
parent
commit
84ca61ed51

+ 3 - 1
src/views/ConstructionApplication3D/SunlightAnalysis/SunlightAnalysis.vue

@@ -31,7 +31,7 @@
         <el-row :gutter="10" style="display: flex; align-items: center">
           <el-col :span="6"> 日照时间范围: </el-col>
           <el-col :span="18">
-            <el-slider
+            <el-slider 
               size="mini"
               v-model="datavalue"
               range
@@ -2049,7 +2049,9 @@ export default {
 };
 </script>
 <style lang="scss">
+
 @import "@/../../zt.scss";
+@import "@/../../datePicker.scss";
 </style>
 <style lang="scss" scoped>
 .el-card {

+ 114 - 0
src/views/ConstructionApplication3D/datePicker.scss

@@ -0,0 +1,114 @@
+// .el-date-editor .el-range__close-icon {
+//     display: none;
+//   }
+
+.el-picker-panel__sidebar {
+  background: #002446;
+  border-color: rgba(37, 103, 141, 0.46);
+  border-radius: 6px 0 0 6px;
+
+  .el-picker-panel__shortcut {
+    color: rgba(255, 255, 255, 1);
+  }
+}
+
+//// 时间选择器  通用样式
+.el-date-editor--daterange.el-input__inner {
+  // width: 200px;
+  background: #002446;
+  padding: 0;
+  padding-left: 7px;
+}
+
+.el-date-editor .el-range-separator {
+  padding: 0;
+  height: 78%;
+}
+
+.el-date-editor .el-range__close-icon {
+  line-height: 23px;
+}
+
+.el-date-editor .el-range__icon {
+  line-height: 22px;
+}
+
+.el-date-picker__header-label {
+  color: #fff;
+}
+
+.el-range-input {
+  background: #002446;
+  font-size: 12px;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 1);
+}
+
+.el-range-separator {
+  line-height: 30px !important;
+  color: rgba(255, 255, 255, 1) !important;
+}
+
+.el-date-editor .el-range-input {
+  font-size: 12px;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 1);
+}
+
+.el-picker-panel,
+.el-time-panel {
+  background: #002446 !important;
+  border: 1px solid rgba(37, 103, 141, 0.46);
+  color: #fff;
+  border-radius: 6px;
+}
+
+.el-picker-panel__icon-btn,
+.el-date-picker__header-label {
+  color: #fff;
+}
+
+.el-time-spinner__item {
+  color: #fff;
+
+  &.active:not(.disabled) {
+    color: #fff;
+  }
+
+  &:hover {
+    background: transparent !important;
+    color: rgb(64, 158, 255); //#3B5064
+  }
+}
+
+.el-date-range-picker__content.is-left {
+  border-right: 1px solid rgba(37, 103, 141, 0.46);
+  color: #fff;
+}
+
+.el-date-table td.in-range div,
+.el-date-table td.in-range div:hover,
+.el-date-table.is-week-mode .el-date-table__row.current div,
+.el-date-table.is-week-mode .el-date-table__row:hover div {
+  background: rgba(23, 94, 165, 0.31) !important;
+}
+
+.el-date-table th {
+  color: #fff;
+}
+
+.el-date-table td.next-month,
+.el-date-table td.prev-month {
+  color: #747985;
+}
+
+// 选择器箭头方向
+.el-input__suffix-inner .el-icon-arrow-down:before {
+  content: " ";
+  border-top: 8px solid #64daff !important;
+  border-bottom: 8px solid transparent !important;
+  border-left: 5.5px solid transparent !important;
+  border-right: 5.5px solid transparent !important;
+  position: relative;
+  top: 12px;
+}

+ 1 - 1
src/views/ConstructionApplication3D/projectManagement/projectManagement.vue

@@ -3519,7 +3519,7 @@ export default {
      */
     openGGPreview(Minfo) {
       this.$layer.close("ConstructionApplication3D");
-
+      this.$router.push('/');
       this.$layer.iframe({
         id: "BillboardDesign",
         layerStyle: {

+ 1 - 0
src/views/billboardplan.vue

@@ -18,6 +18,7 @@ export default {
       switch (componentName) {
         case "BillboardDesign":
           this.layerid = this.$layer.iframe({
+            id: "BillboardDesign",
             content: {
               content: BillboardDesign, //传递的组件对象
               parent: this, //当前的vue对象

+ 1 - 0
src/views/checkmodel.vue

@@ -19,6 +19,7 @@ export default {
       switch (componentName) {
         case "ConstructionApplication3D":
           this.layerid = this.$layer.iframe({
+            id:"ConstructionApplication3D",
             content: {
               content: ConstructionApplication3D, //传递的组件对象
               parent: this, //当前的vue对象

+ 22 - 22
static/Config/config.js

@@ -972,7 +972,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "地类图斑",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "地类图斑",
         },
@@ -1114,7 +1114,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "规划地块",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "规划地块",
         },
@@ -1156,7 +1156,7 @@ window.layerTree = [
         date_server: {
           nvfid: "456sd78",
           server_name: "城镇开发边界",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "城镇开发边界",
         },
@@ -1176,7 +1176,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "生态保护红线",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "生态保护红线",
         },
@@ -1196,7 +1196,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "永久基本农田",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "永久基本农田",
         },
@@ -1216,7 +1216,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "建筑退线",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "建筑退线",
         },
@@ -1318,7 +1318,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "道路中线",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "道路中线",
         },
@@ -1338,7 +1338,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "禁止开口线",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "禁止开口线",
         },
@@ -1358,7 +1358,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "道路红线",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "道路红线",
         },
@@ -1400,7 +1400,7 @@ window.layerTree = [
         date_server: {
           nvfid: "456sd78",
           server_name: "c1_2_商服级别",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c1_2_商服级别",
         },
@@ -1420,7 +1420,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "c2_2_0_住宅级别",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c2_2_0_住宅级别",
         },
@@ -1440,7 +1440,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "c3_2_工业级别",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c3_2_工业级别",
         },
@@ -1460,7 +1460,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "c4_1_公服级别",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c4_1_公服级别",
         },
@@ -1480,7 +1480,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "c2_3_0_工业级别",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c2_3_0_工业级别",
         },
@@ -1500,7 +1500,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "c2_1_0_商服级别",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c2_1_0_商服级别",
         },
@@ -1520,7 +1520,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526wsd78",
           server_name: "c4_路线价",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c4_路线价",
         },
@@ -1540,7 +1540,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526sawsd78",
           server_name: "c2_2_住宅级别",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c2_2_住宅级别",
         },
@@ -1560,7 +1560,7 @@ window.layerTree = [
         date_server: {
           nvfid: "4526sawsd78",
           server_name: "c2_4_0_公服级别",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "c2_4_0_公服级别",
         },
@@ -1602,7 +1602,7 @@ window.layerTree = [
         date_server: {
           nvfid: "456sd78",
           server_name: "国有使用权",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "国有使用权",
         },
@@ -1622,7 +1622,7 @@ window.layerTree = [
         date_server: {
           nvfid: "456sd78",
           server_name: "集体使用权",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "集体使用权",
         },
@@ -1642,7 +1642,7 @@ window.layerTree = [
         date_server: {
           nvfid: "456sd78",
           server_name: "集体所有权",
-          url: "http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data",
+          url: "http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data",
           datasourcename: "sanya",
           datasetname: "集体所有权",
         },
@@ -3330,7 +3330,7 @@ window.ZSBC = {
    * 征地补偿数据服务
    */
   dataServiceUrl:
-    'http://192.168.2.130:8091/iserver/services/data-sanyamap1/rest/data/featureResults.rjson?returnContent=true&hasGeometry=true"',
+    'http://192.168.60.2:8090/iserver/services/data-sanyamap1/rest/data/featureResults.rjson?returnContent=true&hasGeometry=true"',
 
   /**征地补偿标准 */
   ZDBCList: [