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

src/components/mapView/descriptionsInfo.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="detailsInfo">
     <el-descriptions :column="column" :border="border" :title="title" size="mini">
-      <el-descriptions-item v-for="(row, index) in config" :key="index" :label="row.label">
+      <el-descriptions-item v-for="(row, index) in config" :key="index" :label="row.label" :labelStyle="labelStyle">
         <slot v-if="row.isslot" :name="row.value"></slot>
         <span v-else class="information">
-          {{ model[row.value] }}
+          {{ model[row.value] || row.info }}
           <span v-if="model[row.value]">{{ row.unit }}</span>
         </span>
       </el-descriptions-item>
@@ -28,6 +28,7 @@ export default {
       type: Boolean,
       default: true
     },
+    labelStyle: String
   },
   data() {
     return {
@@ -56,7 +57,8 @@ export default {
   color: #fff;
   background-color: transparent;
 }
-/deep/.el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell{
+
+/deep/.el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell {
   padding: 6px 10px;
 }
 

src/components/mapView/tablePage.vue

@@ -21,7 +21,7 @@
         :prop="item.prop"
         :label="item.label"
         :key="index"
-        show-overflow-tooltip
+        :show-overflow-tooltip="overtip"
         :width="item.width || null"
         :fixed="item.fixed"
         :align="item.align || 'left'"
@@ -85,6 +85,10 @@ export default {
       type: String,
       default: "total, sizes, prev, pager, next, jumper",
     },
+    overtip: {
+      type: Boolean,
+      default: true
+    },
   },
   data() {
     return {

src/views/farmlandProtection/gdzl/index.vue

@@ -215,23 +215,23 @@ export default {
           { name: "耕地保有量", ntname: "永久基本农田" },
           {
             name: "耕地保有目标",
-            ntname: "占耕地比",
-            prop: "a",
+            ntname: "占现状耕地比",
+            prop: "zb",
             unit: "km²",
             ntunit: "%",
           },
         ],
         水田: [
           { name: "水田现状" },
-          { name: "占耕地比", prop: "a", unit: "%" },
+          { name: "占耕地比", prop: "zb", unit: "%" },
         ],
         水浇地: [
           { name: "水浇地现状" },
-          { name: "占耕地比", prop: "a", unit: "%" },
+          { name: "占耕地比", prop: "zb", unit: "%" },
         ],
         旱地: [
           { name: "旱地现状" },
-          { name: "占耕地比", prop: "a", unit: "%" },
+          { name: "占耕地比", prop: "zb", unit: "%" },
         ],
       },
       bhlist: [

src/views/geologyDisaster/config.js

@@ -25,7 +25,7 @@ export const zzForm = [
 
 export const TableHeader = [
   { label: "隐患点名称", prop: "zhmc", align: 'center' },
-  { label: "行政村", prop: "szxzc", width: '80px' },
+  { label: "行政村", prop: "szxzc", width: '100px' },
   { label: "等级", prop: "gmdj", width: '50px ', align: 'center' },
   { label: "操作", slot: "action", width: '80px', align: 'center' },
 ]
@@ -75,25 +75,25 @@ export const yhzgInfos = [
 
 //应急预案
 export const yjyaInfos = [
-  { label: '地点', value: 'xzgdlydlmc' },
-  { label: '基本情况', value: 'xzgdmj' },
-  { label: '引发因素', value: 'xzgddb' },
-  { label: '危害对象', value: 'xzgdlyxm' },
-  { label: '预警等级', value: 'xzgdlydlmc' },
-  { label: '预警方法', value: 'xzgdmj' },
-  { label: '应急等级', value: 'xzgddb' },
-  { label: '应急方法', value: 'xzgdlyxm' },
-  { label: '撤离路线', value: 'xzgddb' },
-  { label: '避灾地点', value: 'xzgdlyxm' },
+  { label: '地点', value: 'dd' },
+  { label: '基本情况', value: 'jbqk' },
+  { label: '引发因素', value: 'yfys' },
+  { label: '危害对象', value: 'whdx' },
+  { label: '预警等级', value: 'yujdj' },
+  { label: '预警方法', value: 'yujff' },
+  { label: '应急等级', value: 'yjdj' },
+  { label: '应急方法', value: 'yjff' },
+  { label: '撤离路线', value: 'cllx' },
+  { label: '避灾地点', value: 'bzdd' },
 ]
 export const jszdInfos = [
-  { label: '姓名', value: 'xzgdlydlmc' },
-  { label: '电话', value: 'xzgdmj' },
-  { label: '单位', value: 'xzgddb' },
+  { label: '姓名', value: 'jszdr_xm' },
+  { label: '电话', value: 'jszdr_dh' },
+  { label: '单位', value: 'jszdr_dw' },
 ]
 export const timeInfos = [
-  { label: '编制时间', value: 'xzgdlydlmc' },
-  { label: '修编时间', value: 'xzgdmj' },
+  { label: '编制时间', value: 'bzsj' },
+  { label: '修编时间', value: 'xbsj' },
 ]
 
 export const fileHeader = [
@@ -102,10 +102,10 @@ export const fileHeader = [
   { label: "操作", slot: "action", width: '80px', align: 'center' },
 ]
 export const fzrHeader = [
-  { label: "负责人", prop: "xmmc", align: 'center' },
-  { label: "姓名", prop: "zgbm", width: '120px' },// slot: "mj"
-  { label: "电话", prop: "gm", width: '80px ', slot: "mj", align: 'center' },
-  { label: "责任", width: '80px', align: 'center' },
+  { label: "负责人", prop: "fzr", align: 'center' },
+  { label: "姓名", prop: "xm", width: '80px ', },
+  { label: "电话", prop: "dh", align: 'center' },
+  { label: "责任", prop: "zr", align: 'center' },
 ]
 
 

src/views/geologyDisaster/details.vue

@@ -24,12 +24,12 @@
             <div class="echartTitle">
               <div class="block-title">群测群防</div>
             </div>
-            <tablePage class="tablePage" :cloumn="qcqfInfos" :table="qfqclist" :indexed="false" layout="">
+            <tablePage :cloumn="qcqfInfos" :table="qfqclist" :indexed="false" layout="">
             </tablePage>
             <div class="echartTitle">
               <div class="block-title">检测资料</div>
             </div>
-            <tablePage class="tablePage" :cloumn="fileHeader" :table="fileList" :indexed="false" layout="">
+            <tablePage :cloumn="fileHeader" :table="fileList" :indexed="false" layout="">
               <template #action="{ row }">
                 <span class="usable" @click="preview(row)">查看</span>
                 <span class="usable" @click="download(row)"> 下载 </span>
@@ -55,18 +55,16 @@
             <div @click="bigimg = true" v-show="imgList.length">
               <el-carousel indicator-position="outside" @change="(v) => imgIndex = v">
                 <el-carousel-item v-for="(item, i) in imgList" :key="item">
-                  <div class="imgi"> {{ imgIndex }}</div>
-                  <!-- <div class="imgi">{{ `${i + 1} / ${imgList.length}` }}</div> -->
+                  <div class="imgi">{{ `${i + 1} / ${imgList.length}` }}</div>
                   <img :src="item.imgUrl" />
-                  <div class="imgInfo"> {{ item.info }} </div>
+                  <div class="imgInfo"> {{ item.bz }} </div>
                 </el-carousel-item>
               </el-carousel>
             </div>
             <div class="echartTitle">
               <div class="block-title">治理项目资料</div>
             </div>
-            <tablePage class="tablePage" :cloumn="fzrHeader" :table="zzfiletable" :indexed="false" layout=""
-              ref="tableDialogRef">
+            <tablePage :cloumn="fileHeader" :table="zzfiletable" :indexed="false" layout="">
               <template #action="{ row }">
                 <span class="usable" @click="preview(row)">查看</span>
                 <span class="usable" @click="download(row)"> 下载 </span>
@@ -79,17 +77,18 @@
             <div class="echartTitle">
               <div class="block-title">应急预案</div>
             </div>
-            <DesInfo :model="formData" :config="yjyaInfos"></DesInfo>
+            <DesInfo :model="yuanData" :config="yjyaInfos" labelStyle="width: 70px;"></DesInfo>
             <div class="echartTitle">
               <div class="block-title">相关负责人</div>
             </div>
-            <tablePage class="tablePage" :cloumn="fzrHeader" :table="fzrtable" :indexed="false" layout="">
+            <tablePage class="tablePages" :cloumn="fzrHeader" :table="fzrtable" :indexed="false" layout="" :overtip="false">
             </tablePage>
+            <!-- <DesInfo :column="2" :model="yuanData" :config="fzrInfo"></DesInfo> -->
             <div class="echartTitle">
               <div class="block-title">技术指导人</div>
             </div>
-            <DesInfo :column="2" :model="formData" :config="jszdInfos"></DesInfo>
-            <DesInfo :column="2" :model="formData" :config="timeInfos" :border="false"></DesInfo>
+            <DesInfo :column="2" :model="yuanData" :config="jszdInfos"></DesInfo>
+            <DesInfo :column="2" :model="yuanData" :config="timeInfos" :border="false"></DesInfo>
 
           </div>
         </el-tab-pane>
@@ -104,7 +103,7 @@
         <el-carousel-item v-for="(item, i) in imgList" :key="i">
           <div class="imgi">{{ `${i + 1} / ${imgList.length}` }}</div>
           <img :src="item.imgUrl" />
-          <div class="imgInfo"> {{ item.info }} </div>
+          <div class="imgInfo"> {{ item.bz }} </div>
         </el-carousel-item>
       </el-carousel>
 
@@ -112,8 +111,6 @@
   </div>
 </template>
 <script>
-// import Info from "../../Idleland/components/info.vue";
-// import CustomDetails from "@/components/mapView/custom-detailsInfo.vue";
 import DesInfo from "@/components/mapView/descriptionsInfo.vue";
 import tablePage from "@/components/mapView/tablePage.vue";
 import { QueryOne, QueryList } from "@/api/cockpitNew";
@@ -124,7 +121,6 @@ export default {
       type: Object,
     },
   },
-  // components: { Info, Wrjxx },
   components: { DesInfo, tablePage },
   data() {
     return {
@@ -133,33 +129,15 @@ export default {
       formData: { tbbh: 'skmdslcmdrvnfjkvn就是当你发觉的女第就是当你发觉的三次多少地方' },
       qfqclist: { data: [] },
       fileList: { data: [] },
+      yuanData: {},
       type: "",
       bigimg: false,
-      imgIndex: 0,
+      imgIndex: 1,
       imgList: [
         {
           imgUrl:
             "https://b0.bdstatic.com/ugc/Gr0RkpztmAdvrxnS4n54Iw49d04e3484c9bb1a11f03b38a819d893.jpg@h_1280",
-          info: "育才生态区那阳小组（治理后）"
-        },
-        {
-          imgUrl:
-            "https://img2.baidu.com/it/u=3692233586,2896402884&fm=253&fmt=auto&app=120&f=JPEG?w=759&h=427",
-          info: "育才生态区那阳小组（治理后）"
-        },
-        {
-          imgUrl:
-            "https://img2.baidu.com/it/u=882190421,2711411099&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1067",
-        },
-        {
-          imgUrl:
-            "http://img2.baidu.com/it/u=516755055,1384417278&fm=253&app=138&f=JPEG?w=800&h=1067",
-          info: "育才生态区那阳小组（治理后）"
-        },
-        {
-          imgUrl:
-            "http://img0.baidu.com/it/u=1366170349,307387023&fm=253&app=138&f=JPEG?w=800&h=1067",
-          info: "育才生态区那阳小组（治理后）"
+          bz: "育才生态区那阳小组（治理后）"
         },
       ],
       fzrtable: { data: [] },
@@ -173,7 +151,8 @@ export default {
       yjyaInfos: yjyaInfos,
       fzrHeader: fzrHeader,
       jszdInfos: jszdInfos,
-      timeInfos: timeInfos
+      timeInfos: timeInfos,
+      fzrInfo: []
     };
   },
   mounted() {
@@ -188,13 +167,10 @@ export default {
       });
     },
     download(row) {
-      window.open(`${window.axiosURI}/file/upload/attachment/ ${row.path}`);
+      window.open(`${window.axiosURI}/file/upload/attachment${row.path}`); c
     },
     preview(row) {
-      window.open(
-        ` ${window.axiosURI}/analyse/fzss/ShowReport?filePath=${row.path}`,
-        "_blank"
-      );
+      window.open(` ${window.axiosURI}/file/upload/inline${row.path}`, "_blank");
     },
     handleView({ bsm }, type) {
       // this.type = type;
@@ -205,6 +181,7 @@ export default {
       this.getJcfile(bsm)
       this.getPhotos(bsm)
       this.getZzfile(bsm)
+      this.getyjyaData(bsm)
 
       // if (!e.features[0].fieldNames) {
       //   this.$message({
@@ -236,6 +213,9 @@ export default {
     },
     getPhotos(id) {
       QueryList({ jscType: "t_zhd_zgphoto", id }).then((res) => {
+        res.data.forEach(itemi => {
+          itemi.imgUrl = `${window.axiosURI}/file/upload/attachment${itemi.images}`
+        });
         this.imgList = res.data
       });
     },
@@ -244,6 +224,35 @@ export default {
         this.zzfiletable = res
       });
     },
+    getyjyaData(id) {
+      QueryOne({ jscType: "t_zhd_yjya", id }).then(({ data }) => {
+        this.yuanData = data
+        this.fzrtable = {
+          data: [
+            { fzr: '监测责任人', xm: data.jczrr, dh: data.jczrrdh, zr: data.jczr },
+            { fzr: '应急责任人', xm: data.yjzrr, dh: data.yjzrrdh, zr: data.yjzr },
+            { fzr: '村/社负责人', xm: data.csfzr, dh: data.csfzrdh, zr: data.cszr },
+            { fzr: '市资规局育才分局负责人', xm: data.sjfzr, dh: data.sjfzrdh, zr: data.sjzr },
+            { fzr: '县级责任人', xm: data.xjfzr, dh: data.xjfzrdh, zr: data.xjzr }
+          ]
+        }
+        // this.fzrInfo = [
+        //     { label: '负责人', info: '姓名' },
+        //     { label: '电话', info: '责任' },
+        //     { label: '监测责任人', info: data.jczrr },
+        //     { label: data.jczrrdh, info: data.jczr },
+        //     { label: '应急责任人', info: data.yjzrr },
+        //     { label: data.yjzrrdh, info: data.yjzr },
+        //     { label: '村/社负责人', info: data.csfzr },
+        //     { label: data.csfzrdh, info: data.cszr },
+        //     { label: '市资规局育才分局负责人', info: data.sjfzr },
+        //     { label: data.sjfzrdh, info: data.sjzr },
+        //     { label: '县级责任人', info: data.xjfzr },
+        //     { label: data.xjfzrdh, info: data.xjzr },
+        //   ]
+
+      });
+    },
   },
   mounted() { },
   watch: {},
@@ -310,8 +319,8 @@ export default {
 }
 
 .bigimgdiv {
-  right: 20%;
-  width: 60%;
+  right: 28%;
+  width: 45%;
   max-width: 100%;
   height: 700px;
 
@@ -347,4 +356,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/geologyDisaster/index.vue

@@ -16,10 +16,7 @@
               emitPath: false,
             }"></el-cascader>
         </div>
-        <tablePage class="tablePage" :cloumn="cloumn" :table="table" :indexed="false" layout="" ref="tableDialogRef">
-          <template #mj="{ row }">
-            {{ Number(row.gm).toFixed(2) }}
-          </template>
+        <tablePage class="tablePage" :cloumn="cloumn" :table="table" :indexed="false" layout="" :overtip="false">
           <template #action="{ row }">
             <span class="usable" @click="flyTo(row)"> 定位 </span>
             <span class="usable" @click="detail(row)">详情</span>
@@ -113,13 +110,18 @@ export default {
       });
     },
     flyTo(item) {
-      viewer.flyTo(geoSources[item.bsm],);
+      viewer.flyTo(geoSources[item.bsm]);
       // removeGeoJSON("dzzhhig");
-      // loadGeoJSON(res.geom, "#ff0000", { isfly: true, fill_a }, (data) => {
-      //   data.name = "dzzhhig";
-      //   geoSources[res.pid + res.id + "h"] = data;
-      //   res.entity = "整治图斑";
-      // });
+      // setTimeout(() => {
+      //   getHight(item.lzb_x, item.bzb_y, (gcHight) => {
+      //     let geom = `POINT (${item.lzb_x} ${item.bzb_y} ${gcHight || ''})`
+      //     loadGeoJSON(geom, "#facd91", { isfly: false, point: 'landslide' }, (data) => {
+      //       geoSources[item.bsm + "h"] = data;
+      //       data.name = "dzzhhig";
+      //     });
+      //   })
+      // }, 6000);
+
     },