中图更新

src/api/zt/ztApi.js

@@ -5,13 +5,14 @@ import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from "@/plugins/cache";
 import { Notification, MessageBox, Message, Loading } from "element-ui";
 import { saveAs } from "file-saver";
+import { getToken } from "@/utils/auth";
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 是否显示重新登录
 export let isReloginShow = false;
 // 创建axios实例
 const request = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: window.ZTaxiosURI,
+  baseURL: window.axiosURI,
   //baseURL: "http://192.168.100.252:8080",
   // 超时
   timeout: 100000,
@@ -20,6 +21,8 @@ const request = axios.create({
 // request拦截器
 request.interceptors.request.use(
   (config) => {
+    //代码防止重复提交会导致浏览器内存溢出，因此没在这添加判断
+    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     // 是否需要防止数据重复提交
     const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
     // get请求映射params参数
@@ -161,7 +164,7 @@ request.interceptors.response.use(
  */
 export async function getJZDJWord(data) {
   let response = await request({
-    url: "/exportWord/exportWord4",
+    url: "/model/exportWord/exportWord4",
     method: "post",
     responseType: "blob",
     data: data,
@@ -196,7 +199,7 @@ export async function getJZDJWord(data) {
  */
 export async function getZDBCWord(data) {
   let response = await request({
-    url: "/exportWord/exportWord3",
+    url: "/model/exportWord/exportWord4",
     method: "post",
     responseType: "blob",
     data: data,
@@ -228,7 +231,7 @@ export async function getZDBCWord(data) {
 // 查询项目信息列表
 export async function listProjectinformation(query) {
   return await request({
-    url: "/projectinformation/list",
+    url: "/model/projectinformation/list",
     method: "get",
     params: query,
   });
@@ -236,7 +239,7 @@ export async function listProjectinformation(query) {
 // 查询未关联广告项目信息列表
 export async function NoAssociatedList(query) {
   return await request({
-    url: "/projectinformation/NoAssociatedList",
+    url: "/model/projectinformation/NoAssociatedList",
     method: "get",
     params: query,
   });
@@ -245,7 +248,7 @@ export async function NoAssociatedList(query) {
 // 查询项目信息详细
 export async function getProjectinformation(id) {
   return await request({
-    url: "/projectinformation/" + id,
+    url: "/model/projectinformation/" + id,
     method: "get",
   });
 }
@@ -253,7 +256,7 @@ export async function getProjectinformation(id) {
 // 新增项目信息
 export async function addProjectinformation(data) {
   return await request({
-    url: "/projectinformation",
+    url: "/model/projectinformation",
     method: "post",
     data: data,
   });
@@ -262,7 +265,7 @@ export async function addProjectinformation(data) {
 // 修改项目信息
 export async function updateProjectinformation(data) {
   return await request({
-    url: "/projectinformation",
+    url: "/model/projectinformation",
     method: "put",
     data: data,
   });
@@ -271,7 +274,7 @@ export async function updateProjectinformation(data) {
 // 删除项目信息
 export async function delProjectinformation(id) {
   return await request({
-    url: "/projectinformation/" + id,
+    url: "/model/projectinformation/" + id,
     method: "delete",
   });
 }
@@ -279,7 +282,7 @@ export async function delProjectinformation(id) {
 // 查询报建模型列表
 export async function listConstructionmodel(query) {
   return await request({
-    url: "/constructionmodel/list",
+    url: "/model/constructionmodel/list",
     method: "get",
     params: query,
   });
@@ -288,7 +291,7 @@ export async function listConstructionmodel(query) {
 // 查询报建模型详细
 export async function getConstructionmodel(id) {
   return await request({
-    url: "/constructionmodel/" + id,
+    url: "/model/constructionmodel/" + id,
     method: "get",
   });
 }
@@ -296,7 +299,7 @@ export async function getConstructionmodel(id) {
 // 新增报建模型
 export async function addConstructionmodel(data) {
   return await request({
-    url: "/constructionmodel",
+    url: "/model/constructionmodel",
     method: "post",
     data: data,
   });
@@ -305,7 +308,7 @@ export async function addConstructionmodel(data) {
 // 修改报建模型
 export async function updateConstructionmodel(data) {
   return await request({
-    url: "/constructionmodel",
+    url: "/model/constructionmodel",
     method: "put",
     data: data,
   });
@@ -314,7 +317,7 @@ export async function updateConstructionmodel(data) {
 // 删除报建模型
 export async function delConstructionmodel(id) {
   return await request({
-    url: "/constructionmodel/" + id,
+    url: "/model/constructionmodel/" + id,
     method: "delete",
   });
 }
@@ -322,7 +325,7 @@ export async function delConstructionmodel(id) {
 // 查询项目模型指标人工核算值详细
 export async function getZtProjectModelZb(id) {
   return await request({
-    url: "/ZtProjectModelZb/" + id,
+    url: "/model/ZtProjectModelZb/" + id,
     method: "get",
   });
 }
@@ -330,7 +333,7 @@ export async function getZtProjectModelZb(id) {
 // 新增项目模型指标人工核算值
 export async function addZtProjectModelZb(data) {
   return await request({
-    url: "/ZtProjectModelZb",
+    url: "/model/ZtProjectModelZb",
     method: "post",
     data: data,
   });
@@ -339,7 +342,7 @@ export async function addZtProjectModelZb(data) {
 // 修改项目模型指标人工核算值
 export async function updateZtProjectModelZb(data) {
   return await request({
-    url: "/ZtProjectModelZb",
+    url: "/model/ZtProjectModelZb",
     method: "put",
     data: data,
   });
@@ -351,7 +354,7 @@ export async function updateZtProjectModelZb(data) {
 // 基准地价分析
 export async function getAnalyseResult(data) {
   return request({
-    url: "/jzdjanalyse/getAnalyseResult",
+    url: "/model/jzdjanalyse/getAnalyseResult",
     method: "post",
     data: data,
   });
@@ -360,7 +363,7 @@ export async function getAnalyseResult(data) {
 // 查询基准地价信息列表
 export async function listBenchmarkLandPrices(query) {
   return request({
-    url: "/BenchmarkLandPrices/list",
+    url: "/model/BenchmarkLandPrices/list",
     method: "get",
     params: query,
   });
@@ -369,7 +372,7 @@ export async function listBenchmarkLandPrices(query) {
 // 查询基准地价信息详细
 export async function getBenchmarkLandPrices(id) {
   return request({
-    url: "/BenchmarkLandPrices/" + id,
+    url: "/model/BenchmarkLandPrices/" + id,
     method: "get",
   });
 }
@@ -377,7 +380,7 @@ export async function getBenchmarkLandPrices(id) {
 // 新增基准地价信息
 export async function addBenchmarkLandPrices(data) {
   return request({
-    url: "/BenchmarkLandPrices",
+    url: "/model/BenchmarkLandPrices",
     method: "post",
     data: data,
   });
@@ -386,7 +389,7 @@ export async function addBenchmarkLandPrices(data) {
 // 修改基准地价信息
 export async function updateBenchmarkLandPrices(data) {
   return request({
-    url: "/BenchmarkLandPrices",
+    url: "/model/BenchmarkLandPrices",
     method: "put",
     data: data,
   });
@@ -395,14 +398,14 @@ export async function updateBenchmarkLandPrices(data) {
 // 删除基准地价信息
 export async function delBenchmarkLandPrices(id) {
   return request({
-    url: "/BenchmarkLandPrices/" + id,
+    url: "/model/BenchmarkLandPrices/" + id,
     method: "delete",
   });
 }
 // 查询基准地价分析结果列表
 export function listZtBenchmarkLandPriceResults(query) {
   return request({
-    url: "/ZtBenchmarkLandPriceResults/list",
+    url: "/model/ZtBenchmarkLandPriceResults/list",
     method: "get",
     params: query,
   });
@@ -411,7 +414,7 @@ export function listZtBenchmarkLandPriceResults(query) {
 // 查询基准地价分析结果详细
 export function getZtBenchmarkLandPriceResults(id) {
   return request({
-    url: "/ZtBenchmarkLandPriceResults/" + id,
+    url: "/model/ZtBenchmarkLandPriceResults/" + id,
     method: "get",
   });
 }
@@ -419,7 +422,7 @@ export function getZtBenchmarkLandPriceResults(id) {
 // 新增基准地价分析结果
 export function addZtBenchmarkLandPriceResults(data) {
   return request({
-    url: "/ZtBenchmarkLandPriceResults",
+    url: "/model/ZtBenchmarkLandPriceResults",
     method: "post",
     data: data,
   });
@@ -428,7 +431,7 @@ export function addZtBenchmarkLandPriceResults(data) {
 // 修改基准地价分析结果
 export function updateZtBenchmarkLandPriceResults(data) {
   return request({
-    url: "/ZtBenchmarkLandPriceResults",
+    url: "/model/ZtBenchmarkLandPriceResults",
     method: "put",
     data: data,
   });
@@ -437,7 +440,7 @@ export function updateZtBenchmarkLandPriceResults(data) {
 // 删除基准地价分析结果
 export function delZtBenchmarkLandPriceResults(id) {
   return request({
-    url: "/ZtBenchmarkLandPriceResults/" + id,
+    url: "/model/ZtBenchmarkLandPriceResults/" + id,
     method: "delete",
   });
 }
@@ -447,7 +450,7 @@ export function delZtBenchmarkLandPriceResults(id) {
 // 01 征地补偿标准列表 list
 export function getZdBcbzList(query) {
   return request({
-    url: "/zdbcbz/list",
+    url: "/model/zdbcbz/list",
     method: "get",
     params: query,
   });
@@ -455,14 +458,14 @@ export function getZdBcbzList(query) {
 // 征地  补偿标准 getbyid
 export function getZdBcbzById(id) {
   return request({
-    url: "/zdbcbz/" + id,
+    url: "/model/zdbcbz/" + id,
     method: "get",
   });
 }
 //添加  征地  补偿标准 add
 export function addZdBcbz(data) {
   return request({
-    url: "/zdbcbz/",
+    url: "/model/zdbcbz/",
     method: "post",
     data: data,
   });
@@ -470,7 +473,7 @@ export function addZdBcbz(data) {
 // 更新 征地  补偿标准 update
 export function updateZdBcbz(data) {
   return request({
-    url: "/zdbcbz/",
+    url: "/model/zdbcbz/",
     method: "put",
     data: data,
   });
@@ -478,7 +481,7 @@ export function updateZdBcbz(data) {
 // 删除 征地  补偿标准 delbyid
 export function delZdBcbz(id) {
   return request({
-    url: "/zdbcbz/" + id,
+    url: "/model/zdbcbz/" + id,
     method: "delete",
   });
 }
@@ -486,7 +489,7 @@ export function delZdBcbz(id) {
 // 02 青苗 补偿标准列表 list
 export function getQmbcbzList(query) {
   return request({
-    url: "/qmbcbz/list",
+    url: "/model/qmbcbz/list",
     method: "get",
     params: query,
   });
@@ -494,14 +497,14 @@ export function getQmbcbzList(query) {
 // 青苗 补偿标准 getbyid
 export function getQmbcbzById(id) {
   return request({
-    url: "/qmbcbz/" + id,
+    url: "/model/qmbcbz/" + id,
     method: "get",
   });
 }
 //添加 青苗 补偿标准 add
 export function addQmbcbz(data) {
   return request({
-    url: "/qmbcbz",
+    url: "/model/qmbcbz",
     method: "post",
     data: data,
   });
@@ -509,7 +512,7 @@ export function addQmbcbz(data) {
 // 更新 青苗 补偿标准 update
 export function updateQmbcbz(data) {
   return request({
-    url: "/qmbcbz",
+    url: "/model/qmbcbz",
     method: "put",
     data: data,
   });
@@ -517,7 +520,7 @@ export function updateQmbcbz(data) {
 // 删除 青苗 补偿标准 delbyid
 export function delQmbcbz(id) {
   return request({
-    url: "/qmbcbz/" + id,
+    url: "/model/qmbcbz/" + id,
     method: "delete",
   });
 }
@@ -525,7 +528,7 @@ export function delQmbcbz(id) {
 // 03 拆迁 补偿标准列表 list
 export function getCqBcbzList(query) {
   return request({
-    url: "/cqbczd/list",
+    url: "/model/cqbczd/list",
     method: "get",
     params: query,
   });
@@ -533,14 +536,14 @@ export function getCqBcbzList(query) {
 // 拆迁 补偿标准 getbyid
 export function getCqBcbzById(id) {
   return request({
-    url: "/cqbczd/" + id,
+    url: "/model/cqbczd/" + id,
     method: "get",
   });
 }
 //添加 拆迁 补偿标准 add
 export function addCqBcbz(data) {
   return request({
-    url: "/cqbczd",
+    url: "/model/cqbczd",
     method: "post",
     data: data,
   });
@@ -548,7 +551,7 @@ export function addCqBcbz(data) {
 // 更新 拆迁 补偿标准 update
 export function updateCqBcbz(data) {
   return request({
-    url: "/cqbczd",
+    url: "/model/cqbczd",
     method: "put",
     data: data,
   });
@@ -556,14 +559,14 @@ export function updateCqBcbz(data) {
 // 删除 拆迁 补偿标准 delbyid
 export function delCqBcbz(ids) {
   return request({
-    url: "/cqbczd/" + ids,
+    url: "/model/cqbczd/" + ids,
     method: "delete",
   });
 }
 // 03-1 拆迁 补偿标准项 list
 export function getCqBcbzItemList(query) {
   return request({
-    url: "/cqbcbzitem/list",
+    url: "/model/cqbcbzitem/list",
     method: "get",
     params: query,
   });
@@ -571,14 +574,14 @@ export function getCqBcbzItemList(query) {
 // 拆迁 补偿标准项 getbyid
 export function getCqBcbzItemById(id) {
   return request({
-    url: "/cqbcbzitem/" + id,
+    url: "/model/cqbcbzitem/" + id,
     method: "get",
   });
 }
 //添加 拆迁 补偿标准项 add
 export function addCqBcbzItem(data) {
   return request({
-    url: "/cqbcbzitem",
+    url: "/model/cqbcbzitem",
     method: "post",
     data: data,
   });
@@ -586,7 +589,7 @@ export function addCqBcbzItem(data) {
 // 更新 拆迁 补偿标准项 update
 export function updateCqBcbzItem(data) {
   return request({
-    url: "/cqbcbzitem",
+    url: "/model/cqbcbzitem",
     method: "put",
     data: data,
   });
@@ -594,7 +597,7 @@ export function updateCqBcbzItem(data) {
 // 删除 拆迁 补偿标准项 delbyid
 export function delCqBcbzItem(ids) {
   return request({
-    url: "/cqbcbzitem/" + ids,
+    url: "/model/cqbcbzitem/" + ids,
     method: "delete",
   });
 }
@@ -602,7 +605,7 @@ export function delCqBcbzItem(ids) {
 // 04 拆迁 分析结果 列表 list
 export function getCqResultList(query) {
   return request({
-    url: "/cqresult/list",
+    url: "/model/cqresult/list",
     method: "get",
     params: query,
   });
@@ -610,14 +613,14 @@ export function getCqResultList(query) {
 // 拆迁 分析结果 getbyid
 export function getCqResultById(id) {
   return request({
-    url: "/cqresult/" + id,
+    url: "/model/cqresult/" + id,
     method: "get",
   });
 }
 //添加 拆迁 分析结果 add
 export function addCqResult(data) {
   return request({
-    url: "/cqresult",
+    url: "/model/cqresult",
     method: "post",
     data: data,
   });
@@ -625,7 +628,7 @@ export function addCqResult(data) {
 // 更新 拆迁 分析结果 update
 export function updateCqResult(data) {
   return request({
-    url: "/cqresult",
+    url: "/model/cqresult",
     method: "post",
     data: data,
   });
@@ -633,7 +636,7 @@ export function updateCqResult(data) {
 // 删除 拆迁 分析结果 delbyid
 export function delCqResult(id) {
   return request({
-    url: "/cqresult/" + id,
+    url: "/model/cqresult/" + id,
     method: "delete",
   });
 }
@@ -641,7 +644,7 @@ export function delCqResult(id) {
 // 05 征地 分析结果 列表 list
 export function getZdResultList(query) {
   return request({
-    url: "/zdresult/list",
+    url: "/model/zdresult/list",
     method: "get",
     params: query,
   });
@@ -649,14 +652,14 @@ export function getZdResultList(query) {
 // 征地 分析结果 getbyid
 export function getZdResultById(id) {
   return request({
-    url: "/zdresult/" + id,
+    url: "/model/zdresult/" + id,
     method: "get",
   });
 }
 //添加 征地 分析结果 add
 export function addZdResult(data) {
   return request({
-    url: "/zdresult",
+    url: "/model/zdresult",
     method: "post",
     data: data,
   });
@@ -664,7 +667,7 @@ export function addZdResult(data) {
 // 更新 征地 分析结果 update
 export function updateZdResult(data) {
   return request({
-    url: "/zdresult",
+    url: "/model/zdresult",
     method: "post",
     data: data,
   });
@@ -672,7 +675,7 @@ export function updateZdResult(data) {
 // 删除 征地 分析结果 delbyid
 export function delZdResult(id) {
   return request({
-    url: "/zdresult/" + id,
+    url: "/model/zdresult/" + id,
     method: "delete",
   });
 }
@@ -680,7 +683,7 @@ export function delZdResult(id) {
 // 06 青苗 分析结果 列表 list
 export function getQmResultList(query) {
   return request({
-    url: "/qmresult/list",
+    url: "/model/qmresult/list",
     method: "get",
     params: query,
   });
@@ -688,14 +691,14 @@ export function getQmResultList(query) {
 // 青苗 分析结果 getbyid
 export function getQmResultById(id) {
   return request({
-    url: "/qmresult/" + id,
+    url: "/model/qmresult/" + id,
     method: "get",
   });
 }
 //添加 青苗 分析结果 add
 export function addQmResult(data) {
   return request({
-    url: "/qmresult",
+    url: "/model/qmresult",
     method: "post",
     data: data,
   });
@@ -703,7 +706,7 @@ export function addQmResult(data) {
 // 更新 青苗 分析结果 update
 export function updateQmResult(data) {
   return request({
-    url: "/qmresult",
+    url: "/model/qmresult",
     method: "post",
     data: data,
   });
@@ -711,14 +714,14 @@ export function updateQmResult(data) {
 // 删除 青苗 分析结果 delbyid
 export function delQmResult(id) {
   return request({
-    url: "/qmresult/" + id,
+    url: "/model/qmresult/" + id,
     method: "delete",
   });
 }
 // 07 征收补偿项目  列表 list
 export function getZdProjectList(query) {
   return request({
-    url: "/zdproject/list",
+    url: "/model/zdproject/list",
     method: "get",
     params: query,
   });
@@ -726,14 +729,14 @@ export function getZdProjectList(query) {
 // 征收补偿项目  getbyid
 export function getZdProjectById(id) {
   return request({
-    url: "/zdproject/" + id,
+    url: "/model/zdproject/" + id,
     method: "get",
   });
 }
 //添加 征收补偿项目  add
 export function addZdProject(data) {
   return request({
-    url: "/zdproject",
+    url: "/model/zdproject",
     method: "post",
     data: data,
   });
@@ -741,7 +744,7 @@ export function addZdProject(data) {
 // 更新 征收补偿项目 update
 export function updateZdProject(data) {
   return request({
-    url: "/zdproject",
+    url: "/model/zdproject",
     method: "post",
     data: data,
   });
@@ -749,13 +752,13 @@ export function updateZdProject(data) {
 // 删除 征收补偿项目 delbyid
 export function delZdProject(id) {
   return request({
-    url: "/zdproject/" + id,
+    url: "/model/zdproject/" + id,
     method: "delete",
   });
 }
 export async function expotZDBCWord(data) {
   let response = await request({
-    url: "/zdproject/exportWord",
+    url: "/model/zdproject/exportWord",
     method: "post",
     responseType: "blob",
     data: data,
@@ -789,7 +792,7 @@ export async function expotZDBCWord(data) {
 // 08 权属 分析结果 列表 list
 export function getQsResultList(query) {
   return request({
-    url: "/qsresult/list",
+    url: "/model/qsresult/list",
     method: "get",
     params: query,
   });
@@ -797,14 +800,14 @@ export function getQsResultList(query) {
 // 权属 分析结果 getbyid
 export function getQsResultById(id) {
   return request({
-    url: "/qsresult/" + id,
+    url: "/model/qsresult/" + id,
     method: "get",
   });
 }
 //添加 权属 分析结果 add
 export function addQsResult(data) {
   return request({
-    url: "/qsresult",
+    url: "/model/qsresult",
     method: "post",
     data: data,
   });
@@ -812,7 +815,7 @@ export function addQsResult(data) {
 // 更新 权属 分析结果 update
 export function updateQsResult(data) {
   return request({
-    url: "/qsresult",
+    url: "/model/qsresult",
     method: "post",
     data: data,
   });
@@ -820,7 +823,7 @@ export function updateQsResult(data) {
 // 删除 权属 分析结果 delbyid
 export function delQsResult(id) {
   return request({
-    url: "/qsresult/" + id,
+    url: "/model/qsresult/" + id,
     method: "delete",
   });
 }
@@ -831,7 +834,7 @@ export function delQsResult(id) {
 // 查询夜景灯光列列表
 export function listZtLightList(query) {
   return request({
-    url: "/ZtLightList/list",
+    url: "/model/ZtLightList/list",
     method: "get",
     params: query,
   });
@@ -840,7 +843,7 @@ export function listZtLightList(query) {
 // 查询夜景灯光列详细
 export function getZtLightList(id) {
   return request({
-    url: "/ZtLightList/" + id,
+    url: "/model/ZtLightList/" + id,
     method: "get",
   });
 }
@@ -848,7 +851,7 @@ export function getZtLightList(id) {
 // 新增夜景灯光列
 export function addZtLightList(data) {
   return request({
-    url: "/ZtLightList",
+    url: "/model/ZtLightList",
     method: "post",
     data: data,
   });
@@ -857,7 +860,7 @@ export function addZtLightList(data) {
 // 修改夜景灯光列
 export function updateZtLightList(data) {
   return request({
-    url: "/ZtLightList",
+    url: "/model/ZtLightList",
     method: "put",
     data: data,
   });
@@ -866,7 +869,7 @@ export function updateZtLightList(data) {
 // 删除夜景灯光列
 export function delZtLightList(id) {
   return request({
-    url: "/ZtLightList/" + id,
+    url: "/model/ZtLightList/" + id,
     method: "delete",
   });
 }
@@ -877,7 +880,7 @@ export function delZtLightList(id) {
 // 查询广告项目信息列表
 export function listZtBillboardInfoList(query) {
   return request({
-    url: "/ZtBillboardInfoList/list",
+    url: "/model/ZtBillboardInfoList/list",
     method: "get",
     params: query,
   });
@@ -886,7 +889,7 @@ export function listZtBillboardInfoList(query) {
 // 查询广告项目信息详细
 export function getZtBillboardInfoList(id) {
   return request({
-    url: "/ZtBillboardInfoList/" + id,
+    url: "/model/ZtBillboardInfoList/" + id,
     method: "get",
   });
 }
@@ -894,7 +897,7 @@ export function getZtBillboardInfoList(id) {
 // 新增广告项目信息
 export function addZtBillboardInfoList(data) {
   return request({
-    url: "/ZtBillboardInfoList",
+    url: "/model/ZtBillboardInfoList",
     method: "post",
     data: data,
   });
@@ -903,7 +906,7 @@ export function addZtBillboardInfoList(data) {
 // 修改广告项目信息
 export function updateZtBillboardInfoList(data) {
   return request({
-    url: "/ZtBillboardInfoList",
+    url: "/model/ZtBillboardInfoList",
     method: "put",
     data: data,
   });
@@ -912,7 +915,7 @@ export function updateZtBillboardInfoList(data) {
 // 删除广告项目信息
 export function delZtBillboardInfoList(id) {
   return request({
-    url: "/ZtBillboardInfoList/" + id,
+    url: "/model/ZtBillboardInfoList/" + id,
     method: "delete",
   });
 }
@@ -920,7 +923,7 @@ export function delZtBillboardInfoList(id) {
 // 查询广告模型信息列表
 export function listBillboardModelList(query) {
   return request({
-    url: "/billboardModelList/list",
+    url: "/model/billboardModelList/list",
     method: "get",
     params: query,
   });
@@ -929,7 +932,7 @@ export function listBillboardModelList(query) {
 // 查询广告模型信息详细
 export function getBillboardModelList(id) {
   return request({
-    url: "/billboardModelList/" + id,
+    url: "/model/billboardModelList/" + id,
     method: "get",
   });
 }
@@ -937,7 +940,7 @@ export function getBillboardModelList(id) {
 // 新增广告模型信息
 export function addBillboardModelList(data) {
   return request({
-    url: "/billboardModelList",
+    url: "/model/billboardModelList",
     method: "post",
     data: data,
   });
@@ -946,7 +949,7 @@ export function addBillboardModelList(data) {
 // 批量新增广告模型信息
 export function addBillboardModelLists(data) {
   return request({
-    url: "/billboardModelList/adds",
+    url: "/model/billboardModelList/adds",
     method: "post",
     data: data,
   });
@@ -955,7 +958,7 @@ export function addBillboardModelLists(data) {
 // 修改广告模型信息
 export function updateBillboardModelList(data) {
   return request({
-    url: "/billboardModelList",
+    url: "/model/billboardModelList",
     method: "put",
     data: data,
   });
@@ -964,7 +967,7 @@ export function updateBillboardModelList(data) {
 // 删除广告模型信息
 export function delBillboardModelList(id) {
   return request({
-    url: "/billboardModelList/" + id,
+    url: "/model/billboardModelList/" + id,
     method: "delete",
   });
 }
@@ -976,7 +979,7 @@ export function delBillboardModelList(id) {
  */
 export async function getGGPWord(data) {
   let response = await request({
-    url: "/exportWord/exportGGPWord",
+    url: "/model/exportWord/exportGGPWord",
     method: "post",
     responseType: "blob",
     data: data,
@@ -1008,7 +1011,7 @@ export async function getGGPWord(data) {
 // 查询广告牌位置截图列表
 export function listZtBillboardJt(query) {
   return request({
-    url: "/ZtBillboardJt/list",
+    url: "/model/ZtBillboardJt/list",
     method: "get",
     params: query,
   });
@@ -1017,7 +1020,7 @@ export function listZtBillboardJt(query) {
 // 查询广告牌位置截图详细
 export function getZtBillboardJt(id) {
   return request({
-    url: "/ZtBillboardJt/" + id,
+    url: "/model/ZtBillboardJt/" + id,
     method: "get",
   });
 }
@@ -1025,7 +1028,7 @@ export function getZtBillboardJt(id) {
 // 新增广告牌位置截图
 export function addZtBillboardJt(data) {
   return request({
-    url: "/ZtBillboardJt",
+    url: "/model/ZtBillboardJt",
     method: "post",
     data: data,
   });
@@ -1034,7 +1037,7 @@ export function addZtBillboardJt(data) {
 // 修改广告牌位置截图
 export function updateZtBillboardJt(data) {
   return request({
-    url: "/ZtBillboardJt",
+    url: "/model/ZtBillboardJt",
     method: "put",
     data: data,
   });
@@ -1043,7 +1046,7 @@ export function updateZtBillboardJt(data) {
 // 删除广告牌位置截图
 export function delZtBillboardJt(id) {
   return request({
-    url: "/ZtBillboardJt/" + id,
+    url: "/model/ZtBillboardJt/" + id,
     method: "delete",
   });
 }
@@ -1051,7 +1054,7 @@ export function delZtBillboardJt(id) {
 // 新增广告牌参数历史修改记录
 export function addbillboardModelListHistory(data) {
   return request({
-    url: "/billboardModelListHistory",
+    url: "/model/billboardModelListHistory",
     method: "post",
     data: data,
   });

src/views/ConstructionApplication3D/Demolition/DemolitionList.vue

@@ -3811,6 +3811,7 @@ export default {
         });
         entity.attributes = attributes;
         viewer.entities.add(entity);
+        break;
       }
       var point = new Cesium.Entity({
         id: "aad",

src/views/ConstructionApplication3D/RSAnalysis/RSAnalysis.vue

@@ -55,8 +55,8 @@
           <el-input-number
             size="mini"
             v-model="circlePitch"
-            min="0"
-            max="90"
+            min="75"
+            max="100"
             @change="circlePitchChange"
           ></el-input-number
         ></el-col>
@@ -112,8 +112,8 @@
         <el-input-number
           size="small"
           label="飞行高度:"
-          min="0"
-          max="2000"
+          :min="0"
+          :max="2000"
           v-model="flyH"
           @change="flyChange"
         ></el-input-number>
@@ -123,8 +123,7 @@
         <el-input-number
           size="small"
           label="飞行速度:"
-          min="0"
-          max="120"
+          :min="0"
           v-model="flySpeed"
           @change="flyChange"
         ></el-input-number>
@@ -169,7 +168,7 @@ export default {
       addCircleFlag: false, //环视点标志
       flyCircleLoop: false,
       flyCircleText: "环视漫游",
-      circlePitch: 75,
+      circlePitch: 90,
       circleH: 500,
       flyHOld: 20,
       flyH: 20,
@@ -545,7 +544,7 @@ export default {
           new Cesium.HeadingPitchRange(0, that.circlePitch * -1, that.circleH)
         );
         scene.camera.flyCircle(position);
-
+        that.circlePitchChange();
         // scene.camera.setView({
         //   destination: position,
         //   orientation: {
@@ -734,6 +733,9 @@ export default {
         currentRoute.isStopVisible = false;
         //生成飞行文件中的所有站点列表
         // var allStops = flyManager.getAllRouteStops();
+        if (that.flySpeed == 0) {
+          return;
+        }
         flyManager && flyManager.play();
       });
     },
@@ -748,9 +750,15 @@ export default {
       return d3L;
     },
     flyChange() {
+      if (!flyManager) {
+        return;
+      }
       var that = this;
       flyManager.currentRoute.speed = that.flySpeed / 3.6;
       flyManager && flyManager.stop();
+      if (that.flySpeed == 0) {
+        return;
+      }
       flyManager.currentRoute.stopCollection.forEach((stop, index) => {
         stop.point = new Cesium.Cartesian3.fromDegrees(
           that.lineFylPoints[index][0],

src/views/ConstructionApplication3D/ZBFXAnalysisinfo/ZBFXAnalysisinfo.vue

@@ -25,7 +25,9 @@
                   icon="el-icon-view "
                   >详情</el-button
                 >
-
+                <span style="color: red">{{
+                  DKZBData.infoData ? "" : "当前方案不在所选地块中！！"
+                }}</span>
                 <el-table
                   :data="DKZBData.TableData"
                   :highlight-current-row="true"
@@ -341,10 +343,15 @@ export default {
           }
 
           TableData.push(JRJZMJrow);
-
+          debugger;
           let RJLrow = {};
           RJLrow.zbmc = "容积率";
-          RJLrow.fazbyg = Data.FA_Data.RJL;
+          if (Data.FA_Data.RJL == "NaN") {
+            RJLrow.fazbyg = "-";
+          } else {
+            RJLrow.fazbyg = Data.FA_Data.RJL;
+          }
+
           RJLrow.kgyq = Data.KG_Data.RJLX + "/" + Data.KG_Data.RJLD;
 
           if (!rgzb.RJL) {
@@ -358,7 +365,7 @@ export default {
             RJLrow.rgzbName = "RJL";
           }
 
-          if (RJLrow.rghszb && RJLrow.kgyq) {
+          if (RJLrow.rghszb && RJLrow.kgyq && RJLrow.rghszb != "-") {
             if (
               Number(RJLrow.rghszb) >= Number(Data.KG_Data.RJLX) &&
               Number(RJLrow.rghszb) <= Number(Data.KG_Data.RJLD)
@@ -367,13 +374,20 @@ export default {
             } else {
               RJLrow.jl = false;
             }
+          } else {
+            RJLrow.jl = null;
           }
 
           TableData.push(RJLrow);
 
           let JZMDrow = {};
           JZMDrow.zbmc = "建筑密度";
-          JZMDrow.fazbyg = Data.FA_Data.JZMD;
+
+          if (Data.FA_Data.JZMD == "NaN") {
+            JZMDrow.fazbyg = "-";
+          } else {
+            JZMDrow.fazbyg = Data.FA_Data.JZMD;
+          }
           JZMDrow.kgyq = Data.KG_Data.JZMDX + "/" + Data.KG_Data.JZMDD;
           if (!rgzb.JZMD) {
             rgzb.JZMD = JZMDrow.fazbyg;
@@ -385,7 +399,7 @@ export default {
             JZMDrow.rgzbid = rgzbid;
             JZMDrow.rgzbName = "JZMD";
           }
-          if (JZMDrow.rghszb && JZMDrow.kgyq) {
+          if (JZMDrow.rghszb && JZMDrow.kgyq && JZMDrow.rghszb != "-") {
             if (
               Number(JZMDrow.rghszb) >= Number(Data.KG_Data.JZMDX) &&
               Number(JZMDrow.rghszb) <= Number(Data.KG_Data.JZMDD)

src/views/ConstructionApplication3D/ZBFXAnalysisinfo/detailedInfo.vue

@@ -10,37 +10,47 @@
   >
     <el-container style="height: 100%">
       <el-header style="height: 4rem">
-        <el-descriptions border size="mini" :column="4">
+        <el-descriptions v-if="tableData" border size="mini" :column="4">
           <el-descriptions-item label="地块编码">{{
             tableData.landNo
           }}</el-descriptions-item>
-          <el-descriptions-item label="建筑面积">{{
-            Number(tableData.mj).toFixed(2)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计容面积">{{
-            Number(tableData.jrmj).toFixed(2)
-          }}</el-descriptions-item>
+          <el-descriptions-item label="建筑面积"
+            >{{ Number(tableData.mj).toFixed(2) }}m<sup
+              >2</sup
+            ></el-descriptions-item
+          >
+          <el-descriptions-item label="计容面积"
+            >{{ Number(tableData.jrmj).toFixed(2) }}m<sup
+              >2</sup
+            ></el-descriptions-item
+          >
           <el-descriptions-item label="机动车位">
             {{ tableData.jdcCount }}
           </el-descriptions-item>
           <el-descriptions-item label="非机动车位">{{
             tableData.fjdcCount
           }}</el-descriptions-item>
-          <el-descriptions-item label="计算书面积">{{
-            Number(tableData.famj).toFixed(2)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计算书计容面积">{{
-            Number(tableData.fajrmj).toFixed(2)
-          }}</el-descriptions-item>
+          <el-descriptions-item label="计算书面积"
+            >{{ Number(tableData.famj).toFixed(2) }}m<sup
+              >2</sup
+            ></el-descriptions-item
+          >
+          <el-descriptions-item label="计算书计容面积"
+            >{{ Number(tableData.fajrmj).toFixed(2) }}m<sup
+              >2</sup
+            ></el-descriptions-item
+          >
           <el-descriptions-item label="楼栋数量">{{
             tableData.buildNum
           }}</el-descriptions-item>
         </el-descriptions>
+        <el-empty v-if="!tableData" description="未查询到数据"></el-empty>
       </el-header>
       <el-main>
         <el-row :gutter="10" style="height: 100%">
           <el-col :span="24" style="height: 100%">
             <el-table
+              v-if="tableData"
               :data="tableData.builds"
               style="width: 100%; border: 1px solid rgba(15, 122, 200, 0.4)"
               height="100%"
@@ -66,22 +76,24 @@
                         </el-table-column>
                         <el-table-column label="计算书计容面积" prop="fajrmj">
                           <template slot-scope="scope">
-                            {{ Number(scope.row.fajrmj).toFixed(2) }}
+                            {{ Number(scope.row.fajrmj).toFixed(2) }}m<sup
+                              >2</sup
+                            >
                           </template>
                         </el-table-column>
                         <el-table-column label="计算书面积" prop="famj">
                           <template slot-scope="scope">
-                            {{ Number(scope.row.famj).toFixed(2) }}
+                            {{ Number(scope.row.famj).toFixed(2) }}m<sup>2</sup>
                           </template>
                         </el-table-column>
                         <el-table-column label="核算计容面积" prop="jrmj">
                           <template slot-scope="scope">
-                            {{ Number(scope.row.jrmj).toFixed(2) }}
+                            {{ Number(scope.row.jrmj).toFixed(2) }}m<sup>2</sup>
                           </template>
                         </el-table-column>
                         <el-table-column label="核算建筑面积" prop="mj">
                           <template slot-scope="scope">
-                            {{ Number(scope.row.mj).toFixed(2) }}
+                            {{ Number(scope.row.mj).toFixed(2) }}m<sup>2</sup>
                           </template>
                         </el-table-column>
                       </el-table>
@@ -92,24 +104,24 @@
               <el-table-column label="楼号" prop="buildNo"> </el-table-column>
               <el-table-column label="计算书计容面积" prop="fajrmj">
                 <template slot-scope="scope">
-                  {{ Number(scope.row.fajrmj).toFixed(2) }}
+                  {{ Number(scope.row.fajrmj).toFixed(2) }}m<sup>2</sup>
                 </template>
               </el-table-column>
               <el-table-column label="计算书面积" prop="famj">
                 <template slot-scope="scope">
-                  {{ Number(scope.row.famj).toFixed(2) }}
+                  {{ Number(scope.row.famj).toFixed(2) }}m<sup>2</sup>
                 </template>
               </el-table-column>
               <el-table-column label="楼层数" prop="floorCount">
               </el-table-column>
               <el-table-column label="核算计容面积" prop="jrmj">
                 <template slot-scope="scope">
-                  {{ Number(scope.row.jrmj).toFixed(2) }}
+                  {{ Number(scope.row.jrmj).toFixed(2) }}m<sup>2</sup>
                 </template>
               </el-table-column>
               <el-table-column label="核算建筑面积" prop="mj">
                 <template slot-scope="scope">
-                  {{ Number(scope.row.mj).toFixed(2) }}
+                  {{ Number(scope.row.mj).toFixed(2) }}m<sup>2</sup>
                 </template>
               </el-table-column>
             </el-table>

src/views/ConstructionApplication3D/clipboxByEditor/clipboxByEditor.vue

@@ -25,7 +25,7 @@
         <el-button size="mini" type="primary" @click="onSubmit"
           >绘制剖切</el-button
         >
-        <el-checkbox v-model="checked">切换到地下</el-checkbox>
+        <!-- <el-checkbox v-model="checked">切换到地下</el-checkbox> -->
       </el-form-item>
       <!-- <el-form-item label="">
         <el-button size="mini" @click="removeEntities">清除</el-button>
@@ -106,7 +106,7 @@ export default {
         if (handlerBox.isDrawing) {
           that.tooltip.showAt(
             windowPosition,
-            "<p>点击鼠标左键结束矩形绘制，移动鼠标绘制box高度。</p><p>右键结束绘制.</p>"
+            "<p>点击鼠标左键绘制矩形，向上移动鼠标绘制box高度。</p><p>右键结束绘制.</p>"
           );
         } else {
           that.tooltip.showAt(
@@ -200,6 +200,7 @@ export default {
     },
     //清除
     removeEntities() {
+      this.tooltip.setVisible(false);
       let layers = scene.layers.layerQueue;
       for (var i = 0, j = layers.length; i < j; i++) {
         layers[i].clearCustomClipBox();
@@ -254,6 +255,7 @@ export default {
   },
 
   beforeDestroy() {
+    this.tooltip.setVisible(false);
     this.undergroundModeAnalysis(false);
     this.removeEntities();
   },

src/views/ConstructionApplication3D/projectManagement/projectManagement.vue

@@ -947,8 +947,6 @@ export default {
 
     //分析列表显隐
     async openAnalyzeList(itemModel) {
-      this.SelectConstructionModelHendle(itemModel);
-
       debugger;
       if (itemModel.isggp == null) {
         let BenchmarkLandPrices = await listZtBillboardInfoList({
@@ -962,17 +960,20 @@ export default {
         }
       }
 
-      for (let key in this.$refs) {
-        if (key.includes("AnalyzeList")) {
-          if (key == itemModel.id + "AnalyzeList") {
-            var classList = this.$refs[key][0].$el.classList;
-            classList.toggle("none");
-          } else {
-            var classList = this.$refs[key][0].$el.classList;
-            classList.add("none");
+      this.$nextTick(() => {
+        this.SelectConstructionModelHendle(itemModel);
+        for (let key in this.$refs) {
+          if (key.includes("AnalyzeList")) {
+            if (key == itemModel.id + "AnalyzeList") {
+              var classList = this.$refs[key][0].$el.classList;
+              classList.toggle("none");
+            } else {
+              var classList = this.$refs[key][0].$el.classList;
+              classList.add("none");
+            }
           }
         }
-      }
+      });
 
       // const classList =
       //   this.$refs[itemModel.id + "AnalyzeList"][0].$el.classList;
@@ -981,6 +982,7 @@ export default {
 
     //切换项目
     handleChangeXM(val) {
+      debugger;
       // closAndChangeXM(val);
       // 清除待选模型
       this.WaitingSelectionModel = null;
@@ -1556,10 +1558,11 @@ export default {
 
       //清除多模型图层，数据
       this.modelsload.forEach((model) => {
+        debugger;
         model.layers.forEach((element) => {
           scene.layers.remove(element);
         });
-
+        model.Minfo.checked = false;
         // model.layerDataList.forEach((layerData) => {
         //   let SMID = layerData.data.find((c) => c.label == "SMID").value;
         //   viewer.entities.removeById("MXLH-" + model.id + "-" + SMID);