Răsfoiți Sursa

问题调整

敲代码的猫 1 lună în urmă
părinte
comite
0a08b86201

+ 2 - 2
src/api/screen/service.js

@@ -859,11 +859,11 @@ export function getIssueListLastWeek(appOrg, date = null) {
 }
 
 // 更改问题状态
-export function changeIssueStatus(data) {
+export function changeIssueStatus(formData) {
   return request({
     url: '/large/check/changeIssueStatus',
     method: 'post',
-    data: data,
+    data: formData,
     headers: {
       'Content-Type': 'application/json',
     },

BIN
src/assets/images/device1.png


BIN
src/assets/images/device2.png


BIN
src/assets/images/device_bg.png


BIN
src/assets/images/download.png


BIN
src/assets/images/fail.png


BIN
src/assets/images/humidity.png


BIN
src/assets/images/monito.png


BIN
src/assets/images/produce_data_1.png


BIN
src/assets/images/produce_data_2.png


BIN
src/assets/images/produce_data_3.png


BIN
src/assets/images/produce_data_4.png


BIN
src/assets/images/status_error.png


BIN
src/assets/images/status_success.png


BIN
src/assets/images/status_warning.png


BIN
src/assets/images/success.png


BIN
src/assets/images/temperature.png


BIN
src/assets/images/upload.png


+ 30 - 27
src/views/pad/building/energyRate.vue

@@ -6,16 +6,7 @@
         <span class="title">楼宇本周用电量</span>
       </div>
       <div class="rightList1">
-                <div class="left-list">
-                    <div class="left-info">
-                    <div class="name">
-                      <div> <img src="@/assets/images/service_new/quantity.png"></div>
-                      <div>光伏用电量</div>
-                    </div>
-                    <div class="num">{{ thisWeekElectricityList.total[0].num }}<span class="unit">kWh</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list" style="margin-left: 15px;;">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -24,7 +15,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[1].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="margin-left: -12px;">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -33,7 +24,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[2].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="padding-right: 10px;">
+                 <div class="left-list" >
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -42,9 +33,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[3].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-              </div>
-              <div class="rightList1">
-                <div class="left-list">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -53,7 +42,10 @@
                     <div class="num">{{ thisWeekElectricityList.total[4].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="margin-left: -4px;">
+              </div>
+              <div class="rightList1">
+               
+                 <div class="left-list" >
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -62,7 +54,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[5].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="margin-left: 22px;">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -71,7 +63,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[6].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="padding-right: 20px;">
+                 <div class="left-list" >
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -80,10 +72,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[7].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-              </div>
-
-              <div class="rightList1">
-                <div class="left-list">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -92,6 +81,10 @@
                     <div class="num">{{ thisWeekElectricityList.total[8].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
+              </div>
+
+              <div class="rightList1">
+                
                  <div class="left-list">
                     <div class="left-info">
                     <div class="name">
@@ -110,7 +103,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[10].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="padding-right: 5px;">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -120,10 +113,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[11].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-              </div>
-
-              <div class="rightList1">
-                <div class="left-list">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -132,6 +122,10 @@
                     <div class="num">{{ thisWeekElectricityList.total[12].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
+              </div>
+
+              <div class="rightList1">
+              
                  <div class="left-list">
                     <div class="left-info">
                     <div class="name">
@@ -159,6 +153,15 @@
                     <div class="num">{{ thisWeekElectricityList.total[15].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
+                 <div class="left-list" style="visibility: hidden;">
+                    <div class="left-info">
+                    <div class="name">
+                      <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                      <div>办公用电量</div>
+                    </div>
+                    <div class="num">{{ thisWeekElectricityList.total[7].num }}<span class="unit">kWh</span></div>
+                  </div>
+                 </div>
               </div>
 
               <div class="dialog-list">

+ 27 - 27
src/views/pad/building/energyRateDialog.vue

@@ -11,18 +11,8 @@
             <div class="content-title">
               <span class="title">楼宇本周用电量</span>
             </div>
-            <div class="leftNavList">
-              <div class="left-list">
-                <div class="left-info">
-                  <div class="name">
-                    <div> <img src="@/assets/images/service_new/quantity.png"></div>
-                    <div>光伏用电量</div>
-                  </div>
-                  <div class="num" @click="abnormalClick(1,'光伏')">{{ thisWeekElectricityList.total[0].num }}<span
-                      class="unit">kWh</span></div>
-                </div>
-              </div>
-              <div class="left-list" style="margin-left: 15px;">
+            <div class="leftNavList">           
+              <div class="left-list" >
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -32,7 +22,7 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-left: -12px;">
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -42,7 +32,7 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-right: 18px;">
+              <div class="left-list" >
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -52,9 +42,6 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-            </div>
-
-            <div class="leftNavList">
               <div class="left-list">
                 <div class="left-info">
                   <div class="name">
@@ -65,7 +52,10 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-left: -20px;">
+            </div>
+
+            <div class="leftNavList">
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -85,7 +75,7 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="padding-right: 28px;">
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -95,9 +85,6 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-            </div>
-
-            <div class="leftNavList">
               <div class="left-list">
                 <div class="left-info">
                   <div class="name">
@@ -108,7 +95,10 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-left: -10px;">
+            </div>
+
+            <div class="leftNavList">
+              <div class="left-list" >
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -118,7 +108,7 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-left: -10px;">
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -238,9 +228,6 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-            </div>
-
-            <div class="leftNavList">
               <div class="left-list">
                 <div class="left-info">
                   <div class="name">
@@ -251,6 +238,9 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
+            </div>
+
+            <div class="leftNavList">
               <div class="left-list">
                 <div class="left-info">
                   <div class="name">
@@ -281,6 +271,16 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
+              <div class="left-list" style="visibility: hidden;">
+                <div class="left-info">
+                  <div class="name">
+                    <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                    <div>消防用电量</div>
+                  </div>
+                  <div class="num" @click="abnormalClick(1,'消防')">{{ thisWeekElectricityList.total[5].num }}<span
+                      class="unit">kWh</span></div>
+                </div>
+              </div>
             </div>
           </div>
         </div>

+ 30 - 27
src/views/screen/building/energyRate.vue

@@ -6,16 +6,7 @@
         <span class="title">楼宇本周用电量</span>
       </div>
       <div class="rightList1">
-                <div class="left-list">
-                    <div class="left-info">
-                    <div class="name">
-                      <div> <img src="@/assets/images/service_new/quantity.png"></div>
-                      <div>光伏用电量</div>
-                    </div>
-                    <div class="num">{{ thisWeekElectricityList.total[0].num }}<span class="unit">kWh</span></div>
-                  </div>
-                 </div>
-                 <div class="left-list" style="margin-left: 15px;;">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -24,7 +15,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[1].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="margin-left: -12px;">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -33,7 +24,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[2].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="padding-right: 10px;">
+                 <div class="left-list" >
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -42,9 +33,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[3].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-              </div>
-              <div class="rightList1">
-                <div class="left-list">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -53,7 +42,10 @@
                     <div class="num">{{ thisWeekElectricityList.total[4].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="margin-left: -4px;">
+              </div>
+              <div class="rightList1">
+               
+                 <div class="left-list" >
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -62,7 +54,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[5].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="margin-left: 22px;">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -71,7 +63,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[6].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="padding-right: 20px;">
+                 <div class="left-list" >
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -80,10 +72,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[7].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-              </div>
-
-              <div class="rightList1">
-                <div class="left-list">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -92,6 +81,10 @@
                     <div class="num">{{ thisWeekElectricityList.total[8].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
+              </div>
+
+              <div class="rightList1">
+                
                  <div class="left-list">
                     <div class="left-info">
                     <div class="name">
@@ -110,7 +103,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[10].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-                 <div class="left-list" style="padding-right: 5px;">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -120,10 +113,7 @@
                     <div class="num">{{ thisWeekElectricityList.total[11].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
-              </div>
-
-              <div class="rightList1">
-                <div class="left-list">
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -132,6 +122,10 @@
                     <div class="num">{{ thisWeekElectricityList.total[12].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
+              </div>
+
+              <div class="rightList1">
+              
                  <div class="left-list">
                     <div class="left-info">
                     <div class="name">
@@ -159,6 +153,15 @@
                     <div class="num">{{ thisWeekElectricityList.total[15].num }}<span class="unit">kWh</span></div>
                   </div>
                  </div>
+                 <div class="left-list" style="visibility: hidden;">
+                    <div class="left-info">
+                    <div class="name">
+                      <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                      <div>办公用电量</div>
+                    </div>
+                    <div class="num">{{ thisWeekElectricityList.total[7].num }}<span class="unit">kWh</span></div>
+                  </div>
+                 </div>
               </div>
 
               <div class="dialog-list">

+ 28 - 28
src/views/screen/building/energyRateDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main-data dialog-area" @click.stop="preventDefault" @mouseleave="leaveFun">
+  <div class="main-data dialog-area" @click.stop="preventDefault"  @mouseleave="leaveFun">
     <div class="dialog-title">
       <img src="@/assets/images/main/cont_title_bg.png" />
       <div class="title">楼宇中控</div>
@@ -11,18 +11,8 @@
             <div class="content-title">
               <span class="title">楼宇本周用电量</span>
             </div>
-            <div class="leftNavList">
-              <div class="left-list">
-                <div class="left-info">
-                  <div class="name">
-                    <div> <img src="@/assets/images/service_new/quantity.png"></div>
-                    <div>光伏用电量</div>
-                  </div>
-                  <div class="num" @click="abnormalClick(1,'光伏')">{{ thisWeekElectricityList.total[0].num }}<span
-                      class="unit">kWh</span></div>
-                </div>
-              </div>
-              <div class="left-list" style="margin-left: 15px;">
+            <div class="leftNavList">           
+              <div class="left-list" >
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -32,7 +22,7 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-left: -12px;">
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -42,7 +32,7 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-right: 18px;">
+              <div class="left-list" >
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -52,9 +42,6 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-            </div>
-
-            <div class="leftNavList">
               <div class="left-list">
                 <div class="left-info">
                   <div class="name">
@@ -65,7 +52,10 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-left: -20px;">
+            </div>
+
+            <div class="leftNavList">
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -85,7 +75,7 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="padding-right: 28px;">
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -95,9 +85,6 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-            </div>
-
-            <div class="leftNavList">
               <div class="left-list">
                 <div class="left-info">
                   <div class="name">
@@ -108,7 +95,10 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-left: -10px;">
+            </div>
+
+            <div class="leftNavList">
+              <div class="left-list" >
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -118,7 +108,7 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-              <div class="left-list" style="margin-left: -10px;">
+              <div class="left-list">
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
@@ -238,9 +228,6 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
-            </div>
-
-            <div class="leftNavList">
               <div class="left-list">
                 <div class="left-info">
                   <div class="name">
@@ -251,6 +238,9 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
+            </div>
+
+            <div class="leftNavList">
               <div class="left-list">
                 <div class="left-info">
                   <div class="name">
@@ -281,6 +271,16 @@
                       class="unit">kWh</span></div>
                 </div>
               </div>
+              <div class="left-list" style="visibility: hidden;">
+                <div class="left-info">
+                  <div class="name">
+                    <div> <img src="@/assets/images/service_new/quantity.png"></div>
+                    <div>消防用电量</div>
+                  </div>
+                  <div class="num" @click="abnormalClick(1,'消防')">{{ thisWeekElectricityList.total[5].num }}<span
+                      class="unit">kWh</span></div>
+                </div>
+              </div>
             </div>
           </div>
         </div>

+ 90 - 32
src/views/screen/engineering/issueDealDia.vue

@@ -25,46 +25,51 @@
                   style="margin-bottom: 10px"
                   v-model="value"
                   type="date"
-                  placeholder="选择日期">
+                  placeholder="选择日期"
+                  readonly
+                  >
                 </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" readonly ></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" readonly></el-input>
 
         <div style="width: 130px;height: 130px;background: rgba(15, 86, 86, 0.54);margin-bottom: 10px;border-radius: 8px;color: #00ffff;position: relative;font-size: 45px;display: flex;align-items: center;border: 1px solid #00ffff4d;">
           <i v-if="!fileFlag" class="el-icon-plus" style="position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"></i>
           <input v-if="!fileFlag" type="file" ref="fileInput" @change="handleFileChange" style="display: none;position: absolute;left: -1000px"/>
           <div v-if="!fileFlag" @click="triggerFileInput" style="width: 100%;height: 100%;cursor: pointer;position: absolute;"></div>
           <div class="sth" v-if="fileFlag">
-            <div style="width: 0;height: 0;border-left: 30px solid transparent;border-top: 30px solid #000000;position: absolute;top: 0;right: 0">
-            </div>
-            <div class="close-icon" @click="handleRemove"></div>
-            <div style="width: 100%;height: 50%">
-              <div style="width: 100%;height: 50%;display: flex;justify-content: center;align-items: start">
-                <i class="el-icon-view" @click="handlePictureCardPreview"></i>
-              </div>
-              <div style="width: 100%;height: 50%;display: flex;justify-content: center;color: #00FFFF;font-size: 14px;align-items: end">预览</div>
-            </div>
-          </div>
+    <div style="width: 0;height: 0;border-left: 30px solid transparent;border-top: 30px solid #000000;position: absolute;top: 0;right: 0">
+    </div>
+    <div class="close-icon" @click="handleRemove"></div>
+    <div style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center">
+      <div style="color: #00FFFF;font-size: 14px">{{ fileName }}</div>
+    </div>
+  </div>
           <img width="100%" :src="dialogImageUrl" v-if="fileFlag" style="height: 100%;object-fit: cover;">
         </div>
 
         <div style="margin-bottom: 20px;color: #00ffff80;font-family: PingFangSC-Regular;font-weight: 400;font-size: 14px;">支持.docx、.xlsx格式</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;background: rgba(15, 86, 86, 0.54);color: #00ffff;border: 1px solid #00FFFF;border-radius: 2px;">取消</el-button>
+        <el-button @click="changeIssueStatus" style="width: 100px;margin-top: 10px;margin-right: 10px;border: 1px solid #00FFFF;border-radius: 2px;">提交</el-button>
+        <el-button @click="close" 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>
   </div>
 </template>
 
 <script>
-import { getFoodsList } from "@/api/screen/service";
+import { changeIssueStatus } from "@/api/screen/service";
 import pinyin from "../data/pinyin.js";
 
 export default {
+  props: {
+    getProList: {
+      type: String,
+      default: '',
+    },
+  },
   data() {
     return {
       fileFlag: false,
@@ -72,33 +77,86 @@ export default {
       dialogImageUrl: '',
       dialogVisible: false,
       disabled: false,
-      value:"2020-01-01",
+      value:'',
       check:false,
-      checked:false
+      checked:false,
+       // 新增fileName用于显示文件名
+       fileName: '',
+      // 保存原始File对象
+      selectedFile: null
     };
   },
-  mounted() {},
+  mounted() {
+    this.cl()
+
+  },
   methods: {
+    cl(){
+      // alert(1)
+      this.title = this.getProList.title
+      this.description = this.getProList.description
+     
+      this.value = this.getProList.createDate
+    },
     triggerFileInput(){
       this.$refs.fileInput.click();
     },
-
-    handleFileChange(event) {
-      const file = event.target.files[0];
-      if (file) {
-        this.fileFlag = true
-        const reader = new FileReader();
-        reader.onload = (e) => {
-          this.dialogImageUrl = e.target.result; // base64 编码的图片 URL
-        };
-        reader.readAsDataURL(file); // 读取文件并转换为 base64 格式
-        console.log(this.dialogImageUrl)
+    changeIssueStatus() {
+      if (!this.selectedFile) {
+        this.$message.error('请选择要上传的文件');
+        return;
       }
+
+      const formData = new FormData();
+      formData.append('createDate', this.value);
+      formData.append('title', this.title);
+      formData.append('description', this.description);
+      formData.append('id', this.getProList.id);
+      formData.append('status', 1);
+      formData.append('file', this.selectedFile); 
+
+      changeIssueStatus(formData).then((res) => {
+        if (Number(res.code) === 200) {
+          this.close();
+        }
+      }).catch((err) => {
+        console.error("修改状态失败:", err);
+      });
     },
+    handleFileChange(event) {
+  const file = event.target.files[0];
+  if (!file) return;
+
+  // 添加文件类型校验
+  const allowedTypes = [
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document', // .docx
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' // .xlsx
+  ];
+  
+  if (!allowedTypes.includes(file.type)) {
+    this.$message.error('仅支持上传.docx和.xlsx格式文件');
+    this.handleRemove();
+    return;
+  }
+
+  this.fileFlag = true;
+  this.selectedFile = file; // 保存原始File对象
+  this.fileName = file.name; // 显示文件名
+},
+
+
+   
     handleRemove() {
-      this.fileFlag = false
-      this.dialogImageUrl = ''
+      this.fileFlag = false;
+      this.fileName = '';
+      this.selectedFile = null;
+      if (this.$refs.fileInput) {
+        this.$refs.fileInput.value = ''; // 清空文件输入
+      }
     },
+
+    // 移除图片预览相关方法
+  
     handlePictureCardPreview() {
       this.dialogVisible = true;
     },

+ 4 - 4
src/views/screen/engineering/issueListDia.vue

@@ -17,7 +17,7 @@
     </div>
 
     <!-- 表格数据 -->
-    <div class="flex-container" @click="dealIssue">
+    <div class="flex-container">
       <div class="header">
         <div class="flex-column" style="width: 15%">时间</div>
         <div class="flex-column" style="width: 15%">标题</div>
@@ -37,7 +37,7 @@
         </div>
         <div class="flex-column" style="width: 15%">
           <span v-if="item.status == 1"></span>
-          <span v-if="item.status == 0" style="color: #00FFFF;cursor: pointer" @click="togglePost(item)">变更状态</span>
+          <span v-if="item.status == 0" style="color: #00FFFF;cursor: pointer" @click="dealIssue(item)">变更状态</span>
           <div v-if="item.status == 0&&item.isShowPost" class="wanjie" @click="changeIssueStatus(item.id)">已完结</div>
         </div>
       </div>
@@ -98,8 +98,8 @@ export default {
   document.head.appendChild(style);
 },
 methods: {
-  dealIssue(){
-    this.$emit('dealIssue')
+  dealIssue(y){
+    this.$emit('dealIssue',y)
   },
 
     // 获取近一周问题列表

+ 6 - 2
src/views/screen/engineering/main.vue

@@ -214,7 +214,9 @@
         <issue-deal-dia
           v-if="showIssueDeal === 1"
           @close="onCloseIssueDeal"
-          :monitorInfo="this.monitorInfo">
+          :monitorInfo="this.monitorInfo"
+           :getProList="getProList"
+          >
         </issue-deal-dia>
       </div>
     </div>
@@ -329,6 +331,7 @@ export default {
       list2: [],
       imgUrl:'',
       curCompanyear:'',
+      getProList:'',
       curCompanMonth:'',
       showRes:0,
       showC:false,
@@ -529,7 +532,8 @@ export default {
       this.showIssueSub = 1
       this.showIssue = 0
     },
-    onDealIssue(){
+    onDealIssue(u){
+      this.getProList=u
       this.showIssueDeal = 1
       this.showIssue = 0
     },