Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Combinations/NightscapeAnalysis/index.js

@@ -263,13 +263,21 @@ const Nightscape = {
         var colorTable = new Cesium.ColorTable();
         if (that.tycindex == 0) {
           colorTable.insert(
-            65,
+            61,
+            new Cesium.Color(255 / 255, 255 / 255, 255 / 255)
+          );
+          colorTable.insert(
+            43,
             new Cesium.Color(255 / 255, 0 / 255, 234 / 255)
           );
           colorTable.insert(30, new Cesium.Color(13 / 255, 255 / 255, 0 / 255));
         } else if (that.tycindex == 1) {
           colorTable.insert(
-            65,
+            61,
+            new Cesium.Color(255 / 255, 255 / 255, 255 / 255)
+          );
+          colorTable.insert(
+            43,
             new Cesium.Color(255 / 255, 255 / 255, 0 / 255)
           );
           colorTable.insert(
@@ -277,15 +285,22 @@ const Nightscape = {
             new Cesium.Color(0 / 255, 232 / 255, 255 / 255)
           );
         } else {
-          colorTable.insert(65, new Cesium.Color(23 / 255, 0 / 255, 255 / 255));
+          colorTable.insert(
+            61,
+            new Cesium.Color(255 / 255, 255 / 255, 255 / 255)
+          );
+          colorTable.insert(
+            43,
+            new Cesium.Color(95 / 255, 234 / 255, 106 / 255)
+          );
           colorTable.insert(
             30,
-            new Cesium.Color(155 / 255, 0 / 255, 255 / 255)
+            new Cesium.Color(95 / 255, 234 / 255, 106 / 255)
           );
         }
         var layer = scene.layers.find("TYCB@BaoPo0621N");
         var hyp = new Cesium.HypsometricSetting();
-        hyp.MaxVisibleValue = 65;
+        hyp.MaxVisibleValue = 61;
         hyp.MinVisibleValue = 30;
         hyp.ColorTable = colorTable;
         hyp.DisplayMode = Cesium.HypsometricSettingEnum.DisplayMode.FACE;

src/views/ConstructionApplication3D/NightscapeAnalysis/NightscapeAnalysis.vue

@@ -180,6 +180,7 @@ export default {
       entityPointLightPairs: new Map(), // Entity和点光源对象的键值对
       entitySpotLightPairs: new Map(), // Entity和聚光灯对象的键值对
       entityDirectionalLightPairs: new Map(), // Entity和平行光对象的键值对
+      tycindex: 0,
     };
   },
   props: {
@@ -481,7 +482,11 @@ export default {
           var colorTable = new Cesium.ColorTable();
           if (that.tycindex == 0) {
             colorTable.insert(
-              65,
+              61,
+              new Cesium.Color(255 / 255, 255 / 255, 255 / 255)
+            );
+            colorTable.insert(
+              43,
               new Cesium.Color(255 / 255, 0 / 255, 234 / 255)
             );
             colorTable.insert(
@@ -490,7 +495,11 @@ export default {
             );
           } else if (that.tycindex == 1) {
             colorTable.insert(
-              65,
+              61,
+              new Cesium.Color(255 / 255, 255 / 255, 255 / 255)
+            );
+            colorTable.insert(
+              43,
               new Cesium.Color(255 / 255, 255 / 255, 0 / 255)
             );
             colorTable.insert(
@@ -499,17 +508,21 @@ export default {
             );
           } else {
             colorTable.insert(
-              65,
-              new Cesium.Color(23 / 255, 0 / 255, 255 / 255)
+              61,
+              new Cesium.Color(255 / 255, 255 / 255, 255 / 255)
+            );
+            colorTable.insert(
+              43,
+              new Cesium.Color(95 / 255, 234 / 255, 106 / 255)
             );
             colorTable.insert(
               30,
-              new Cesium.Color(155 / 255, 0 / 255, 255 / 255)
+              new Cesium.Color(95 / 255, 234 / 255, 106 / 255)
             );
           }
           var layer = scene.layers.find("TYCB@BaoPo0621N");
           var hyp = new Cesium.HypsometricSetting();
-          hyp.MaxVisibleValue = 65;
+          hyp.MaxVisibleValue = 61;
           hyp.MinVisibleValue = 30;
           hyp.ColorTable = colorTable;
           hyp.DisplayMode = Cesium.HypsometricSettingEnum.DisplayMode.FACE;

src/views/complianceAnalysis/ghzc.scss

@@ -85,7 +85,7 @@
             overflow-x: auto;
             height: calc(100% - 40px);
             box-sizing: border-box;
-            padding-top: 10px !important;
+            // padding-top: 10px !important;
 
             .el-tab-pane {
                 height: 100%;

src/views/siteselection/components/fzxz.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="hgxsc">
+  <div class="hgxsc ghzc">
     <el-form
       :model="ruleForm"
       ref="ruleForm"
-      label-width="100px"
+      label-width="105px"
       :rules="rules"
+      label-position="left"
     >
       <!-- <div class="block-title">基本信息</div> -->
       <el-form-item label="选址范围:" prop="xzmj">
@@ -17,13 +18,13 @@
           placeholder="请输入项目名称"
         ></el-input>
       </el-form-item>
-      <el-form-item label="项目类型:" prop="xmlx">
+      <!-- <el-form-item label="项目类型:" prop="xmlx">
         <el-input
           v-model="ruleForm.xmlx"
           size="mini"
           placeholder="请输入项目类型"
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="建设单位:" prop="jsdw">
         <el-input
           v-model="ruleForm.jsdw"
@@ -59,7 +60,7 @@
           size="mini"
         ></el-cascader>
       </el-form-item>
-      <el-form-item label="用地面积" required>
+      <el-form-item label="用地面积(亩):" required>
         <el-col :span="11">
           <el-form-item prop="ydmjbegin">
             <el-input
@@ -88,7 +89,7 @@
       </div>
       <el-button size="mini" @click="yzpz">配置</el-button>
     </div>
-    <div class="treeDiv">
+    <div class="XZtree">
       <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="yxyzmc" label="因子名称" show-overflow-tooltip>
         </el-table-column>
@@ -135,7 +136,7 @@ export default {
         xzmj: 0,
         xmmc: "",
         jsdw: "",
-        xmlx: "",
+        // xmlx: "",
         ydlx: "",
         ydmjbegin: "", //用地面积开始
         ydmjend: "", //用地面积结束
@@ -149,7 +150,7 @@ export default {
           { min: 3, max: 10, message: "长度在 3 到 5 个字符", trigger: "blur" },
         ],
         jsdw: [{ required: true, message: "请输入建设单位", trigger: "blur" }],
-        xmlx: [{ required: true, message: "请输入项目类型", trigger: "blur" }],
+        // xmlx: [{ required: true, message: "请输入项目类型", trigger: "blur" }],
         ydlx: [{ required: true, message: "请输入用地类型", trigger: "blur" }],
         ydmjbegin: [
           { required: true, message: "请输入用地面积", trigger: "blur" },
@@ -462,7 +463,7 @@ export default {
           let obj = {
             xzmj: Number(this.ruleForm.xzmj),
             xmmc: this.ruleForm.xmmc,
-            xmlx: this.ruleForm.xmlx,
+            // xmlx: this.ruleForm.xmlx,
             jsdw: this.ruleForm.jsdw,
             ydxz_bsm: this.ydlxBSM, //用地性质标识码
             // ydlx: this.ruleForm.ydlx,
@@ -522,7 +523,7 @@ export default {
       (this.ruleForm = {
         xmmc: "",
         jsdw: "",
-        xmlx: "",
+        // xmlx: "",
         ydlx: "",
         ydmjbegin: "", //用地面积开始
         ydmjend: "", //用地面积结束
@@ -571,7 +572,7 @@ export default {
     width: 100%;
   }
 
-  .treeDiv {
+  .XZtree {
     width: 100%;
     height: calc(100% - 400px);
     // padding: 7px;

src/views/siteselection/components/yxyzPop.vue

@@ -209,7 +209,7 @@ export default {
       selectdata.forEach((item) => {
         console.log(item, "item----");
         tableList.push({
-          // id: item.bsm,
+          id: item.bsm,
           // name: item.yxyzmc,
           // condition: item.spatial_type,
           // value: "",
@@ -256,7 +256,7 @@ export default {
         this.$message.warning("请勾选可选因子");
         return false;
       }
-
+      // this.dialogData = [];
       let list = this.$refs.tree.getCheckedNodes().filter((item) => {
         return item.children == undefined || item.children.length == 0;
       });
@@ -305,10 +305,12 @@ export default {
     },
     clearitem(item) {
       this.options[0].children = this.options[0].children.filter((item1) => {
-        return item.id != item1.value;
+        // return item.id != item1.value;
+        return item.id != item1.yxz;
       });
       this.options[1].children = this.options[1].children.filter((item1) => {
-        return item.id != item1.value;
+        // return item.id != item1.value;
+        return item.id != item1.yxz;
       });
       this.options[0].children.length == 0
         ? (this.options[0].disabled = true)
@@ -378,6 +380,8 @@ export default {
   .right-table {
     margin-top: 10px;
     height: 400px;
+    overflow: hidden;
+    overflow-y: auto;
     /deep/ .el-table__inner-wrapper {
       height: 100%;
     }
@@ -394,4 +398,5 @@ export default {
 /deep/.el-dialog__body {
   color: #fff !important;
 }
+
 </style>

static/css/index.css

@@ -71,9 +71,12 @@ body::-webkit-scrollbar-track {
 
 .el-dialog {
   background: transparent !important;
-  background: url(/static/images/popup/background.png) no-repeat !important;
-  background-size: 100% 100% !important;
-  background-position: center !important;
+  /* background: url(/static/images/popup/background.png) no-repeat !important; */
+  /* background-size: 100% 100% !important; */
+  /* background-position: center !important; */
+  border: none;
+  background-color: #02213e9a !important;
+  color: #fff;
 }
 
 .el-dialog__title,
@@ -81,13 +84,26 @@ body::-webkit-scrollbar-track {
   color: white !important;
 }
 
-.el-dialog__header {
-  background: url(/static/images/popup/modal-title.png) no-repeat !important;
+.el-dialog__title {
+  color: #fff !important;
+  border-bottom: 2px solid #2A5277 !important;
+  display: inline-block;
+  width: 100% !important;
+}
+
+/* .el-dialog__header {
+  background: url(/static/images/ghzc//second_titlebg.png) no-repeat !important;
   background-size: 100% 100% !important;
   background-position: center !important;
-}
+} */
 
 .el-dialog__headerbtn .el-dialog__close {
+  width: 22px;
+  height: 22px;
+  background: #335F87;
+  border-radius: 4px;
+  border: 1px solid rgba(123, 162, 198, 0.5);
+  line-height: 21px;
   color: white !important;
 }
 
@@ -148,7 +164,7 @@ div::-webkit-scrollbar-track {
   color: #2d8cf0b3;
 }
 
-.el-message-box__btns .el-button{
+.el-message-box__btns .el-button {
   background: #0f7ac8 !important;
   border-color: #0f7ac8 !important;
   color: #fff !important;
@@ -165,10 +181,12 @@ div::-webkit-scrollbar {
   width: 5px;
   height: 5px;
 }
+
 div::-webkit-scrollbar-thumb {
   background: rgba(63, 147, 245, 0.6);
   border-radius: 5px;
 }
+
 div::-webkit-scrollbar-track {
   background: rgba(4, 28, 50, 0.6);
 }
@@ -189,6 +207,7 @@ div::-webkit-scrollbar-track {
   background-size: 100% 100%;
   background-position: center;
 }
+
 .vl-notify.vl-notify-alert h2.vl-notice-title .lv-title {
   height: auto !important;
 }
@@ -205,11 +224,12 @@ div::-webkit-scrollbar-track {
   z-index: -1;
 }
 
-.vl-notice-title > span {
+.vl-notice-title>span {
   font-size: 16px;
   font-weight: 700;
   letter-spacing: 1px;
 }
+
 .icon-remove {
   width: 22px;
   height: 22px;
@@ -222,11 +242,12 @@ div::-webkit-scrollbar-track {
   top: 10px !important;
 }
 
-.lv-icon-maxmini > i {
+.lv-icon-maxmini>i {
   color: #fff !important;
 }
 
 .lv-icon-maxmini .vlicon-max {
   display: none !important;
 }
+
 /* -----------中图弹窗------------ */