Merge remote-tracking branch 'origin/main'

src/views/screen/engineering/issueSubDia.vue

@@ -12,9 +12,9 @@
     <div class="me">
       <div style="width: 35%;color: #00ffff;">
         <div style="text-align: right;margin-bottom: 10px;height: 32px;line-height: 32px">时间：</div>
-        <div style="text-align: right;margin-bottom: 20px;height: 32px;line-height: 32px">问题：</div>
+        <div style="text-align: right;margin-bottom: 20px;height: 32px;line-height: 32px">标题：</div>
         <div style="text-align: right;margin-bottom: 145px;">问题内容：</div>
-        <div style="text-align: right;margin-bottom: 13px">选项：</div>
+        <!-- <div style="text-align: right;margin-bottom: 13px">选项：</div> -->
         <div style="text-align: right">附件：</div>
       </div>
       <div style="width: 65%;">
@@ -24,10 +24,10 @@
           type="date"
           placeholder="选择日期">
         </el-date-picker>
-        <el-input placeholder="请输入内容" style="margin-bottom: 10px;width: 220px"></el-input>
+        <el-input placeholder="请输入标题" style="margin-bottom: 10px;width: 220px"></el-input>
         <el-input type="textarea" :rows=8 placeholder="请输入内容" resize="none" style="margin-bottom: 10px;width: 350px"></el-input>
-        <el-checkbox v-model="check" @change="change">备选项1</el-checkbox>
-        <el-checkbox v-model="checked" @change="changed" style="margin-right: 200px">备选项</el-checkbox>
+        <!-- <el-checkbox v-model="check" @change="change">备选项1</el-checkbox>
+        <el-checkbox v-model="checked" @change="changed" style="margin-right: 200px">备选项</el-checkbox> -->
         <div style="width: 130px;height: 130px;background: rgba(15, 86, 86, 0.54);margin-top: 10px;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>
           <input v-if="!fileFlag" type="file" ref="fileInput" @change="handleFileChange" style="display: none;position: absolute;left: -1000px"/>

src/views/screen/logistics/assets/codeBillDialog.vue

@@ -124,7 +124,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>楼宇</div>
                     </div>
-                    <div class="num">56<span class="unit">m²</span></div>
+                    <div class="num">56<span class="unit">件</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -133,7 +133,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>服务</div>
                     </div>
-                    <div class="num">51<span class="unit">m²</span></div>
+                    <div class="num">51<span class="unit">件</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -142,7 +142,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>办公</div>
                     </div>
-                    <div class="num">48<span class="unit">m²</span></div>
+                    <div class="num">48<span class="unit">件</span></div>
                   </div>
                  </div>
 
@@ -160,7 +160,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>楼宇</div>
                     </div>
-                    <div class="num">56<span class="unit">m²</span></div>
+                    <div class="num">56<span class="unit">件</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -169,7 +169,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>服务</div>
                     </div>
-                    <div class="num">51<span class="unit">m²</span></div>
+                    <div class="num">51<span class="unit">件</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -178,7 +178,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>办公</div>
                     </div>
-                    <div class="num">48<span class="unit">m²</span></div>
+                    <div class="num">48<span class="unit">件</span></div>
                   </div>
                  </div>
 
@@ -196,7 +196,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>楼宇</div>
                     </div>
-                    <div class="num">56<span class="unit">m²</span></div>
+                    <div class="num">56<span class="unit">件</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -205,7 +205,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>服务</div>
                     </div>
-                    <div class="num">51<span class="unit">m²</span></div>
+                    <div class="num">51<span class="unit">件</span></div>
                   </div>
                  </div>
                  <div class="left-list">
@@ -214,7 +214,7 @@
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
                       <div>办公</div>
                     </div>
-                    <div class="num">48<span class="unit">m²</span></div>
+                    <div class="num">48<span class="unit">件</span></div>
                   </div>
                  </div>
 

src/views/screen/logistics/logisticsAssets.vue

@@ -36,8 +36,7 @@
                     position="left"
                   :chart-data="pieData"
                   :legend="pieLegend"
-                  
-                  :center="['35%','40%']"                             
+                  :center="['35%','40%']"
                   width="220px"
                   height="180px"
                 />
@@ -79,7 +78,7 @@
                     position="left"
                   :chart-data="lyData"
                   :legend="lyLegend"
-                  :center="['30%','60%']"                             
+                  :center="['30%','60%']"
                   width="400px"
                   height="180px"
                 />
@@ -89,7 +88,7 @@
                     position="left"
                   :chart-data="fwData"
                   :legend="fwLegend"
-                  :center="['30%','60%']"                             
+                  :center="['30%','60%']"
                   width="400px"
                   height="180px"
                 />
@@ -99,7 +98,7 @@
                     position="left"
                   :chart-data="bgData"
                   :legend="bgLegend"
-                  :center="['30%','60%']"                             
+                  :center="['30%','60%']"
                   width="400px"
                   height="180px"
                 />
@@ -113,34 +112,34 @@
                 <span class="title">资产存量</span>
               </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/liveSwin.png"></div>
-                      <div>楼宇</div> 
+                      <div>楼宇</div>
                     </div>
-                    <div class="num">56<span class="unit">m²</span></div>                
+                    <div class="num">56<span class="unit">件</span></div>
                   </div>
                  </div>
-                 <div class="left-list">                
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div> 
+                      <div>服务</div>
                     </div>
-                    <div class="num">51<span class="unit">m²</span></div>                
+                    <div class="num">51<span class="unit">件</span></div>
                   </div>
                  </div>
-                 <div class="left-list">                
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div> 
+                      <div>办公</div>
                     </div>
-                    <div class="num">48<span class="unit">m²</span></div>                
+                    <div class="num">48<span class="unit">件</span></div>
                   </div>
                  </div>
-           
+
               </div>
             </div>
 
@@ -149,75 +148,75 @@
                 <span class="title">资产新增数量</span>
               </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/liveSwin.png"></div>
-                      <div>楼宇</div> 
+                      <div>楼宇</div>
                     </div>
-                    <div class="num">56<span class="unit">m²</span></div>                
+                    <div class="num">56<span class="unit">件</span></div>
                   </div>
                  </div>
-                 <div class="left-list">                
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div> 
+                      <div>服务</div>
                     </div>
-                    <div class="num">51<span class="unit">m²</span></div>                
+                    <div class="num">51<span class="unit">件</span></div>
                   </div>
                  </div>
-                 <div class="left-list">                
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div> 
+                      <div>办公</div>
                     </div>
-                    <div class="num">48<span class="unit">m²</span></div>                
+                    <div class="num">48<span class="unit">件</span></div>
                   </div>
                  </div>
-           
+
               </div>
             </div>
-           
+
             <div class="content">
               <div class="total-cont">
                 <span class="title">资产报废数量</span>
               </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/liveSwin.png"></div>
-                      <div>楼宇</div> 
+                      <div>楼宇</div>
                     </div>
-                    <div class="num">56<span class="unit">m²</span></div>                
+                    <div class="num">56<span class="unit">件</span></div>
                   </div>
                  </div>
-                 <div class="left-list">                
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>服务</div> 
+                      <div>服务</div>
                     </div>
-                    <div class="num">51<span class="unit">m²</span></div>                
+                    <div class="num">51<span class="unit">件</span></div>
                   </div>
                  </div>
-                 <div class="left-list">                
+                 <div class="left-list">
                     <div class="left-info">
                     <div class="name">
                       <div> <img src="@/assets/images/service_new/liveSwin.png"></div>
-                      <div>办公</div> 
+                      <div>办公</div>
                     </div>
-                    <div class="num">48<span class="unit">m²</span></div>                
+                    <div class="num">48<span class="unit">件</span></div>
                   </div>
                  </div>
-           
+
               </div>
             </div>
-   
+
       </div>
-  
+
     </div>
   </div>
 </template>
@@ -263,9 +262,9 @@ export default {
         textStyle: {
           color: "#FFF",
         },
-      
+
       },
-      
+
      //楼宇资产占比
      lyData: [
         { value: 24.15, name: "电梯" },
@@ -284,7 +283,7 @@ export default {
         textStyle: {
           color: "#FFF",
         },
-      
+
       },
       //服务资产占比
       fwData: [
@@ -304,7 +303,7 @@ export default {
         textStyle: {
           color: "#FFF",
         },
-      
+
       },
       //办公资产占比
       bgData: [
@@ -312,7 +311,7 @@ export default {
         { value: 24.15, name: "电气" },
         { value: 44.15, name: "楼宇通风" },
         { value: 24.15, name: "供热采暖" },
-   
+
       ],
       bgLegend: {
         top: 25,
@@ -323,7 +322,7 @@ export default {
         textStyle: {
           color: "#FFF",
         },
-      
+
       },
     };
   },
@@ -584,7 +583,7 @@ export default {
       }
     }
   }
-  
+
   .content {
     margin-top: 10px;
     padding-left: 20px;