From d6cd8d2ed5be9eef0289cbc0cfc4910fd557108e Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Mon, 17 Nov 2025 14:32:32 +0800 Subject: [PATCH] =?UTF-8?q?flx:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/message.vue | 2 +- src/views/companyAdmin/companyDiagram.vue | 124 +- .../companyAdmin/companyDiagram_20251117.vue | 4284 +++++++++++++++++ .../projectFront/projectSummary/baseInfo.vue | 550 +-- .../projectSummary/baseInfo_20251117.vue | 1206 +++++ 5 files changed, 5748 insertions(+), 418 deletions(-) create mode 100644 src/views/companyAdmin/companyDiagram_20251117.vue create mode 100644 src/views/projectFront/projectSummary/baseInfo_20251117.vue diff --git a/src/components/message.vue b/src/components/message.vue index fb7f29b3..aaa03978 100644 --- a/src/components/message.vue +++ b/src/components/message.vue @@ -365,7 +365,7 @@ export default { // 接收消息处理 client.on("message", (topic, message) => { // console.log(message); - console.log("收到来自", topic, "的消息", message.toString()); + console.log("收到来自", topic, "的消息", JSON.parse(message)); message = JSON.parse(message); // if(message.content){ // if(message.content.indexOf("火点检测") > -1 || message.content.indexOf("温度报警") > -1){ diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue index 16c5b2f6..32e53341 100644 --- a/src/views/companyAdmin/companyDiagram.vue +++ b/src/views/companyAdmin/companyDiagram.vue @@ -634,7 +634,7 @@ :model="addProjectForm" ref="addProjectForm" :rules="addProjectFormRules" - label-width="120px" + label-width="130px" class="dialogFormBox big" :inline="true" > @@ -676,7 +676,7 @@ :placeholder="$t('message.companyDiagram.PleaseEnter')" > - + --> + + - - + --> - - + --> - + + + + + + + + +
+ 是 + 否 +
+ + + + - + - @@ -1016,7 +1045,7 @@ - + -->
{ - const showPassword = isMaskedData(this.addAccountForm.showPassword) && this.addAccountForm.showPassword === this.oldAddAccountForm.showPassword + const showPassword = + isMaskedData(this.addAccountForm.showPassword) && + this.addAccountForm.showPassword === + this.oldAddAccountForm.showPassword; if (showPassword || valid) { // 只检查指定的字段 const sensitiveFields = ["userTel", "showPassword"]; @@ -3421,7 +3479,7 @@ export default { this.oldAddAccountForm, sensitiveFields ); - console.log(processedData) + console.log(processedData); if (this.isAdd) { addSystemUserApi(this.addAccountForm).then((res) => { this.addAccountDialog = false; @@ -3594,20 +3652,26 @@ export default { console.log("编辑页有值吗", item); this.projectDialogTitle = this.$t("message.companyDiagram.editProject"); //编辑项目 this.isAdd = false; - this.addProjectForm = JSON.parse(JSON.stringify({ - ...item, - projectIcon: item.projectIcon ? item.projectIcon : "", - })); + this.addProjectForm = JSON.parse( + JSON.stringify({ + ...item, + projectIcon: item.projectIcon ? item.projectIcon : "", + }) + ); this.addProjectDialog = true; this.$nextTick(() => { setTimeout(() => { this.$refs["addProjectForm"].clearValidate(); this.$refs.cascader.$refs.panel.activePath = []; - this.provincesCityArr = [ - item.provincesCode, - item.cityCode, - item.areaCode, - ]; + if (item.areaCode) { + this.provincesCityArr = [ + item.provincesCode, + item.cityCode, + item.areaCode, + ]; + } else { + this.provincesCityArr = [item.provincesCode, item.cityCode]; + } }, 200); }); }, @@ -3674,7 +3738,7 @@ export default { console.log(val); this.addProjectForm.provincesCode = val[0]; this.addProjectForm.cityCode = val[1]; - this.addProjectForm.areaCode = val[2]; + this.addProjectForm.areaCode = val[2] || ""; }, // handleRemove(){ // this.addProjectForm.layoutImage='' @@ -3705,7 +3769,7 @@ export default { // console.log(res); this.addProjectForm.projectIcon = this.$store.state.FILEURL + res.data[0].imageUrl; - console.log(this.addProjectForm.projectIcon); + console.log(this.addProjectForm.projectIcon); }, openAuthorizedConfig(type) { this.authorizedConfig = { @@ -3968,7 +4032,7 @@ export default { } /deep/ .projectDialog .el-dialog { - margin-top: 20px !important; + // margin-top: 20px !important; margin-bottom: 0; .el-input--medium .el-input__inner { // height: 65px; diff --git a/src/views/companyAdmin/companyDiagram_20251117.vue b/src/views/companyAdmin/companyDiagram_20251117.vue new file mode 100644 index 00000000..8db698d5 --- /dev/null +++ b/src/views/companyAdmin/companyDiagram_20251117.vue @@ -0,0 +1,4284 @@ + + + + \ No newline at end of file diff --git a/src/views/projectFront/projectSummary/baseInfo.vue b/src/views/projectFront/projectSummary/baseInfo.vue index f645a48c..a8bd37f3 100644 --- a/src/views/projectFront/projectSummary/baseInfo.vue +++ b/src/views/projectFront/projectSummary/baseInfo.vue @@ -22,22 +22,25 @@ {{ $t('message.companyDiagram.Table.edit') }}{{ $t("message.companyDiagram.Table.edit") }}
-
{{ $t('message.companyDiagram.sheet') }}
+
{{ $t("message.companyDiagram.sheet") }}
{{ - $t('message.companyDiagram.entryName1') + $t("message.companyDiagram.entryName1") }} {{ projectDetail.projectName @@ -45,7 +48,7 @@
{{ - $t('message.companyDiagram.Table.projectAddress') + $t("message.companyDiagram.Table.projectAddress") }} {{ projectDetail.projectAddress @@ -54,15 +57,15 @@
{{ $t( - 'message.companyDiagram.dialog_ProjectPop_up.provincesCode' + "message.companyDiagram.dialog_ProjectPop_up.provincesCode" ) }} {{ projectDetail.provinceName - }}{{projectDetail.cityName}}{{ projectDetail.areaName }}{{ projectDetail.provinceName }}{{ projectDetail.cityName + }}{{ projectDetail.areaName }}
-
+ +
+ 项目/场站负责人 + {{ + projectDetail.projectSiteManager + }}
{{ - $t('message.companyDiagram.dialog_ProjectPop_up.longitude') + $t("message.companyDiagram.dialog_ProjectPop_up.longitude") }} {{ projectDetail.longitude }}
- {{ - $t( - 'message.companyDiagram.dialog_ProjectPop_up.projectNumber' - ) - }} - {{ - projectDetail.projectNumber + 装机容量(万kW) + {{ + projectDetail.installedCapacity }}
- {{ - $t( - 'message.companyDiagram.dialog_ProjectPop_up.projectAcreage' - ) - }} - {{ projectDetail.projectAcreage }}(m²) -
-
- {{ - $t( - 'message.companyDiagram.dialog_ProjectPop_up.startWorkDate' - ) - }} - {{ - projectDetail.startWorkDate - }} -
-
- {{ - $t('message.companyDiagram.dialog_ProjectPop_up.saleAcreage') - }} - {{ projectDetail.saleAcreage }} -
-
- {{ - $t('message.companyDiagram.dialog_ProjectPop_up.buildingNum') - }} - {{ - projectDetail.buildingNum - }} -
-
- {{ - $t('message.companyDiagram.dialog_ProjectPop_up.projectTel') - }} - {{ projectDetail.projectTel }} + 配储容量 + {{ projectDetail.capacity }}(m²)
- {{ $t('message.projectInfo.projectOnlyMark') }} + {{ $t("message.projectInfo.projectOnlyMark") }} {{ projectDetail.projectSn @@ -156,85 +125,26 @@
{{ - $t('message.companyDiagram.dialog_ProjectPop_up.latitude') + $t("message.companyDiagram.dialog_ProjectPop_up.latitude") }} {{ projectDetail.latitude }}
- {{ - $t('message.companyDiagram.dialog_ProjectPop_up.projectType') + 新能源类型 + {{ + projectDetail.renewableEnergyType }} - {{ item.name }}
- {{ - $t( - 'message.companyDiagram.dialog_ProjectPop_up.structureType' - ) + 是否配储 + {{ + projectDetail.storageRequired == 1 ? "是" : "否" }} - {{ item.name }}
- {{ - $t('message.companyDiagram.dialog_ProjectPop_up.bulidStatus') - }} - {{ item.name }} -
-
- {{ - $t( - 'message.companyDiagram.dialog_ProjectPop_up.constructionStage' - ) - }} - {{ item.name }} - -
-
- {{ - $t('message.companyDiagram.dialog_ProjectPop_up.households') - }} - {{ projectDetail.households }} -
-
- {{ - $t('message.companyDiagram.dialog_ProjectPop_up.layoutImage') - }} + 项目配图
-
+
@@ -296,7 +206,7 @@ :model="addProjectForm" ref="addProjectForm" :rules="addProjectFormRules" - label-width="120px" + label-width="130px" class="dialogFormBox big" :inline="true" > @@ -338,14 +248,9 @@ :placeholder="$t('message.companyDiagram.PleaseEnter')" > - + @@ -372,7 +277,7 @@ @@ -388,208 +293,36 @@ :disabled="true" > - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - +
- - - {{ $t('message.projectInfo.is') }} - - - {{ $t('message.projectInfo.isNot') }} - - + 是 + 否
+ + +
- +
- - + -->
{{ $t('message.companyDiagram.cancel') }}{{ $t("message.companyDiagram.cancel") }} {{ $t('message.companyDiagram.determine') }}{{ $t("message.companyDiagram.determine") }}
@@ -671,14 +404,17 @@
+ + \ No newline at end of file