Merge remote-tracking branch 'origin/master'

src/components/OneMap/BasicMap.vue

@@ -468,8 +468,6 @@ export default {
         }
         /*sugb 20240530 瓦片服务*/
         case 'WMTSLayer': {
-          console.log("#########瓦片服务-start#######")
-          console.log(JSON.stringify(layerItem))
           this.webTiledLayerId.push(layerItem.id)
           layer = new WMTSLayer({
             id: layerItem.id,
@@ -761,7 +759,6 @@ export default {
     },
     //复选框处理方法
     changeLayerVisible(layerConfig, visible, esriMap) {
-      //TODO:
       console.log("复选框处理事件")
       console.log(JSON.stringify(layerConfig))
       console.log(JSON.stringify(visible))

src/components/OneMap/widgets/BaseMap.vue

@@ -65,6 +65,7 @@ export default {
       let tmsLayer = new TMSLayer({
         // urlTemplate: "/sd_dom/sd/{z}/{x}/{y}.png"
         urlTemplate: "http://218.59.194.82:12682/sd_dom/sd/{z}/{x}/{y}.png"
+        //urlTemplate: "http://218.59.194.82:13480/sddltbtiles01/{z}/{x}/{y}.png"
       });
 
       this.localMap=new Basemap({

src/views/qcsb/modules/QcSsgqzysytdqkDetail.vue

@@ -459,40 +459,40 @@
               </td>
             </tr>
             <tr>
-              <td>
-                <a-col :span="24">
-                  <a-form-model-item label="总建筑面积(平方米)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zjzmj">
-                    <a-col :span="22">
-                      <a-input-number v-if="!disabled && !isAudit" v-model="model.zjzmj" placeholder="请输入总建筑面积" :disabled='zjzmjDisabled'
-                                      style="width: 100%"/>
-                      <span v-if='model.zjzmj==null || model.zjzmj==0'></span>
-                      <span v-else  >{{ model.zjzmj }} M²</span>
-                    </a-col>
-                    <a-col :span="2">
-                      <a-icon class='info' type='question-circle-o' @click='info("zjzmj")'></a-icon>
-                    </a-col>
-                  </a-form-model-item>
-                </a-col>
-              </td>
-              <td >
-                <a-col :span="24">
-                  <a-form-model-item label='证载建筑面积(平方米)' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='qzpzsymj2'>
-                    <a-col :span="22">
-                      <a-input-number v-if="!disabled && !isAudit" v-model='model.qzpzsymj' placeholder='请输入证载建筑面积' style='width: 100%'/>
-                      <span v-if='model.qzpzsymj==null || model.qzpzsymj==0'></span>
-                      <span v-else >{{ model.qzpzsymj }} M²</span>
-                    </a-col>
-                    <a-col :span="2">
-                      <a-icon class='info' type='question-circle-o' @click='info("qzpzsymj2")'></a-icon>
-                    </a-col>
-                  </a-form-model-item>
-                </a-col>
-              </td>
+<!--              <td>-->
+<!--                <a-col :span="24">-->
+<!--                  <a-form-model-item label="总建筑面积(平方米)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zjzmj">-->
+<!--                    <a-col :span="22">-->
+<!--                      <a-input-number v-if="!disabled && !isAudit" v-model="model.zjzmj" placeholder="请输入总建筑面积" :disabled='zjzmjDisabled'-->
+<!--                                      style="width: 100%"/>-->
+<!--                      <span v-if='model.zjzmj==null || model.zjzmj==0'></span>-->
+<!--                      <span v-else  >{{ model.zjzmj }} M²</span>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="2">-->
+<!--                      <a-icon class='info' type='question-circle-o' @click='info("zjzmj")'></a-icon>-->
+<!--                    </a-col>-->
+<!--                  </a-form-model-item>-->
+<!--                </a-col>-->
+<!--              </td>-->
+<!--              <td >-->
+<!--                <a-col :span="24">-->
+<!--                  <a-form-model-item label='证载建筑面积(平方米)' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='qzpzsymj2'>-->
+<!--                    <a-col :span="22">-->
+<!--                      <a-input-number v-if="!disabled && !isAudit" v-model='model.qzpzsymj' placeholder='请输入证载建筑面积' style='width: 100%'/>-->
+<!--                      <span v-if='model.qzpzsymj==null || model.qzpzsymj==0'></span>-->
+<!--                      <span v-else >{{ model.qzpzsymj }} M²</span>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="2">-->
+<!--                      <a-icon class='info' type='question-circle-o' @click='info("qzpzsymj2")'></a-icon>-->
+<!--                    </a-col>-->
+<!--                  </a-form-model-item>-->
+<!--                </a-col>-->
+<!--              </td>-->
             </tr>
             <tr>
               <td>
                 <a-col :span="24">
-                  <a-form-model-item label='实际面积(平方米)' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='sjzytdmj'>
+                  <a-form-model-item label='实际占用面积(平方米)' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='sjzytdmj'>
                     <a-col :span="22">
                       <a-input-number v-if="!disabled && !isAudit" v-model='model.sjzytdmj' placeholder='请输入实际占用土地面积' style='width: 100%'/>
                       <span v-if='model.sjzytdmj==null || model.sjzytdmj==0'></span>
@@ -506,9 +506,9 @@
               </td>
               <td>
                 <a-col :span="24">
-                  <a-form-model-item label='实际建筑面积(平方米)' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='sjsyjzmj'>
+                  <a-form-model-item label='实际使用面积(平方米)' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='sjsyjzmj'>
                     <a-col :span="22">
-                      <a-input-number v-if="!disabled && !isAudit" v-model='model.sjsyjzmj' placeholder='请输入实际建筑面积' style='width: 100%'/>
+                      <a-input-number v-if="!disabled && !isAudit" v-model='model.sjsyjzmj' placeholder='请输入实际使用面积' style='width: 100%'/>
                       <span v-if='model.sjsyjzmj==null || model.sjsyjzmj==0'></span>
                       <span v-else  >{{ model.sjsyjzmj }} M²</span>
                     </a-col>

src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -299,7 +299,7 @@ export default {
         {
           title: '使用权使用方式',
           align: 'center',
-          dataIndex: 'syqsyfs_dictText'
+          dataIndex: 'syqsyfs'
         },
         {
           title: '实际用途',