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

src/views/ConstructionApplication3D/Demolition/DemolitionList.vue

@@ -118,8 +118,8 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="分析结果" name="third" style="width: 100%;">
-        <el-empty v-if="curProjectInfo==null" description="暂无数据"></el-empty>
-        <el-row class="box-card" v-model="curProjectInfo" v-if="curProjectInfo!=null">
+        <el-empty v-if="curProjectInfo.id==''" description="暂无数据"></el-empty>
+        <el-row class="box-card" v-model="curProjectInfo" v-if="curProjectInfo.id!=''">
           <el-col :span="18">
             <span style="font-size: 1rem">{{
               curProjectInfo.name
@@ -128,7 +128,7 @@
             <el-button type="primary" size="mini" @click="exportWord(curProjectInfo)">导出报告</el-button>
           </el-col>
         </el-row>
-        <el-tabs v-model="activePage1" v-if="curProjectInfo!=null" @tab-click="pageClick" style="height: auto;">
+        <el-tabs v-model="activePage1" v-if="curProjectInfo.id!=''" @tab-click="pageClick" style="height: auto;">
           <el-tab-pane label="国有评估" name="GY">
             <div class="divrow">
               <div class="divCol">
@@ -1215,7 +1215,46 @@ export default {
         
         this.clear();
         this.removePolygonEntity();
-        this.curProjectInfo=null;
+        this.curProjectInfo={
+        id: "",
+        projectName: "",
+        imageData: "",
+        totalZDMJ: 0.0,
+        gyMJ: 0.0,
+        jtMJ: 0.0,
+        dateTime: "",
+        /* 征地标准值
+         */
+        zdValue: "",
+        /* 青苗标准值
+         */
+        qmValue: "",
+        /**
+         * 拆迁标准值
+         */
+        cqValue: "",
+        /**
+         * 分析范围
+         */
+        regions: {},
+        /**
+         * 拆迁分析结果
+         */
+        cqResult: {
+        },
+        /**
+         * 青苗分析结果
+         */
+        qmResult: {},
+        /**
+         * 征地分析结果
+         */
+        zdResult: {},
+        /**
+         * 权属信息
+         */
+        qsResult: {}
+      };
       }
     },
     /**

src/views/farmlandProtection/components/hcxx.vue

@@ -38,7 +38,12 @@
         <div class="selectTab"></div>
       </div>
       <div class="imgList">
-        <div class="imgDiv" v-for="(item, i) in monitorList" :key="i">
+        <div
+          class="imgDiv"
+          v-for="(item, i) in monitorList"
+          :key="i"
+          @click="clickImg(i)"
+        >
           <span>{{ i + 1 }}</span>
           <img :src="item.imgUrl" />
           <p>{{ item.info }}</p>
@@ -60,24 +65,49 @@ export default {
     return {
       monitorList: [
         {
-          imgUrl: require("./u385.jpg"),
+          imgUrl:
+            "https://b0.bdstatic.com/ugc/Gr0RkpztmAdvrxnS4n54Iw49d04e3484c9bb1a11f03b38a819d893.jpg@h_1280",
           info: "2024-09-27 15:04",
+          name: "钱复式",
+          lat: "168.18",
+          lon: "46.33",
+          psfw: "45°",
         },
         {
-          imgUrl: require("./u385.jpg"),
+          imgUrl:
+            "https://img2.baidu.com/it/u=3692233586,2896402884&fm=253&fmt=auto&app=120&f=JPEG?w=759&h=427",
           info: "2024-09-27 15:04",
+          name: "梅执礼",
+          lat: "168.18",
+          lon: "46.33",
+          psfw: "45°",
         },
         {
-          imgUrl: require("./u385.jpg"),
+          imgUrl:
+            "https://img2.baidu.com/it/u=882190421,2711411099&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1067",
           info: "2024-09-27 15:04",
+          name: "陈贵志",
+          lat: "168.18",
+          lon: "46.33",
+          psfw: "45°",
         },
         {
-          imgUrl: require("./u385.jpg"),
+          imgUrl:
+            "http://img2.baidu.com/it/u=516755055,1384417278&fm=253&app=138&f=JPEG?w=800&h=1067",
           info: "2024-09-27 15:04",
+          name: "权超英",
+          lat: "168.18",
+          lon: "46.33",
+          psfw: "45°",
         },
         {
-          imgUrl: require("./u385.jpg"),
+          imgUrl:
+            "http://img0.baidu.com/it/u=1366170349,307387023&fm=253&app=138&f=JPEG?w=800&h=1067",
           info: "2024-09-27 15:04",
+          name: "王XX",
+          lat: "168.18",
+          lon: "46.33",
+          psfw: "45°",
         },
       ],
     };
@@ -88,6 +118,10 @@ export default {
     changeData(name, updata) {
       this[name] = updata;
     },
+    clickImg(val) {
+      this.$emit("updateParent", "emitImgList", this.monitorList);
+      this.$emit("updateParent", "emitImgIndex", val);
+    },
   },
   watch: {},
   watch: {},

src/views/farmlandProtection/components/tbDetails.vue

@@ -2,7 +2,7 @@
   <div class="ghzc">
     <div class="sm-panel sm-function-module-query" v-drag>
       <div class="sm-panel-header">
-        <span>服务详情</span>
+        <span>图斑详情</span>
         <i class="el-icon-close" @click="closeBox"></i>
       </div>
       <div class="ServiceCon">
@@ -45,17 +45,28 @@ export default {
           后类型: "XXX",
         },
       ],
+      emitImgIndex:-1,
+      emitImgList:[],
     };
   },
   computed: {},
   mounted() {},
   methods: {
+    changeData(name, updata) {
+      this[name] = updata;
+    },
     closeBox() {
       this.$emit("updateParent", "isShowTb", false);
+      this.$emit("updateParent", "emitImgIndex", -1);
     },
   },
   watch: {},
-  watch: {},
+  watch: {
+    emitImgIndex(val){
+      this.$emit("updateParent", "imgIndex", val);
+      this.$emit("updateParent", "imgList", this.emitImgList);
+    }
+  },
   beforeDestroy() {},
 };
 </script>

src/views/farmlandProtection/jctb/index.vue

@@ -22,7 +22,42 @@
         </el-tabs>
       </div>
     </div>
-    <tbDetails @updateParent="changeData" :detailObj="detailObj" v-show="isShowTb"></tbDetails>
+    <tbDetails
+      @updateParent="changeData"
+      :detailObj="detailObj"
+      v-show="isShowTb"
+    ></tbDetails>
+    <div class="imgRemove" v-drag v-show="imgIndex != -1">
+      <div class="sm-panel-header">
+        <span>图片详情</span>
+        <i class="el-icon-close" @click="closeBox"></i>
+      </div>
+      <div class="imgBox">
+        <el-carousel
+          trigger="click"
+          height="332px"
+          indicator-position="none"
+          :autoplay="false"
+          :initial-index="imgIndex"
+          ref="carousel"
+        >
+          <el-carousel-item v-for="(item, i) in imgList" :key="i">
+            <img :src="item.imgUrl" />
+            {{ item }}
+            <div class="imgInfo">
+              <p>
+                <span>拍摄时间:{{ item.info }}</span
+                ><span>拍摄人:{{ item.name }}</span>
+              </p>
+              <p>
+                <span>拍摄坐标:{{ item.lat }}, {{ item.lon }}</span
+                ><span>拍摄方位:{{ item.psfw }}</span>
+              </p>
+            </div>
+          </el-carousel-item>
+        </el-carousel>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -43,15 +78,18 @@ export default {
       // detailObj: null,
       detailObj: {
         tbbh: "6401812024070108270002",
-        jcmj:'3.98',
+        jcmj: "3.98",
         xzmc: "海棠区",
         qsx: "20230925",
         hsx: "20240701",
         qxl: "草地",
         hlx: "新增推堆土",
-        zxdjd:'106.675447',
-        zxdwd:'38.209985'
+        zxdjd: "106.675447",
+        zxdwd: "38.209985",
       },
+      // isShowImg: false,
+      imgList: [],
+      imgIndex: -1,
     };
   },
   methods: {
@@ -60,6 +98,16 @@ export default {
     },
     tabClick(evt) {
       this.activeTabs = evt.name;
+      this.isShowTb = false
+      this.imgIndex= -1
+    },
+    closeBox() {
+      this.imgIndex = -1;
+    },
+  },
+  watch: {
+    imgIndex(val) {
+      this.$refs.carousel.setActiveItem(val);
     },
   },
 };
@@ -85,4 +133,59 @@ export default {
     height: 100%;
   }
 }
+.imgRemove {
+  width: 504px;
+  height: 368px;
+  // background: #33ccff;
+  // background-color: rgba(38, 38, 38, 0.6);;
+  background: url(/static/images/ghzc/内容框.png) no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  z-index: 99;
+  left: 41%;
+  top: 30%;
+  .imgBox {
+    width: 100%;
+    height: 332px;
+    img {
+      width: 100%;
+      height: 332px;
+    }
+    .imgInfo {
+      width: 245px;
+      height: 46px;
+      // background-color: rgba(255, 192, 203, 0.356);
+      position: absolute;
+      bottom: 0;
+      left: 10px;
+      p {
+        display: flex;
+        justify-content: space-between;
+        font-size: 12px;
+        height: 50%;
+        line-height: 2;
+        span {
+          // margin: 0px 5px;
+        }
+      }
+    }
+  }
+  /deep/.el-carousel__arrow {
+    background-color: rgba(45, 140, 240, 0.4);
+  }
+  /deep/.el-carousel__arrow:hover {
+    background-color: rgba(45, 140, 240);
+  }
+  /deep/ .el-icon-close:before {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    font-size: larger;
+    font-weight: bold;
+
+    &:hover {
+      color: aqua;
+    }
+  }
+}
 </style>