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

src/components/Combinations/LayerManage/LayerManage.vue

@@ -1,5 +1,6 @@
 <template>
   <layer-manage-split
+    :addlayerdata="addlayerdata"
     @visibleChange="visibleChange"
     @transSliderChange="transSliderChange"
     @handleCheckChange="handleCheckChange"

src/components/mapView/range.vue

@@ -109,7 +109,7 @@ export default {
       // this.addPolygon();
       ShapeUpload(formdata).then((res) => {
         if (res.success) {
-          this.model.xzmj = 62.1;
+          this.model.xzmj = (res.data.area / 1000000).toFixed(2);
           viewer.entities.removeAll();
           this.fileDataID = res.data.id;
           let geoms = res.data.geom
@@ -271,7 +271,7 @@ export default {
           // this.addPolygon();
           ShapeUpload(formdata).then((res) => {
             if (res.success) {
-              this.model.xzmj = 62.1;
+              this.model.xzmj = (res.data.area / 1000000).toFixed(2);
               this.$message({
                 message: "绘制成功!",
                 type: "success",

src/store/store.js

@@ -40,16 +40,6 @@ var store2 = {
         flattenNames: [],//存储压平的名称数组
         cockpit_date: null,
         viewer_flag: true,
-        cockpit_hysy: {
-            text: {
-                xzqhdm_number: 0,
-                zhmj: 0,
-            },
-            echart: {
-                x: [],
-                bar: [],
-            }
-        },
         cockpit_tdsc: {
             scjd: {
                 percentage: 0,
@@ -65,8 +55,17 @@ var store2 = {
         },
         cockpit_tdgy: {//土地供应
             gy_jg: {
-                xdata:[],
-                result:[],
+                xdata: [],
+                result: [],
+            },
+        },
+        cockpit_hysy: {//海域使用
+            info: {
+                jh_mj:0,//计划出让海域
+                sj_number:0,//实际出让海域面积
+                jh_number:0,//计划出让项目
+                sj_mj:0,//完成出让海域面积
+
             },
         },
         regional_information: {
@@ -208,12 +207,6 @@ var store2 = {
     setIsEditZ(newValue) {
         this.state.isEditZ = newValue;
     },
-    setCockpitHysyEchart(newValue) {
-        this.state.cockpit_hysy.echart = newValue;
-    },
-    setCockpitHysyText(newValue) {
-        this.state.cockpit_hysy.text = newValue;
-    },
     setCockpitDate(newValue) {
         this.state.cockpit_date = newValue;
     }, setCockpitGkzb(newValue) {

src/views/cockpit/hysy.vue

@@ -10,13 +10,13 @@
                 <div class="lt_box box">
                     <div class="text">
                         <p>计划出让海域</p>
-                        <span>66.23</span>公顷
+                        <span>{{ store.state.cockpit_hysy.info.jh_mj }}</span>公顷
                     </div>
                 </div>
                 <div class="lb_box box">
                     <div class="text">
-                        <p>计划出让海域</p>
-                        <span>66.23</span>公顷
+                        <p>完成出让海域</p>
+                        <span>{{ store.state.cockpit_hysy.info.sj_mj }}</span>公顷
                     </div>
                 </div>
 
@@ -25,14 +25,14 @@
 
                 <div class="rt_box box">
                     <div class="text">
-                        <p>计划出让海域</p>
-                        <span>66.23</span>公顷
+                        <p>计划出让项目</p>
+                        <span>{{ store.state.cockpit_hysy.info.jh_number }}</span>个
                     </div>
                 </div>
                 <div class="rb_box box">
                     <div class="text">
-                        <p>计划出让海域</p>
-                        <span>66.23</span>公顷
+                        <p>完成出让项目</p>
+                        <span>{{ store.state.cockpit_hysy.info.sj_number }}</span>个
                     </div>
                 </div>
             </div>
@@ -45,22 +45,11 @@
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-import { cockpitInfo } from '@/api/cockpit'
-
+import { QueryOne, QueryList } from "../../api/cockpitNew";
 export default {
     components: {},
     data() {
         return {
-            label_text: {
-                xzqhdm_number: 0,
-                zhmj: 0,
-
-            },
-            label_echart: {
-                x: [],
-                bar: [],
-
-            }
         };
     },
     //监听属性 类似于data概念
@@ -411,6 +400,17 @@ export default {
             };
             myChart.setOption(option);
 
+        },
+        async init_info(params) {
+            const that = this;
+            let obj = {
+                jscType: 'jsc_hysyq_ztsh',
+                beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+                endTime: params ? params.endTime : store.state.cockpit_date[1],
+                id: params ? params.id : '4602'
+            };
+            let data = await QueryList(obj);
+            store.state.cockpit_hysy.info = data.data[0]
         }
     },
     mounted() {
@@ -418,6 +418,8 @@ export default {
         this.$nextTick((res) => {
             that.init_hysyEchart();
             that.init_dial_watch_hysy();
+
+            this.init_info();
         })
     },
     beforeUpdate() { }, //生命周期 - 更新之前

src/views/cockpitNew1/datePicker.scss

@@ -0,0 +1,107 @@
+.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;
+  }
+  
+  .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: 20px !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-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;
+  }

src/views/cockpitNew1/datePicker.vue

@@ -86,112 +86,5 @@ export default {
   padding: 0;
   width: 180px !important;
 }
-
-.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;
-}
-
-.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: 20px !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-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;
-}
+@import "datePicker";
 </style>

src/views/complianceAnalysis/components/lsjl.vue

@@ -2,16 +2,16 @@
   <div class="tpwjxm">
     <el-row>
       <el-col :span="13">
+        <!-- daterange value-format="yyyy-MM-dd" :clearable="false"align="left" -->
         <el-date-picker
           v-model="pageObj.sj"
           type="datetimerange"
-          range-separator="至"
+          range-separator="~"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           class="datepicker"
           size="mini"
           @change="changedate"
-          :default-time="defaultTime1"
         >
         </el-date-picker>
       </el-col>
@@ -40,38 +40,27 @@
         :key="item.bsm"
         @click="zoomItem(item)"
       >
-        <div>{{ dindex + 1 }}. 项目名称：{{ item.xmmc }}</div>
+        <!-- <div>{{ dindex + 1 }}. 项目名称：{{ item.xmmc }}</div> -->
+        <div class="index">{{ dindex + 1 }}</div>
+        <div class="nameTitle">{{ item.xmmc }}</div>
         <div>建设单位：{{ item.jsdw }}</div>
         <div class="item_bottom">
-          <el-tag type="warning" size="mini" v-if="item.rwzt == 0">创建</el-tag>
-          <el-tag size="mini" v-if="item.rwzt == 1">执行中</el-tag>
-          <el-tag type="success" size="mini" v-if="item.rwzt == 2">完成</el-tag>
-          <el-tag type="danger" size="mini" v-if="item.rwzt == 3">错误</el-tag>
+          <el-tag type="warning" v-if="item.rwzt == 0">创建</el-tag>
+          <el-tag v-if="item.rwzt == 1">执行中</el-tag>
+          <el-tag type="success" v-if="item.rwzt == 2">完成</el-tag>
+          <el-tag type="danger" v-if="item.rwzt == 3">错误</el-tag>
           <div>
-            <el-button type="primary" size="mini" @click.stop="checkRz(item)"
-              >日志</el-button
+            <span class="button" @click.stop="checkRz(item)">日志</span>
+            <span class="button" @click="checkDetails(item)">结果</span>
+            <span class="button" v-if="item.fxbg" @click.stop="report(item)"
+              >报告</span
             >
-            <el-button
-              type="primary"
-              size="mini"
-              style="margin-left: 5px"
-              @click="checkDetails(item)"
-              >结果</el-button
-            >
-            <el-button
-              v-if="item.fxbg"
-              type="primary"
-              size="mini"
-              style="margin-left: 5px"
-              @click.stop="report(item)"
-              >报告</el-button
-            >
-            <!-- <el-button
-              size="mini"
+            <!-- <span
+             
               style="margin-left: 5px"
               @click.stop="del(item)"
               v-if="item.rwzt == 2 || item.rwzt == 3"
-              >删除</el-button
+              >删除</span
             > -->
           </div>
         </div>
@@ -161,8 +150,8 @@ export default {
     },
 
     changeForm() {
-      // this.pageObj.page = 1;
-      // this.getData();
+      this.pageObj.page = 1;
+      this.getData();
     },
     changedate(val) {
       if (val) {
@@ -176,16 +165,16 @@ export default {
     },
 
     getData() {
-      this.$emit("updateParent", "loading", true);
-      GetPage({ ...this.pageObj }).then((res) => {
-        setTimeout(() => {
-          this.$emit("updateParent", "loading", false);
-        }, 100);
-        this.pageObj.total = res.recordstotal;
-        this.pageObj.page = res.page;
-        this.pageObj.allpage = res.totalpages;
-        this.datalist = res.data;
-      });
+      // this.$emit("updateParent", "loading", true);
+      // GetPage({ ...this.pageObj }).then((res) => {
+      //   setTimeout(() => {
+      //     this.$emit("updateParent", "loading", false);
+      //   }, 100);
+      //   this.pageObj.total = res.recordstotal;
+      //   this.pageObj.page = res.page;
+      //   this.pageObj.allpage = res.totalpages;
+      //   this.datalist = res.data;
+      // });
     },
     zoomItem(item) {
       this.now = item.bsm;
@@ -237,27 +226,79 @@ export default {
     overflow-x: hidden;
     overflow-y: auto;
     color: #fff;
-    line-height: 40px;
 
     .dataItem {
-      height: 150px;
-      border: 1px dashed #02a7f0;
-      padding: 10px 20px;
+      height: 80px;
+      border-bottom: 1px solid #667e8f;
+      padding-left: 30px;
       position: relative;
       margin-bottom: 10px;
+      color: #cddeeb;
+      line-height: 20px;
     }
     .dataItem:hover,
     .dataItemHight {
-      border: 1px solid #02a7f0;
+      // border: 1px solid #02a7f0;
       background-color: rgba(64, 158, 255, 0.2);
     }
+    .index {
+      width: 30px;
+      height: 100%;
+      line-height: 70px;
+      font-weight: bold;
+      font-size: 16px;
+      color: #ffffff;
+      text-align: center;
+      position: absolute;
+      left: 0;
+    }
+    .nameTitle {
+      color: #ffffff;
+      font-size: 16px;
+      line-height: 20px;
+    }
     .item_bottom {
       display: flex;
       justify-content: space-between;
+      margin-top: 5px;
       .el-tag {
-        margin-top: 14px;
+        // margin-top: 14px;
+        width: 48px;
+        height: 18px;
+        line-height: 18px;
+        position: absolute;
+        top: 0;
+        right: 0;
+        color: #fff;
+
+        border-radius: 0px 0px 2px 14px;
+        border-color: transparent;
+      }
+      .el-tag--success {
+        background: linear-gradient(
+          170deg,
+          rgba(0, 200, 128, 0.6) 0%,
+          rgba(155, 255, 139, 0.7) 100%
+        );
+      }
+      .button {
+        width: 48px;
+        height: 20px;
+        font-size: 14px;
+        line-height: 20px;
+        color: #b6e0ff;
+        text-align: center;
+        display: inline-block;
+        background-image: url("/static/images/ghzc/btnbg.png");
+        background-size: 100% 100%;
+        cursor: pointer;
+        margin-right: 8px;
       }
     }
   }
 }
 </style>
+
+<style lang="scss">
+@import "../../cockpitNew1/datePicker.scss";
+</style>

src/views/map3d.vue

@@ -298,7 +298,7 @@ export default {
 }
 
 .header {
-  height: 60px;
+  height: 74px;
   position: fixed;
   top: 0px;
   width: 100%;
@@ -308,8 +308,8 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  background-image: url("/static/images/overview/title_new.png");
-
+  // background-image: url("/static/images/overview/title_new.png");
+  background-image: url("/static/images/overview/title.gif");
   background-size: 100% 100%;
 }
 
@@ -433,7 +433,7 @@ export default {
   height: 25px;
   line-height: 25px;
   /* text-align: center; */
-  text-align: left;
+  text-align: center;
   width: 100%;
   display: inline-block;
   position: relative;
@@ -447,8 +447,9 @@ export default {
 
 .timeline-item-time {
   top: -62px;
-  font-size: 14px;
-  text-align: left;
+    font-size: 17px;
+    text-align: center;
+    font-weight: bold;
 }
 
 .el-menu-demo {

src/views/viewer1.vue

@@ -97,62 +97,16 @@ export default {
             this.$refs.wpjg_ref.setData(this.params);
             this.$refs.tdsc_ref.init_scjd(this.params);
             this.$refs.tdgy_ref.init_tdgy_gy_jd(this.params);
+            this.$refs.hysy_ref.init_info(this.params);
 
             
+            
         },
         dateChange(date) {
             this.params.beginTime = date[0]
             this.params.endTime = date[1]
             this.setDatas()
         },
-        async hysyq(address) {
-            // 选中xzqh查询
-            let obj = {
-                beginTime: store.state.cockpit_date[0],
-                endTime: store.state.cockpit_date[1],
-                jscType: 'jsc_hysyq_ztsh',
-                id: address
-            };
-            let data = await cockpitInfo(obj);
-
-            let obg_text = {
-                xzqhdm_number: data.data[0].xzqhdm_number,
-                zhmj: data.data[0].zhmj == undefined ? 0 : data.data[0].zhmj,
-
-            }
-            obg_text.zhmj == null ? 0 : obg_text.zhmj;
-            store.setCockpitHysyText(obg_text);
-
-            // 图表数据
-            let obj_echart = {
-                beginTime: store.state.cockpit_date[0],
-                endTime: store.state.cockpit_date[1],
-                jscType: 'jsc_hysyq_yelx',
-                id: address
-            };
-            let data_echart = await cockpitInfo(obj_echart);
-
-            let obg_echart = {
-                x: data_echart.data.map(item => item.yhlx_name),
-                bar: data_echart.data.map(item => item.zhmj)
-
-            }
-
-            obg_echart.x.length == 0 ? obg_echart.x = ['渔业基础设施用海', '开放式养殖用海', '旅游基础设施用海', '浴场用海',
-                '游乐场用海'] : obg_echart.x = obg_echart.x;
-
-            obg_echart.bar.length == 0 ? obg_echart.bar = [0, 0, 0, 0, 0,] : obg_echart.bar = obg_echart.bar;
-
-            store.setCockpitHysyEchart(obg_echart);
-
-
-
-            // getRenKou();
-
-        },
-        hysyq_xzqh() {
-            const that = this;
-        },
         async gkzb_xzqh(address) {
             let obj = {
                 // beginTime: store.state.cockpit_date[0],
@@ -232,8 +186,6 @@ export default {
                         let adcode = obj.adcode
                         that.params.id = adcode
                         that.setDatas()
-                        // 驾驶舱海域使用权
-                        that.hysyq(adcode);
                         // 管控指标
                         that.gkzb_xzqh(adcode);
                         viewer.entities.values.forEach((res) => {
@@ -260,10 +212,7 @@ export default {
                         if (res.billboard != undefined)
                             res.billboard.show._value = false
                     })
-                    // 海域使用
-                    that.hysyq_xzqh();
-                    // 土地收储
-                    that.tdsc();
+               
                     // 管控指标
                     that.gkzb();
 
@@ -316,6 +265,7 @@ export default {
         init_xzqh() {
             const that = this;
             xzqh.features.forEach((res) => {
+                console.log('res: ', res);
 
                 let obj = {
                     'type': "cockpit",
@@ -390,6 +340,8 @@ export default {
             })
         },
         init_hyqy() {
+            console.log(1111);
+            
             const that = this;
 
             hyqy.features.forEach((res) => {