1

src/views/screen/building/energyRate.vue

@@ -202,7 +202,6 @@ import LineChart from "@/components/Echarts/LineChart.vue";
 import PieChart from "@/components/Echarts/PieChart.vue";
 import BarChart from "@/components/Echarts/BarChart.vue";
 import echarts from "echarts";
-import {carbonEmissionStatistics, energyForYear} from "@/api/screen/service";
 import {
 
 thisWeekElectricity,todayElectricity,monthElectricity,roomLoad,warnDevice,warnEvent,waterState
@@ -250,11 +249,9 @@ export default {
          //楼宇每月用电量
     this.monthElectricity()
 
-    //碳排放量月度变化趋势图
-    this.carbonEmissionStatistics();
 
-    //年度累计综合能耗
-    this.energyForYear();
+
+
   },
   destroyed() {},
   beforeDestroy() {},
@@ -268,8 +265,8 @@ export default {
         }
       });
     },
-   
-       
+
+
     //楼宇今日总用电量
     todayElectricity() {
       todayElectricity(this.$props.appOrg).then((res) => {
@@ -354,7 +351,7 @@ export default {
     }
     });
     },
-   
+
       //楼宇每月用电量
     monthElectricity() {
       monthElectricity(this.$props.appOrg).then((res) => {
@@ -468,89 +465,9 @@ export default {
 },
 
 
-    //碳排放量月度变化趋势图
-    carbonEmissionStatistics() {
-      carbonEmissionStatistics().then((res) => {
-        if (Number(res.code) === 200) {
-          this.energyRateLineData = [
-            {
-              name: "2024年",
-              type: "line",
-              areaStyle: {
-                opacity: 0.8,
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: "rgba(214, 124, 21, 0.1804)",
-                  },
-                  {
-                    offset: 1,
-                    color: "rgba(255, 255, 255, 0)",
-                  },
-                ]),
-              },
-              smooth: true,
-              lineStyle: {
-                width: 2, // 设置线宽
-                color: res.data.year2024.color, // 设置线的颜色
-              },
-              data: res.data.year2024.dataList,
-            },
-            {
-              name: "2023年",
-              type: "line",
-              areaStyle: {
-                opacity: 0.8,
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0.03,
-                    color: "rgba(30, 240, 215, 0.4196)",
-                  },
-                  {
-                    offset: 0.68,
-                    color: "rgba(23, 240, 240, 0)",
-                  },
-                ]),
-              },
-              lineStyle: {
-                width: 2, // 设置线宽
-                color: res.data.year2023.color, // 设置线的颜色
-              },
-              smooth: true,
-              data: res.data.year2023.dataList,
-            },
-          ];
-          this.energyRateLineAxis = {
-              type: "category",
-              data: res.data.xList,
-              axisLabel: {
-              color: "white", // 设置横坐标轴字体颜色为红色
-            },
-            axisLine: {
-              show: true,
-                lineStyle:{
-                color:"#08595B"
-              }
-            },
-            axisTick: {
-              show: false,
-            },
-            splitArea: false,
-          };
-        }
-      });
-    },
 
-    //年度累计综合能耗
-    energyForYear() {
-      energyForYear().then((res) => {
-        if (Number(res.code) === 200) {
-          this.yearAllChangeData.energyNum = res.data.energyNum.value;
-          this.yearAllChangeData.reduceName = res.data.reduceNum.name;
-          this.yearAllChangeData.reduceNum = Math.abs(res.data.reduceNum.value);
-        }
-      });
-    },
+
+
   },
 };
 </script>

src/views/screen/engineering/issueListDia.vue

@@ -32,13 +32,13 @@
         <div class="flex-column" style="width: 30%">{{ item.description }}</div>
         <div class="flex-column" style="width: 15%">{{ item.person }}</div>
         <div class="flex-column" style="width: 10%">
-          <span v-if="item.status == 0"><span style="color: #67C23A">●</span> 已完结</span>
-          <span v-if="item.status == 1"><span style="color: #FAAD14">●</span> 处理中</span>
+          <span v-if="item.status == 1"><span style="color: #67C23A">●</span> 已完结</span>
+          <span v-if="item.status == 0"><span style="color: #FAAD14">●</span> 处理中</span>
         </div>
         <div class="flex-column" style="width: 15%">
-          <span v-if="item.status == 0"></span>
-          <span v-if="item.status == 1" style="color: #00FFFF;cursor: pointer" @click="togglePost(item)">变更状态</span>
-          <div v-if="item.status == 1&&item.isShowPost" class="wanjie" @click="changeIssueStatus(item.id)">已完结</div>
+          <span v-if="item.status == 1"></span>
+          <span v-if="item.status == 0" style="color: #00FFFF;cursor: pointer" @click="togglePost(item)">变更状态</span>
+          <div v-if="item.status == 0&&item.isShowPost" class="wanjie" @click="changeIssueStatus(item.id)">已完结</div>
         </div>
       </div>
     </div>

src/views/screen/engineering/issueSubDia.vue

@@ -29,12 +29,12 @@
           placeholder="选择日期">
         </el-date-picker>-->
         <div>
-          <el-input placeholder="请输入标题" style="margin-bottom: 20px;width: 220px"></el-input>
+          <el-input v-model="title" placeholder="请输入标题" style="margin-bottom: 20px;width: 220px"></el-input>
         </div>
 
-        <el-input type="textarea" :rows=6 placeholder="请输入内容" resize="none" style="margin-bottom: 20px;width: 350px"></el-input>
+        <el-input v-model="description" type="textarea" :rows=6 placeholder="请输入内容" resize="none" style="margin-bottom: 20px;width: 350px"></el-input>
 
-        <el-input type="textarea" :rows=6 placeholder="请输入整改要求" resize="none" style="margin-bottom: 20px;width: 350px"></el-input>
+        <el-input v-model="need" type="textarea" :rows=6 placeholder="请输入整改要求" resize="none" style="margin-bottom: 20px;width: 350px"></el-input>
 
         <div style="width: 130px;height: 130px;background: rgba(15, 86, 86, 0.54);margin-bottom: 10px;mborder-radius: 4px;color: #00ffff;position: relative;font-size: 45px;display: flex;align-items: center">
           <i v-if="!fileFlag" class="el-icon-plus" style="position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"></i>
@@ -53,7 +53,7 @@
           </div>
           <img width="100%" :src="dialogImageUrl" v-if="fileFlag" style="height: 100%;object-fit: cover;">
         </div>
-        <el-button style="width: 100px;margin-top: 10px;margin-right: 10px;border: 1px solid #00FFFF;border-radius: 2px;">提交</el-button>
+        <el-button style="width: 100px;margin-top: 10px;margin-right: 10px;border: 1px solid #00FFFF;border-radius: 2px;" @click="add">提交</el-button>
         <el-button style="width: 100px;margin-top: 10px;background: rgba(15, 86, 86, 0.54);color: #00ffff;border: 1px solid #00FFFF;border-radius: 2px;">取消</el-button>
       </div>
     </div>
@@ -61,13 +61,22 @@
 </template>
 
 <script>
-import { getFoodsList } from "@/api/screen/service";
+import { add } from "@/api/screen/service";
 import pinyin from "../data/pinyin.js";
 
 export default {
   name: "UnitCamera",
+  props: {
+    imgUrl: {
+      type: String,
+      default: '',
+    },
+  },
   data() {
     return {
+      title:'',
+      description:'',
+      need:'',
       fileFlag: false,
       fileList: [],
       dialogImageUrl: '',
@@ -79,11 +88,33 @@ export default {
     };
   },
   mounted() {},
+  mounted() {
+    this.dialogImageUrl = this.imgUrl
+},
   methods: {
     triggerFileInput(){
       this.$refs.fileInput.click();
     },
-
+    add() {
+       alert(this.imgUrl)
+      return
+      const issueData = {
+        title:this.title,
+        description:this.description,
+        need:this.need,
+        projectId:'',
+        delFlag: 0,
+        file:this.dialogImageUrl,
+        status: 0,
+      };
+      add(issueData).then((res) => {
+        if (Number(res.code) === 200) {
+          this.close();
+        }
+      }).catch((err) => {
+        console.error("提交失败：", err);
+      });
+    },
     handleFileChange(event) {
       const file = event.target.files[0];
       if (file) {

src/views/screen/engineering/main.vue

@@ -208,7 +208,8 @@
         <issue-sub-dia
           v-if="showIssueSub === 1"
           @close="onCloseIssueSub"
-          :monitorInfo="this.monitorInfo">
+          :monitorInfo="this.monitorInfo"
+          :imgUrl="this.imgUrl">
         </issue-sub-dia>
         <issue-deal-dia
           v-if="showIssueDeal === 1"
@@ -326,6 +327,7 @@ export default {
       ],
       list1: [],
       list2: [],
+      imgUrl:'',
       curCompanyear:'',
       curCompanMonth:'',
       showRes:0,
@@ -503,7 +505,8 @@ export default {
       this.showCamera = 1;
     },
     //入口
-    onChooseIssue(){
+    onChooseIssue(t){
+      this.imgUrl=t
       this.flag = 1
       this.showType = 0;
       this.showC = true;

src/views/screen/engineering/monitorLive.vue

@@ -57,6 +57,7 @@ export default {
       winNum: 1,
       videoObj: '',
       played: false,
+      imgSrc:'',
       code: '',
       direction:''
     };
@@ -92,8 +93,8 @@ export default {
       this.videoObj && this.videoObj.videoStop(this.winNum);
       this.$emit("closeMonitor")
     },
-    issue(){
-      this.$emit("issue");
+    issue(t){
+      this.$emit("issue",t);
     },
     // 播放器加载完毕
     playVideo(obj) {
@@ -192,7 +193,9 @@ export default {
         winNum: this.winNum,
         code: this.monitorInfo.cameraCode,
       });
-      this.issue()
+      this.imgSrc=this.fileName
+      this.issue(this.imgSrc)
+
     },
 
     amplify() {

src/views/screen/logistics/logisticsAssets.vue

@@ -30,6 +30,8 @@
              办公各类资产占比
             </div>
                </div>
+               <!-- :labelShow="true"
+               :labelLine="true" -->
                <div class="device-item1" v-if="showTab === 'main'">
                     <pie-chart
                     position="left"
@@ -356,7 +358,7 @@ export default {
     timeMonth(){
       const year = this.currentTime.getFullYear();
       return `${year}`;
-    } 
+    }
 
   },
   created() {