中图版本更新0927

src/api/zt/ztApi.js

@@ -5,15 +5,13 @@ 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.axiosURI,
+  baseURL: window.ZTaxiosURI,
   //baseURL: "http://192.168.100.252:8080",
   // 超时
   timeout: 100000,
@@ -22,8 +20,6 @@ const request = axios.create({
 // request拦截器
 request.interceptors.request.use(
   (config) => {
-    //代码防止重复提交会导致浏览器内存溢出，因此没在这添加判断
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     // 是否需要防止数据重复提交
     const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
     // get请求映射params参数
@@ -165,7 +161,7 @@ request.interceptors.response.use(
  */
 export async function getJZDJWord(data) {
   let response = await request({
-    url: "/model/exportWord/exportWord4",
+    url: "/sanya/exportWord/exportWord4",
     method: "post",
     responseType: "blob",
     data: data,
@@ -200,7 +196,7 @@ export async function getJZDJWord(data) {
  */
 export async function getZDBCWord(data) {
   let response = await request({
-    url: "/model/exportWord/exportWord3",
+    url: "/sanya/exportWord/exportWord3",
     method: "post",
     responseType: "blob",
     data: data,
@@ -232,7 +228,7 @@ export async function getZDBCWord(data) {
 // 查询项目信息列表
 export async function listProjectinformation(query) {
   return await request({
-    url: "/model/projectinformation/list",
+    url: "/sanya/projectinformation/list",
     method: "get",
     params: query,
   });
@@ -241,7 +237,7 @@ export async function listProjectinformation(query) {
 // 查询项目信息详细
 export async function getProjectinformation(id) {
   return await request({
-    url: "/model/projectinformation/" + id,
+    url: "/sanya/projectinformation/" + id,
     method: "get",
   });
 }
@@ -249,7 +245,7 @@ export async function getProjectinformation(id) {
 // 新增项目信息
 export async function addProjectinformation(data) {
   return await request({
-    url: "/model/projectinformation",
+    url: "/sanya/projectinformation",
     method: "post",
     data: data,
   });
@@ -258,7 +254,7 @@ export async function addProjectinformation(data) {
 // 修改项目信息
 export async function updateProjectinformation(data) {
   return await request({
-    url: "/model/projectinformation",
+    url: "/sanya/projectinformation",
     method: "put",
     data: data,
   });
@@ -267,7 +263,7 @@ export async function updateProjectinformation(data) {
 // 删除项目信息
 export async function delProjectinformation(id) {
   return await request({
-    url: "/model/projectinformation/" + id,
+    url: "/sanya/projectinformation/" + id,
     method: "delete",
   });
 }
@@ -275,7 +271,7 @@ export async function delProjectinformation(id) {
 // 查询报建模型列表
 export async function listConstructionmodel(query) {
   return await request({
-    url: "/model/constructionmodel/list",
+    url: "/sanya/constructionmodel/list",
     method: "get",
     params: query,
   });
@@ -284,7 +280,7 @@ export async function listConstructionmodel(query) {
 // 查询报建模型详细
 export async function getConstructionmodel(id) {
   return await request({
-    url: "/model/constructionmodel/" + id,
+    url: "/sanya/constructionmodel/" + id,
     method: "get",
   });
 }
@@ -292,7 +288,7 @@ export async function getConstructionmodel(id) {
 // 新增报建模型
 export async function addConstructionmodel(data) {
   return await request({
-    url: "/model/constructionmodel",
+    url: "/sanya/constructionmodel",
     method: "post",
     data: data,
   });
@@ -301,7 +297,7 @@ export async function addConstructionmodel(data) {
 // 修改报建模型
 export async function updateConstructionmodel(data) {
   return await request({
-    url: "/model/constructionmodel",
+    url: "/sanya/constructionmodel",
     method: "put",
     data: data,
   });
@@ -310,7 +306,7 @@ export async function updateConstructionmodel(data) {
 // 删除报建模型
 export async function delConstructionmodel(id) {
   return await request({
-    url: "/model/constructionmodel/" + id,
+    url: "/sanya/constructionmodel/" + id,
     method: "delete",
   });
 }
@@ -318,7 +314,7 @@ export async function delConstructionmodel(id) {
 // 查询项目模型指标人工核算值详细
 export async function getZtProjectModelZb(id) {
   return await request({
-    url: "/model/ZtProjectModelZb/" + id,
+    url: "/sanya/ZtProjectModelZb/" + id,
     method: "get",
   });
 }
@@ -326,7 +322,7 @@ export async function getZtProjectModelZb(id) {
 // 新增项目模型指标人工核算值
 export async function addZtProjectModelZb(data) {
   return await request({
-    url: "/model/ZtProjectModelZb",
+    url: "/sanya/ZtProjectModelZb",
     method: "post",
     data: data,
   });
@@ -335,7 +331,7 @@ export async function addZtProjectModelZb(data) {
 // 修改项目模型指标人工核算值
 export async function updateZtProjectModelZb(data) {
   return await request({
-    url: "/model/ZtProjectModelZb",
+    url: "/sanya/ZtProjectModelZb",
     method: "put",
     data: data,
   });
@@ -347,7 +343,7 @@ export async function updateZtProjectModelZb(data) {
 // 基准地价分析
 export async function getAnalyseResult(data) {
   return request({
-    url: "/model/jzdjanalyse/getAnalyseResult",
+    url: "/sanya/jzdjanalyse/getAnalyseResult",
     method: "post",
     data: data,
   });
@@ -356,7 +352,7 @@ export async function getAnalyseResult(data) {
 // 查询基准地价信息列表
 export async function listBenchmarkLandPrices(query) {
   return request({
-    url: "/model/BenchmarkLandPrices/list",
+    url: "/sanya/BenchmarkLandPrices/list",
     method: "get",
     params: query,
   });
@@ -365,7 +361,7 @@ export async function listBenchmarkLandPrices(query) {
 // 查询基准地价信息详细
 export async function getBenchmarkLandPrices(id) {
   return request({
-    url: "/model/BenchmarkLandPrices/" + id,
+    url: "/sanya/BenchmarkLandPrices/" + id,
     method: "get",
   });
 }
@@ -373,7 +369,7 @@ export async function getBenchmarkLandPrices(id) {
 // 新增基准地价信息
 export async function addBenchmarkLandPrices(data) {
   return request({
-    url: "/model/BenchmarkLandPrices",
+    url: "/sanya/BenchmarkLandPrices",
     method: "post",
     data: data,
   });
@@ -382,7 +378,7 @@ export async function addBenchmarkLandPrices(data) {
 // 修改基准地价信息
 export async function updateBenchmarkLandPrices(data) {
   return request({
-    url: "/model/BenchmarkLandPrices",
+    url: "/sanya/BenchmarkLandPrices",
     method: "put",
     data: data,
   });
@@ -391,14 +387,14 @@ export async function updateBenchmarkLandPrices(data) {
 // 删除基准地价信息
 export async function delBenchmarkLandPrices(id) {
   return request({
-    url: "/model/BenchmarkLandPrices/" + id,
+    url: "/sanya/BenchmarkLandPrices/" + id,
     method: "delete",
   });
 }
 // 查询基准地价分析结果列表
 export function listZtBenchmarkLandPriceResults(query) {
   return request({
-    url: "/model/ZtBenchmarkLandPriceResults/list",
+    url: "/sanya/ZtBenchmarkLandPriceResults/list",
     method: "get",
     params: query,
   });
@@ -407,7 +403,7 @@ export function listZtBenchmarkLandPriceResults(query) {
 // 查询基准地价分析结果详细
 export function getZtBenchmarkLandPriceResults(id) {
   return request({
-    url: "/model/ZtBenchmarkLandPriceResults/" + id,
+    url: "/sanya/ZtBenchmarkLandPriceResults/" + id,
     method: "get",
   });
 }
@@ -415,7 +411,7 @@ export function getZtBenchmarkLandPriceResults(id) {
 // 新增基准地价分析结果
 export function addZtBenchmarkLandPriceResults(data) {
   return request({
-    url: "/model/ZtBenchmarkLandPriceResults",
+    url: "/sanya/ZtBenchmarkLandPriceResults",
     method: "post",
     data: data,
   });
@@ -424,7 +420,7 @@ export function addZtBenchmarkLandPriceResults(data) {
 // 修改基准地价分析结果
 export function updateZtBenchmarkLandPriceResults(data) {
   return request({
-    url: "/model/ZtBenchmarkLandPriceResults",
+    url: "/sanya/ZtBenchmarkLandPriceResults",
     method: "put",
     data: data,
   });
@@ -433,7 +429,7 @@ export function updateZtBenchmarkLandPriceResults(data) {
 // 删除基准地价分析结果
 export function delZtBenchmarkLandPriceResults(id) {
   return request({
-    url: "/model/ZtBenchmarkLandPriceResults/" + id,
+    url: "/sanya/ZtBenchmarkLandPriceResults/" + id,
     method: "delete",
   });
 }
@@ -443,7 +439,7 @@ export function delZtBenchmarkLandPriceResults(id) {
 // 01 征地补偿标准列表 list
 export function getZdBcbzList(query) {
   return request({
-    url: "/model/zdbcbz/list",
+    url: "/sanya/zdbcbz/list",
     method: "get",
     params: query,
   });
@@ -451,14 +447,14 @@ export function getZdBcbzList(query) {
 // 征地  补偿标准 getbyid
 export function getZdBcbzById(id) {
   return request({
-    url: "/model/zdbcbz/getInfo/" + id,
+    url: "/sanya/zdbcbz/" + id,
     method: "get",
   });
 }
 //添加  征地  补偿标准 add
 export function addZdBcbz(data) {
   return request({
-    url: "/model/zdbcbz/",
+    url: "/sanya/zdbcbz/",
     method: "post",
     data: data,
   });
@@ -466,7 +462,7 @@ export function addZdBcbz(data) {
 // 更新 征地  补偿标准 update
 export function updateZdBcbz(data) {
   return request({
-    url: "/model/zdbcbz/",
+    url: "/sanya/zdbcbz/",
     method: "put",
     data: data,
   });
@@ -474,7 +470,7 @@ export function updateZdBcbz(data) {
 // 删除 征地  补偿标准 delbyid
 export function delZdBcbz(id) {
   return request({
-    url: "/model/zdbcbz/" + id,
+    url: "/sanya/zdbcbz/" + id,
     method: "delete",
   });
 }
@@ -482,7 +478,7 @@ export function delZdBcbz(id) {
 // 02 青苗 补偿标准列表 list
 export function getQmbcbzList(query) {
   return request({
-    url: "/model/qmbcbz/list",
+    url: "/sanya/qmbcbz/list",
     method: "get",
     params: query,
   });
@@ -490,14 +486,14 @@ export function getQmbcbzList(query) {
 // 青苗 补偿标准 getbyid
 export function getQmbcbzById(id) {
   return request({
-    url: "/model/qmbcbz/" + id,
+    url: "/sanya/qmbcbz/" + id,
     method: "get",
   });
 }
 //添加 青苗 补偿标准 add
 export function addQmbcbz(data) {
   return request({
-    url: "/model/qmbcbz",
+    url: "/sanya/qmbcbz",
     method: "post",
     data: data,
   });
@@ -505,7 +501,7 @@ export function addQmbcbz(data) {
 // 更新 青苗 补偿标准 update
 export function updateQmbcbz(data) {
   return request({
-    url: "/model/qmbcbz",
+    url: "/sanya/qmbcbz",
     method: "put",
     data: data,
   });
@@ -513,7 +509,7 @@ export function updateQmbcbz(data) {
 // 删除 青苗 补偿标准 delbyid
 export function delQmbcbz(id) {
   return request({
-    url: "/model/qmbcbz/" + id,
+    url: "/sanya/qmbcbz/" + id,
     method: "delete",
   });
 }
@@ -521,7 +517,7 @@ export function delQmbcbz(id) {
 // 03 拆迁 补偿标准列表 list
 export function getCqBcbzList(query) {
   return request({
-    url: "/model/cqbczd/list",
+    url: "/sanya/cqbczd/list",
     method: "get",
     params: query,
   });
@@ -529,14 +525,14 @@ export function getCqBcbzList(query) {
 // 拆迁 补偿标准 getbyid
 export function getCqBcbzById(id) {
   return request({
-    url: "/model/cqbcbz/" + id,
+    url: "/sanya/cqbczd/" + id,
     method: "get",
   });
 }
 //添加 拆迁 补偿标准 add
 export function addCqBcbz(data) {
   return request({
-    url: "/model/cqbcbz",
+    url: "/sanya/cqbczd",
     method: "post",
     data: data,
   });
@@ -544,22 +540,22 @@ export function addCqBcbz(data) {
 // 更新 拆迁 补偿标准 update
 export function updateCqBcbz(data) {
   return request({
-    url: "/model/cqbcbz",
-    method: "post",
+    url: "/sanya/cqbczd",
+    method: "put",
     data: data,
   });
 }
 // 删除 拆迁 补偿标准 delbyid
-export function delCqBcbz(id) {
+export function delCqBcbz(ids) {
   return request({
-    url: "/model/cqbcbz/" + id,
+    url: "/sanya/cqbczd/" + ids,
     method: "delete",
   });
 }
 // 03-1 拆迁 补偿标准项 list
 export function getCqBcbzItemList(query) {
   return request({
-    url: "/model/cqbcbzitem/list",
+    url: "/sanya/cqbcbzitem/list",
     method: "get",
     params: query,
   });
@@ -567,14 +563,14 @@ export function getCqBcbzItemList(query) {
 // 拆迁 补偿标准项 getbyid
 export function getCqBcbzItemById(id) {
   return request({
-    url: "/model/cqbcbzitem/" + id,
+    url: "/sanya/cqbcbzitem/" + id,
     method: "get",
   });
 }
 //添加 拆迁 补偿标准项 add
 export function addCqBcbzItem(data) {
   return request({
-    url: "/model/cqbcbzitem",
+    url: "/sanya/cqbcbzitem",
     method: "post",
     data: data,
   });
@@ -582,15 +578,15 @@ export function addCqBcbzItem(data) {
 // 更新 拆迁 补偿标准项 update
 export function updateCqBcbzItem(data) {
   return request({
-    url: "/model/cqbcbzitem",
+    url: "/sanya/cqbcbzitem",
     method: "put",
     data: data,
   });
 }
 // 删除 拆迁 补偿标准项 delbyid
-export function delCqBcbzItem(id) {
+export function delCqBcbzItem(ids) {
   return request({
-    url: "/model/cqbcbzitem/" + id,
+    url: "/sanya/cqbcbzitem/" + ids,
     method: "delete",
   });
 }
@@ -598,7 +594,7 @@ export function delCqBcbzItem(id) {
 // 04 拆迁 分析结果 列表 list
 export function getCqResultList(query) {
   return request({
-    url: "/model/cqresult/list",
+    url: "/sanya/cqresult/list",
     method: "get",
     params: query,
   });
@@ -606,14 +602,14 @@ export function getCqResultList(query) {
 // 拆迁 分析结果 getbyid
 export function getCqResultById(id) {
   return request({
-    url: "/model/cqresult/" + id,
+    url: "/sanya/cqresult/" + id,
     method: "get",
   });
 }
 //添加 拆迁 分析结果 add
 export function addCqResult(data) {
   return request({
-    url: "/model/cqresult",
+    url: "/sanya/cqresult",
     method: "post",
     data: data,
   });
@@ -621,7 +617,7 @@ export function addCqResult(data) {
 // 更新 拆迁 分析结果 update
 export function updateCqResult(data) {
   return request({
-    url: "/model/cqresult",
+    url: "/sanya/cqresult",
     method: "post",
     data: data,
   });
@@ -629,7 +625,7 @@ export function updateCqResult(data) {
 // 删除 拆迁 分析结果 delbyid
 export function delCqResult(id) {
   return request({
-    url: "/model/cqresult/" + id,
+    url: "/sanya/cqresult/" + id,
     method: "delete",
   });
 }
@@ -637,7 +633,7 @@ export function delCqResult(id) {
 // 05 征地 分析结果 列表 list
 export function getZdResultList(query) {
   return request({
-    url: "/model/zdresult/list",
+    url: "/sanya/zdresult/list",
     method: "get",
     params: query,
   });
@@ -645,14 +641,14 @@ export function getZdResultList(query) {
 // 征地 分析结果 getbyid
 export function getZdResultById(id) {
   return request({
-    url: "/model/zdresult/" + id,
+    url: "/sanya/zdresult/" + id,
     method: "get",
   });
 }
 //添加 征地 分析结果 add
 export function addZdResult(data) {
   return request({
-    url: "/model/zdresult",
+    url: "/sanya/zdresult",
     method: "post",
     data: data,
   });
@@ -660,7 +656,7 @@ export function addZdResult(data) {
 // 更新 征地 分析结果 update
 export function updateZdResult(data) {
   return request({
-    url: "/model/zdresult",
+    url: "/sanya/zdresult",
     method: "post",
     data: data,
   });
@@ -668,7 +664,7 @@ export function updateZdResult(data) {
 // 删除 征地 分析结果 delbyid
 export function delZdResult(id) {
   return request({
-    url: "/model/zdresult/" + id,
+    url: "/sanya/zdresult/" + id,
     method: "delete",
   });
 }
@@ -676,7 +672,7 @@ export function delZdResult(id) {
 // 06 青苗 分析结果 列表 list
 export function getQmResultList(query) {
   return request({
-    url: "/model/qmresult/list",
+    url: "/sanya/qmresult/list",
     method: "get",
     params: query,
   });
@@ -684,14 +680,14 @@ export function getQmResultList(query) {
 // 青苗 分析结果 getbyid
 export function getQmResultById(id) {
   return request({
-    url: "/model/qmresult/" + id,
+    url: "/sanya/qmresult/" + id,
     method: "get",
   });
 }
 //添加 青苗 分析结果 add
 export function addQmResult(data) {
   return request({
-    url: "/model/qmresult",
+    url: "/sanya/qmresult",
     method: "post",
     data: data,
   });
@@ -699,7 +695,7 @@ export function addQmResult(data) {
 // 更新 青苗 分析结果 update
 export function updateQmResult(data) {
   return request({
-    url: "/model/qmresult",
+    url: "/sanya/qmresult",
     method: "post",
     data: data,
   });
@@ -707,14 +703,14 @@ export function updateQmResult(data) {
 // 删除 青苗 分析结果 delbyid
 export function delQmResult(id) {
   return request({
-    url: "/model/qmresult/" + id,
+    url: "/sanya/qmresult/" + id,
     method: "delete",
   });
 }
 // 07 征收补偿项目  列表 list
 export function getZdProjectList(query) {
   return request({
-    url: "/model/zdproject/list",
+    url: "/sanya/zdproject/list",
     method: "get",
     params: query,
   });
@@ -722,14 +718,14 @@ export function getZdProjectList(query) {
 // 征收补偿项目  getbyid
 export function getZdProjectById(id) {
   return request({
-    url: "/model/zdproject/" + id,
+    url: "/sanya/zdproject/" + id,
     method: "get",
   });
 }
 //添加 征收补偿项目  add
 export function addZdProject(data) {
   return request({
-    url: "/model/zdproject",
+    url: "/sanya/zdproject",
     method: "post",
     data: data,
   });
@@ -737,7 +733,7 @@ export function addZdProject(data) {
 // 更新 征收补偿项目 update
 export function updateZdProject(data) {
   return request({
-    url: "/model/zdproject",
+    url: "/sanya/zdproject",
     method: "post",
     data: data,
   });
@@ -745,13 +741,13 @@ export function updateZdProject(data) {
 // 删除 征收补偿项目 delbyid
 export function delZdProject(id) {
   return request({
-    url: "/model/zdproject/" + id,
+    url: "/sanya/zdproject/" + id,
     method: "delete",
   });
 }
 export async function expotZDBCWord(data) {
   let response = await request({
-    url: "/model/zdproject/exportWord",
+    url: "/sanya/zdproject/exportWord",
     method: "post",
     responseType: "blob",
     data: data,
@@ -785,7 +781,7 @@ export async function expotZDBCWord(data) {
 // 08 权属 分析结果 列表 list
 export function getQsResultList(query) {
   return request({
-    url: "/model/qsresult/list",
+    url: "/sanya/qsresult/list",
     method: "get",
     params: query,
   });
@@ -793,14 +789,14 @@ export function getQsResultList(query) {
 // 权属 分析结果 getbyid
 export function getQsResultById(id) {
   return request({
-    url: "/model/qsresult/" + id,
+    url: "/sanya/qsresult/" + id,
     method: "get",
   });
 }
 //添加 权属 分析结果 add
 export function addQsResult(data) {
   return request({
-    url: "/model/qsresult",
+    url: "/sanya/qsresult",
     method: "post",
     data: data,
   });
@@ -808,7 +804,7 @@ export function addQsResult(data) {
 // 更新 权属 分析结果 update
 export function updateQsResult(data) {
   return request({
-    url: "/model/qsresult",
+    url: "/sanya/qsresult",
     method: "post",
     data: data,
   });
@@ -816,7 +812,7 @@ export function updateQsResult(data) {
 // 删除 权属 分析结果 delbyid
 export function delQsResult(id) {
   return request({
-    url: "/model/qsresult/" + id,
+    url: "/sanya/qsresult/" + id,
     method: "delete",
   });
 }
@@ -827,7 +823,7 @@ export function delQsResult(id) {
 // 查询夜景灯光列列表
 export function listZtLightList(query) {
   return request({
-    url: "/model/ZtLightList/list",
+    url: "/sanya/ZtLightList/list",
     method: "get",
     params: query,
   });
@@ -836,7 +832,7 @@ export function listZtLightList(query) {
 // 查询夜景灯光列详细
 export function getZtLightList(id) {
   return request({
-    url: "/model/ZtLightList/" + id,
+    url: "/sanya/ZtLightList/" + id,
     method: "get",
   });
 }
@@ -844,7 +840,7 @@ export function getZtLightList(id) {
 // 新增夜景灯光列
 export function addZtLightList(data) {
   return request({
-    url: "/model/ZtLightList",
+    url: "/sanya/ZtLightList",
     method: "post",
     data: data,
   });
@@ -853,7 +849,7 @@ export function addZtLightList(data) {
 // 修改夜景灯光列
 export function updateZtLightList(data) {
   return request({
-    url: "/model/ZtLightList",
+    url: "/sanya/ZtLightList",
     method: "put",
     data: data,
   });
@@ -862,7 +858,7 @@ export function updateZtLightList(data) {
 // 删除夜景灯光列
 export function delZtLightList(id) {
   return request({
-    url: "/model/ZtLightList/" + id,
+    url: "/sanya/ZtLightList/" + id,
     method: "delete",
   });
 }
@@ -873,7 +869,7 @@ export function delZtLightList(id) {
 // 查询广告项目信息列表
 export function listZtBillboardInfoList(query) {
   return request({
-    url: "/model/ZtBillboardInfoList/list",
+    url: "/sanya/ZtBillboardInfoList/list",
     method: "get",
     params: query,
   });
@@ -882,7 +878,7 @@ export function listZtBillboardInfoList(query) {
 // 查询广告项目信息详细
 export function getZtBillboardInfoList(id) {
   return request({
-    url: "/model/ZtBillboardInfoList/" + id,
+    url: "/sanya/ZtBillboardInfoList/" + id,
     method: "get",
   });
 }
@@ -890,7 +886,7 @@ export function getZtBillboardInfoList(id) {
 // 新增广告项目信息
 export function addZtBillboardInfoList(data) {
   return request({
-    url: "/model/ZtBillboardInfoList",
+    url: "/sanya/ZtBillboardInfoList",
     method: "post",
     data: data,
   });
@@ -899,7 +895,7 @@ export function addZtBillboardInfoList(data) {
 // 修改广告项目信息
 export function updateZtBillboardInfoList(data) {
   return request({
-    url: "/model/ZtBillboardInfoList",
+    url: "/sanya/ZtBillboardInfoList",
     method: "put",
     data: data,
   });
@@ -908,7 +904,7 @@ export function updateZtBillboardInfoList(data) {
 // 删除广告项目信息
 export function delZtBillboardInfoList(id) {
   return request({
-    url: "/model/ZtBillboardInfoList/" + id,
+    url: "/sanya/ZtBillboardInfoList/" + id,
     method: "delete",
   });
 }
@@ -916,7 +912,7 @@ export function delZtBillboardInfoList(id) {
 // 查询广告模型信息列表
 export function listBillboardModelList(query) {
   return request({
-    url: "/model/billboardModelList/list",
+    url: "/sanya/billboardModelList/list",
     method: "get",
     params: query,
   });
@@ -925,7 +921,7 @@ export function listBillboardModelList(query) {
 // 查询广告模型信息详细
 export function getBillboardModelList(id) {
   return request({
-    url: "/model/billboardModelList/" + id,
+    url: "/sanya/billboardModelList/" + id,
     method: "get",
   });
 }
@@ -933,7 +929,7 @@ export function getBillboardModelList(id) {
 // 新增广告模型信息
 export function addBillboardModelList(data) {
   return request({
-    url: "/model/billboardModelList",
+    url: "/sanya/billboardModelList",
     method: "post",
     data: data,
   });
@@ -942,7 +938,7 @@ export function addBillboardModelList(data) {
 // 批量新增广告模型信息
 export function addBillboardModelLists(data) {
   return request({
-    url: "/model/billboardModelList/adds",
+    url: "/sanya/billboardModelList/adds",
     method: "post",
     data: data,
   });
@@ -951,7 +947,7 @@ export function addBillboardModelLists(data) {
 // 修改广告模型信息
 export function updateBillboardModelList(data) {
   return request({
-    url: "/model/billboardModelList",
+    url: "/sanya/billboardModelList",
     method: "put",
     data: data,
   });
@@ -960,7 +956,7 @@ export function updateBillboardModelList(data) {
 // 删除广告模型信息
 export function delBillboardModelList(id) {
   return request({
-    url: "/model/billboardModelList/" + id,
+    url: "/sanya/billboardModelList/" + id,
     method: "delete",
   });
 }

src/views/ConstructionApplication3D/Demolition/CQSetInfo.vue

@@ -94,7 +94,7 @@
 </template>
 <script>
 import {
-  getCqBcbzList, getCqBcbzItemList,
+  getCqBcbzList, getCqBcbzItemList, getCqBcbzById,
   addCqBcbz, updateCqBcbz, updateCqBcbzItem, delCqBcbzItem
 } from "@/api/zt/ztApi.js";
 export default {
@@ -329,9 +329,40 @@ export default {
      * 选择标准下拉框
      */
     selectZDBZ() {
-      debugger;
-      if (this.bcbz && this.bcbz != "") {
-        this.curBCBZ = this.bcbzList.find((t) => t.value == this.bcbz);
+      var that = this;
+      if (that.bcbz && that.bcbz != "") {
+        if (window.isUseDB) {
+          that.curBCBZ = {
+            id: '',
+            name: '',
+            bcbz: []
+          }
+          var queryParams =
+          {
+            "bz": null,
+            "des": null,
+            "grade": null,
+            "id": null,
+            "jg": null,
+            "pid": that.bcbz
+          }
+          getCqBcbzItemList(queryParams).then((response) => {
+            if (response) {
+              that.curBCBZ.bcbz = response.rows;
+            }
+          }).catch((err) => {
+            console.log(err)
+          })
+        }
+        else {
+          this.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.CQBCList));
+          if (this.cqValue != undefined && this.cqValue != "") {
+            this.curBCBZ = this.bcbzList.find((t) => t.id == this.bcbz);
+          }
+        }
+      }
+      else {
+        that.$message.warning("请选择标准")
       }
     },
 
@@ -358,11 +389,13 @@ export default {
       if (window.isUseDB) {
         var item = {
           id: that.curBCBZ.id,
-          name: that.curBCBZ.name
+          name: that.curBCBZ.name,
+          bcbz: that.curBCBZ.bcbz
         }
         updateCqBcbz(item).then((res) => {
           if (res)
-            that.$layer.alert("保存完成");
+            that.getInitData();
+          that.$layer.alert("保存完成");
 
         }).catch((err) => {
           console.log(err)
@@ -404,7 +437,8 @@ export default {
      */
     saveData() {
       debugger;
-      var val = (window.ZSBC.CQBCList.length + 1).toString();
+      var date = new Date();
+      var val = date.getTime().toString();
       var that = this;
       var newBCBZ = {
         id: val,
@@ -414,7 +448,8 @@ export default {
       if (window.isUseDB) {
         addCqBcbz(newBCBZ).then((res) => {
           if (res)
-            that.$layer.alert("保存完成");
+            that.getInitData();
+          that.$layer.alert("保存完成");
         }).catch((err) => {
           console.log(err)
         })

src/views/ConstructionApplication3D/Demolition/CQShowInfo.vue

@@ -311,15 +311,32 @@ export default {
      */
     selectZDBZ() {
       debugger;
-      if (this.bcbz == undefined && this.bcbz == "") {
+      var that = this;
+      if (that.bcbz == undefined && that.bcbz == "") {
+        that.$message.warning("请选择标准")
         return;
       }
       if (window.isUseDB) {
-
-        var name
+        var queryParams =
+        {
+          "bz": null,
+          "des": null,
+          "grade": null,
+          "id": null,
+          "jg": null,
+          "pid": this.bcbz
+        }
+        getCqBcbzItemList(queryParams).then((response) => {
+          if (response) {
+            that.curBCBZ.bcbz = response.rows;
+          }
+        }).catch((err) => {
+          console.log(err)
+        })
       }
       else {
-        this.curBCBZ = this.bcbzList.find((t) => t.value == this.bcbz);
+        that.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.CQBCList));
+        that.curBCBZ = that.bcbzList.find(t => t.id == this.bcbz)
       }
 
     },

src/views/ConstructionApplication3D/Demolition/DemolitionList.vue

@@ -112,8 +112,8 @@
               </el-col>
             </el-row>
           </el-card>
-          <el-pagination background layout="prev, pager, next" :page-size="pageSize" :current-page="currentPage"
-            :total="rowsCount" @current-change="onCurrentChange">
+          <el-pagination background layout="prev, pager, next" :page-size="pageSize"   :total="rowsCount" :current-page="currentPage"
+           @current-change="onCurrentChange">
           </el-pagination>
         </div>
       </el-tab-pane>
@@ -488,8 +488,6 @@
                   </li>
                 </ul>
               </el-tab-pane>
-
-
             </el-tabs>
           </el-tab-pane>
         </el-tabs>
@@ -1200,7 +1198,7 @@ export default {
         debugger
         getZdProjectList(queryParams).then((res) => {
           that.projectList = res.rows;
-          that.rowsCount = res.toatl;
+          that.rowsCount = res.total;
         }).catch((err) => {
           console.log(err)
         })

src/views/ConstructionApplication3D/Demolition/QMSetInfo.vue

@@ -4,7 +4,7 @@
     <el-row :gutter="10">
       <el-col :span="6">青苗补偿标准：</el-col>
       <el-col :span="18">
-        <el-select v-model="bcbz" style="width: 90%" @change="selectZDBZ()">
+        <el-select v-model="bcbz" style="width: 90%" @change="selectZDBZ">
           <el-option v-for="item in bcbzList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-col>
@@ -20,15 +20,15 @@
     <el-row>
       <el-col :span="6">经济作物：</el-col>
       <el-col :span="16">
-        <el-input style="width: 100%" placeholder="请输入" type="number" min="0" v-model="curBCBZ.jjzw"
-          @change="changeBCBZ" @input="inputChange"></el-input></el-col>
+        <el-input style="width: 100%" placeholder="请输入" type="number" min="0" v-model="curBCBZ.jjzw" @change="changeBCBZ"
+          @input="inputChange"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row>
       <el-col :span="6">树木补偿：</el-col>
       <el-col :span="16">
-        <el-input style="width: 100%" placeholder="请输入" type="number" min="0" v-model="curBCBZ.sm"
-          @change="changeBCBZ" @input="inputChange"></el-input></el-col>
+        <el-input style="width: 100%" placeholder="请输入" type="number" min="0" v-model="curBCBZ.sm" @change="changeBCBZ"
+          @input="inputChange"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row justify="center" type="flex">
@@ -49,7 +49,7 @@
 </template>
 <script>
 import {
-  getQmbcbzList, updateQmbcbz, addQmbcbz
+  getQmbcbzList, updateQmbcbz, addQmbcbz, getQmbcbzById
 } from "@/api/zt/ztApi.js";
 export default {
   props: ["qmValue"],
@@ -93,7 +93,7 @@ export default {
   methods: {
     initForm() {
       debugger;
-      this.getInitData()
+      this.getInitData();
     },
     getInitData() {
       var that = this;
@@ -102,7 +102,7 @@ export default {
         getQmbcbzList().then((response) => {
           if (response) {
             that.bcbzList = response.rows
-            if (that.qmValue != undefined || that.qmValue != "") {
+            if (that.bcbz != undefined || that.bcbz != "") {
               that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
             }
           }
@@ -112,17 +112,31 @@ export default {
       }
       else {
         that.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.QMBCList));
-        if (that.qmValue != undefined || this.qmValue != "") {
-          that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
-        }
+        that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
       }
     },
     selectZDBZ() {
-      debugger;
-      if (this.bcbz && this.bcbz != "") {
-        this.curBCBZ = this.bcbzList.find((t) => t.id == this.bcbz);
+      var that = this;
+      if (that.bcbz == null && that.bcbz == "") {
+        that.$message.warning("请选择标准")
+        return;
+      }
+      if (window.isUseDB) {
+        getQmbcbzById(that.bcbz).then((response) => {
+          if (response) {
+            that.curBCBZ = response.data
+          }
+        }).catch((err) => {
+          console.log(err)
+        })
       }
-      // this.changeZDBZ();
+      else {
+        that.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.QMBCList));
+        that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
+      }
+
+
+
     },
     /**
      * 选择标准改变
@@ -145,36 +159,36 @@ export default {
      * 保存修改
      */
     save() {
-
-      if (this.bcbz == "") {
-        this.$layer.alert("请选择补偿标准");
+      var that = this;
+      if (that.bcbz == "") {
+        that.$layer.alert("请选择补偿标准");
         return;
       }
-      if (!this.changeBCBZ())
+      if (!that.changeBCBZ())
         return;
       debugger;
       var model = {
-        "id": this.curBCBZ.id,
-        "jjzw": this.curBCBZ.jjzw,
-        "name": this.curBCBZ.name,
-        "nzw": this.curBCBZ.nzw,
-        "sm": this.curBCBZ.sm,
+        "id": that.curBCBZ.id,
+        "name": that.curBCBZ.name,
+        "jjzw": that.curBCBZ.jjzw,
+        "nzw": that.curBCBZ.nzw,
+        "sm": that.curBCBZ.sm,
       }
       if (window.isUseDB) {//数据库
         updateQmbcbz(model).then((response) => {
           if (response.code == 200) {
-            this.$layer.alert("保存完成");
+            that.getInitData()
+            that.$layer.alert("保存完成");
           }
         }).catch((err) => {
           console.log(err.console)
         })
       }
       else {
-
         var index = window.ZSBC.QMBCList.findIndex((t) => t.value == this.bcbz);
         if (index > -1) {
-          window.ZSBC.QMBCList[index] = this.curBCBZ;
-          this.$layer.alert("保存完成");
+          window.ZSBC.QMBCList[index] = that.curBCBZ;
+          that.$layer.alert("保存完成");
         }
       }
     },
@@ -183,16 +197,17 @@ export default {
      */
     saveAs() {
       if (!this.changeBCBZ())
-        return ;
+        return;
       this.dialogFormVisible = true;
     },
     submitForm(formName) {
-
-      this.$refs[formName].validate((valid) => {
+      var that = this;
+      that.$refs[formName].validate((valid) => {
         if (valid) {
           // alert('submit!');
-          this.dialogFormVisible = false;
-          this.saveData();
+          that.dialogFormVisible = false;
+          that.saveData();
+         
           // this.$layer.alert("保存完成");
         } else {
           console.log("error submit!!");
@@ -206,30 +221,32 @@ export default {
      */
     saveData() {
       debugger;
-      var val = (window.ZSBC.QMBCList.length + 1).toString();
+      var  that=this;
+      var date=new Date();
+      var val = date.getTime().toString();
       var newBCBZ = {
         "id": val,
-        "jjzw": this.curBCBZ.jjzw,
-        "name": this.ruleForm.name,
-        "nzw": this.curBCBZ.nzw,
-        "sm": this.curBCBZ.sm,
+        "jjzw": that.curBCBZ.jjzw,
+        "name": that.ruleForm.name,
+        "nzw": that.curBCBZ.nzw,
+        "sm": that.curBCBZ.sm,
       };
       if (window.isUseDB) {
         newBCBZ.id = null
         addQmbcbz(newBCBZ).then((response) => {
           if (response && response.code == 200) {
-            this.$layer.alert("保存完成");
+            that.getInitData();
+            that.$layer.alert("保存完成");
           }
         }).catch((err) => {
-
           console.log(err)
         })
       }
       else {
         window.ZSBC.QMBCList.push(newBCBZ);
-        this.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.QMBCList))
-        this.bcbz = val;
-        this.curBCBZ = this.bcbzList.find(t => t.id == this.bcbz);
+        that.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.QMBCList))
+        that.bcbz = val;
+        that.curBCBZ = that.bcbzList.find(t => t.id == that.bcbz);
       }
     },
     changeBCBZ() {
@@ -247,10 +264,10 @@ export default {
       }
       return true;
     },
-    inputChange(){
+    inputChange() {
       this.changeBCBZ()
     }
-    
+
   }
 };
 </script>

src/views/ConstructionApplication3D/Demolition/QMShowInfo.vue

@@ -4,7 +4,7 @@
     <el-row :gutter="10">
       <el-col :span="6">青苗补偿标准：</el-col>
       <el-col :span="18">
-        <el-select v-model="bcbz" style="width: 90%" @change="selectZDBZ()">
+        <el-select v-model="bcbz" style="width: 90%" @change="selectZDBZ">
           <el-option v-for="item in bcbzList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-col>
@@ -19,13 +19,14 @@
     <el-row>
       <el-col :span="6">经济作物：</el-col>
       <el-col :span="16">
-        <el-input style="width: 100%" placeholder="请输入" v-model="curBCBZ.jjzw"></el-input></el-col>
+        <el-input style="width: 100%" placeholder="请输入" v-model="curBCBZ.jjzw" readonly></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row>
       <el-col :span="6">树木补偿：</el-col>
       <el-col :span="16">
-        <el-input style="width: 100%; text-align: right" placeholder="请输入" v-model="curBCBZ.sm"></el-input></el-col>
+        <el-input style="width: 100%; text-align: right" placeholder="请输入" v-model="curBCBZ.sm"
+          readonly></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <!-- <el-row justify="center" type="flex">
@@ -48,9 +49,8 @@
 </template>
 <script>
 import {
-  getQmbcbzList
+  getQmbcbzList, getQmbcbzById
 } from "@/api/zt/ztApi.js";
-import { triangleGrid } from "@turf/turf";
 export default {
   props: ["qmValue"],
   name: "QMSetInfo",
@@ -104,11 +104,9 @@ export default {
         getQmbcbzList().then((response) => {
           if (response) {
             that.bcbzList = response.rows
-            if (that.qmValue != undefined || that.qmValue != "") {
               that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
-            }
           }
-        }).catch((err)=>{
+        }).catch((err) => {
           console.log(err)
         })
       }
@@ -121,9 +119,22 @@ export default {
 
     },
     selectZDBZ() {
-      debugger;
       var that = this;
-      if (that.bcbz && that.bcbz != "") {
+      if (that.bcbz==null && that.bcbz == "")  {
+        that.$message.warning("请选择标准")
+        return;
+      }
+      if (window.isUseDB) {
+        getQmbcbzById(that.bcbz).then((response) => {
+          if (response) {
+            that.curBCBZ = response.data
+          }
+        }).catch((err) => {
+          console.log(err)
+        })
+      }
+      else {
+        that.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.QMBCList));
         that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
       }
     },

src/views/ConstructionApplication3D/Demolition/ZDSetInfo.vue

@@ -15,7 +15,7 @@
     <el-row>
       <el-col :span="6">土地年产值：</el-col>
       <el-col :span="16"><el-input style="width: 100%" type="number" min="0" placeholder="请输入"
-          v-model.number="curBCBZ.tdcz" @change="changeZDBZ"  @input="inputChange"></el-input>
+          v-model.number="curBCBZ.tdcz" @change="changeZDBZ" @input="inputChange"></el-input>
       </el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
@@ -41,7 +41,7 @@
     <el-row>
       <el-col :span="6">综合补偿倍数</el-col>
       <el-col :span="16"><el-input type="number" min="0" style="width: 100%" placeholder="请输入" v-model="curBCBZ.azbcbs"
-          @change="changeZDBZ"  @input="inputChange"></el-input></el-col>
+          @change="changeZDBZ" @input="inputChange"></el-input></el-col>
     </el-row>
     <el-row>
       <el-col :span="6">安置补偿费：</el-col>
@@ -80,7 +80,7 @@
 </template>
 <script>
 import {
-  getZdBcbzList, updateZdBcbz, addZdBcbz
+  getZdBcbzList, updateZdBcbz, addZdBcbz, getZdBcbzById
 } from "@/api/zt/ztApi.js";
 export default {
   props: ["zdValue"],
@@ -151,14 +151,25 @@ export default {
     initForm() {
       debugger;
       this.getInitData();
-
     },
     selectZDBZ() {
-      debugger;
-      if (this.bcbz && this.bcbz != "") {
-        this.curBCBZ = this.bcbzList.find((t) => t.id == this.bcbz);
+      var that = this;
+      if (that.bcbz == null && that.bcbz == "") {
+        that.$message.warning("请选择标准");
+        return;
       }
-      this.changeZDBZ();
+      if (window.isUseDB) {//数据库
+        getZdBcbzById(that.bcbz).then((response) => {
+          that.curBCBZ = response.data;
+        }).catch((err) => {
+          console.log(err)
+        })
+      }
+      else {
+        that.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.ZDBCList));
+        that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
+      }
+
     },
     getInitData() {
       var that = this;
@@ -198,11 +209,11 @@ export default {
         return false;
       }
       this.curBCBZ.tdbcf =
-        parseFloat( this.curBCBZ.tdcz) *  parseFloat(this.curBCBZ.tdbcbs);
+        parseFloat(this.curBCBZ.tdcz) * parseFloat(this.curBCBZ.tdbcbs);
       this.curBCBZ.azbcf =
-      parseFloat(this.curBCBZ.tdcz) * parseFloat( this.curBCBZ.azbcbs);
+        parseFloat(this.curBCBZ.tdcz) * parseFloat(this.curBCBZ.azbcbs);
       this.curBCBZ.bchj =
-      parseFloat(this.curBCBZ.tdbcf) +  parseFloat(this.curBCBZ.azbcf);
+        parseFloat(this.curBCBZ.tdbcf) + parseFloat(this.curBCBZ.azbcf);
       return true;
     },
     /**
@@ -226,14 +237,14 @@ export default {
       if (window.isUseDB) {
         var Model =
         {
-          "azbcbs": that.curBCBZ.azbcbs,
-          "azbcf": that.curBCBZ.azbcf,
-          "bchj": that.curBCBZ.bchj,
           "id": that.curBCBZ.id,
           "name": that.curBCBZ.name,
-          "tbcz": that.curBCBZ.tbcz,
+          "tdcz": that.curBCBZ.tdcz,
           "tdbcbs": that.curBCBZ.tdbcbs,
           "tdbcf": that.curBCBZ.tdbcf,
+          "azbcbs": that.curBCBZ.azbcbs,
+          "azbcf": that.curBCBZ.azbcf,
+          "bchj": that.curBCBZ.bchj
         };
         updateZdBcbz(Model).then((response) => {
           if (response && response.code == 200) {
@@ -285,7 +296,8 @@ export default {
      */
     saveData() {
       debugger;
-      var val = (window.ZSBC.ZDBCList.length + 1)
+      var date = new Date();
+      var val = date.getTime().toString();
       var that = this
       var newBCBZ =
       {
@@ -317,8 +329,7 @@ export default {
       }
 
     },
-    inputChange()
-    {
+    inputChange() {
       this.changeZDBZ();
     }
   },

src/views/ConstructionApplication3D/Demolition/ZDShowInfo.vue

@@ -4,8 +4,9 @@
       <el-col :span="6">征地补偿标准：</el-col>
       <el-col :span="18">
         <el-select size="mini" v-model="bcbz" style="width: 90%" @change="selectZDBZ" placeholder="请选择">
-          <el-option v-for="item in bcbzList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          <el-option v-for="item in bcbzList" :key="item.id" :label="item.name" readonly :value="item.id"></el-option>
         </el-select>
+
       </el-col>
     </el-row>
     <el-row class="subtitle">
@@ -13,8 +14,8 @@
     </el-row>
     <el-row style="display: flex; align-items: center">
       <el-col :span="6">土地年产值：</el-col>
-      <el-col :span="16"><el-input controls-position="right" size="mini" style="width: 100%" 
-          placeholder="请输入" v-model="curBCBZ.tdcz" @change="changeZDBZ"></el-input>
+      <el-col :span="16"><el-input controls-position="right" size="mini" style="width: 100%" placeholder="请输入"
+          v-model="curBCBZ.tdcz" readonly @change="changeZDBZ"></el-input>
       </el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
@@ -24,13 +25,13 @@
     </el-row>
     <el-row>
       <el-col :span="6">综合补偿倍数：</el-col>
-      <el-col :span="16"><el-input size="mini" style="width: 100%"  placeholder="请输入"
-          v-model="curBCBZ.tdbcbs" @change="changeZDBZ"></el-input></el-col>
+      <el-col :span="16"><el-input size="mini" style="width: 100%" placeholder="请输入" v-model="curBCBZ.tdbcbs"
+          @change="changeZDBZ" readonly></el-input></el-col>
     </el-row>
     <el-row>
       <el-col :span="6">土地补偿费：</el-col>
       <el-col :span="16">
-        <el-input size="mini" placeholder="自动计算" readonly  v-model="curBCBZ.tdbcf"></el-input></el-col>
+        <el-input size="mini" placeholder="自动计算" readonly v-model="curBCBZ.tdbcf"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row class="subtitle">
@@ -39,13 +40,12 @@
     </el-row>
     <el-row>
       <el-col :span="6">综合补偿倍数</el-col>
-      <el-col :span="16"><el-input size="mini"  style="width: 100%" placeholder="请输入"
-          v-model="curBCBZ.azbcbs" @change="changeZDBZ"></el-input></el-col>
+      <el-col :span="16"><el-input size="mini" style="width: 100%" placeholder="请输入" v-model="curBCBZ.azbcbs"
+          @change="changeZDBZ" readonly></el-input></el-col>
     </el-row>
     <el-row>
       <el-col :span="6">安置补偿费：</el-col>
-      <el-col :span="16"><el-input size="mini" v-model="curBCBZ.azbcf" readonly 
-          placeholder="自动计算"></el-input></el-col>
+      <el-col :span="16"><el-input size="mini" v-model="curBCBZ.azbcf" readonly placeholder="自动计算"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row class="subtitle">
@@ -62,7 +62,7 @@
 </template>
 <script>
 import {
-  getZdBcbzList
+  getZdBcbzList, getZdBcbzById
 } from "@/api/zt/ztApi.js";
 export default {
   props: ["zdValue"],
@@ -81,35 +81,35 @@ export default {
        * 当前标准
        */
       curBCBZ: {
-        name: "征地标准01",
-        id: "1",
+        name: "",
+        id: "",
 
         /**
          * 土地统一年产值
          */
-        tdcz: 1000,
+        tdcz: 0,
         /**
          * 土地补偿倍数
          */
 
-        tdbcbs: 10,
+        tdbcbs: 0,
         /**
          * 土地补偿费
          */
-        tdbcf: 10000,
+        tdbcf: 0,
         /**
          * 安置补偿倍数
          */
 
-        azbcbs: 10,
+        azbcbs: 0,
         /**
          * 安置补偿费
          */
-        azbcf: 10000,
+        azbcf: 0,
         /**
          * 补偿合计
          */
-        bchj: 20000,
+        bchj: 0,
       },
     };
   },
@@ -122,22 +122,41 @@ export default {
       debugger
       var that = this
       that.bcbz = that.zdValue;
+      if (that.bcbz==null && that.bcbz == "")  {
+        console.log("未选择标准")
+        return;
+      }
       if (window.isUseDB) {//数据库
         getZdBcbzList().then((response) => {
           that.bcbzList = response.rows;
-          if (that.bcbz != undefined && that.bcbz != "") {
-            that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
-          }
+          that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
         }).catch((err) => {
           console.log(err)
         })
       }
       else {
-        this.bcbzList = window.ZSBC.ZDBCList;
-        if (that.bcbz != undefined && this.bcbz != "") {
-          that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
-        }
+        that.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.ZDBCList));
+        that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
+      }
+    },
+    selectZDBZ() {
+      var that = this;
+      if (that.bcbz==null && that.bcbz == "") {
+        that.$message.warning("请选择标准");
+        return;
+      }
+      if (window.isUseDB) {//数据库
+        getZdBcbzById(that.bcbz).then((response) => {
+          that.curBCBZ = response.data;
+        }).catch((err) => {
+          console.log(err)
+        })
       }
+      else {
+        that.bcbzList = JSON.parse(JSON.stringify(window.ZSBC.ZDBCList));
+        that.curBCBZ = that.bcbzList.find((t) => t.id == that.bcbz);
+      }
+
     }
   },
 };

src/views/ConstructionApplication3D/billboard/addBiillboardModel.vue

@@ -1524,6 +1524,17 @@ export default {
       data.templateBottom = JSON.stringify(data.templateBottom);
       data.templateCentre = JSON.stringify(data.templateCentre);
       data.templateTop = JSON.stringify(data.templateTop);
+      data.viewing_angle = JSON.stringify({
+        destination: viewer.camera.position,
+        orientation: {
+          // 方向
+          heading: viewer.camera.heading,
+          // 视角
+          pitch: viewer.camera.pitch,
+          // 倾斜角度
+          roll: viewer.camera.roll,
+        },
+      });
       debugger;
       let result = await addBillboardModelList(data);
       debugger;

src/views/ConstructionApplication3D/billboard/billboardCheckList.vue

@@ -77,6 +77,18 @@
             style="color: aqua"
             >审查</el-button
           >
+          <el-button
+            v-if="
+              (scope.row.ReviewStatus != undefined) &
+              (scope.row.ReviewStatus != '') &
+              (scope.row.ReviewStatus != null)
+            "
+            @click="checkResult(scope.row)"
+            type="text"
+            size="small"
+            style="color: aqua"
+            >详情</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -84,6 +96,7 @@
 </template>
 <script>
 import billboardChekInfo from "@/views/ConstructionApplication3D/billboard/billboardChekInfo.vue";
+import billboardChekResults from "@/views/ConstructionApplication3D/billboard/billboardChekResults.vue";
 import { listBillboardModelList } from "@/api/zt/ztApi.js";
 export default {
   data() {
@@ -196,6 +209,37 @@ export default {
         },
       });
     },
+
+    /**
+     * 弹窗审查结果
+     * @param {*} row
+     */
+    checkResult(row) {
+      if (this.deltailLayerId != null) this.$layer.close(this.deltailLayerId);
+      var width = 400;
+
+      var top = 500;
+      var left = Math.floor(document.body.clientWidth - width / 2);
+      var height = 500;
+
+      this.deltailLayerId = this.$layer.iframe({
+        content: {
+          content: billboardChekResults, //传递的组件对象
+          parent: this, //当前的vue对象
+          data: { info: JSON.parse(JSON.stringify(row)), pinfo: this.info }, //props
+        },
+        offset: [left.toString(), top.toString()], //left top  左上角(left=430px/2;top=（800px+header高）/2)
+        area: [width.toString() + "px", height.toString() + "px"],
+        title: "广告牌审查结果",
+        maxmin: false,
+        shade: false, //是否显示遮罩
+        shadeClose: false, //点击遮罩是否关闭
+        cancel: () => {
+          //关闭事件
+          this.init();
+        },
+      });
+    },
   },
 };
 </script>

src/views/ConstructionApplication3D/billboard/billboardChekInfo.vue

@@ -722,6 +722,7 @@ export default {
         id: item.id,
         ReviewComments: item.ReviewComments,
         ReviewStatus: item.ReviewStatus,
+        results: JSON.stringify(that.tableData),
       });
       debugger;
       if (result.code == 200) {

src/views/ConstructionApplication3D/billboard/billboardChekResults.vue

@@ -0,0 +1,156 @@
+<template>
+  <div class="ZTGlobal" style="width: 400px; padding: 5px; height: 100%">
+    <el-row>
+      <span style="color: white">{{ info.billboardType }}</span>
+    </el-row>
+    <el-row
+      ><span style="color: aqua">{{ info.billboardName }}</span></el-row
+    >
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column type="index"> </el-table-column>
+      <el-table-column prop="ReviewContent" label="审查项"> </el-table-column>
+      <el-table-column prop="ReviewMethod" label="审查方式"> </el-table-column>
+
+      <el-table-column fixed="right" label="结果" width="100">
+        <template slot-scope="scope">
+          {{ scope.row.ruleResult == "true" ? "符合" : "不符合" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-row>
+      <el-input
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4 }"
+        placeholder="请输入审查意见"
+        v-model="info.ReviewComments"
+      >
+      </el-input>
+    </el-row>
+  </div>
+</template>
+<script>
+import {
+  cartesian3ToWGS84,
+  mapQuery,
+  flatten,
+  mercator2lonLat,
+  undergroundMode,
+  getGroundPoint,
+} from "@/utils/MapHelper/MapHelper.js";
+import {
+  pointToLineDistance,
+  point,
+  lineString,
+  difference,
+  buffer,
+  lineToPolygon,
+} from "@turf/turf";
+import { v4 as uuidv4 } from "uuid";
+import { updateBillboardModelList } from "@/api/zt/ztApi.js";
+export default {
+  data() {
+    return {
+      layerDatas: [],
+      tableData: [],
+      messageNum: 0,
+      layerDataList: [],
+    };
+  },
+  props: {
+    info: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    pinfo: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    layerid: {
+      type: String,
+      default: "",
+    },
+    lydata: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    lyoption: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  created() {
+    let that = this;
+    if (that.info.template) {
+      if (typeof that.info.template === "string") {
+        that.info.template = JSON.parse(that.info.template);
+      }
+    } else {
+      that.info.template = {};
+    }
+
+    if (that.info.templateBottom) {
+      if (typeof that.info.templateBottom === "string") {
+        that.info.templateBottom = JSON.parse(that.info.templateBottom);
+      }
+    } else {
+      that.info.templateBottom = {};
+    }
+    if (that.info.templateCentre) {
+      if (typeof that.info.templateCentre === "string") {
+        that.info.templateCentre = JSON.parse(that.info.templateCentre);
+      }
+    } else {
+      that.info.templateCentre = {};
+    }
+    if (that.info.templateTop) {
+      if (typeof that.info.templateTop === "string") {
+        that.info.templateTop = JSON.parse(that.info.templateTop);
+      }
+    } else {
+      that.info.templateTop = {};
+    }
+    if (that.info.results) {
+      if (typeof that.info.results === "string") {
+        that.info.results = JSON.parse(that.info.results);
+      }
+    } else {
+      that.info.results = [];
+    }
+    this.init();
+  },
+  mounted() {},
+  methods: {
+    async init() {
+      debugger;
+      let that = this;
+      that.tableData = that.info.results;
+    },
+  },
+  beforeDestroy() {
+    viewer.entities.removeAll();
+  },
+};
+</script>
+<style lang="scss">
+@import "@/../../zt.scss";
+</style>
+<style scoped>
+div
+  .el-row
+  .el-table
+  .el-row
+  .el-table-column
+  .el-radio__label
+  .el-table-column {
+  font-size: 10px;
+}
+</style>

src/views/ConstructionApplication3D/billboard/billboardDesign.vue

@@ -230,17 +230,16 @@ export default {
      */
     locationSingleModel(Mitem) {
       if (Mitem.isAddModel) {
-        let entitie = viewer.entities.getById("pointBillboard_" + Mitem.id);
-        if (entitie) {
-          viewer.flyTo(entitie);
-        } else {
+        let entitie = viewer.entities.getById("point_Billboard_" + Mitem.id);
+        if (!entitie) {
           //渲染单个广告牌
           // if (billboardModel.id == Mitem.id) {
           this.DrawBillboard(Mitem);
-          let entitie = viewer.entities.getById("pointBillboard_" + Mitem.id);
-          viewer.flyTo(entitie);
+          // viewer.flyTo(entitie);
           // }
         }
+
+        viewer.camera.setView(JSON.parse(Mitem.viewing_angle));
       }
     },
     /**
@@ -737,13 +736,13 @@ export default {
           if (billboardModel.templateTop.yL) {
             h = Number(billboardModel.templateTop.yL) / 2;
           }
-          viewer.entities.removeById("pointBillboard_" + billboardModel.id);
+          viewer.entities.removeById("point_Billboard_" + billboardModel.id);
           lodash.remove(
             entityList,
-            (entity) => entity.id === "pointBillboard_" + billboardModel.id
+            (entity) => entity.id === "point_Billboard_" + billboardModel.id
           );
           const point = viewer.entities.add({
-            id: "pointBillboard_" + billboardModel.id,
+            id: "point_Billboard_" + billboardModel.id,
             //点
             position: Cesium.Cartesian3.fromDegrees(
               Number(billboardModel.templateTop.x),
@@ -833,7 +832,7 @@ export default {
       //   });
       //   entityList.push(entity);
       //   const point = viewer.entities.add({
-      //     id: "pointBillboard_" + billboardModel.id,
+      //     id: "point_Billboard_" + billboardModel.id,
       //     //点
       //     position: Cesium.Cartesian3.fromDegrees(
       //       billboardModel.x,
@@ -927,10 +926,10 @@ export default {
           entityList,
           (entity) => entity.id === "billboard_" + item.id
         );
-        viewer.entities.removeById("pointBillboard_" + item.id);
+        viewer.entities.removeById("point_Billboard_" + item.id);
         lodash.remove(
           entityList,
-          (entity) => entity.id === "pointBillboard_" + item.id
+          (entity) => entity.id === "point_Billboard_" + item.id
         );
       }
     },
@@ -955,8 +954,10 @@ export default {
           try {
             var promisse11w = scene.open(info.url);
             Cesium.when(promisse11w, function (layers) {
+              debugger;
               layers.forEach((element) => {
                 that.thislayers.push(element.name);
+                window.viewer.flyTo(element);
               });
             });
             that.yp(info);

src/views/ConstructionApplication3D/projectInfo/addProjectInfo.vue

@@ -147,10 +147,12 @@ export default {
         landarea: [
           { required: true, message: "不能为空", trigger: "blur" },
           { type: "number", message: "必须为数字值", trigger: "blur" },
+          { validator: this.validateNumber, trigger: "blur" },
         ],
         totalprojectinvestment: [
           { required: true, message: "不能为空", trigger: "blur" },
           { type: "number", message: "必须为数字值", trigger: "blur" },
+          { validator: this.validateNumber, trigger: "blur" },
         ],
       },
     };
@@ -196,6 +198,13 @@ export default {
     }
   },
   methods: {
+    validateNumber(rule, value, callback) {
+      if (value < 0) {
+        return callback(new Error("数字需大于等于0"));
+      } else {
+        callback();
+      }
+    },
     submitForm(formName) {
       let that = this;
       this.$refs[formName].validate(async (valid) => {

src/views/ConstructionApplication3D/projectManagement/projectManagement.vue

@@ -217,9 +217,9 @@
                               <el-button
                                 type="primary"
                                 size="mini"
-                                @click.stop="openNightscapeAnalysis(itemModel)"
-                                >夜景分析</el-button
-                              >
+                                @click.stop="normAnalysis(item, itemModel)"
+                                >指标分析
+                              </el-button>
                             </el-col>
                             <el-col :span="8">
                               <el-button
@@ -247,20 +247,21 @@
                                 >控规分析
                               </el-button>
                             </el-col>
+
                             <el-col :span="8">
                               <el-button
                                 type="primary"
                                 size="mini"
-                                @click.stop="normAnalysis(item, itemModel)"
-                                >指标分析
+                                @click.stop="CheckPark(itemModel, true)"
+                                >车位审核
                               </el-button>
                             </el-col>
                             <el-col :span="8">
                               <el-button
                                 type="primary"
                                 size="mini"
-                                @click.stop="CheckPark(itemModel, true)"
-                                >车位审核
+                                @click.stop="RSAnalysis(itemModel)"
+                                >人视分析
                               </el-button>
                             </el-col>
                             <!-- <el-col :span="8">
@@ -327,19 +328,19 @@
                               <el-button
                                 type="primary"
                                 size="mini"
-                                @click.stop="RSAnalysis(itemModel)"
-                                >人视分析
+                                @click.stop="
+                                  BuildingStretchingAnalysis(itemModel)
+                                "
+                                >楼体拉伸
                               </el-button>
                             </el-col>
                             <el-col :span="8">
                               <el-button
                                 type="primary"
                                 size="mini"
-                                @click.stop="
-                                  BuildingStretchingAnalysis(itemModel)
-                                "
-                                >楼体拉伸
-                              </el-button>
+                                @click.stop="openNightscapeAnalysis(itemModel)"
+                                >夜景分析</el-button
+                              >
                             </el-col>
                           </el-row>
                           <el-row :gutter="24">
@@ -516,11 +517,9 @@
                                 <el-button
                                   type="primary"
                                   size="mini"
-                                  @click.stop="
-                                    openNightscapeAnalysis(itemModel)
-                                  "
-                                  >夜景分析</el-button
-                                >
+                                  @click.stop="normAnalysis(itemModel)"
+                                  >指标分析
+                                </el-button>
                               </el-col>
                               <el-col :span="8">
                                 <el-button
@@ -548,20 +547,21 @@
                                   >控规分析
                                 </el-button>
                               </el-col>
+
                               <el-col :span="8">
                                 <el-button
                                   type="primary"
                                   size="mini"
-                                  @click.stop="normAnalysis(itemModel)"
-                                  >指标分析
+                                  @click.stop="CheckPark(itemModel, true)"
+                                  >车位审核
                                 </el-button>
                               </el-col>
                               <el-col :span="8">
                                 <el-button
                                   type="primary"
                                   size="mini"
-                                  @click.stop="CheckPark(itemModel, true)"
-                                  >车位审核
+                                  @click.stop="RSAnalysis(itemModel)"
+                                  >人视分析
                                 </el-button>
                               </el-col>
                               <!-- <el-col :span="8">
@@ -628,8 +628,10 @@
                                 <el-button
                                   type="primary"
                                   size="mini"
-                                  @click.stop="RSAnalysis(itemModel)"
-                                  >人视分析
+                                  @click.stop="
+                                    BuildingStretchingAnalysis(itemModel)
+                                  "
+                                  >楼体拉伸
                                 </el-button>
                               </el-col>
                               <el-col :span="8">
@@ -637,10 +639,10 @@
                                   type="primary"
                                   size="mini"
                                   @click.stop="
-                                    BuildingStretchingAnalysis(itemModel)
+                                    openNightscapeAnalysis(itemModel)
                                   "
-                                  >楼体拉伸
-                                </el-button>
+                                  >夜景分析</el-button
+                                >
                               </el-col>
                             </el-row>
                             <el-row :gutter="24">

src/views/ConstructionApplication3D/skylineAnalysis/TJXResult.vue

@@ -3,8 +3,8 @@
         <!-- <img :src="imageData.data" style="height: auto; width: auto;" />"> -->
         <el-button type="primary" @click="download">下载</el-button>
         <br>
-        <canvas id="mycan1" ref="mycan1" style="height: 100%;height: 100%;background-color: transparent;"></canvas>
-        <!-- <canvas id="mycan2" ref="mycan2" width="907" height="350" style="height: 100%;height: 100%;"></canvas> -->
+        <canvas id="mycan1" ref="mycan1" style="height: inherit;background-color: transparent;"></canvas>
+        <!-- <canvas id="mycan2" ref="mycan2" style="height: inherit;display: none;"></canvas> -->
 
     </div>
 </template>
@@ -31,8 +31,8 @@ export default {
 
             var skyRgb = that.imageData.rgb
             var canvas1 = that.$refs["mycan1"]
-
-            skylineExecute.drawCanvas(canvas1, that.imageData.data, viewW, viewH, skyRgb)
+            var canvas2 = that.$refs["mycan2"]
+            skylineExecute.drawCanvas(canvas1, canvas2, that.imageData.data, viewW, viewH, skyRgb)
         },
         download() {
             var canvas = this.$refs['mycan1']

src/views/ConstructionApplication3D/skylineAnalysis/skylineAnalysis.vue

@@ -75,7 +75,7 @@ export default {
         0
       );
       drawHandler.activate()
-
+      facade.setBoundByPoints(null,null)
       drawHandler.drawEvt.addEventListener(function (result) {
         debugger
         startPoint = result.object.positions[0];