diff --git a/package.json b/package.json index aeb4380..a158fb1 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,18 @@ "description": "力鼎后台管理系统", "author": "LionLi", "license": "MIT", + "scripts": { "dev": "vite", "build": "vite build", "build:prod": "vite build && node ./built.js", "built": "node ./built.js", - "preview": "vite preview" + "preview": "vite preview", + "提示":{ + "打包上传服务器": "npm run build:prod", + "打包": "npm run build", + "开发环境fang": "npm run dev" + } }, "repository": { "type": "git", diff --git a/src/admin/api/renovation/scheme/equipment.js b/src/admin/api/renovation/scheme/equipment.js index 04a0002..0a0a490 100644 --- a/src/admin/api/renovation/scheme/equipment.js +++ b/src/admin/api/renovation/scheme/equipment.js @@ -40,3 +40,17 @@ export function deleteData(ids) { }) } +// 查询 +export function treelist(planType,speclevel) { + return request({ + url: '/technicalPlan/treeCapacityEquipment/'+planType, + method: 'get', + baseURL: "/plan-api", + params: { + planType: planType, + speclevel:speclevel + } + + }) +} + diff --git a/src/admin/api/renovation/scheme/equipmentEnergyConsumption.js b/src/admin/api/renovation/scheme/equipmentEnergyConsumption.js index 78409a1..3311baa 100644 --- a/src/admin/api/renovation/scheme/equipmentEnergyConsumption.js +++ b/src/admin/api/renovation/scheme/equipmentEnergyConsumption.js @@ -6,7 +6,8 @@ export function list(query) { url: '/technicalPlan/equipmentEnergyConsumption/list', method: 'get', baseURL: "/plan-api", - params: query + params: query, + }) } @@ -47,4 +48,15 @@ export function updateComponentRunTime(data) { method: 'post', data: data }) -} \ No newline at end of file +} + +// 查询 +export function multipleConsumption(data) { + return request({ + url: '/technicalPlan/equipmentEnergyConsumption/multipleConsumption', + method: 'post', + baseURL: "/plan-api", + data + }) +} + diff --git a/src/admin/api/renovation/scheme/test copy.ts b/src/admin/api/renovation/scheme/test copy.ts deleted file mode 100644 index fe4f3eb..0000000 --- a/src/admin/api/renovation/scheme/test copy.ts +++ /dev/null @@ -1 +0,0 @@ -const a =1 \ No newline at end of file diff --git a/src/admin/api/renovation/scheme/test.ts b/src/admin/api/renovation/scheme/test.ts deleted file mode 100644 index 8687484..0000000 --- a/src/admin/api/renovation/scheme/test.ts +++ /dev/null @@ -1 +0,0 @@ -export const a =2 diff --git a/src/admin/api/renovation/scheme/waterQualityRegion.js b/src/admin/api/renovation/scheme/waterQualityRegion.js new file mode 100644 index 0000000..a5967f9 --- /dev/null +++ b/src/admin/api/renovation/scheme/waterQualityRegion.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +// 查询 +export function list(query) { + return request({ + url: '/waterQualityRegion/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + + +// 新增 +export function postData(data) { + return request({ + url: '/waterQualityRegion', + baseURL: "/plan-api", + method: 'post', + data: data + }) +} + +// 修改 +export function putData(data) { + return request({ + url: '/waterQualityRegion', + baseURL: "/plan-api", + method: 'put', + data: data + }) +} + +// 删除 +export function deleteData(regionIds) { + return request({ + url: '/waterQualityRegion/'+regionIds, + baseURL: "/plan-api", + method: 'delete' + }) +} + diff --git a/src/admin/api/renovation/technicalPlan/capacity.js b/src/admin/api/renovation/technicalPlan/capacity.js new file mode 100644 index 0000000..034b25e --- /dev/null +++ b/src/admin/api/renovation/technicalPlan/capacity.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +// 查询 +export function list(query) { + return request({ + url: '/technicalPlanForeign/capacity/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + + +// 新增 +export function postData(data) { + return request({ + url: '/technicalPlanForeign/capacity', + baseURL: "/plan-api", + method: 'post', + data: data + }) +} + +// 修改 +export function putData(data) { + return request({ + url: '/technicalPlanForeign/capacity', + baseURL: "/plan-api", + method: 'put', + data: data + }) +} + +// 删除 +export function deleteData(planIds) { + return request({ + url: '/technicalPlanForeign/capacity/'+planIds, + baseURL: "/plan-api", + method: 'delete' + }) +} + diff --git a/src/admin/api/renovation/technicalPlan/discharge.js b/src/admin/api/renovation/technicalPlan/discharge.js new file mode 100644 index 0000000..fcae386 --- /dev/null +++ b/src/admin/api/renovation/technicalPlan/discharge.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' + +// 查询 +export function list(query) { + return request({ + url: '/waterQualityStandardForeign/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + + +// 新增 +export function postData(data) { + return request({ + url: '/waterQualityStandardForeign', + baseURL: "/plan-api", + method: 'post', + data: data + }) +} + +// 修改 +export function putData(data) { + return request({ + url: '/waterQualityStandardForeign', + baseURL: "/plan-api", + method: 'put', + data: data + }) +} + +// 删除 +export function deleteData(standardIds) { + return request({ + url: '/waterQualityStandardForeign/'+standardIds, + baseURL: "/plan-api", + method: 'delete' + }) +} +//树形水质标准 +export function treeRegionLevel() { + return request({ + url: '/waterQualityStandardForeign/treeRegionLevel', + baseURL: "/plan-api", + method: 'get', + + }) +} +//根据水质标准ID查询 +export function getData(id) { + return request({ + url: '/waterQualityStandardForeign/queryById/'+id, + baseURL: "/plan-api", + method: 'get', + }) +} diff --git a/src/admin/api/renovation/technicalPlan/distdevice.js b/src/admin/api/renovation/technicalPlan/distdevice.js new file mode 100644 index 0000000..bf812c8 --- /dev/null +++ b/src/admin/api/renovation/technicalPlan/distdevice.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +// 查询 +export function list(query) { + return request({ + url: '/equipmentParam/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + + +// 新增 +export function postData(data) { + return request({ + url: '/equipmentParam', + baseURL: "/plan-api", + method: 'post', + data: data + }) +} + +// 修改 +export function putData(data) { + return request({ + url: '/equipmentParam', + baseURL: "/plan-api", + method: 'put', + data: data + }) +} + +// 删除 +export function deleteData(paramIds) { + return request({ + url: '/equipmentParam/'+paramIds, + baseURL: "/plan-api", + method: 'delete' + }) +} + + diff --git a/src/admin/api/renovation/technicalPlan/equipment.js b/src/admin/api/renovation/technicalPlan/equipment.js new file mode 100644 index 0000000..9a82037 --- /dev/null +++ b/src/admin/api/renovation/technicalPlan/equipment.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +// 查询外贸技术方案配置列表 +export function list(query) { + return request({ + url: '/technicalPlanForeign/config/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + +// 查询外贸技术方案配置详细 +export function getByid(configId) { + return request({ + url: '/technicalPlanForeign/config/' + configId, + method: 'get', + baseURL: "/plan-api", + }) +} + +// 新增外贸技术方案配置 +export function postData(data) { + return request({ + url: '/technicalPlanForeign/config', + method: 'post', + data: data, + baseURL: "/plan-api", + }) +} + +// 修改外贸技术方案配置 +export function putData(data) { + return request({ + url: '/technicalPlanForeign/config', + method: 'put', + data: data, + baseURL: "/plan-api", + }) +} + +// 删除外贸技术方案配置 +export function delData(configId) { + return request({ + url: '/technicalPlanForeign/config/' + configId, + method: 'delete', + baseURL: "/plan-api", + }) +} diff --git a/src/admin/api/renovation/technicalPlan/equipmentComponent.js b/src/admin/api/renovation/technicalPlan/equipmentComponent.js new file mode 100644 index 0000000..f1759bb --- /dev/null +++ b/src/admin/api/renovation/technicalPlan/equipmentComponent.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +// 查询 +export function list(query) { + return request({ + url: '/technicalPlanForeign/equipmentComponent/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + + +// 新增 +export function postData(data) { + return request({ + url: '/technicalPlanForeign/equipmentComponent', + baseURL: "/plan-api", + method: 'post', + data: data + }) +} + +// 修改 +export function putData(data) { + return request({ + url: '/technicalPlanForeign/equipmentComponent', + baseURL: "/plan-api", + method: 'put', + data: data + }) +} + +// 删除 +export function deleteData(ids) { + return request({ + url: '/technicalPlanForeign/equipmentComponent/'+ids, + baseURL: "/plan-api", + method: 'delete' + }) +} + diff --git a/src/admin/api/renovation/technicalPlan/equipmentEnergyConsumption.js b/src/admin/api/renovation/technicalPlan/equipmentEnergyConsumption.js new file mode 100644 index 0000000..c1bcb8b --- /dev/null +++ b/src/admin/api/renovation/technicalPlan/equipmentEnergyConsumption.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' + +// 查询 +export function list(query) { + return request({ + url: '/technicalPlanForeign/equipmentEnergyConsumption/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + + +// 新增 +export function postData(data) { + return request({ + url: '/equipmentParam', + baseURL: "/plan-api", + method: 'post', + data: data + }) +} + +// 修改 +export function putData(data) { + return request({ + url: '/equipmentParam', + baseURL: "/plan-api", + method: 'put', + data: data + }) +} + +// 删除 +export function deleteData(paramIds) { + return request({ + url: '/equipmentParam/'+paramIds, + baseURL: "/plan-api", + method: 'delete' + }) +} +// 修改 +export function updateComponentRunTime(data) { + return request({ + url: '/technicalPlanForeign/equipmentEnergyConsumption/updateComponentRunTime', + baseURL: "/plan-api", + method: 'post', + data: data + }) +}// 查询 +export function multipleConsumption(query) { + return request({ + url: '/technicalPlanForeign/equipmentEnergyConsumption/consumption', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} \ No newline at end of file diff --git a/src/admin/api/renovation/technicalPlan/index.js b/src/admin/api/renovation/technicalPlan/index.js new file mode 100644 index 0000000..eb93cd6 --- /dev/null +++ b/src/admin/api/renovation/technicalPlan/index.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +// 查询 +export function list(query) { + return request({ + url: '/technicalPlanForeign/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + + +// 新增 +export function postData(data) { + + + + + return request({ + url: '/technicalPlanForeign', + baseURL: "/plan-api", + method: 'post', + data: data + }) +} + +// 修改 +export function putData(data) { + return request({ + url: '/technicalPlanForeign', + baseURL: "/plan-api", + method: 'put', + data: data + }) +} + +// 删除 +export function deleteData(planIds) { + return request({ + url: '/technicalPlanForeign/'+planIds, + baseURL: "/plan-api", + method: 'delete' + }) +} + diff --git a/src/admin/api/renovation/technicalPlan/waterQualityRegion.js b/src/admin/api/renovation/technicalPlan/waterQualityRegion.js new file mode 100644 index 0000000..d8c203b --- /dev/null +++ b/src/admin/api/renovation/technicalPlan/waterQualityRegion.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +// 查询 +export function list(query) { + return request({ + url: '/waterQualityRegionForeign/list', + method: 'get', + baseURL: "/plan-api", + params: query + }) +} + + +// 新增 +export function postData(data) { + return request({ + url: '/waterQualityRegionForeign', + baseURL: "/plan-api", + method: 'post', + data: data + }) +} + +// 修改 +export function putData(data) { + return request({ + url: '/waterQualityRegionForeign', + baseURL: "/plan-api", + method: 'put', + data: data + }) +} + +// 删除 +export function deleteData(regionIds) { + return request({ + url: '/waterQualityRegionForeign/'+regionIds, + baseURL: "/plan-api", + method: 'delete' + }) +} + diff --git a/src/admin/components/FileUpload/index.vue b/src/admin/components/FileUpload/index.vue index aaa1bdd..ef573e7 100644 --- a/src/admin/components/FileUpload/index.vue +++ b/src/admin/components/FileUpload/index.vue @@ -1,218 +1,222 @@ - - - - - 选取文件 - - - - 请上传 - 大小不超过 {{ fileSize }}MB - 格式为 {{ fileType.join("/") }} - 的文件 - - - - - - {{ getFileName(file.name) }} - - - 删除 - - - - - - - - - + + + + + 选取文件 + + + + 请上传 + 大小不超过 {{ fileSize }}MB + 格式为 {{ fileType.join("/") }} + 的文件 + + + + + + {{ getFileName(file.name) }} + + + 删除 + + + + + + + + + diff --git a/src/admin/utils/request.js b/src/admin/utils/request.js index 17f3802..27b31ef 100644 --- a/src/admin/utils/request.js +++ b/src/admin/utils/request.js @@ -38,6 +38,7 @@ service.interceptors.request.use(config => { url = url.slice(0, -1); config.params = {}; config.url = url; + } if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) { const requestObj = { @@ -62,6 +63,7 @@ service.interceptors.request.use(config => { } } } + return config }, error => { console.log(error) diff --git a/src/admin/views/renovation/scheme/compant/SCSB.vue b/src/admin/views/renovation/scheme/compant/SCSB.vue index 37c0a2c..e63af0a 100644 --- a/src/admin/views/renovation/scheme/compant/SCSB.vue +++ b/src/admin/views/renovation/scheme/compant/SCSB.vue @@ -2,11 +2,24 @@ - + + + {{ item.label }} + + + + + @@ -15,18 +28,14 @@ {{ item.name }} - + - + - + @@ -84,47 +88,222 @@ - - - + + + + + + 葡萄糖 + + - + + + + 碳酸钠 + + + + + + PAC(28%) + + + + + + 氯片 + + + + + + + + + + + + + + + + + + + + + + 人工费 + + + + + + okr提成 + + + + + + 其他部门提成 + + + + + + 包装费 + + + + + + 企业综合管理费 + + + + + + 运输费 + + + + + + 管线安装/吊装/搬运费 + + + + + + 服务器租赁费 + + + + + + 融资成本 + + + + + + 投标代理费/场地/专家费/配合费 + + + + + + 増值税 + + + + + + 其他 + + + + + + + + + + 相关设备参数与电费计算 - - - {{ scope.row.equipment.equipmentName }} - - + label="设备名称" + align="center" + prop="processingCapacity" + > + + {{ scope.row.equipment.equipmentName }} + + - - + {{ scope.row.capacityTonnage }} - + import { treeRegionLevel, getData } from "@/api/renovation/scheme/discharge"; import { list } from "@/api/renovation/scheme/capacity"; -import { list as equipmentEnergyConsumptionList } from "@/api/renovation/scheme/equipmentEnergyConsumption"; +import { + list as equipmentEnergyConsumptionList, + multipleConsumption, +} from "@/api/renovation/scheme/equipmentEnergyConsumption"; const { proxy } = getCurrentInstance(); -const { coliform_removal, technical_plan_type,packing_method } = proxy.useDict( +const { coliform_removal, technical_plan_type, packing_method,spec_level } = proxy.useDict( "coliform_removal", - "technical_plan_type","packing_method" + "technical_plan_type", + "packing_method", + "spec_level" ); +import { + list as equipmentList, + treelist, +} from "@/api/renovation/scheme/equipment"; +import { list as capList } from "@/api/renovation/scheme/capacity"; const props = defineProps({ modelValue: { @@ -202,12 +391,18 @@ const props = defineProps({ }; }, }, - citytype:{ + citytype: { type: Array, default: () => { return []; }, - } + }, + planType: { + type: String, + default: () => { + return ""; + }, + }, }); const form = ref({ @@ -216,104 +411,154 @@ const form = ref({ coliformRemoval: null, equipmentParamId: null, }); +watch( + () => props.planType, + (val) => { + form.equipmentParamId = []; + if (val) gettreelist(val,null); + } +); +watch( + () => form.value.speclevel, + (newval, oldval) => { + if(newval){ + gettreelist(null,newval); + } + + }, + { deep: true } + +) const inletlist = ref([ { - name: "CODcr", + name: "cod", value: "250~400", }, { - name: "NH3-N", + name: "bod", + value: "0~400", + }, + { + name: "nh3", value: "30~50", }, { - name: "TN", + name: "tn", value: "40~65", }, { - name: "TP", + name: "tp", value: "2.5~5.0", }, { - name: "SS", + name: "ss", value: "100~200", }, { - name: "PH", + name: "ph", value: "6~9", }, + { + name: "animalVegetableOil", + value: "0~1", + }, ]); const outletlist = ref([]); const tonnageData = ref([]); - +const treeListData = ref([]); const tableDevice = ref([]); const tableDict = ref([]); const devicelist = ref([]); const cityValue = ref([]); const dataList = ref([]); -const citytype = ref(proxy.citytype) +const citytype = ref(proxy.citytype); console.log(proxy.modelValue); -function watchData(){ +function watchData() { watch( - () => proxy.modelValue.planId, + () => proxy.modelValue.planId, - (newval, oldval) => { - if (newval) { - let newForm = proxy.modelValue; - debugger - citytype.value.forEach((element) => { - let val = element.children.filter( - (item) => newForm.waterQualityStandardId == item.value - ); - if (val.length > 0) { - cityValue.value = [element.label, val[0].value]; - handleChange(cityValue.value); - } - }); + (newval, oldval) => { + if (newval) { + let newForm = proxy.modelValue; + citytype.value.forEach((element) => { + let val = element.children.filter( + (item) => newForm.waterQualityStandardId == item.value + ); + if (val.length > 0) { + cityValue.value = [element.label, val[0].value]; + handleChange(cityValue.value); + } + }); - form.value.equipmentParamId = newForm.equipmentDetail.map((item) => { - return item?.capacityId; - }); + gettreelist(newForm.planType,newForm.speclevel); + form.value.equipmentParamId = newForm.equipmentDetail.map((item) => { + return `${item.capacityId}-${item.equipmentId}`; + }); - changeSelect(form.value.equipmentParamId); - form.value.coliformRemoval = newForm.coliformRemoval; - form.value.packingMethod =newForm.packingMethod - } else { - rest(); + // form.value.equipmentParamId = newForm.equipmentDetail.map((item) => { + // return item?.capacityId; + // }); + + // changeSelect(form.value.equipmentParamId); + form.value.coliformRemoval = newForm.coliformRemoval; + form.value.packingMethod = newForm.packingMethod; + form.value.speclevel = newForm.speclevel + form.value.na2co3 = newForm.na2co3; + form.value.pac = newForm.pac; + form.value.naclo = newForm.naclo; + form.value.glucose = newForm.glucose; + cost.value=newForm?.cost||{ + laborCost:'', + royaltyOKR:'', + royaltyOther:'', + packingFee:'', + manageFee:'', + shippingFee:'', + buildingFee:'', + serverFee:'', + financingCost:'', + biddingFee:'', + vat:'' } - }, - { immediate: true } -); - - + } else { + rest(); + } + }, + { immediate: true } + ); } async function handleChange(params) { console.log(params); outletlist.value = []; - let data = await getData(params[1]); - form.value.waterQualityStandardId = params[1]; - const keyValue = [ - "standardId", - "basisDoc", - "createBy", - "createTime", - "level", - "region", - "updateBy", - "updateTime", - ]; - for (let item in data.data) { - if (!keyValue.includes(item)) { - outletlist.value.push({ - name: item, - value: data.data[item], - }); + if (params[1]) { + let data = await getData(params[1]); + form.value.waterQualityStandardId = params[1]; + const keyValue = [ + "standardId", + "basisDoc", + "createBy", + "createTime", + "level", + "region", + "regionId", + "updateBy", + "updateTime", + ]; + for (let item in data.data) { + if (!keyValue.includes(item)) { + outletlist.value.push({ + name: item, + value: data.data[item], + }); + } } + } else { + proxy.$modal.msgError("出水指标配置项错误,请联系管理员"); } } function changeSelect(value) { - console.log(devicelist.value); dataList.value = []; dataList.value = devicelist.value.filter((item) => @@ -338,25 +583,40 @@ const objectSpanMethod = ({ row, column, rowIndex, columnIndex }) => { }; async function getList() { let data = await list(); - let equipData =await equipmentEnergyConsumptionList(); + let equipData = await equipmentEnergyConsumptionList(); devicelist.value = equipData.rows; - tonnageData.value = data.data.map((item, index) => { return { value: item.capacityId, label: item.capacityTonnage + "吨", }; }); - watchData() + watchData(); } +const cost=ref({}) function rest() { form.value = { waterIn: null, waterQualityStandardId: null, coliformRemoval: null, equipmentParamId: null, + speclevel:0 + }; + cost.value={ + laborCost:'', + royaltyOKR:'', + royaltyOther:'', + packingFee:'', + manageFee:'', + shippingFee:'', + buildingFee:'', + serverFee:'', + financingCost:'', + biddingFee:'', + vat:'' + } dataList.value = []; } function handleSubmit() { @@ -364,16 +624,59 @@ function handleSubmit() { obj[item.name] = item.value; return obj; }, {}); - form.value.equipmentDetail = dataList.value; - return form.value; + form.value.equipmentDetail = form.value.equipmentParamId.map((item) => { + let data = item.split("-"); + return { + capacityId: data[0], + equipmentId: data[1], + }; + }); + debugger + form.value.cost=cost.value + return { ...form.value }; } defineExpose({ handleSubmit, rest, }); +async function gettreelist(type,level) { + type =type||props.planType + level = level||form.value.speclevel + let res = await treelist(type,level); + let data = res.data; + data.forEach((element) => { + element.children.forEach((item) => { + (item.label = `${item.label}(${element.label})`), + (item.value = element.value + "-" + item.value); + }); + }); + treeListData.value = data; +} + +watch( + () => form.value.equipmentParamId, + (newVal, oldVal) => { + console.log("新值:", newVal); + if ( + Object.prototype.toString.call(newVal) == "[object Array]" && + newVal.length + ) { + let data = newVal.map((item) => { + return { + equipmentId: item.split("-")[1], + capacityId: item.split("-")[0], + }; + }); + multipleConsumption(data).then((res) => { + dataList.value = res.data; + }); + } + + // 在这里处理值变化后的逻辑 + } +); onMounted(() => { getList(); - }); diff --git a/src/admin/views/renovation/scheme/distdevice.vue b/src/admin/views/renovation/scheme/distdevice.vue index 2d0e901..e428fba 100644 --- a/src/admin/views/renovation/scheme/distdevice.vue +++ b/src/admin/views/renovation/scheme/distdevice.vue @@ -10,7 +10,7 @@ v-show="showSearch" label-width="68px" > - + + + + + + + @@ -150,14 +165,14 @@ @@ -167,7 +182,7 @@ @@ -177,9 +192,16 @@ + diff --git a/src/admin/views/renovation/technicalPlan/deviceList.vue b/src/admin/views/renovation/technicalPlan/deviceList.vue new file mode 100644 index 0000000..68b7fa6 --- /dev/null +++ b/src/admin/views/renovation/technicalPlan/deviceList.vue @@ -0,0 +1,245 @@ + + + + + + + + + + + 搜索 + 重置 + + + + + + 新增 + + + 修改 + + + 删除 + + + + + + + + + + + + + + + + + 修改 + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/admin/views/renovation/technicalPlan/discharge.vue b/src/admin/views/renovation/technicalPlan/discharge.vue new file mode 100644 index 0000000..bb77114 --- /dev/null +++ b/src/admin/views/renovation/technicalPlan/discharge.vue @@ -0,0 +1,486 @@ + + + + + 新增 + + + + + + + + + + + + 新增 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/admin/views/renovation/technicalPlan/distdevice.vue b/src/admin/views/renovation/technicalPlan/distdevice.vue new file mode 100644 index 0000000..b3516a7 --- /dev/null +++ b/src/admin/views/renovation/technicalPlan/distdevice.vue @@ -0,0 +1,327 @@ + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + {{ scope.row.equipmentName }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/admin/views/renovation/technicalPlan/index.vue b/src/admin/views/renovation/technicalPlan/index.vue new file mode 100644 index 0000000..7055224 --- /dev/null +++ b/src/admin/views/renovation/technicalPlan/index.vue @@ -0,0 +1,544 @@ + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + 新增 + + + + + + + + + + + + + + + + 修改 + 导出 + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/admin/views/system/porfiles/profiles.vue b/src/admin/views/system/porfiles/profiles.vue index 311374c..b7883c8 100644 --- a/src/admin/views/system/porfiles/profiles.vue +++ b/src/admin/views/system/porfiles/profiles.vue @@ -302,7 +302,7 @@ const generateData = () => { }; // generateData().then((res) => { // console.log(res) -// debugger +// // userData.value = res; // }); /** 提交按钮 */ diff --git a/src/admin/views/system/user/index.vue b/src/admin/views/system/user/index.vue index 122fae5..b71235a 100644 --- a/src/admin/views/system/user/index.vue +++ b/src/admin/views/system/user/index.vue @@ -403,7 +403,7 @@ const { queryParams, form, rules } = toRefs(data); /** 通过条件过滤节点 */ const filterNode = (value, data) => { if (!value) return true; - debugger + return data.label.indexOf(value) !== -1; }; /** 根据名称筛选部门树 */ diff --git a/src/index/views/index.vue b/src/index/views/index.vue index 6af3639..47a0ffa 100644 --- a/src/index/views/index.vue +++ b/src/index/views/index.vue @@ -23,7 +23,7 @@ const userStore = useUserStore() import {getDesktopRouters} from '@index/api/menu' const {proxy} = getCurrentInstance(); const openMenu =(item)=>{ -debugger + if(item.path){ if(isHttp(item.path)){ diff --git a/src/ldmap/utils/map/init.js b/src/ldmap/utils/map/init.js index f66d733..8b7ab02 100644 --- a/src/ldmap/utils/map/init.js +++ b/src/ldmap/utils/map/init.js @@ -1036,7 +1036,7 @@ const ldMap = { returnObj.line.push(self.getMapByPoint(item, [])) } catch (error) { console.log(error) - debugger + } } @@ -1087,7 +1087,7 @@ const ldMap = { if (lineId && lineId != nowPointId) { let linedata = linelayer.filter(item => item.id == lineId) console.log(linedata.length) - if(linedata.length >1){debugger} + if(linedata.length >1){} linedata = linedata[0] if (!linedata) { return data } let val = [geometry.x, geometry.y, attributes.data.pointType, parseInt(linedata.attributes.data.styleId), nowPointId] @@ -1097,8 +1097,8 @@ const ldMap = { let nextItem = point.filter(item => item.id == nextPointId) nextItem=nextItem[0] - if(nextItem.length >1){debugger} - if (!nextItem) { debugger } + if(nextItem.length >1){} + if (!nextItem) { } return this.getMapByPoint(nextItem, data) } else { //到终点 @@ -1308,7 +1308,7 @@ const ldMap = { exitLineByVal(data) { let polylineLayer = self.lineLayer - + let p6 = this.lineLayer.graphics.items.filter(item => { return item.id == data.id || item.id == data.lineId diff --git a/stats.html b/stats.html index 277aad5..febc5a8 100644 --- a/stats.html +++ b/stats.html @@ -4822,7 +4822,7 @@ var drawChart = (function (exports) {