Browse Source

修改省直单位柱状图自适应宽度

sugb 6 months ago
parent
commit
3f8b0f350b

+ 2 - 2
.env.development

@@ -1,8 +1,8 @@
 NODE_ENV=development
 #本地
-#VUE_APP_API_BASE_URL=http://127.0.0.1:8088/jeecg-boot/
+VUE_APP_API_BASE_URL=http://127.0.0.1:8080/jeecg-boot/
 #外部测试用
-VUE_APP_API_BASE_URL=http://49.235.111.199:13307/jeecg-boot/
+#VUE_APP_API_BASE_URL=http://49.235.111.199:13307/jeecg-boot/
 #测试服务器直连
 #VUE_APP_API_BASE_URL=http://10.233.1.64:8080/jeecg-boot/
 

+ 15 - 16
src/components/OneMap/BasicMap.vue

@@ -468,21 +468,21 @@ export default {
         }
         /*sugb 20240530 瓦片服务*/
         case 'WMTSLayer': {
-          this.webTiledLayerId.push(layerItem.id)
-          layer = new WMTSLayer({
-            id: layerItem.id,
-            url: layerItem.url,               //WMTS服务的URL地址
-            layerIdentifier: layerItem.name,  //属性用于指定你要加载的WMTS图层的标识符(即图层名称)
-            title: layerItem.alias,           //描述
-            style: layerItem.style,           //图层的样式。通常为default
-            format: 'image/png',              //瓦片图像的格式,可默认
-            activeLayer: {
-              id: layerItem.name, //图层名称
-              tileMatrixSetId: 'EPSG:4326', //瓦片矩阵集的标识符(通常为坐标参考系统的EPSG代码)
-            },
-            visible: layerItem.visible, //是否显示
-          })
-          break
+            this.webTiledLayerId.push(layerItem.id)
+            layer = new WMTSLayer({
+              id: layerItem.id,
+              url: layerItem.url,               //WMTS服务的URL地址
+              layerIdentifier: layerItem.name,  //属性用于指定你要加载的WMTS图层的标识符(即图层名称)
+              title: layerItem.alias,           //描述
+              style: layerItem.style,           //图层的样式。通常为default
+              format: 'image/png',              //瓦片图像的格式,可默认
+              activeLayer: {
+                id: layerItem.name, //图层名称
+                tileMatrixSetId: 'EPSG:4326', //瓦片矩阵集的标识符(通常为坐标参考系统的EPSG代码)
+              },
+              visible: layerItem.visible, //是否显示
+            })
+            break
         }
         /*sugb 20240530 wms服务*/
         case 'WFSLayer': {
@@ -498,7 +498,6 @@ export default {
             }],
             visible: layerItem.visible,
           })
-
           layer_opacity = new WFSLayer({
             id: layerItem.id,
             url: layerItem.url,

+ 306 - 276
src/components/OneMap/widgets/SpatialAnalysis.vue

@@ -1,257 +1,308 @@
 TODO: 待完善
 <template>
   <div>
-    <div :class='`analysis`' style='display: flex;' v-drag='`.analysis .ant-card-head`'>
-      <a-card v-show='value' :title='title' style=' max-height: 90vh; width: 335px;  box-shadow: 0 0 5px #357ee5;'>
-        <a-icon slot='extra' type='close' style='cursor: pointer; color: #FFFFFF;' @click="$emit('input',false)" />
+    <div :class="`analysis`" style="display: flex;" v-drag="`.analysis .ant-card-head`">
+      <a-card v-show="value" :title="title" style=" max-height: 90vh; width: 335px;  box-shadow: 0 0 5px #357ee5;">
+        <a-icon slot="extra" type="close" style="cursor: pointer; color: #FFFFFF;" @click="$emit('input', false)" />
         <div>
-          <h4>选择分析源图层:</h4><!--v-if="isMore"-->
-          <a-radio-group v-model='tableType' button-style='solid' @change='onChange'>
-            <a-radio v-for='(item,index) in activeItemList ' :key='item.id' :value='index' v-show='!item.isHidden'>
+          <h4>选择分析源图层:</h4>
+          <!--v-if="isMore"-->
+          <a-radio-group v-model="tableType" button-style="solid" @change="onChange">
+            <a-radio v-for="(item, index) in activeItemList" :key="item.id" :value="index" v-show="!item.isHidden">
               {{ item.sourceName }}
             </a-radio>
           </a-radio-group>
-          <div style='margin: 20px auto;'>
-            <a-radio-group v-model='typeSelected' button-style='solid' @change='getTypeSelected'>
+          <div style="margin: 20px auto;">
+            <a-radio-group v-model="typeSelected" button-style="solid" @change="getTypeSelected">
               <a-tooltip>
-                <template slot='title'>
+                <template slot="title">
                   针对图斑分析
                 </template>
-                <a-radio-button value='point'>
+                <a-radio-button value="point">
                   点选分析
                 </a-radio-button>
               </a-tooltip>
               <a-tooltip>
-                <template slot='title'>
+                <template slot="title">
                   自由绘制分析
                 </template>
-                <a-radio-button value='polygon'>
+                <a-radio-button value="polygon">
                   绘制分析
                 </a-radio-button>
               </a-tooltip>
             </a-radio-group>
-            <a-button style='margin-left: 20px' @click='clear' type='danger'>清空</a-button>
+            <a-button style="margin-left: 20px" @click="clear" type="danger">清空</a-button>
           </div>
         </div>
-        <div>
-        </div>
+        <div></div>
       </a-card>
     </div>
     <!-- 分析结果抽屉 -->
     <a-drawer
-      title='分析结果'
-      placement='right'
-      :closable='true'
-      :visible="basicMap.drawerVisible&&result[0].type!==''"
-      @close='handleCancel'
-      width='700'
-      :mask='false'
-      class='analysis'
+      title="分析结果"
+      placement="right"
+      :closable="true"
+      :visible="basicMap.drawerVisible && result[0].type !== ''"
+      @close="handleCancel"
+      width="700"
+      :mask="false"
+      class="analysis"
     >
       <!-- 分析结果内容 -->
-      <div style=' '>
-        <a-tabs v-model='key' tab-position='left' @change='tabsCallback' size='small'>
-          <a-tab-pane v-if='gdXx' style='position: relative' key='项目信息' tab='项目信息'>
-            <div class='info'>
-              <div class='content'>
-                <div v-for='dk in gdXxList' :key='dk.title'>
-                  <div v-show='dk.content!=null' class='caseother'><span class='title'>【{{ dk.title }}】</span><span
-                    class='text'>{{ dk.content }}</span></div>
+      <div style=" ">
+        <a-tabs v-model="key" tab-position="left" @change="tabsCallback" size="small">
+          <a-tab-pane v-if="gdXx" style="position: relative" key="项目信息" tab="项目信息">
+            <div class="info">
+              <div class="content">
+                <div v-for="dk in gdXxList" :key="dk.title">
+                  <div v-show="dk.content != null" class="caseother">
+                    <span class="title">【{{ dk.title }}】</span><span class="text">{{ dk.content }}</span>
+                  </div>
                 </div>
               </div>
             </div>
           </a-tab-pane>
-          <a-tab-pane v-for='(item,index) in result' style='position: relative' :key='item.type' :tab='item.type'>
+          <a-tab-pane v-for="(item, index) in result" style="position: relative" :key="item.type" :tab="item.type">
             <div>
-              <div v-if='isTotal[index]' style=''>
-                <a-table style='' :columns='item.columns' :data-source='item.data' :pagination='false'
-                         :scroll='{y: 300 }'>
-                  <template slot='types' slot-scope='text'>
+              <div v-if="isTotal[index]" style="">
+                <a-table
+                  style=""
+                  :columns="item.columns"
+                  :data-source="item.data"
+                  :pagination="false"
+                  :scroll="{ y: 300 }"
+                >
+                  <template slot="types" slot-scope="text">
                     <a>{{ text }}</a>
                   </template>
-                  <template slot='area' slot-scope='text,record'>
-                    <a @click='handleLocate(record)'>{{ text }}</a>
+                  <template slot="area" slot-scope="text, record">
+                    <a @click="handleLocate(record)">{{ text }}</a>
                   </template>
                 </a-table>
                 <!--饼图-->
-                <Pie style=' margin-top: 80px; ' :height='300' :dataSource='item.pieData'></Pie>
+                <Pie style=" margin-top: 80px; " :height="300" :dataSource="item.pieData"></Pie>
               </div>
               <div v-else>
-                <a-icon type='rollback' style='position: absolute; right: 10px;top:-10px;font-size: 16px;z-index: 100'
-                        @click='handleBack(index)' />
-                <div v-if="item.type=='案件'" class='info' style='overflow: unset;user-select: auto;'>
-                  <a-timeline style=''>
-                    <template v-for='(item) in data'>
-                      <a-timeline-item color='green' v-if="item.TYPE=='sb'" :key=item.id>
-                        <div slot='dot'
-                             style='font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative'>
-              <span
-                style='font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;'>
-                报
-              </span>
+                <a-icon
+                  type="rollback"
+                  style="position: absolute; right: 10px;top:-10px;font-size: 16px;z-index: 100"
+                  @click="handleBack(index)"
+                />
+                <div v-if="item.type == '案件'" class="info" style="overflow: unset;user-select: auto;">
+                  <a-timeline style="">
+                    <template v-for="item in data">
+                      <a-timeline-item color="green" v-if="item.TYPE == 'sb'" :key="item.id">
+                        <div
+                          slot="dot"
+                          style="font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative"
+                        >
+                          <span
+                            style="font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;"
+                          >
+                            报
+                          </span>
                         </div>
-                        <div class='content'>
-                          <div class='ant-popover-arrow' style=' left: -5px;top: 12px;color: #AFDCF8;'></div>
-                          <div class='casedate'><span class='title'>【上报日期】</span><span>{{ item.RQ }}</span></div>
-                          <div class='caseother'><span class='title'>【巡查员】</span><span>{{ item.REALNAME }}</span>
+                        <div class="content">
+                          <div class="ant-popover-arrow" style=" left: -5px;top: 12px;color: #AFDCF8;"></div>
+                          <div class="casedate">
+                            <span class="title">【上报日期】</span><span>{{ item.RQ }}</span>
+                          </div>
+                          <div class="caseother">
+                            <span class="title">【巡查员】</span><span>{{ item.REALNAME }}</span>
+                          </div>
+                          <div class="caseother">
+                            <span class="title">【描述】</span><span>{{ item.MS }}</span>
                           </div>
-                          <div class='caseother'><span
-                            class='title'>【描述】</span><span>{{ item.MS }}</span></div>
-                          <div class='caseother' v-show='item.ZPNAME'>
-                            <span class='title'>【媒体信息】</span>
-                            <div class='images' v-viewer>
-                              <img v-for='src in item.ZPNAME' :key='src' :src='src'>
+                          <div class="caseother" v-show="item.ZPNAME">
+                            <span class="title">【媒体信息】</span>
+                            <div class="images" v-viewer>
+                              <img v-for="src in item.ZPNAME" :key="src" :src="src" />
                             </div>
                           </div>
-                          <div class='caseother' v-show='item.SPNAME'>
-                            <span class='title'>【视频信息】</span>
+                          <div class="caseother" v-show="item.SPNAME">
+                            <span class="title">【视频信息】</span>
                             <div>
-                              <img src='@/assets/caseVideoNew.png' @click='handleVideo(item.SPNAME)'>
+                              <img src="@/assets/caseVideoNew.png" @click="handleVideo(item.SPNAME)" />
                             </div>
                           </div>
                         </div>
                       </a-timeline-item>
-                      <a-timeline-item color='green' v-else-if="item.TYPE=='zp'">
-                        <div slot='dot'
-                             style='font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative'>
-              <span
-                style='font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;'>
-                派
-              </span>
+                      <a-timeline-item color="green" v-else-if="item.TYPE == 'zp'">
+                        <div
+                          slot="dot"
+                          style="font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative"
+                        >
+                          <span
+                            style="font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;"
+                          >
+                            派
+                          </span>
                         </div>
-                        <div class='content'>
-                          <div class='ant-popover-arrow' style=' left: -5px;top: 12px;color: #AFDCF8;'></div>
-                          <div class='casedate'><span class='title'>【派发日期】</span><span>{{ item.RQ }}</span></div>
-                          <div class='caseother'><span class='title'>【处理员】</span><span>{{ item.REALNAME }}</span>
+                        <div class="content">
+                          <div class="ant-popover-arrow" style=" left: -5px;top: 12px;color: #AFDCF8;"></div>
+                          <div class="casedate">
+                            <span class="title">【派发日期】</span><span>{{ item.RQ }}</span>
                           </div>
-                          <div class='caseother'><span
-                            class='title'>【描述】</span><span>{{ item.MS }}</span></div>
-                          <div class='caseother' v-show='item.ZPNAME'>
-                            <span class='title'>【媒体信息】</span>
-                            <div class='images' v-viewer>
-                              <img v-for='src in item.ZPNAME' :key='src' :src='src'>
+                          <div class="caseother">
+                            <span class="title">【处理员】</span><span>{{ item.REALNAME }}</span>
+                          </div>
+                          <div class="caseother">
+                            <span class="title">【描述】</span><span>{{ item.MS }}</span>
+                          </div>
+                          <div class="caseother" v-show="item.ZPNAME">
+                            <span class="title">【媒体信息】</span>
+                            <div class="images" v-viewer>
+                              <img v-for="src in item.ZPNAME" :key="src" :src="src" />
                             </div>
                           </div>
-                          <div class='caseother' v-show='item.SPNAME'>
-                            <span class='title'>【视频信息】</span>
+                          <div class="caseother" v-show="item.SPNAME">
+                            <span class="title">【视频信息】</span>
                             <div>
-                              <img src='@/assets/caseVideoNew.png' @click='handleVideo(item.SPNAME)'>
+                              <img src="@/assets/caseVideoNew.png" @click="handleVideo(item.SPNAME)" />
                             </div>
                           </div>
                         </div>
                       </a-timeline-item>
-                      <a-timeline-item color='green' v-else-if="item.TYPE=='db'" :key='item.ID'>
-                        <div slot='dot'
-                             style='font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative'>
-              <span
-                style='font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;'>
-                督
-              </span>
+                      <a-timeline-item color="green" v-else-if="item.TYPE == 'db'" :key="item.ID">
+                        <div
+                          slot="dot"
+                          style="font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative"
+                        >
+                          <span
+                            style="font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;"
+                          >
+                            督
+                          </span>
                         </div>
-                        <div class='content'>
-                          <div class='ant-popover-arrow' style=' left: -5px;top: 12px;color: #AFDCF8;'></div>
-                          <div class='casedate'><span class='title'>【督办日期】</span><span>{{ item.RQ }}</span></div>
-                          <div class='caseother'><span class='title'>【督办员】</span><span>{{ item.REALNAME }}</span>
+                        <div class="content">
+                          <div class="ant-popover-arrow" style=" left: -5px;top: 12px;color: #AFDCF8;"></div>
+                          <div class="casedate">
+                            <span class="title">【督办日期】</span><span>{{ item.RQ }}</span>
+                          </div>
+                          <div class="caseother">
+                            <span class="title">【督办员】</span><span>{{ item.REALNAME }}</span>
+                          </div>
+                          <div class="caseother">
+                            <span class="title">【描述】</span><span>{{ item.MS }}</span>
                           </div>
-                          <div class='caseother'><span
-                            class='title'>【描述】</span><span>{{ item.MS }}</span></div>
-                          <div class='caseother' v-show='item.ZPNAME'>
-                            <span class='title'>【媒体信息】</span>
-                            <div class='images' v-viewer>
-                              <img v-for='src in item.ZPNAME' :key='src' :src='src'>
+                          <div class="caseother" v-show="item.ZPNAME">
+                            <span class="title">【媒体信息】</span>
+                            <div class="images" v-viewer>
+                              <img v-for="src in item.ZPNAME" :key="src" :src="src" />
                             </div>
                           </div>
-                          <div class='caseother' v-show='item.SPNAME'>
-                            <span class='title'>【视频信息】</span>
+                          <div class="caseother" v-show="item.SPNAME">
+                            <span class="title">【视频信息】</span>
                             <div>
-                              <img src='@/assets/caseVideoNew.png' @click='handleVideo(item.SPNAME)'>
+                              <img src="@/assets/caseVideoNew.png" @click="handleVideo(item.SPNAME)" />
                             </div>
                           </div>
                         </div>
                       </a-timeline-item>
-                      <a-timeline-item color='green' v-else-if="item.TYPE=='cl'">
-                        <div slot='dot'
-                             style='font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative'>
-              <span
-                style='font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;'>
-                处
-              </span>
+                      <a-timeline-item color="green" v-else-if="item.TYPE == 'cl'">
+                        <div
+                          slot="dot"
+                          style="font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative"
+                        >
+                          <span
+                            style="font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;"
+                          >
+                            处
+                          </span>
                         </div>
-                        <div class='content'>
-                          <div class='ant-popover-arrow' style=' left: -5px;top: 12px;color: #AFDCF8;'></div>
-                          <div class='casedate'><span class='title'>【处理日期】</span><span>{{ item.RQ }}</span></div>
-                          <div class='caseother'><span class='title'>【处理员】</span><span>{{ item.REALNAME }}</span>
+                        <div class="content">
+                          <div class="ant-popover-arrow" style=" left: -5px;top: 12px;color: #AFDCF8;"></div>
+                          <div class="casedate">
+                            <span class="title">【处理日期】</span><span>{{ item.RQ }}</span>
                           </div>
-                          <div class='caseother'><span
-                            class='title'>【描述】</span><span>{{ item.MS }}</span></div>
-                          <div class='caseother' v-show='item.ZPNAME'>
-                            <span class='title'>【媒体信息】</span>
-                            <div class='images' v-viewer>
-                              <img v-for='src in item.ZPNAME' :key='src' :src='src'>
+                          <div class="caseother">
+                            <span class="title">【处理员】</span><span>{{ item.REALNAME }}</span>
+                          </div>
+                          <div class="caseother">
+                            <span class="title">【描述】</span><span>{{ item.MS }}</span>
+                          </div>
+                          <div class="caseother" v-show="item.ZPNAME">
+                            <span class="title">【媒体信息】</span>
+                            <div class="images" v-viewer>
+                              <img v-for="src in item.ZPNAME" :key="src" :src="src" />
                             </div>
                           </div>
-                          <div class='caseother' v-show='item.SPNAME'>
-                            <span class='title'>【视频信息】</span>
+                          <div class="caseother" v-show="item.SPNAME">
+                            <span class="title">【视频信息】</span>
                             <div>
-                              <img src='@/assets/caseVideoNew.png' @click='handleVideo(item.SPNAME)'>
+                              <img src="@/assets/caseVideoNew.png" @click="handleVideo(item.SPNAME)" />
                             </div>
                           </div>
                         </div>
                       </a-timeline-item>
-                      <a-timeline-item color='green' v-else-if="item.TYPE=='ff'" :key='item.TYPE'>
-                        <div slot='dot'
-                             style='font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative'>
-              <span
-                style='font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;'>
-                飞
-              </span>
+                      <a-timeline-item color="green" v-else-if="item.TYPE == 'ff'" :key="item.TYPE">
+                        <div
+                          slot="dot"
+                          style="font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative"
+                        >
+                          <span
+                            style="font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;"
+                          >
+                            飞
+                          </span>
                         </div>
-                        <div class='content'>
-                          <div class='ant-popover-arrow' style=' left: -5px;top: 12px;color: #AFDCF8;'></div>
-                          <div class='casedate'><span class='title'>【复飞日期】</span><span>{{ item.RQ }}</span></div>
-                          <div class='caseother'><span class='title'>【复飞员】</span><span>{{ item.REALNAME }}</span>
+                        <div class="content">
+                          <div class="ant-popover-arrow" style=" left: -5px;top: 12px;color: #AFDCF8;"></div>
+                          <div class="casedate">
+                            <span class="title">【复飞日期】</span><span>{{ item.RQ }}</span>
+                          </div>
+                          <div class="caseother">
+                            <span class="title">【复飞员】</span><span>{{ item.REALNAME }}</span>
                           </div>
-                          <div class='caseother'><span
-                            class='title'>【描述】</span><span>{{ item.MS }}</span></div>
-                          <div class='caseother' v-show='item.ZPNAME'>
-                            <span class='title'>【媒体信息】</span>
-                            <div class='images' v-viewer>
-                              <img v-for='src in item.ZPNAME' :key='src' :src='src'>
+                          <div class="caseother">
+                            <span class="title">【描述】</span><span>{{ item.MS }}</span>
+                          </div>
+                          <div class="caseother" v-show="item.ZPNAME">
+                            <span class="title">【媒体信息】</span>
+                            <div class="images" v-viewer>
+                              <img v-for="src in item.ZPNAME" :key="src" :src="src" />
                             </div>
                           </div>
-                          <div class='caseother' v-show='item.SPNAME'>
-                            <span class='title'>【视频信息】</span>
+                          <div class="caseother" v-show="item.SPNAME">
+                            <span class="title">【视频信息】</span>
                             <div>
-                              <img src='@/assets/caseVideoNew.png' @click='handleVideo(item.SPNAME)'>
+                              <img src="@/assets/caseVideoNew.png" @click="handleVideo(item.SPNAME)" />
                             </div>
                           </div>
                         </div>
                       </a-timeline-item>
-                      <a-timeline-item color='green' v-else-if="item.TYPE=='sh'">
-                        <div slot='dot'
-                             style='font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative'>
-              <span
-                style='font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;'>
-                审
-              </span>
+                      <a-timeline-item color="green" v-else-if="item.TYPE == 'sh'">
+                        <div
+                          slot="dot"
+                          style="font-size: 14px;background-color: #336699;border-radius: 50%;text-align: center;width: 30px;height: 30px;position: relative"
+                        >
+                          <span
+                            style="font-weight: bold;color: #FFF;background-color: #46A4DA;border-radius: 50%;width:75%;height:75%;display: inline-block;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);line-height: initial;"
+                          >
+                            审
+                          </span>
                         </div>
-                        <div class='content'>
-                          <div class='ant-popover-arrow' style=' left: -5px;top: 12px;color: #AFDCF8;'></div>
-                          <div class='casedate'><span class='title'>【审核日期】</span><span>{{ item.RQ }}</span></div>
-                          <div class='caseother'><span class='title'>【审核员】</span><span>{{ item.REALNAME }}</span>
+                        <div class="content">
+                          <div class="ant-popover-arrow" style=" left: -5px;top: 12px;color: #AFDCF8;"></div>
+                          <div class="casedate">
+                            <span class="title">【审核日期】</span><span>{{ item.RQ }}</span>
+                          </div>
+                          <div class="caseother">
+                            <span class="title">【审核员】</span><span>{{ item.REALNAME }}</span>
                           </div>
-                          <div class='caseother'><span
-                            class='title'>【描述】</span><span>{{ item.MS }}</span></div>
-                          <div class='caseother' v-show='item.ZPNAME'>
-                            <span class='title'>【媒体信息】</span>
-                            <div class='images' v-viewer>
-                              <img v-for='src in item.ZPNAME' :key='src' :src='src'>
+                          <div class="caseother">
+                            <span class="title">【描述】</span><span>{{ item.MS }}</span>
+                          </div>
+                          <div class="caseother" v-show="item.ZPNAME">
+                            <span class="title">【媒体信息】</span>
+                            <div class="images" v-viewer>
+                              <img v-for="src in item.ZPNAME" :key="src" :src="src" />
                             </div>
                           </div>
-                          <div class='caseother' v-show='item.SPNAME'>
-                            <span class='title'>【视频信息】</span>
+                          <div class="caseother" v-show="item.SPNAME">
+                            <span class="title">【视频信息】</span>
                             <div>
-                              <img src='@/assets/caseVideoNew.png' @click='handleVideo(item.SPNAME)'>
+                              <img src="@/assets/caseVideoNew.png" @click="handleVideo(item.SPNAME)" />
                             </div>
                           </div>
                         </div>
@@ -280,26 +331,23 @@ TODO: 待完善
                                               </a-timeline-item>-->
                   </a-timeline>
                 </div>
-                <div v-else class='info' style='width: 100%'>
-                  <div class='content' v-for='(dks,ind) in item.list' :key='ind'>
-                    <div v-for='dk in dks' :key='dk.name'>
-                      <div v-show='dk.content!=null' class='caseother'><span class='title'>【{{ dk.name }}】</span><span
-                        class='text'>{{ dk.content }}</span></div>
+                <div v-else class="info" style="width: 100%">
+                  <div class="content" v-for="(dks, ind) in item.list" :key="ind">
+                    <div v-for="dk in dks" :key="dk.name">
+                      <div v-show="dk.content != null" class="caseother">
+                        <span class="title">【{{ dk.name }}】</span><span class="text">{{ dk.content }}</span>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
-
-
           </a-tab-pane>
         </a-tabs>
       </div>
     </a-drawer>
-    <locate-by-geoinfo ref='locateByGeoinfo'></locate-by-geoinfo>
-
+    <locate-by-geoinfo ref="locateByGeoinfo"></locate-by-geoinfo>
   </div>
-
 </template>
 
 <script>
@@ -370,8 +418,8 @@ export default {
         let list = []
         console.log(666, this.basicMap.layerList)
         if (this.basicMap.layerList.length > 0) {
-          this.basicMap.layerList.map((item) => {
-            item.layers.map((layer) => {
+          this.basicMap.layerList.map(item => {
+            item.layers.map(layer => {
               if (layer.analyzable) {
                 list.push(layer)
               }
@@ -443,7 +491,10 @@ export default {
           }
           if (item.ZPNAME) {
             this.data[index].ZPNAME = this.data[index].ZPNAME.split(';')
-            if (!this.data[index].ZPNAME[this.data[index].length - 1] || this.data[index].ZPNAME[this.data[index].length - 1] === '') {
+            if (
+              !this.data[index].ZPNAME[this.data[index].length - 1] ||
+              this.data[index].ZPNAME[this.data[index].length - 1] === ''
+            ) {
               this.data[index].ZPNAME.pop()
             }
             this.data[index].ZPNAME.forEach((itemA, ind) => {
@@ -452,7 +503,6 @@ export default {
           }
         })
       } else {
-
       }
       let { success, message, result } = await getAction(this.url.detail, {
         table: this.key,
@@ -471,7 +521,7 @@ export default {
             return
           }
         }
-        result.forEach((item) => {
+        result.forEach(item => {
           let list = []
           for (var key in item.fldalia) {
             list.push({ name: item.fldalia[key], content: item.result[key], wkt: item.result.WKT })
@@ -487,7 +537,6 @@ export default {
       }
     },
     handleLocate(record, isOwn) {
-
       if (!isOwn) {
         this.basicMap.analysis_Drew_GraphicsLayer.removeAll()
         this.lng = []
@@ -517,13 +566,16 @@ export default {
           return
         } else if (item.includes('MULTIPOLYGON')) {
           if (bsIndex != -1) {
-            type = geomInfo.slice(0, bsIndex).trim().toUpperCase()
+            type = geomInfo
+              .slice(0, bsIndex)
+              .trim()
+              .toUpperCase()
             geojson = new wktParser.parse(geomInfo)
           } else {
             type = JSON.parse(item.geoinfo).type.toUpperCase()
             geojson = JSON.parse(item.geoinfo)
           }
-          geojson.coordinates.forEach((coords) => {
+          geojson.coordinates.forEach(coords => {
             let rings = []
             for (let i = 0; i < coords.length; i++) {
               let ring = []
@@ -534,14 +586,14 @@ export default {
               }
               rings.push(ring)
             }
-            rings.forEach((coords) => {
+            rings.forEach(coords => {
               coords.forEach((itemC, index) => {
                 if (rings.length > 1) {
                   if (!Array.isArray(itemC)) {
                     this.lng.push(coords[0])
                     this.lat.push(coords[1])
                   } else {
-                    itemC.forEach((it) => {
+                    itemC.forEach(it => {
                       this.lng.push(it[0])
                       this.lat.push(it[1])
                     })
@@ -562,10 +614,11 @@ export default {
             let g = Math.floor(Math.random() * 255)
             let b = Math.floor(Math.random() * 255)
             const polygonSymbol = {
-              type: 'simple-fill',  // autocasts as new SimpleFillSymbol()
+              type: 'simple-fill', // autocasts as new SimpleFillSymbol()
               // color: [128, 128, 128, 0.5],
               color: [r, g, b, 0.5],
-              outline: {  // autocasts as new SimpleLineSymbol()
+              outline: {
+                // autocasts as new SimpleLineSymbol()
                 color: [r, g, b],
                 width: '6px',
                 style: 'short-dot'
@@ -578,9 +631,11 @@ export default {
             this.basicMap.analysis_Drew_GraphicsLayer.add(graphic)
           })
         } else {
-
           if (bsIndex != -1) {
-            type = geomInfo.slice(0, bsIndex).trim().toUpperCase()
+            type = geomInfo
+              .slice(0, bsIndex)
+              .trim()
+              .toUpperCase()
             geojson = new wktParser.parse(geomInfo)
           } else {
             type = JSON.parse(item.geoinfo).type.toUpperCase()
@@ -598,14 +653,14 @@ export default {
             }
             rings.push(ring)
           }
-          rings.forEach((coords) => {
+          rings.forEach(coords => {
             coords.forEach((itemC, index) => {
               if (rings.length > 1) {
                 if (!Array.isArray(itemC)) {
                   this.lng.push(coords[0])
                   this.lat.push(coords[1])
                 } else {
-                  itemC.forEach((it) => {
+                  itemC.forEach(it => {
                     this.lng.push(it[0])
                     this.lat.push(it[1])
                   })
@@ -626,10 +681,11 @@ export default {
           let g = Math.floor(Math.random() * 255)
           let b = Math.floor(Math.random() * 255)
           const polygonSymbol = {
-            type: 'simple-fill',  // autocasts as new SimpleFillSymbol()
+            type: 'simple-fill', // autocasts as new SimpleFillSymbol()
             // color: [128, 128, 128, 0.5],
             color: [g, r, b, 0.5],
-            outline: {  // autocasts as new SimpleLineSymbol()
+            outline: {
+              // autocasts as new SimpleLineSymbol()
               color: [r, g, b],
               width: '3px',
               style: 'solid'
@@ -652,19 +708,18 @@ export default {
       }
       this.lng.sort()
       this.lat.sort()
-      let extent = new Extent(
-        this.lng[0], this.lat[0], this.lng[this.lat.length - 1], this.lat[this.lat.length - 1]
-      )
+      let extent = new Extent(this.lng[0], this.lat[0], this.lng[this.lat.length - 1], this.lat[this.lat.length - 1])
       this.basicMap.mapView.extent = extent
       let cur_scale = this.basicMap.mapView.scale
-      this.basicMap.mapView.goTo({
+      this.basicMap.mapView.goTo(
+        {
           scale: cur_scale * 1.2
-        }, {
+        },
+        {
           duration: 500
         }
       )
       this.basicMap.mapView2.extent = this.basicMap.mapView.extent
-
     },
     handleCancel() {
       this.basicMap.drawerVisible = false
@@ -688,8 +743,8 @@ export default {
           m_layer.visible = checked
         }
       })
-      this.basicMap.layerList.map((item) => {
-        item.layers.map((layerItem) => {
+      this.basicMap.layerList.map(item => {
+        item.layers.map(layerItem => {
           if (layerItem === layer) {
             layerItem.visible = true
           } else {
@@ -743,8 +798,8 @@ export default {
           }
         }
       })
-      this.basicMap.layerList.map((item) => {
-        item.layers.map((layerItem) => {
+      this.basicMap.layerList.map(item => {
+        item.layers.map(layerItem => {
           if (layerItem.analyzable) {
             if (layerItem === layer) {
               layerItem.visible = true
@@ -759,7 +814,7 @@ export default {
       this.indeterminate = !!checkedList.length && checkedList.length < this.plainOptions.length
       this.checkAll = checkedList.length === this.plainOptions.length
       this.orderTable = []
-      checkedList.forEach((item) => {
+      checkedList.forEach(item => {
         this.orderTableList.forEach((itemTable, index) => {
           if (itemTable.atablecname === item) {
             this.orderTable.push(itemTable.atableename)
@@ -789,9 +844,9 @@ export default {
       this.basicMap.drawerVisible = true
     },
     mercatorTolonlat(mercator) {
-      var x = mercator[0] / 20037508.34 * 180
-      var y = mercator[1] / 20037508.34 * 180
-      y = 180 / Math.PI * (2 * Math.atan(Math.exp(y * Math.PI / 180)) - Math.PI / 2)
+      var x = (mercator[0] / 20037508.34) * 180
+      var y = (mercator[1] / 20037508.34) * 180
+      y = (180 / Math.PI) * (2 * Math.atan(Math.exp((y * Math.PI) / 180)) - Math.PI / 2)
       return [x, y]
     },
     stopDraw() {
@@ -836,32 +891,19 @@ export default {
       view.focus()
       switch (this.typeSelected) {
         case 'point':
-          action.on(
-            [
-              'vertex-add',
-              'vertex-remove',
-              'redo',
-              'undo',
-              'draw-complete'
-            ], this.createPoint)
+          action.on(['vertex-add', 'vertex-remove', 'redo', 'undo', 'draw-complete'], this.createPoint)
           break
         case 'polygon':
           action.on(
-            [
-              'vertex-add',
-              'vertex-remove',
-              'redo',
-              'undo',
-              'draw-complete',
-              'cursor-update'
-            ], this.createPolygon)
+            ['vertex-add', 'vertex-remove', 'redo', 'undo', 'draw-complete', 'cursor-update'],
+            this.createPolygon
+          )
           break
         default:
-
           break
       }
 
-      action.on('draw-complete', (evt) => {
+      action.on('draw-complete', evt => {
         let type = 'Polygon'
         evt.vertices.forEach((item, index) => {
           evt.vertices[index] = this.mercatorTolonlat(item)
@@ -878,9 +920,9 @@ export default {
             },
             properties: null,
             crs: {
-              'type': 'name',
-              'properties': {
-                'name': 'EPSG:4490'
+              type: 'name',
+              properties: {
+                name: 'EPSG:4490'
               }
             }
           }
@@ -912,13 +954,14 @@ export default {
           spatialReference: this.view.spatialReference
         }),
         symbol: {
-          type: 'simple-marker',  // autocasts as new SimpleMarkerSymbol()
+          type: 'simple-marker', // autocasts as new SimpleMarkerSymbol()
           style: 'square',
           color: 'blue',
-          size: '8px',  // pixels
-          outline: {  // autocasts as new SimpleLineSymbol()
+          size: '8px', // pixels
+          outline: {
+            // autocasts as new SimpleLineSymbol()
             color: [255, 255, 0],
-            width: 3  // points
+            width: 3 // points
           }
         }
       })
@@ -940,10 +983,11 @@ export default {
           spatialReference: this.view.spatialReference
         }),
         symbol: {
-          type: 'simple-fill',  // autocasts as new SimpleFillSymbol()
+          type: 'simple-fill', // autocasts as new SimpleFillSymbol()
           color: [51, 51, 204, 0.4],
           style: 'solid',
-          outline: {  // autocasts as new SimpleLineSymbol()
+          outline: {
+            // autocasts as new SimpleLineSymbol()
             color: 'red',
             width: 1
           }
@@ -979,7 +1023,6 @@ export default {
         })
         this.checkedList = this.plainOptions
         this.orderTable = this.allOrderTable
-
       } else {
         if (message.includes('null')) {
           message = '没有查询到数据'
@@ -996,7 +1039,7 @@ export default {
       let length = 1
       this.gdXx = false
       let url = this.url.polygon
-     // console.log('------------------------------------地块分析传入参数---------------------------------')
+      // console.log('------------------------------------地块分析传入参数---------------------------------')
       if (this.typeSelected === 'point') {
         url = this.url.point
         if (this.table === 'GD_DKXX') {
@@ -1053,8 +1096,10 @@ export default {
             if (!item.result) {
               item.type = '项目信息'
               item.list = []
-              for (var key in item) {  //遍历对象的所有属性,包括原型链上的所有属性
-                if (item.hasOwnProperty(key) && key != 'type' && key != 'list') { //判断是否是对象自身的属性,而不包含继承自原型链上的属性,不是后加的属性
+              for (var key in item) {
+                //遍历对象的所有属性,包括原型链上的所有属性
+                if (item.hasOwnProperty(key) && key != 'type' && key != 'list') {
+                  //判断是否是对象自身的属性,而不包含继承自原型链上的属性,不是后加的属性
                   let val = { title: key, content: item[key] }
                   item.list.push(val)
                 }
@@ -1081,8 +1126,8 @@ export default {
               this.isTotal.push(true)
               this.result[resInd].type = item.type
               type = item.type
-              this.basicMap.layerList.map((child) => {
-                child.layers.map((layer) => {
+              this.basicMap.layerList.map(child => {
+                child.layers.map(layer => {
                   if (layer.alias === item.type) {
                     this.keys.push(layer)
                   }
@@ -1093,14 +1138,14 @@ export default {
               col = { title: '用途', dataIndex: 'types', key: 'types', scopedSlots: { customRender: 'types' } }
               col2 = { title: '面积(公顷)', dataIndex: 'area', key: 'area', scopedSlots: { customRender: 'area' } }
               // 土地价值
-              col3 = { title: '土地价值(元)', dataIndex: 'tdjz', key: 'tdjz', scopedSlots: { customRender: 'tdjz' } }
+              // col3 = { title: '土地价值(元)', dataIndex: 'tdjz', key: 'tdjz', scopedSlots: { customRender: 'tdjz' } }
               col.title = item.afieldcname
               //列信息
-              this.result[resInd].columns.push(col, col2, col3)
+              this.result[resInd].columns.push(col, col2)
             }
             data[resInd].push(item.result)
             //遍历分组
-            if (index === (result.length - length)) {
+            if (index === result.length - length) {
               data.forEach((arr, index) => {
                 let pies = []
                 let map = {}
@@ -1108,37 +1153,23 @@ export default {
                 //遍历分组
                 for (let i = 0; i < arr.length; i++) {
                   let ai = arr[i]
-                  console.log("############要遍历的 result 信息(ai)#############")
+                  console.log('############要遍历的 result 信息(ai)#############')
                   console.log(ai)
                   console.log(map[ai.types])
 
                   //判断map里记录类型存在######################
-                  if (!map[ai.types]) {
-                    dest.push({
-                      key: ai.types,
-                      types: ai.types,
-                      objectids: [ai.objectid],
-                      wkt: [ai.info],
-                      area: ai.area,
-                      tdjz: ai.tdjz == null ? '地类不确定' : ai.tdjz
-                    })
-                    let pie = { item: '示例一', count: 40 }
-                    pie.item = ai.types
-                    pie.count = parseFloat(ai.area)
-                    pies.push(pie)
-                    map[ai.types] = ai
-                  } else {
-                    for (let j = 0; j < dest.length; j++) {
-                      let dj = dest[j]
-                      if (dj.types === ai.types) {
-                        dj.area = parseFloat(parseFloat(dj.area) + parseFloat(ai.area)).toFixed(4)
-                        dj.wkt.push(ai.info)
-                        dj.objectids.push(ai.objectid)
-                        pies[j].count = parseFloat(dj.area)
-                        break
-                      }
-                    }
-                  }
+                  dest.push({
+                    key: ai.types,
+                    types: ai.types,
+                    objectids: [ai.objectid],
+                    wkt: [ai.info],
+                    area: ai.area
+                  })
+                  let pie = { item: '示例一', count: 40 }
+                  pie.item = ai.types
+                  pie.count = parseFloat(ai.area)
+                  pies.push(pie)
+                  map[ai.types] = ai
                   //##############################################
                 }
                 //饼图
@@ -1182,7 +1213,6 @@ export default {
       this.basicMap.mapView.graphics.removeAll()
     }
   }
-
 }
 </script>
 <style scoped>
@@ -1195,7 +1225,6 @@ export default {
   /*display: flex;*/
   flex-wrap: wrap;
   align-items: center;
-
 }
 
 .info {
@@ -1222,22 +1251,24 @@ export default {
   top: 50%;
   transform: translateY(-50%);
 }
-
 </style>
 <style>
 .analysis .ant-tabs .ant-tabs-left-content {
   overflow-y: auto;
 }
 
-.analysis .ant-tabs-tab-prev, .ant-tabs-tab-next {
+.analysis .ant-tabs-tab-prev,
+.ant-tabs-tab-next {
   color: rgba(0, 0, 0, 0.55);
 }
 
-:root .analysis .ant-tabs-tab-prev-icon-target, :root .analysis .ant-tabs-tab-next-icon-target {
+:root .analysis .ant-tabs-tab-prev-icon-target,
+:root .analysis .ant-tabs-tab-next-icon-target {
   font-size: 24px;
 }
 
-.analysis .ant-tabs-tab-btn-disabled, .analysis .ant-tabs-tab-btn-disabled:hover {
+.analysis .ant-tabs-tab-btn-disabled,
+.analysis .ant-tabs-tab-btn-disabled:hover {
   color: rgba(0, 0, 0, 0.25);
 }
 
@@ -1275,6 +1306,5 @@ export default {
 .analysis .ant-spin-nested-loading {
   max-height: 50vh;
   overflow-y: auto;
-
 }
 </style>

+ 0 - 4
src/views/tj/compoent/BarDobuleData.vue

@@ -189,10 +189,6 @@ export default {
       })
       myChart.setOption(option);
       myChart.resize();
-      /*window.addEventListener("resize", myChart.resize);*/
-
-      //  })
-
     }
   },
 

+ 0 - 1
src/views/tj/compoent/BarTdsjyt.vue

@@ -187,7 +187,6 @@ export default {
       })
       myChart.setOption(option);
       myChart.resize();
-
     }
   },
 

+ 282 - 263
src/views/tj/sjtjModules.vue

@@ -4,7 +4,7 @@
       <a-row>
         <a-col :sm="24" :md="12" :xl="4">
           <a-card style="height: 146px">
-            <a-avatar style="margin-left: 3%" :size="40" icon="user"/>
+            <a-avatar style="margin-left: 3%" :size="40" icon="user" />
             <a-select default-value="ssqy" style="width: 150px;margin-top: 12%;margin-left: 4%" @change="handleChange">
               <a-select-option value="szdw">
                 省直单位
@@ -15,28 +15,31 @@
             </a-select>
           </a-card>
         </a-col>
-
-        <a-col v-show="this.type=='ssqy'" :sm="24" :md="12" :xl="20">
+        <!--省属企业-->
+        <a-col v-show="this.type == 'ssqy'" :sm="24" :md="12" :xl="20">
           <a-card class="flex-space-between">
             <a-col class="flex-center" :sm="18" :md="12" :xl="5" @click="handleQy">
-              <div class='tjcxcound1'>
+              <div class="tjcxcound1">
                 <div style="color: white;padding-top: 0.6rem">
                   <div style="width: 5rem;margin-left: 1rem;margin-top:10px;float: left; ">已审核省属企业数量</div>
-                  <div style="font-size: 24px; margin-top:6%;float: right;font-weight:600;">{{ SSQYSL }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span></div>
+                  <div style="font-size: 24px; margin-top:6%;float: right;font-weight:600;">
+                    {{ SSQYSL
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span>
+                  </div>
                   <!--                  <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSZ }}<span style="font-size: 16px;margin-left:5px;margin-right: 5px;font-weight:400" >亩</span></div>-->
                 </div>
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="5">
-              <div class='tjcxcound2'>
+              <div class="tjcxcound2">
                 <div style="color: white;padding-top: 0.6rem">
                   <div style="width: 5rem;margin-left: 1rem;margin-top:10px;float: left; ">上报地块企业数量</div>
-                  <div style="font-size: 24px;margin-top:6%; float: right;font-weight:600;">{{ SBDKQYSL }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span></div>
+                  <div style="font-size: 24px;margin-top:6%; float: right;font-weight:600;">
+                    {{ SBDKQYSL
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span>
+                  </div>
                 </div>
 
-
                 <!--              <div style="color: white;padding-top: 1rem">-->
                 <!--                <div>已上报省属企业地块总面积</div>-->
                 <!--                <div>-->
@@ -46,13 +49,17 @@
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="5">
-              <div class='tjcxcound3' @click="visibleInfo({sfsb:3})">
+              <div class="tjcxcound3" @click="visibleInfo({ sfsb: 3 })">
                 <div style="color: white;padding-top: 0.6rem">
                   <div style="width: 5rem;margin-left: 1rem;margin-top:10px;float: left; ">已审核省属企业地块</div>
-                  <div style="font-size: 24px; float: right;font-weight:600;">{{ COUNTDK }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">块</span></div>
-                  <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSS }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">亩</span></div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">
+                    {{ COUNTDK
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">块</span>
+                  </div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">
+                    {{ SUMSS
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">亩</span>
+                  </div>
                 </div>
                 <!--                <div>其中省直单位闲置低效面积</div>-->
                 <!--                <div>-->
@@ -61,13 +68,19 @@
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="5">
-              <div class='tjcxcound4' @click="visibleInfo({sfsb:3,tdsyxz:'闲置低效土地'})">
+              <div class="tjcxcound4" @click="visibleInfo({ sfsb: 3, tdsyxz: '闲置低效土地' })">
                 <div style="color: white;padding-top: 0.6rem">
-                  <div style="width: 8rem;margin-left: 1rem;margin-top:10px;float: left; ">其中省属企业闲置低效地块</div>
-                  <div style="font-size: 24px; float: right;font-weight:600;">{{ COUNTDKBYSSXZDX }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">块</span></div>
-                  <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSSXZDX }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">亩</span></div>
+                  <div style="width: 8rem;margin-left: 1rem;margin-top:10px;float: left; ">
+                    其中省属企业闲置低效地块
+                  </div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">
+                    {{ COUNTDKBYSSXZDX
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">块</span>
+                  </div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">
+                    {{ SUMSSXZDX
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">亩</span>
+                  </div>
                 </div>
                 <!--              <div style="color: white;padding-top: 1rem">-->
                 <!--                <div>其中省属企业闲置低效面积</div>-->
@@ -79,26 +92,30 @@
             </a-col>
           </a-card>
         </a-col>
-        <a-col v-show="this.type=='szdw'" :sm="24" :md="12" :xl="20">
+        <!--省直单位-->
+        <a-col v-show="this.type == 'szdw'" :sm="24" :md="12" :xl="20">
           <a-card class="flex-space-between">
             <a-col class="flex-center" :sm="18" :md="12" :xl="5">
-              <div class='tjcxcound1' @click="handleDw()">
+              <div class="tjcxcound1" @click="handleDw()">
                 <div style="color: white;padding-top: 0.6rem">
                   <div style="width: 5rem;margin-left: 1rem;margin-top:10px;float: left; ">已审核省直单位数量</div>
-                  <div style="font-size: 24px; margin-top:6%; float: right;font-weight:600;">{{ SZQYSL }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span></div>
+                  <div style="font-size: 24px; margin-top:6%; float: right;font-weight:600;">
+                    {{ SZQYSL
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span>
+                  </div>
                 </div>
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="5">
-              <div class='tjcxcound2'>
+              <div class="tjcxcound2">
                 <div style="color: white;padding-top: 0.6rem">
                   <div style="width: 5rem;margin-left: 1rem;margin-top:10px;float: left; ">上报地块单位数量</div>
-                  <div style="font-size: 24px; margin-top:6%; float: right;font-weight:600;">{{ SSDWSL }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span></div>
+                  <div style="font-size: 24px; margin-top:6%; float: right;font-weight:600;">
+                    {{ SSDWSL
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">家</span>
+                  </div>
                 </div>
 
-
                 <!--              <div style="color: white;padding-top: 1rem">-->
                 <!--                <div>已上报省属企业地块总面积</div>-->
                 <!--                <div>-->
@@ -108,15 +125,17 @@
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="5">
-              <div class='tjcxcound3' @click="visibleInfoBySz({sfsb:3})">
+              <div class="tjcxcound3" @click="visibleInfoBySz({ sfsb: 3 })">
                 <div style="color: white;padding-top: 0.6rem">
-
                   <div style="width: 5rem;margin-left: 1rem;margin-top:10px;float: left; ">已审核省直单位地块</div>
-                  <div style="font-size: 24px; float: right;font-weight:600;">{{ COUNTDKBYSZ }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">块</span></div>
-                  <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSZ }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">亩</span></div>
-
+                  <div style="font-size: 24px; float: right;font-weight:600;">
+                    {{ COUNTDKBYSZ
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">块</span>
+                  </div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">
+                    {{ SUMSZ
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">亩</span>
+                  </div>
                 </div>
                 <!--                <div>其中省直单位闲置低效面积</div>-->
                 <!--                <div>-->
@@ -125,13 +144,19 @@
               </div>
             </a-col>
             <a-col class="flex-center" :sm="24" :md="12" :xl="5">
-              <div class='tjcxcound4' @click="visibleInfoBySz({sfsb:3,tdsyxz:'闲置低效土地'})">
+              <div class="tjcxcound4" @click="visibleInfoBySz({ sfsb: 3, tdsyxz: '闲置低效土地' })">
                 <div style="color: white;padding-top: 0.6rem">
-                  <div style="width: 8rem;margin-left: 1rem;margin-top:10px;float: left; ">其中省直单位闲置低效地块</div>
-                  <div style="font-size: 24px; float: right;font-weight:600;">{{ COUNTDKBYSZXZDX }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">块</span></div>
-                  <div style="font-size: 24px; float: right;font-weight:600;">{{ SUMSZXZDX }}<span
-                    style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">亩</span></div>
+                  <div style="width: 8rem;margin-left: 1rem;margin-top:10px;float: left; ">
+                    其中省直单位闲置低效地块
+                  </div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">
+                    {{ COUNTDKBYSZXZDX
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">块</span>
+                  </div>
+                  <div style="font-size: 24px; float: right;font-weight:600;">
+                    {{ SUMSZXZDX
+                    }}<span style="font-size: 16px;margin-left:5px;margin-right: 10px;font-weight:400">亩</span>
+                  </div>
                 </div>
                 <!--              <div style="color: white;padding-top: 1rem">-->
                 <!--                <div>其中省属企业闲置低效面积</div>-->
@@ -144,37 +169,50 @@
           </a-card>
         </a-col>
       </a-row>
-
     </div>
     <div>
-      <a-row v-show="this.type=='szdw'">
+      <a-row v-show="this.type == 'szdw'">
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 42rem">
-            <mapData ref="map2ref" :resultMapData="this.resMapSzData" :titles="this.title2"
-                     @visible="visibleInfoBySz"></mapData>
+            <mapData
+              ref="map2ref"
+              :resultMapData="this.resMapSzData"
+              :titles="this.title2"
+              @visible="visibleInfoBySz"
+            ></mapData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <PieData :resultData="this.resData1"
-                     :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'省直单位土地获取方式占比':'省直单位土地获取方式占比'"
-                     @visible="visibleInfoBySz"></PieData>
+            <PieData
+              :resultData="this.resData1"
+              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位土地获取方式占比' : '省直单位土地获取方式占比'"
+              @visible="visibleInfoBySz"
+            ></PieData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <DoughnutData :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'省直单位权证登记比例情况':'省直单位权证登记比例情况’' +
-             '' +
-              '' " :result-data="this.DoughnutData"
-                          :pie-color="this.color1" @visibleZs="visibleInfoBySz"></DoughnutData>
+            <DoughnutData
+              :titleText="
+                this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位权证登记比例情况' : '省直单位权证登记比例情况’' + '' + ''
+              "
+              :result-data="this.DoughnutData"
+              :pie-color="this.color1"
+              @visibleZs="visibleInfoBySz"
+            ></DoughnutData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 20rem">
             <a-col :sm="24" :md="12" :xl="24">
-              <BarTdsjyt :titleText="this.tem_xzqhmc? this.tem_xzqhmc+'省直单位土地批准用途情况':'省直单位土地批准用途情况'"
-                         :result-x-data=this.resXData :dw="this.dw2"
-                         style="width:800px ;height:300px;" @visibleSz="visibleInfoBySz"></BarTdsjyt>
+              <BarTdsjyt
+                :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位土地批准用途情况' : '省直单位土地批准用途情况'"
+                :result-x-data="this.resXData"
+                :dw="this.dw2"
+                style="width:100% ;height:300px;"
+                @visibleSz="visibleInfoBySz"
+              ></BarTdsjyt>
             </a-col>
           </a-card>
         </a-col>
@@ -195,22 +233,20 @@
         <!--        </a-col>-->
         <a-col :sm="24" :md="12" :xl="24">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <BarDobuleData style="width: 1600px"
-                           :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'省直单位实际占用面积':'省直单位实际占用面积'"
-                           :result-x-data="resBarSzData"
-                           @visible="visibleInfoSzXzqh">
+            <BarDobuleData
+              style="width: 100%"
+              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省直单位实际占用面积' : '省直单位实际占用面积'"
+              :result-x-data="resBarSzData"
+              @visible="visibleInfoSzXzqh"
+            >
             </BarDobuleData>
           </a-card>
         </a-col>
       </a-row>
-      <a-row v-show="this.type=='ssqy'">
+      <a-row v-show="this.type == 'ssqy'">
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 43rem">
-            <mapData
-              ref="mapref"
-              :resultMapData="this.resMapSsData"
-              :titles="this.title1"
-              @visible="visibleInfo">
+            <mapData ref="mapref" :resultMapData="this.resMapSsData" :titles="this.title1" @visible="visibleInfo">
             </mapData>
           </a-card>
         </a-col>
@@ -218,18 +254,20 @@
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
             <PieData
               :resultData="this.resData"
-              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'省属企业土地获取方式占比':'省属企业土地获取方式占比'"
-              @visible="visibleInfo">
+              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省属企业土地获取方式占比' : '省属企业土地获取方式占比'"
+              @visible="visibleInfo"
+            >
             </PieData>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
             <DoughnutData
-              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'省属企业权证登记比例情况':'省属企业权证登记比例情况'"
+              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省属企业权证登记比例情况' : '省属企业权证登记比例情况'"
               :result-data="this.DoughnutData1"
-              :pie-color="this.color1" @visibleCard="visibleInfo">
-
+              :pie-color="this.color1"
+              @visibleCard="visibleInfo"
+            >
             </DoughnutData>
           </a-card>
         </a-col>
@@ -237,17 +275,24 @@
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
             <PieQdfsMj
               :resultData="this.resData2"
-              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'省属企业土地地块面积获取方式占比' : '省属企业土地地块面积获取方式占比'"
-              @visible="visibleInfo">
+              :titleText="
+                this.tem_xzqhmc
+                  ? this.tem_xzqhmc + '省属企业土地地块面积获取方式占比'
+                  : '省属企业土地地块面积获取方式占比'
+              "
+              @visible="visibleInfo"
+            >
             </PieQdfsMj>
           </a-card>
         </a-col>
         <a-col :sm="24" :md="12" :xl="6">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
             <DoughnutData
-              :titleText="this.tem_xzqh ? this.tem_xzqhmc+'省属企业土地使用现状占比':'省属企业土地使用现状占比'"
+              :titleText="this.tem_xzqh ? this.tem_xzqhmc + '省属企业土地使用现状占比' : '省属企业土地使用现状占比'"
               :result-data="this.DoughnutData2"
-              :PieColor="this.color" @visible="visibleInfo">
+              :PieColor="this.color"
+              @visible="visibleInfo"
+            >
             </DoughnutData>
           </a-card>
         </a-col>
@@ -256,10 +301,12 @@
             <a-col :sm="24" :md="12" :xl="24">
               <!--              <a-card style="margin-bottom: 1rem;width:100%;height: 20rem">-->
               <BarTdsjyt
-                :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'省属企业土地实际用途情况':'省属企业土地实际用途情况'"
+                :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省属企业土地实际用途情况' : '省属企业土地实际用途情况'"
                 :result-x-data="this.resYData"
                 :dw="this.dw2"
-                :seriesName="'地块数量'" @visible="visibleInfo">
+                :seriesName="'地块数量'"
+                @visible="visibleInfo"
+              >
               </BarTdsjyt>
             </a-col>
           </a-card>
@@ -267,111 +314,93 @@
         <a-col :sm="24" :md="12" :xl="12">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
             <BarDobuleData
-              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'省属企业实际占用面积':'省属企业实际占用面积'"
+              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '省属企业实际占用面积' : '省属企业实际占用面积'"
               :result-x-data="resBarSsData"
-              @visible="visibleInfoXzqh">
+              @visible="visibleInfoXzqh"
+            >
             </BarDobuleData>
           </a-card>
         </a-col>
 
         <a-col :sm="24" :md="12" :xl="24">
           <a-card style="margin-bottom: 1rem;width:100%;height: 21rem">
-            <BarData :titleText="this.tem_xzqhmc ? this.tem_xzqhmc+'一级单位用地面积汇总':'一级单位用地面积汇总'"
-                     :result-x-data="this.resYDatas"
-                     :seriesName="'地块面积(亩)'"
-                     :dw="this.dw" @visible="visibleInfoYjdw"
-                     style="width:calc(100% - 0px);height:300px;">
-
+            <BarData
+              :titleText="this.tem_xzqhmc ? this.tem_xzqhmc + '一级单位用地面积汇总' : '一级单位用地面积汇总'"
+              :result-x-data="this.resYDatas"
+              :seriesName="'地块面积(亩)'"
+              :dw="this.dw"
+              @visible="visibleInfoYjdw"
+              style="width:calc(100% - 0px);height:300px;"
+            >
             </BarData>
           </a-card>
         </a-col>
-
       </a-row>
       <j-modal
         :visible="visible"
         @cancel="handleCancel"
         @ok="handleOk"
         cancelText="关闭"
-        :okButtonProps="{ class:{'jee-hidden': false} }"
+        :okButtonProps="{ class: { 'jee-hidden': false } }"
       >
         <QcSsgqzysytdqkListBySs :param="this.param"></QcSsgqzysytdqkListBySs>
-
       </j-modal>
 
-
-      <j-modal
-        :visible="visibleQy"
-        @cancel="handleCancel"
-        @ok="handleOk"
-        cancelText="关闭"
-      >
+      <j-modal :visible="visibleQy" @cancel="handleCancel" @ok="handleOk" cancelText="关闭">
         <QcQyxxListBySs></QcQyxxListBySs>
       </j-modal>
 
-      <j-modal
-        :visible="visibleDw"
-        @cancel="handleCancel"
-        @ok="handleOk"
-        cancelText="关闭"
-      >
+      <j-modal :visible="visibleDw" @cancel="handleCancel" @ok="handleOk" cancelText="关闭">
         <QcQyxxListBySz></QcQyxxListBySz>
       </j-modal>
 
-      <j-modal
-        :visible="visibleSz"
-        @cancel="handleCancel"
-        @ok="handleOk"
-        cancelText="关闭"
-      >
+      <j-modal :visible="visibleSz" @cancel="handleCancel" @ok="handleOk" cancelText="关闭">
         <QcSsgqzysytdqkListBySz :param="this.paramSz"></QcSsgqzysytdqkListBySz>
       </j-modal>
     </div>
   </div>
-
-
 </template>
 
-
 <script>
-import mapData from "@views/tj/compoent/map3Data";
-
-import PieData from "@views/tj/compoent/PieData";
-import PieQdfsMj from "@views/tj/compoent/PieQdfsMj";
-import DoughnutData from "@views/tj/compoent/DoughnutData";
-import BarData from "@views/tj/compoent/BarData";
-import BarTdsjyt from "@views/tj/compoent/BarTdsjyt";
-import BarDobuleData from "@views/tj/compoent/BarDobuleData";
-import WaterWorld from "@views/tj/compoent/WaterWorld";
-import NightingaleCharData from "@views/tj/compoent/NightingaleCharData";
-import {getAction} from "@api/manage";
-import QcSsgqzysytdqkListBySs from "@views/qcsb/QcSsgqzysytdqkList_tj"
-import QcQyxxListBySs from "@views/qcsb/qyxx/QcQyxxList_tj"
-import QcQyxxListBySz from "@views/sydwqcsb/sydwxx/QcQyxxList_tj"
-import {initDictOptions} from '@/components/dict/JDictSelectUtil'
-
-import QcSsgqzysytdqkListBySz from "@views/sydwqcsb/QcSsgqzysytdqkList_tj"
+import mapData from '@views/tj/compoent/map3Data'
+
+import PieData from '@views/tj/compoent/PieData'
+import PieQdfsMj from '@views/tj/compoent/PieQdfsMj'
+import DoughnutData from '@views/tj/compoent/DoughnutData'
+import BarData from '@views/tj/compoent/BarData'
+import BarTdsjyt from '@views/tj/compoent/BarTdsjyt'
+import BarDobuleData from '@views/tj/compoent/BarDobuleData'
+import WaterWorld from '@views/tj/compoent/WaterWorld'
+import NightingaleCharData from '@views/tj/compoent/NightingaleCharData'
+import { getAction } from '@api/manage'
+import QcSsgqzysytdqkListBySs from '@views/qcsb/QcSsgqzysytdqkList_tj'
+import QcQyxxListBySs from '@views/qcsb/qyxx/QcQyxxList_tj'
+import QcQyxxListBySz from '@views/sydwqcsb/sydwxx/QcQyxxList_tj'
+import { initDictOptions } from '@/components/dict/JDictSelectUtil'
+
+import QcSsgqzysytdqkListBySz from '@views/sydwqcsb/QcSsgqzysytdqkList_tj'
 
 export default {
-  name: "sjtj",
+  name: 'sjtj',
   data() {
     return {
-      SUMSS: "",
-      SUMSSXZDX: "",
+      SUMSS: '',
+      SUMSSXZDX: '',
       visible: false,
       visibleDw: false,
-      SUMSZ: "",
-      SZQYSL: "",
-      SSDWSL: "",
-      SUMSZXZDX: "",
+      SUMSZ: '',
+      SZQYSL: '',
+      SSDWSL: '',
+      SUMSZXZDX: '',
       type: 'ssqy',
       DoughnutData: [],
       title2: {
-        title: "省直单位地块统计",
-        orgCode: "A03"
+        title: '省直单位地块统计',
+        orgCode: 'A03'
       },
       title1: {
-        title: "省属企业地块统计",
-        orgCode: "A04"
+        title: '省属企业地块统计',
+        orgCode: 'A04'
       },
       DoughnutData1: [],
       DoughnutData2: [],
@@ -382,39 +411,38 @@ export default {
       dw: '单位(亩)',
       dw2: '单位(块)',
       resData: [],
-      SSQYSL: "",
-      SBDKQYSL: "",
+      SSQYSL: '',
+      SBDKQYSL: '',
       resMapSzData: [],
       resMapSsData: [],
       resBarSsData: [],
       resBarSzData: [],
-      cz: "",
-      qyzy: "",
-      xzdx: "",
+      cz: '',
+      qyzy: '',
+      xzdx: '',
       visibleSz: false,
-      sum: "",
+      sum: '',
       param: {},
-      COUNTDK: "",
-      COUNTDKBYSZ: "",
-      COUNTDKBYSSXZDX: "",
-      COUNTDKBYSZXZDX: "",
-      tem_xzqhmc: "",
-      paramSz: "",
+      COUNTDK: '',
+      COUNTDKBYSZ: '',
+      COUNTDKBYSSXZDX: '',
+      COUNTDKBYSZXZDX: '',
+      tem_xzqhmc: '',
+      paramSz: '',
       resData2: [],
       color: ['#8E42FF', '#FF6B6B', '#2ca7f9', '#F0D418', '#2E64FF'],
-      color1: ['#2ca7f9', '#a181fc','#fd6f97','#FF6226'],
+      color1: ['#2ca7f9', '#a181fc', '#fd6f97', '#FF6226'],
 
-      resData1:
-        [                  //每个模块的名字和值
-
-        ],
+      resData1: [
+        //每个模块的名字和值
+      ],
       resWordDataZy: 0.98,
       resWordDataCz: 0.01,
       resWordDataXz: 0.01,
-      tem_xzqh: "",
-      textBysz: "省直单位土地获取方式占比",
-      textByss: "省属企业土地地块数量获取方式占比",
-      textBysss: "省属企业土地地块面积获取方式占比",
+      tem_xzqh: '',
+      textBysz: '省直单位土地获取方式占比',
+      textByss: '省属企业土地地块数量获取方式占比',
+      textBysss: '省属企业土地地块面积获取方式占比',
       //titleBysz2: "单位权证登记比例情况",
       //titleByszs: "土地使用现状占比",
       BarTitleBysz: '土地批准用途情况',
@@ -422,102 +450,107 @@ export default {
       BarTitleBysjzymj: '省属企业实际占用面积',
       BarTitleBysjzymjs: '一级单位用地面积汇总',
       BarTitleBysjzymj2: '省直单位实际占用面积',
-      WaterWorldTitle: '企业土地使用情况',
+      WaterWorldTitle: '企业土地使用情况'
       // WaterWorldTitleByqyzy: '企业自用',
       // WaterWorldTitleBydycz: '对外出租',
       // WaterWorldTitleByxzdx: '闲置低效'
-
     }
   },
   watch: {
-    "param": {
+    param: {
       handler(newVal, oldVal) {
         if (newVal.sfsb == null) {
           this.tem_xzqh = newVal.xzqh
           this.tem_xzqhmc = newVal.xzqhmc
-          this.initTable();
+          this.initTable()
         }
         if (!this.param.xzqh) {
-          this.param.xzqh = this.tem_xzqh;
+          this.param.xzqh = this.tem_xzqh
         }
       }
     },
-    "paramSz": {
+    paramSz: {
       handler(newVal, oldVal) {
         if (newVal.sfsb == null) {
           this.tem_xzqh = newVal.xzqh
           this.tem_xzqhmc = newVal.xzqhmc
-          this.initTable();
+          this.initTable()
         }
         if (!this.paramSz.xzqh) {
-          this.paramSz.xzqh = this.tem_xzqh;
+          this.paramSz.xzqh = this.tem_xzqh
         }
       }
     }
   },
   mounted() {
     new Promise(resolve => {
-      this.initTable();
+      this.initTable()
       this.initMap()
     }).then(res => {
-      console.log(res);//数据返回了
+      console.log(res) //数据返回了
     })
   },
   components: {
-    mapData, DoughnutData,
-    BarData, BarTdsjyt, WaterWorld,
-    NightingaleCharData, BarDobuleData,
-    PieData, PieQdfsMj, QcSsgqzysytdqkListBySz,
-    QcSsgqzysytdqkListBySs, QcQyxxListBySs, QcQyxxListBySz
+    mapData,
+    DoughnutData,
+    BarData,
+    BarTdsjyt,
+    WaterWorld,
+    NightingaleCharData,
+    BarDobuleData,
+    PieData,
+    PieQdfsMj,
+    QcSsgqzysytdqkListBySz,
+    QcSsgqzysytdqkListBySs,
+    QcQyxxListBySs,
+    QcQyxxListBySz
   },
   methods: {
     initTable() {
-      this.getPieData();
+      this.getPieData()
       // this.getPieQdfsMj(resolve);
-      this.getPieData2();
-      this.getPieDatasz();
-      this.getDougatasz();
-      this.getTdsyxzDougatasz();
-      this.getDougatass();
-      this.getBarsz();
-      this.getBarss();
-      this.getBarszSjzyData();
-      this.getAreaData();
-      this.getBarssSjzyData();
+      this.getPieData2()
+      this.getPieDatasz()
+      this.getDougatasz()
+      this.getTdsyxzDougatasz()
+      this.getDougatass()
+      this.getBarsz()
+      this.getBarss()
+      this.getBarszSjzyData()
+      this.getAreaData()
+      this.getBarssSjzyData()
       this.geszqyzytData()
     },
     initMap() {
-      this.getMapSzData();
-      this.getMapSsData();
+      this.getMapSzData()
+      this.getMapSsData()
     },
     handleChange(value) {
-      if (value == "ssqy") {
-        getAction("/qcsb.qyxx/qcQyxx/ssdtdktj").then(res => {
+      if (value == 'ssqy') {
+        getAction('/qcsb.qyxx/qcQyxx/ssdtdktj').then(res => {
           if (res.code == 200) {
             this.resMapSsData = res.result
-            this.$refs.mapref.initMap();
+            this.$refs.mapref.initMap()
             //初始化图表
-            this.tem_xzqh = "";
-            this.tem_xzqhmc = "";
+            this.tem_xzqh = ''
+            this.tem_xzqhmc = ''
             this.initTable()
-            this.type = value;
+            this.type = value
           }
         })
       }
-      if (value == "szdw") {
-        getAction("/qcsb.qyxx/qcQyxx/szdtdktj").then(res => {
+      if (value == 'szdw') {
+        getAction('/qcsb.qyxx/qcQyxx/szdtdktj').then(res => {
           if (res.code == 200) {
             this.resMapSzData = res.result
-            this.$refs.map2ref.initMap();
-            this.tem_xzqh = "";
-            this.tem_xzqhmc = "";
+            this.$refs.map2ref.initMap()
+            this.tem_xzqh = ''
+            this.tem_xzqhmc = ''
             this.initTable()
-            this.type = value;
+            this.type = value
           }
         })
-
       }
-
     },
     handleCancel() {
       this.visible = false
@@ -548,10 +581,10 @@ export default {
       this.visible = true
     },
     visibleInfoXzqh(params) {
-      initDictOptions("xq").then(res => {
+      initDictOptions('xq').then(res => {
         for (const re of res.result) {
           if (re.text == params.xzqh) {
-            this.param = {xzqh: re.value, sfsb: "3"}
+            this.param = { xzqh: re.value, sfsb: '3' }
             this.visible = true
           }
         }
@@ -563,12 +596,10 @@ export default {
       // this.$router.push({ name:'qcsb-qcSsgqzysytdqk-list', query:{sfsb:3} });
     },
     visibleInfoSzXzqh(params) {
-      initDictOptions("xq").then(res => {
-
+      initDictOptions('xq').then(res => {
         for (const re of res.result) {
           if (re.text == params.xzqh) {
-
-            this.paramSz = {xzqh: re.value, sfsb: "3"}
+            this.paramSz = { xzqh: re.value, sfsb: '3' }
             this.visibleSz = true
           }
         }
@@ -580,10 +611,10 @@ export default {
       // this.$router.push({ name:'qcsb-qcSsgqzysytdqk-list', query:{sfsb:3} });
     },
     visibleInfoYjdw(params) {
-      initDictOptions("yjdw").then(res => {
+      initDictOptions('yjdw').then(res => {
         for (const re of res.result) {
           if (re.text == params.sysOrgCode) {
-            this.param = {sysOrgCode: re.value, sfsb: "3"}
+            this.param = { sysOrgCode: re.value, sfsb: '3' }
             this.visible = true
           }
         }
@@ -603,29 +634,28 @@ export default {
 
     // 顶部四大卡片数据查询
     getAreaData() {
-      getAction("/qcsb.qyxx/qcQyxx/sbdkmj").then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/sbdkmj').then(res => {
         if (res.code == 200) {
-          this.SUMSS = res.result.SUMSS.toFixed(2);
-          this.SUMSSXZDX = res.result.SUMSSXZDX.toFixed(2);
-          this.SUMSZXZDX = res.result.SUMSZXZDX.toFixed(2);
-          this.SUMSZ = res.result.SUMSZ.toFixed(2);
-          this.COUNTDK = res.result.COUNTDK;
-          this.COUNTDKBYSZ = res.result.COUNTDKBYSZ;
-          this.COUNTDKBYSSXZDX = res.result.COUNTDKBYSSXZDX;
-          this.COUNTDKBYSZXZDX = res.result.COUNTDKBYSZXZDX;
-          this.SSQYSL = res.result.SSQYSL;
-          this.SBDKQYSL = res.result.SBDKQYSL;
-          this.SZQYSL = res.result.SZQYSL;
-          this.SSDWSL = res.result.SSDWSL;
-
+          this.SUMSS = res.result.SUMSS.toFixed(2)
+          this.SUMSSXZDX = res.result.SUMSSXZDX.toFixed(2)
+          this.SUMSZXZDX = res.result.SUMSZXZDX.toFixed(2)
+          this.SUMSZ = res.result.SUMSZ.toFixed(2)
+          this.COUNTDK = res.result.COUNTDK
+          this.COUNTDKBYSZ = res.result.COUNTDKBYSZ
+          this.COUNTDKBYSSXZDX = res.result.COUNTDKBYSSXZDX
+          this.COUNTDKBYSZXZDX = res.result.COUNTDKBYSZXZDX
+          this.SSQYSL = res.result.SSQYSL
+          this.SBDKQYSL = res.result.SBDKQYSL
+          this.SZQYSL = res.result.SZQYSL
+          this.SSDWSL = res.result.SSDWSL
         }
       })
     },
     // 省属企业土地获取方式占比
     getPieData() {
-      getAction("/qcsb.qyxx/qcQyxx/tdhqfs", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/tdhqfs', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
-          this.resData = res.result;
+          this.resData = res.result
         }
       })
     },
@@ -638,83 +668,76 @@ export default {
     // },
     // 省属企业土地地块面积获取方式占比
     getPieData2() {
-      getAction("/qcsb.qyxx/qcQyxx/tdhqfsArea", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/tdhqfsArea', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
-          this.resData2 = res.result;
+          this.resData2 = res.result
         }
       })
     },
     // 省直单位土地获取方式占比
     getPieDatasz() {
-      getAction("/qcsb.qyxx/qcQyxx/tdhqfssz", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/tdhqfssz', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
-          this.resData1 = res.result;
+          this.resData1 = res.result
         }
       })
     },
     // 省直单位权证登记比例情况
     getDougatass() {
-      getAction("/qcsb.qyxx/qcQyxx/qzdjblss", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/qzdjblss', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
-          this.DoughnutData = res.result;
+          this.DoughnutData = res.result
         }
       })
-
     },
     // 省属企业权证登记比例情况
     getDougatasz() {
-      getAction("/qcsb.qyxx/qcQyxx/qzdjblsz", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/qzdjblsz', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
-          this.DoughnutData1 = res.result;
-
+          this.DoughnutData1 = res.result
         }
       })
     },
     //统计-土地使用现状占比/省属企业土地使用现状占比
     getTdsyxzDougatasz() {
-      getAction("/qcsb.qyxx/qcQyxx/tdsyxzzb", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/tdsyxzzb', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
-          this.DoughnutData2 = res.result;
+          this.DoughnutData2 = res.result
         }
       })
     },
     // 省直单位土地批准用途情况
     getBarsz() {
-      getAction("/qcsb.qyxx/qcQyxx/sjyttjsz", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/sjyttjsz', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
           this.resXData = res.result
         }
       })
-
     },
     // 省属企业土地实际用途情况
     getBarss() {
-      getAction("/qcsb.qyxx/qcQyxx/sjyttjss", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/sjyttjss', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
           this.resYData = res.result
         }
       }),
-        getAction("/qcsb.qyxx/qcQyxx/yjdwmjhz", {xzqh: this.tem_xzqh}).then(res => {
+        getAction('/qcsb.qyxx/qcQyxx/yjdwmjhz', { xzqh: this.tem_xzqh }).then(res => {
           if (res.code == 200) {
             this.resYDatas = res.result
-
           }
         })
-
     },
     // 省直单位地块统计
     getMapSzData() {
-      getAction("/qcsb.qyxx/qcQyxx/szdtdktj").then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/szdtdktj').then(res => {
         if (res.code == 200) {
           this.resMapSzData = res.result
-
         }
       })
-
     },
     // 省属企业地块统计
     getMapSsData() {
-      getAction("/qcsb.qyxx/qcQyxx/ssdtdktj").then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/ssdtdktj').then(res => {
         if (res.code == 200) {
           this.resMapSsData = res.result
         }
@@ -722,16 +745,15 @@ export default {
     },
     // 省属企业实际占用面积
     getBarssSjzyData() {
-      getAction("/qcsb.qyxx/qcQyxx/sszytdmjtj", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/sszytdmjtj', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
           this.resBarSsData = res.result
-
         }
       })
     },
     // 省直单位实际占用面积
     getBarszSjzyData() {
-      getAction("/qcsb.qyxx/qcQyxx/szzytdmjtj", {xzqh: this.tem_xzqh}).then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/szzytdmjtj', { xzqh: this.tem_xzqh }).then(res => {
         if (res.code == 200) {
           this.resBarSzData = res.result
         }
@@ -739,18 +761,15 @@ export default {
     },
 
     geszqyzytData() {
-      getAction("/qcsb.qyxx/qcQyxx/szqyzy").then(res => {
+      getAction('/qcsb.qyxx/qcQyxx/szqyzy').then(res => {
         if (res.code == 200) {
-          this.resWordDataCz = parseFloat(res.result[0].value / res.result[3].value);
-          this.resWordDataZy = parseFloat(res.result[1].value / res.result[3].value);
-          this.resWordDataXz = parseFloat(res.result[2].value / res.result[3].value);
-
+          this.resWordDataCz = parseFloat(res.result[0].value / res.result[3].value)
+          this.resWordDataZy = parseFloat(res.result[1].value / res.result[3].value)
+          this.resWordDataXz = parseFloat(res.result[2].value / res.result[3].value)
         }
       })
-    },
-
+    }
   }
-
 }
 </script>
 
@@ -764,7 +783,7 @@ export default {
   font-size: 16px;
   text-align: left;
   border-radius: 10px;
-  cursor: pointer
+  cursor: pointer;
 }
 
 .tjcxcound2 {
@@ -788,7 +807,7 @@ export default {
   font-size: 16px;
   text-align: left;
   border-radius: 10px;
-  cursor: pointer
+  cursor: pointer;
 }
 
 .tjcxcound4 {
@@ -800,16 +819,16 @@ export default {
   font-size: 16px;
   text-align: left;
   border-radius: 10px;
-  cursor: pointer
+  cursor: pointer;
 }
 
 .flex-space-between > div.ant-card-body {
   display: flex;
   justify-content: space-between;
 }
+
 .flex-center {
   display: flex;
   justify-content: center;
 }
-
-</style>
+</style>