zzy ++ 样式修改

src/components/apply-resource/ApplyAgreeContent.vue

@@ -91,7 +91,7 @@
 
   </div>
   <template v-if="isSelectDialogIsShow">
-  <preview-map-dialog   v-model:dialog-visible="isSelectDialogIsShow" />
+    <preview-map-dialog   v-model:dialog-visible="isSelectDialogIsShow" />
   </template>
 </template>
 
@@ -436,9 +436,11 @@ export default {
       }
     }
     watch(() => mapStore.currentDrawContent,val => {
-      if(val !==''){
+      if(val){
         console.log("val.rings",val.rings)
         form.value.slt = JSON.stringify(val.rings)
+      }else{
+        form.value.slt = ''
       }
     })
     function applyResource() {

src/data/all-forms.js

@@ -1316,6 +1316,9 @@ export const resourceApplyFormGx2 = {
    modelValue: 'slt',
    colClass: 'el-col-24',
    label: '图框选择',
+   elInputEleAttrs:{
+    disabled:true
+   },
    itemOtherAttrs:{
     required:true,
     rules:[

src/pinia/useStore.js

@@ -78,6 +78,7 @@ export const useMapStore = defineStore('map',{
    isCoordinateResIsShow:false,
    isNormalizationProcessingResIsShow:false, //归一化处理结果
    currentDrawContent:[],
+   currentDrawCalculation:null,
    geologyDrawContent:[],  //地质绘制内容
    transformData:[],
    normalizationProcessingResult:[],  //归一化处理结果
@@ -142,6 +143,10 @@ export const useMapStore = defineStore('map',{
   changeCurrentDrawContent(payload){
    this.currentDrawContent = payload
   },
+  changeCurrentDrawCalculation(payload){
+   this.currentDrawCalculation = payload
+  },
+
   changeGeologyDrawContent(payload){
    this.geologyDrawContent = payload
   },

src/service/my-apply.js

@@ -33,6 +33,21 @@ export function getMyApplyHomeTableDataPipe(params) {
   }
  })
 }
+
+export function selectToolResourceApplicationApplyPageList(params) {
+ return requestInstance({
+  url:'/tool-resource-application/selectToolResourceApplicationApplyPageList',
+  data:{
+   status:"0,1,2,3,4,5",
+   applicantUnit:params.unitcode
+  },
+  params:{
+   size:params.pageSize,
+   page:params.pageIndex
+  }
+ })
+}
+
 export function getMyCollectionHomeTableDataFw(params) {
  return requestInstance({
   url:'/ptjkInterface/selectPersonalFavoritePageList',

src/unit/map/AddLayer.js

@@ -12,7 +12,11 @@ const undergroundBuildingLayerList = [
     '地下管线-松江','地下管线-浦东','地下管线-虹口','地下管线-金山',
     '地下管线-长宁','地下管线-闵行','地下管线-青浦','地下管线-静安',
     '地下管线-黄浦', '地铁区间', '高架（地上，梁柱路面）', '高架（地下，承台桩基）',
-    '地质模型（除崇明区）','水文地质模型（除崇明区）'
+    '地质模型（除崇明区）','水文地质模型（除崇明区）','①0吹填土','⑿粉质粘土',
+    '⑧粉质粘土','⑥粉质粘土','⑤3粉质粘土','⑤2砂质粉土','⑾粉细砂','⑨粉细砂',
+    '⑦1砂质粉土','⑤1粉质粘土','③3淤泥质粘性土','①3新近沉积土（江滩土）','⑩粉质粘土','⑦2粉砂',
+    '④2粉砂','④1淤泥质粘土','③2粉砂','③1淤泥质粘性土','②3砂质粉土','②1粉质粘土',
+    '①1填土'
 
 ]
 //地下白膜列表
@@ -1422,6 +1426,7 @@ export function CollisionAnalysis(params){
         "maishen1": params.maishen1,
         "maishen2": params.maishen2,
         "guanjing": params.guanjing,
+        "color":params.color
     })
 }
 
@@ -2918,6 +2923,7 @@ export function DrawPreviewMap(params){
         "type": params.type,
         "clear": true,
         "hasZ": params.hasZ,
+        "is_calculation":true,
         "countNumber":params.countNumber!=undefined?params.countNumber:null
     })
 }

src/views/c-views/personal/MyApply.vue

@@ -106,7 +106,12 @@ import {
   myApplyHomeTableHeaderData, myApplyHomeTableHeaderPipe,
   myApplyHomeTableHeaderService
 } from "@/data/alll-table-header";
-import {getMyApplyHomeTableDataFw, getMyApplyHomeTableDataPipe, getMyApplyHomeTableDataSj} from "@/service/my-apply";
+import {
+  getMyApplyHomeTableDataFw,
+  getMyApplyHomeTableDataPipe,
+  getMyApplyHomeTableDataSj,
+  selectToolResourceApplicationApplyPageList
+} from "@/service/my-apply";
 import {useDetailOrEdit, usePagination} from "@/unit/use-method/usePagination";
 import {useRootStore} from "@/pinia/useStore";
 import ElePagination from "@/components/common/ElePagination.vue";
@@ -188,13 +193,14 @@ let baseUrl = import.meta.env.VITE_BASE_API
         }else if(form.value['type'] == 2){
           url = getMyApplyHomeTableDataFw;
         }else{
-          url = getMyApplyHomeTableDataPipe;
+          url = selectToolResourceApplicationApplyPageList;
         }
         url({
           name:form.value['name'],
           pageIndex:pageIndex.value,
           pageSize:pageSize.value,
-          user_id:store.userInfo.gxjh_usercode
+          user_id:store.userInfo.gxjh_usercode,
+          unitcode:store.userInfo.gxjh_unitcode
         }).then(res => {
           if(form.value['type'] == 3){
             tableData.value = res.data.Rows

src/views/c-views/resource-apply/PreviewMapDialog.vue

@@ -28,10 +28,10 @@ import CityGis from "@/unit/map/CityGis.Bridge";
 import {previewMapBridge} from "@/unit/map/map";
 import {nextTick, onBeforeUnmount, onMounted} from 'vue'
 import {
-  AddPreviewSingleLayer, clearPreviewAllLayerMap, DrawPreviewMap, MapPreviewClickAll
+  AddPreviewSingleLayer, clearPreviewAllLayerMap, DrawMap, DrawPreviewMap, MapPreviewClickAll
 } from "@/unit/map/AddLayer";
 import {useMapStore} from "@/pinia/useStore";
-import {showMessage} from "@/unit/element-ui/tip";
+import {showConfirmOrExit, showMessage} from "@/unit/element-ui/tip";
 
 let bridge
 export default {
@@ -39,32 +39,60 @@ export default {
   setup(props,{emit}) {
     const mapStore = useMapStore()
     function handleClose() {
+      if(!props.currentDialog){
+        mapStore.changeCurrentDrawContent(null);
+        mapStore.changeCurrentDrawCalculation(null);
+      }
       emit('update:dialogVisible',false)
     }
     function saveExtent() {
-      debugger
       if(!mapStore.currentDrawContent){
         showMessage({
           tpe:'warning',
           message:'未完成范围选择'
         })
+      }else if(!isAreaQualified(300000,mapStore.currentDrawCalculation)){
+        showConfirmOrExit(() => {
+          DrawPreviewMap({
+            type:'rectangle',
+            hasZ:false
+          })
+        },() => {
+          mapStore.changeCurrentDrawContent(null);
+          mapStore.changeCurrentDrawCalculation(null);
+          DrawPreviewMap({
+            type:'rectangle',
+            hasZ:false
+          })
+        },'选中范围超出指定面积0.3平方千米，是否重新绘制？','系统提示')
+
       }else{
         emit('update:dialogVisible',false)
       }
     }
+    function isAreaQualified(num,string){
+      let actualNum = string.split('.')[0];
+      if(string.includes("千")){
+        actualNum = actualNum*1000*1000
+      }
+      if(actualNum > num *1){
+        return false
+      }else{
+        return true
+      }
+    }
     onBeforeUnmount(()=>{
       clearPreviewAllLayerMap()
       previewMapBridge.bridgeContent= bridge= {}
     })
     onMounted(() => {
-      // console.log(111111111111)
       //加载地图控件
       debugger
       nextTick(() => {
         previewMapBridge.bridgeContent =  bridge = new CityGis.Bridge({
           id: "i_map2",
-          url: 'https://cimweb.zjw.sh.cegn.cn:2007/VUE-Map-Tool-Widget/#/jk_map?theme=light', //建科发布
-          //url: 'http://localhost:8081/#/jk_map?theme=light',
+          //url: 'https://cimweb.zjw.sh.cegn.cn:2007/VUE-Map-Tool-Widget/#/jk_map?theme=light', //建科发布
+          url: 'http://localhost:8081/#/jk_map?theme=light',
           onReady: function () {
             // console.log("地图创建完成");
           }
@@ -82,8 +110,8 @@ export default {
           MapPreviewClickAll();
         }else{
           DrawPreviewMap({
-            type:"polygon",
-            hasZ:false
+            type:"rectangle",
+            hasZ:false,
           })
         }
         bridge.addEventListener(function (arg) {
@@ -92,17 +120,8 @@ export default {
             case 'DrawComplete':
               mapStore.changeCurrentDrawContent(arg.data.geometry)
               break;
-            case 'MapIsReady':
-              // AddPreviewSingleLayer({
-              //   type:props.currentDialog.SERVICE_TYPE,
-              //   id:props.currentDialog.S_CODE,
-              //   visible:true,
-              //   url:props.currentDialog.ADDRESS,
-              //   opacity:1,
-              //   title:props.currentDialog.NAME
-              //
-              //
-              // })
+            case 'Calculation':
+              mapStore.changeCurrentDrawCalculation(arg.data.result)
               break;
           }
           // console.log(arg.action +":"+ JSON.stringify(arg.data));

src/views/c-views/right-tool/RightTool.vue

@@ -91,7 +91,11 @@ import {
   setWatchLineAny,
   ViewshedArea
 } from "@/unit/map/AddLayer";
-import {getBoatRealTimePosition, getMyApplyHomeTableDataPipe} from "@/service/my-apply";
+import {
+  getBoatRealTimePosition,
+  getMyApplyHomeTableDataPipe,
+  selectToolResourceApplicationApplyPageList
+} from "@/service/my-apply";
 import {all} from "axios";
 import {useMapStore, useRootStore} from "@/pinia/useStore";
 import {urlTheme} from "@/unit/Theme/Theme";
@@ -407,11 +411,12 @@ export default {
         })
       }
       if(currentCode === "pipeAnalysis"){
-        getMyApplyHomeTableDataPipe({
+        console.log("store已申请分析列表已申请分析列表",store.userInfo)
+        selectToolResourceApplicationApplyPageList({
           name:'',
           pageIndex:1,
           pageSize:10000,
-          user_id:store.userInfo.gxjh_usercode
+          unitcode:store.userInfo.gxjh_unitcode
         }).then(res => {
           let data = res.data.Rows;
           if(data.length >0){

src/views/c-views/right-tool/geologyTheme/normalizationProcessing/NormalizationProcessingResult.vue

@@ -37,39 +37,15 @@ export default {
       },
       {
         prop:'layername',
-        label:'初始土层名称'
-      },
-      {
-        prop:'layerorder',
-        label:'土层序号'
+        label:'土层名称'
       },
       {
         prop:'layerno',
-        label:'土层编号'
-      },
-      {
-        prop:'humidity',
-        label:'土层饱和度'
-      },
-      {
-        prop:'density',
-        label:'土层密度'
-      },
-      {
-        prop:'compress',
-        label:'土层压缩性'
-      },
-      {
-        prop:'color',
-        label:'土层颜色'
+        label:'初始土层编号'
       },
       {
-        prop:'state',
-        label:'土层状态'
-      },
-      {
-        prop:'sdescribe',
-        label:'土层描述'
+        prop:'mergedLayer',
+        label:'归一化土层编号'
       }
     ]);
     function uploadFile(){
@@ -91,14 +67,21 @@ export default {
         document.body.removeChild(link);
       })
     }
+    function close(){
+      mapStore.changeIsNormalizationProcessingResIsShow(false)
+    }
     onMounted(()=>{
       tableData.value = mapStore.normalizationProcessingResult;
     })
+    onBeforeUnmount(()=>{
+      mapStore.changeIsNormalizationProcessingResIsShow(false)
+    })
     return{
       mapStore,
       tableData,
       columList,
-      uploadFile
+      uploadFile,
+      close
     }
   }
 }

src/views/c-views/right-tool/pipeTheme/collisionAnalysis/CollisionAnalysis.vue

@@ -8,15 +8,21 @@
           绘制
         </div>
       </div>
-      <common-num-title title="输入起点埋深(m)" num="2" />
+      <common-num-title title="选择要绘制的管线大类" num="2" />
+      <div class="row-item">
+        <el-select  v-model="form.color">
+          <el-option   v-for="item in colorOptions" :key="item.value" :value="item.value" :label="item.label"></el-option>
+        </el-select>
+      </div>
+      <common-num-title title="输入起点埋深(m)" num="3" />
       <div class="row-item">
         <el-input clearable v-model="form.startHeight"/>
       </div>
-      <common-num-title title="输入终点埋深(m)" num="3" />
+      <common-num-title title="输入终点埋深(m)" num="4" />
       <div class="row-item">
         <el-input clearable v-model="form.endHeight"/>
       </div>
-      <common-num-title title="输入管径(m)" num="4" />
+      <common-num-title title="输入管径(m)" num="5" />
       <div class="row-item">
         <el-input clearable v-model="form.radius"/>
       </div>
@@ -46,8 +52,31 @@ export default {
     let form = ref({
       startHeight:null,
       endHeight:null,
-      radius:null
+      radius:null,
+      color:null
     });
+    let colorOptions = ref ([
+      {
+        label:'电力',
+        value:'#FF0000'
+      },
+      {
+        label:'通信',
+        value:'#00FF00'
+      },
+      {
+        label:'给水',
+        value:'#0000FF'
+      },
+      {
+        label:'排水',
+        value:'#990000'
+      },
+      {
+        label:'燃气',
+        value:'#FF00FF'
+      }
+    ]);
     function drawLine(){
       DrawMap({
         type:'polyline',
@@ -69,7 +98,8 @@ export default {
       CollisionAnalysis({
         maishen1:form.value.startHeight,
         maishen2:form.value.endHeight,
-        guanjing:form.value.radius
+        guanjing:form.value.radius,
+        color:form.value.color
       })
       mapStore.changeIsCollisionAnalysisIsShow(true)
     }
@@ -82,7 +112,8 @@ export default {
       startAna,
       close,
       mapStore,
-      form
+      form,
+      colorOptions
     }
   }
 }
@@ -90,6 +121,11 @@ export default {
 
 <style scoped lang="scss">
 #collision-analysis{
+  ::v-deep{
+    .el-select{
+      width: 100%;
+    }
+  }
   display: flex;
   flex-direction: column;
   mx-height: 500px;

src/views/c-views/right-tool/pipeTheme/collisionAnalysis/CollisionAnalysisResult.vue

@@ -15,7 +15,7 @@
 import {useMapStore} from "@/pinia/useStore";
 import CommonMapToolTitle from "@/components/common/CommonMapToolTitle.vue";
 import MyTable from "@/components/common/MyTable.vue";
-import {ref, watch} from "vue";
+import {onBeforeUnmount, ref, watch} from "vue";
 import {setFieldQuerySearch} from "@/unit/map/AddLayer";
 export default {
   name: "CollisionAnalysisResult",
@@ -78,6 +78,9 @@ export default {
     watch(()=> mapStore.returnPipeCollision,(val) => {
       getTableData(val)
     })
+    onBeforeUnmount(()=>{
+      mapStore.changeIsCollisionAnalysisIsShow(false)
+    })
     return{
       tableData,
       columList,

src/views/c-views/right-tool/pipeTheme/excavationAnalysis/ExcavationAnalysisResult.vue

@@ -15,7 +15,7 @@
 import CommonMapToolTitle from "@/components/common/CommonMapToolTitle.vue";
 import {useMapStore} from "@/pinia/useStore";
 import MyTable from "@/components/common/MyTable.vue";
-import {ref, watch} from "vue";
+import {onBeforeUnmount, ref, watch} from "vue";
 import {setFieldQuerySearch} from "@/unit/map/AddLayer";
 import {closeShowLoading, showLoading} from "@/unit/element-loading/element-loader";
 export default {
@@ -76,6 +76,9 @@ export default {
     watch(()=> mapStore.returnPipeExcavation,(val) => {
       getTableData(val)
     })
+    onBeforeUnmount(()=>{
+      mapStore.changeIsExcavationAnalysisIsShow(false)
+    })
     return{
       tableData,
       columList,

src/views/c-views/right-tool/pipeTheme/horizontalDistanceAnalysis/HorizontalDistanceAnalysisResult.vue

@@ -5,7 +5,7 @@
       <div class="top-chart" ref="pipeCut">
 
       </div>
-      <common-num-title title="截面统计表" />
+      <common-num-title title="1、截面统计表" />
       <div class="bottom-table">
         <my-table
             :headers="columList"
@@ -13,7 +13,7 @@
             :page-size="5"
         />
       </div>
-      <common-num-title title="水平净距分析" />
+      <common-num-title title="2、水平净距分析" />
       <my-table
           :headers="columDistanceList"
           :table-data="tableDistanceData"
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import {nextTick, ref, watch} from 'vue'
+import {nextTick, onBeforeUnmount, ref, watch} from 'vue'
 import CommonMapToolTitle from "@/components/common/CommonMapToolTitle.vue";
 import {setPipeCutEchart} from "@/echarts/option";
 import MyTable from "@/components/common/MyTable.vue";
@@ -213,6 +213,9 @@ export default {
     function close(){
       mapStore.changeIsHorizontalDistanceAnalysisIsShow(false)
     }
+    onBeforeUnmount(()=>{
+      mapStore.changeIsHorizontalDistanceAnalysisIsShow(false)
+    })
     watch(()=> mapStore.returnPipeSection,(val) => {
       getChartsData(val);
     })
@@ -254,6 +257,9 @@ export default {
       width: 100%;
       height: 400px;
     }
+    .bottom-table{
+      padding-bottom: 20px;
+    }
     .row-item{
       margin-bottom: 15px;
     }

src/views/c-views/right-tool/pipeTheme/pipeAgeAnalysis/PipeAgeAnalysisResult.vue

@@ -15,7 +15,7 @@
 import CommonMapToolTitle from "@/components/common/CommonMapToolTitle.vue";
 import {useMapStore} from "@/pinia/useStore";
 import MyTable from "@/components/common/MyTable.vue";
-import {ref, watch} from "vue";
+import {onBeforeUnmount, ref, watch} from "vue";
 import {setFieldQuerySearch} from "@/unit/map/AddLayer";
 import {PipeJson} from "@/units/local-data";
 import {closeShowLoading} from "@/unit/element-loading/element-loader";
@@ -106,6 +106,9 @@ export default {
     watch(()=> mapStore.returnPipeAge,(val) => {
       getTableData(val)
     })
+    onBeforeUnmount(()=>{
+      mapStore.changeIsPipeAgeAnalysisIsShow(false)
+    })
     return{
       tableData,
       columList,

src/views/c-views/right-tool/pipeTheme/pipeProfile/pipeProfileResult.vue

@@ -17,7 +17,7 @@
 <script>
 import CommonMapToolTitle from "@/components/common/CommonMapToolTitle.vue";
 import {useMapStore} from "@/pinia/useStore";
-import {nextTick, ref, watch} from "vue";
+import {nextTick, onBeforeUnmount, ref, watch} from "vue";
 import {setFieldQuerySearch} from "@/unit/map/AddLayer";
 import {setPipeCutEchart, setPipeProfileEchart} from "@/echarts/option";
 export default {
@@ -91,6 +91,9 @@ export default {
     watch(()=> mapStore.returnPipeProfile,(val) => {
       getTableData(val)
     })
+    onBeforeUnmount(()=>{
+      mapStore.changeIsPipeProfileIsShow(false)
+    })
     return{
       tableData,
       columList,

src/views/c-views/right-tool/pipeTheme/pipeStatisticAnalysis/PipeStatisticAnalysisResult.vue

@@ -15,7 +15,7 @@
 import CommonMapToolTitle from "@/components/common/CommonMapToolTitle.vue";
 import {useMapStore} from "@/pinia/useStore";
 import MyTable from "@/components/common/MyTable.vue";
-import {ref, watch} from "vue";
+import {onBeforeUnmount, ref, watch} from "vue";
 import {setFieldQuerySearch} from "@/unit/map/AddLayer";
 import {PipeJson} from "@/units/local-data";
 import {closeShowLoading} from "@/unit/element-loading/element-loader";
@@ -86,6 +86,9 @@ export default {
     watch(()=> mapStore.returnPipeStatistic,(val) => {
       getTableData(val)
     })
+    onBeforeUnmount(()=>{
+      mapStore.changeIsPipeStatisticAnalysisIsShow(false)
+    })
     return{
       tableData,
       columList,

src/views/login/Login.vue

@@ -28,7 +28,7 @@ export default {
   },
   mounted(){
     let _this = this;
-    window.location.href='https://cimweb.zjw.sh.cegn.cn:2007/cim-home/#/login';
+    //window.location.href='https://cimweb.zjw.sh.cegn.cn:2007/cim-home/#/login';
     this.timer = setInterval(()=>{
       _this.dateTime = new Date();
     },1000)