在线入库多项目

src/api/APIs.ts

@@ -27,6 +27,14 @@ export const getPBScodeRuleList_api = (data) => {
     params: data,
   });
 };
+//  批量删除PBS模板
+export const deletePbsModelByIds = (data) => {
+  return request({
+    method: "delete",
+    url: "/tofly-sxgk/pbs/deleteByIds",
+    params: data,
+  });
+};
 
 //  PBS编码规则管理列表子项信息
 export const getPBScodeRuleInfo_api = (data) => {

src/api/DMA/collect.ts

@@ -1,20 +0,0 @@
-import request from "@/utils/request"
-
-// 历史流量采集
-export function flowCollectHistory(data, file) {
-  return request({
-    url: "/gis/dmaflow/list",
-    method: "post",
-    data,
-    responseType: file ? 'blob' : 'json'
-  })
-}
-// 历史压力采集
-export function pressureCollectHistory(data, file) {
-  return request({
-    url: "/gis/dmapress/list",
-    method: "post",
-    data,
-    responseType: file ? 'blob' : 'json'
-  })
-}

src/api/DMA/icf.ts

@@ -1,19 +0,0 @@
-import request from "@/utils/request"
-
-// ICF状况因子列表
-export function icfInfoList(params) {
-  return request({
-    url: "/gis/dmaicf/icf",
-    method: "get",
-    params
-  })
-}
-
-// ICF状况因子编辑
-export function editIcfInfo(data) { 
-  return request({
-    url: "/gis/dmaicf/icfUpdate",
-    method: "post",
-    data
-  })
- }

src/api/DMA/observeMeter.ts

@@ -1,56 +0,0 @@
-import requeset from '@/utils/request'
-
-//  获取观察表月供水量
-export function observeMeterSupplyMonthlyList(params, file) {
-  return requeset({
-    url: '/gis/supplyMonth/getSupplyMonth',
-    method: 'get',
-    params,
-    responseType: file ? 'blob' : 'json'
-  })
-}
-//  获取分区内观察表统计信息
-export function observeMeterStatisticInfo(params) {
-  return requeset({
-    url: '/gis/tableCount/getPartition',
-    method: 'get',
-    params
-  })
-}
-//  获取观察表详细信息
-export function observeMeterDetailInfo(params, file) {
-  return requeset({
-    url: '/gis/tableCount/viewPartition',
-    method: 'get',
-    params,
-    responseType: file ? 'blob' : 'json'
-  })
-}
-
-//  获取观察表月供水量(按月)
-export function observeMeterSupplyMonthlyListM(params, file) {
-  return requeset({
-    url: '/gis/supplyMonth/getSupplyMonth',
-    method: 'get',
-    params,
-    responseType: file ? 'blob' : 'json'
-  })
-}
-//  获取观察表月供水量(按天)
-export function observeMeterSupplyMonthlyListD(params, file) {
-  return requeset({
-    url: '/gis/supplyMonth/getSupplyDay',
-    method: 'get',
-    params,
-    responseType: file ? 'blob' : 'json'
-  })
-}
-//  获取观察表月供水量(按时)
-export function observeMeterSupplyMonthlyListH(params, file) {
-  return requeset({
-    url: '/gis/supplyMonth/getSupplyHour',
-    method: 'get',
-    params,
-    responseType: file ? 'blob' : 'json'
-  })
-}

src/api/DMA/productionSellDiff.ts

@@ -1,37 +0,0 @@
-import request from "@/utils/request"
-
-// 产销差分析
-export function produceDiff(params, file) {
-  return request({
-    url: "/gis/produceDiff/waterDiff",
-    method: "get",
-    params,
-    responseType: file ? 'blob' : 'json'
-  })
-}
-// 获取月份供水量、售水量、产销差量汇总情况
-export function threeSituations(params) {
-  return request({
-    url: "/gis/produceDiff/clloctByDma",
-    method: "get",
-    params,
-  })
-}
-
-// 获取区域观察表
-export function minStroomMeters(params) {
-  return request({
-    url: "/gis/night/getTableTree",
-    method: "get",
-    params,
-  })
-}
-// 夜间最小流量汇总
-export function minStroomMeterSets(params, file) {
-  return request({
-    url: "/gis/night/minFLow",
-    method: "get",
-    params,
-    responseType: file ? 'blob' : 'json'
-  })
-}

src/api/DMA/splitMeter.ts

@@ -1,43 +0,0 @@
-import request from '@/utils/request'
-
-// 获取抄表片区
-export function getAreas(params) {
-  return request({
-    url: '/gis/AreaSubTable/getArea',
-    method: 'get',
-    params
-  })
-}
-// 获获取抄表本
-export function getBooks(params) {
-  return request({
-    url: '/gis/AreaSubTable/getCopybook',
-    method: 'get',
-    params
-  })
-}
-// 查询用户水表档案
-export function getArchives(params) {
-  return request({
-    url: '/gis/AreaSubTable/getSubTable',
-    method: 'get',
-    params
-  })
-}
-// 获取用户用水量
-export function getUserWaterCost(params) {
-  return request({
-    url: '/gis/AreaSubTable/getUseWater',
-    method: 'get',
-    params
-  })
-}
-// 用户水表档案导出
-export function exportUserWaterCost(params) {
-  return request({
-    url: '/gis/AreaSubTable/exportSubTable',
-    method: 'get',
-    responseType: 'blob',
-    params
-  })
-}

src/api/DMA/tubing.ts

@@ -1,19 +0,0 @@
-import request from "@/utils/request"
-
-// 管材类别列表
-export function tubingMaterialType(params) {
-  return request({
-    url: "/gis/dmaicf/type",
-    method: "get",
-    params
-  })
-}
-
-// 管材类别编辑
-export function editTubingMaterailType(data) { 
-  return request({
-    url: "/gis/dmapietype",
-    method: "put",
-    data
-  })
- }

src/api/DMA/warn.ts

@@ -1,26 +0,0 @@
-import request from "@/utils/request"
-
-// 异常信息列表
-export function warnList(params) {
-  return request({
-    url: "/gis/warn/getWarn",
-    method: "get",
-    params
-  })
-}
-// 异常占比信息
-export function warnTypePercentage(params) {
-  return request({
-    url: "/gis/warn/analyze",
-    method: "get",
-    params
-  })
-}
-// 异常数据操作
-export function warnDataOperation(data) {
-  return request({
-    url: "/gis/warn/warnHandle",
-    method: "post",
-    data
-  })
-}

src/api/DMA/workOrderManage.ts

@@ -1,11 +0,0 @@
-import request from "@/utils/request"
-
-// 效果评价
-export function effectRate(params, file) {
-  return request({
-    url: "/gis/warn/resultEval",
-    method: "get",
-    params,
-    responseType: file ? "blob" : "json"
-  })
-}

src/api/DMA/zoningManage.ts

@@ -1,96 +0,0 @@
-import request from '@/utils/request'
-
-// 分区管理分区树
-export function zoningTree(params) {
-  return request({
-    url: '/gis/area/partition',
-    method: 'get',
-    params
-  })
-}
-
-// 通过点击左侧树获取该分区下的列表
-export function getTargetZoningList(params) {
-  return request({
-    url: '/gis/area/partitionById',
-    method: 'get',
-    params
-  })
-}
-
-// 获取不同分区的个数
-export function getDifferentZoningNum(params) {
-  return request({
-    url: '/gis/area/partitionNum',
-    method: 'get',
-    params
-  })
-}
-
-// 删除选定项
-export function deleteSelections(params) {
-  return request({
-    url: '/gis/area/partition',
-    method: 'delete',
-    params
-  })
-}
-
-// 新增或修改分区
-export function createAndEditZoning(data) {
-  return request({
-    url: '/gis/area/partition',
-    method: 'post',
-    data
-  })
-}
-
-// 获取管材列表
-export function getMaterialList(params) {
-  return request({
-    url: '/base/syscommoncode/getByfjId',
-    method: 'get',
-    params
-  })
-}
-// 获取用户信息
-export function getBingUser(params) {
-  return request({
-    url: '/gis/AreaBingYh/getBing',
-    method: 'get',
-    params
-  })
-}
-// 用户批量解绑
-export function postBingUser(data) {
-  return request({
-    url: '/gis/AreaBingYh/unbing',
-    method: 'POST',
-    data
-  })
-}
-
-// 解绑分区下所有用户
-export function postBingAllUser(data) {
-  return request({
-    url: '/gis/AreaBingYh/unbingAreaId',
-    method: 'POST',
-    data
-  })
-}
-// 用户批量绑定
-export function postBingUserBD(data) {
-  return request({
-    url: '/gis/AreaBingYh/bing',
-    method: 'POST',
-    data
-  })
-}
-// 获取用户信息
-export function getCbb(data) {
-  return request({
-    url: '/gis/AreaBingYh/cbb',
-    method: 'get',
-    data
-  })
-}

src/api/DMA/zoningMeterManage.ts

@@ -1,126 +0,0 @@
-import request from '@/utils/request'
-
-// 区域视察表
-// 查询表列表
-export function obeserveMeterList(params) {
-  return request({
-    url: '/gis/dmaTable/selectTableInfo',
-    method: 'get',
-    params
-  })
-}
-// 添加表信息
-export function addNewMeterInfos(data) {
-  return request({
-    url: '/gis/dmaTable/insertTableInfo',
-    method: 'post',
-    data
-  })
-}
-// 修改表信息
-export function editMeterInfos(data) {
-  return request({
-    url: '/gis/dmaTable/updateTableInfo',
-    method: 'put',
-    data
-  })
-}
-// 删除表信息
-export function deleteMeterInfos(params) {
-  return request({
-    url: '/gis/dmaTable/deleteTableInfo',
-    method: 'delete',
-    params
-  })
-}
-// 获取站点列表
-export function getStationList(params) {
-  return request({
-    url: '/gis/scadaAbout/selectStation',
-    method: 'get',
-    params
-  })
-}
-// 获取指标列表
-export function getTargetList(params) {
-  return request({
-    url: '/gis/dmaTable/viewIndex',
-    method: 'get',
-    params
-  })
-}
-// 绑定指标
-export function bindingTarget(data) {
-  return request({
-    url: '/gis/dmaTable/bindIndex',
-    method: 'post',
-    data
-  })
-}
-// 获取绑定的指标列表
-export function getBindedTargetList(params) {
-  return request({
-    url: '/gis/dmaTable/bindTableInfo',
-    method: 'get',
-    params
-  })
-}
-// 解绑指标
-export function unbindTarget(params) {
-  return request({
-    url: '/gis/dmaTable/untieIndex',
-    method: 'delete',
-    params
-  })
-}
-// 区域表导出
-export function exportZoningMeter(params) {
-  return request({
-    url: '/gis/dmaTable/exportTableInfo',
-    method: 'get',
-    responseType: 'blob',
-    params
-  })
-}
-// 表平均流量
-export function getMeterAvgFlow(params) {
-  return request({
-    url: '/gis/dmaTable/avgFlow',
-    method: 'get',
-    params
-  })
-}
-// 表历史流量
-export function getMeterHistoryFlow(params) {
-  return request({
-    url: '/gis/dmaTable/historicalTraffic',
-    method: 'get',
-    params
-  })
-}
-// 旧表数据
-export function getOldMeterData(params) {
-  return request({
-    url: '/gis/dmaTable/oldTableData',
-    method: 'get',
-    params
-  })
-}
-// 换表
-export function changeMeter(data) {
-  return request({
-    url: '/gis/dmaTable/changeTable',
-    method: 'post',
-    data
-  })
-}
-
-// 水表查询
-export function getusernamelist(params) {
-  return request({
-    url: '/meter/waterGis/numberGetInfo',
-    method: 'get',
-    params
-  })
-}
-

src/views/OnlineImport/widgets/PipeOnlineImport/widget.vue

@@ -38,6 +38,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.levelname==='工程'||scope.row.levelname==='单项工程'||scope.row.levelname==='单位工程（CWP）'">
               <el-button class="tdbutton" size="mini" type="primary" @click="openNewNode(scope.row)">新建</el-button>
+              <!-- <i class="el-icon-delete" style="color:red;margin-left:10px;" @click="deleteData(scope.row)"></i> -->
             </div>
             <div v-else-if="scope.row.levelname==='分部工程（专业）'">
               <el-button class="tdbutton" size="mini" type="success" @click="pipeDataImport(scope.row)">导入</el-button>
@@ -64,7 +65,7 @@
         </el-form-item>
         <el-form-item label="下级节点选择">
           <el-select @change="nextNodeChange()" v-model="addNodeForm.id" clearable style="width:100%">
-            <el-option v-for="(item,index) in nodeOptions" :key="index" :label="item.name" :value="item.value">
+            <el-option v-for="(item,index) in nodeOptions" :key="index" :label="item.name" :value="item.id">
               <span style="float: left">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
             </el-option>
@@ -452,6 +453,7 @@ export default class PipeOnlineImprt extends Vue {
           })
         }
         if (result[0]) {
+          this.isNewProj=false
           this.structures = result[0].structures
           let data = formatTree(result[0].structures)
           this.tableData = data
@@ -504,7 +506,7 @@ export default class PipeOnlineImprt extends Vue {
                       }).then((boinfos) => {
                         if (boinfos.code === 1) {
                           const list = boinfos.result.records.map((item) => {
-                            return { name: item.name, value: item.code }
+                            return { name: item.name, value: item.code,id:item.id }
                           })
                           this.nodeOptions = list
                         }
@@ -525,7 +527,7 @@ export default class PipeOnlineImprt extends Vue {
       pid: this.addNodeForm.pid,
       code: this.addNodeForm.code,
       name: this.addNodeForm.name,
-      prjId: this.$store.state.project.project.currentPrj
+      prjId: this.$store.state.project.project.id
     }
     addStrctureNode(data)
       .then((result) => {
@@ -544,7 +546,7 @@ export default class PipeOnlineImprt extends Vue {
   /**下级节点选择器选中事件 */
   nextNodeChange() {
     const node = this.nodeOptions.find((item) => {
-      return item.value === this.addNodeForm.id
+      return item.id === this.addNodeForm.id
     })
     this.addNodeForm.code = this.addNodeForm.pCode + this.connector + node.value
     this.addNodeForm.name = node.name
@@ -738,6 +740,7 @@ export default class PipeOnlineImprt extends Vue {
   导入excel表，创建二三维数据集【正式库】  
    */
   zsbuildDatasets() {
+    const dataUser=this.$store.state.project.project.dataUser
     if (this.files.length === 0) {
       this.$message.warning('请上传管网数据表')
       return
@@ -746,6 +749,10 @@ export default class PipeOnlineImprt extends Vue {
       this.$message.warning('请选择导入层级')
       return
     }
+    if(!dataUser||dataUser===''){
+      this.$message.warning('未绑定空间数据库，请检查')
+      return
+    }
     const loading = this.$loading({
       text: '后台处理中',
       lock: true,
@@ -759,10 +766,12 @@ export default class PipeOnlineImprt extends Vue {
     formdata.append('importType', '1')
     formdata.append('id', '' + this.impForm.id)
     formdata.append('wkid', '4546')
+    formdata.append('dataUser',dataUser)
     request({
       url: '/tofly-lzd-data/data/import/' + this.impForm.id,
       method: 'POST',
-      data: formdata
+      data: formdata,
+      timeout:600000
     })
       .then((result) => {
         this.$message.success('正式库数据集生成成功')
@@ -799,8 +808,13 @@ export default class PipeOnlineImprt extends Vue {
     重建三维网络【正式库】
    */
   zsbuildNetwork() {
+    const dataUser=this.$store.state.project.project.dataUser
+    if(!dataUser||dataUser===''){
+      this.$message.warning('未绑定空间数据库，请检查')
+      return
+    }
     request({
-      url: '/tofly-lzd-data/data/createNetwork?importType=1',
+      url: '/tofly-lzd-data/data/createNetwork?importType=1&dataUser='+dataUser,
       method: 'POST'
     })
       .then((result) => {
@@ -837,8 +851,13 @@ export default class PipeOnlineImprt extends Vue {
     制作场景缓存【正式库】
    */
   zsbuildModelTiles() {
+    const dataUser=this.$store.state.project.project.dataUser
+    if(!dataUser||dataUser===''){
+      this.$message.warning('未绑定空间数据库，请检查')
+      return
+    }
     request({
-      url: '/tofly-lzd-data/data/modelSlice3d?importType=1',
+      url: '/tofly-lzd-data/data/modelSlice3d?importType=1&dataUser='+dataUser,
       method: 'POST'
     })
       .then((result) => {
@@ -896,6 +915,11 @@ export default class PipeOnlineImprt extends Vue {
   }
   /**更新发布标识 */
   updatePubcliSign(id) {
+    const dataUser=this.$store.state.project.project.dataUser
+    if(!dataUser||dataUser===''){
+      this.$message.warning('未绑定空间数据库，请检查')
+      return
+    }
     request({
       url: `/tofly-lzd-data/data/updateStatus/${id}`,
       method: 'get',
@@ -924,6 +948,11 @@ export default class PipeOnlineImprt extends Vue {
    * 根据工程id删除数据
    */
   deleteData(row) {
+    const dataUser=this.$store.state.project.project.dataUser
+    if(!dataUser||dataUser===''){
+      this.$message.warning('未绑定空间数据库，请检查')
+      return
+    }
     const id = row.id
     this.$confirm('是否删除该节点')
       .then(() => {
@@ -934,7 +963,7 @@ export default class PipeOnlineImprt extends Vue {
           background: 'rgba(0, 0, 0, 0.7)'
         })
         request({
-          url: '/tofly-lzd-data/data/deleteData/' + id + '?importType=1&id=' + id,
+          url: '/tofly-lzd-data/data/deleteData/' + id + '?importType=1&id=' + id+'&dataUser='+dataUser,
           method: 'POST'
         })
           .then((result) => {