Merge remote-tracking branch 'origin/main'

src/utils/device.js

@@ -1,7 +1,4 @@
-// export function isPadDevice() {
-//     const userAgent = navigator.userAgent || navigator.vendor || window.opera;
-//     return /iPad|Tablet|Android|Mobile/i.test(userAgent) && !/Phone/i.test(userAgent);
-//   }
+
 export function isPadDevice() {
   const userAgent = navigator.userAgent || navigator.vendor || window.opera;
   const platform = navigator.platform || '';
@@ -12,6 +9,6 @@ export function isPadDevice() {
       return true; // iOS 13+ iPad
   }
 
-  // 其他平板设备检测
-  return /iPad|Tablet|Android|Mobile/i.test(userAgent) && !/Phone/i.test(userAgent);
+  return /iPad|Tablet/i.test(userAgent);
+  // return /iPad|Tablet|Android|Mobile/i.test(userAgent) && !/Phone/i.test(userAgent);
 }

src/views/pad/data/company.json

@@ -1,7 +1,7 @@
 [
   {
     "value": "10001",
-    "label": "国网山西省公司",
+    "label": "国网山西省电力公司",
     "children": [
       {
         "value": "10001",

src/views/pad/engineering/main.vue

@@ -336,7 +336,7 @@ export default {
       company: [
         {
           "value": "10001",
-          "label": "国网山西省公司",
+          "label": "国网山西省电力公司",
           "children": [
             {
               "value": "10001",

src/views/pad/engineering/unitAccessto.vue

@@ -218,7 +218,7 @@
       handleUnitDataList() {
         let unitDataList = [];
         unitDataList.push({
-          name: "国网山西省公司",
+          name: "国网山西省电力公司",
           num: 56,
           onLineNum: 46
         });

src/views/pad/official/carWarningDialog.vue

@@ -136,7 +136,7 @@ export default {
       // 公务用车资源情况
       dataList: [
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -152,7 +152,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -168,7 +168,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -184,7 +184,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -200,7 +200,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -216,7 +216,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -232,7 +232,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,

src/views/pad/official/main.vue

@@ -231,7 +231,7 @@ export default {
       company: [
         {
           "value": "10001",
-          "label": "国网山西省公司",
+          "label": "国网山西省电力公司",
           "children": [
             {
               "value": "10001",

src/views/pad/service/basicOperation.vue

@@ -10,7 +10,7 @@
           <div v-for="(item, index) in dataList" :key="index" class="data-item">
             <div class="data-fir">
               <img src="@/assets/images/service_new/img_1.png" class="icon" />
-              <div class="name">{{item.name}}</div>
+              <div class="name">{{item.name}}{{index === 1 ? '(本月)' : ''}}</div>
             </div>
             <div class="data-snd">
               <div class="num">{{item.data}}</div>

src/views/pad/service/basicOperationDialog.vue

@@ -25,7 +25,7 @@
                       src="@/assets/images/service_new/img_1.png"
                       class="icon"
                     />
-                    <div class="name">{{ item.name }}</div>
+                    <div class="name">{{ item.name }}{{index === 1 ? '(本月)' : ''}}</div>
                   </div>
                   <div class="data-snd">
                     <div class="num">{{ item.data }}</div>

src/views/pad/service/canteenDialog.vue

@@ -53,7 +53,7 @@
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
-              <span class="title">食堂服务满意度
+              <span class="title">食堂服务满意度(本月)
               </span>
             </div>
             <div class="content">
@@ -235,7 +235,7 @@
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
-              <span class="title">食堂安全管理</span>
+              <span class="title">食堂安全管理(本月)</span>
             </div>
             <div class="data-list">
               <div class="data-item">

src/views/pad/service/property.vue

@@ -3,11 +3,7 @@
     <!-- <div class="title-area">物业服务</div> -->
     <div class="content-area">
       <div class="content-title">
-        <span class="title">数据概况
-          <el-tooltip class="item" effect="dark" content="统计近三月数据" placement="top-start">
-                  <img src="@/assets/images/main/tips.png" class="tips" />
-                </el-tooltip>
-        </span>
+        <span class="title">数据概况(近三月)</span>
       </div>
       <div class="content">
         <div class="data-content">

src/views/pad/service/propertyDialog.vue

@@ -11,11 +11,7 @@
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
-              <span class="title">数据概况
-                <el-tooltip class="item" effect="dark" content="统计近三月数据" placement="top-start">
-                  <img src="@/assets/images/main/tips.png" class="tips" />
-                </el-tooltip>
-              </span>
+              <span class="title">数据概况(近三月)</span>
             </div>
             <div class="data-chart">
               <div class="data-content">

src/views/pad/service/weekFoods.vue

@@ -255,11 +255,13 @@ export default {
     flex-direction: row;
     align-items: center;
     .data-list {
-      background: radial-gradient(
-        190% 71% at 50% 49%,
-        rgba(21, 105, 107, 0.54) 0%,
-        rgba(27, 95, 97, 0) 100%
-      );
+      // background: radial-gradient(
+      //   190% 71% at 50% 49%,
+      //   rgba(21, 105, 107, 0.54) 0%,
+      //   rgba(27, 95, 97, 0) 100%
+      // );
+      background: #0b0a0a;
+      opacity: 0.9;
       width: 100%;
       height: 492px;
       padding: 20px;

src/views/screen/data/company.json

@@ -1,7 +1,7 @@
  [
   {
     "value": "10001",
-    "label": "国网山西省公司",
+    "label": "国网山西省电力公司",
     "children": [
       {
         "value": "10001",

src/views/screen/engineering/main.vue

@@ -341,7 +341,7 @@ export default {
       company: [
         {
           "value": "10001",
-          "label": "国网山西省公司",
+          "label": "国网山西省电力公司",
           "children": [
             {
               "value": "10001",

src/views/screen/engineering/unitAccessto.vue

@@ -218,7 +218,7 @@ export default {
     handleUnitDataList() {
       let unitDataList = [];
       unitDataList.push({
-        name: "国网山西省公司",
+        name: "国网山西省电力公司",
         num: 56,
         onLineNum: 46
       });

src/views/screen/official/carWarningDialog.vue

@@ -136,7 +136,7 @@ export default {
       // 公务用车资源情况
       dataList: [
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -152,7 +152,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -168,7 +168,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -184,7 +184,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -200,7 +200,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -216,7 +216,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,
@@ -232,7 +232,7 @@ export default {
           n: 55
         },
         {
-          a: "国网山西省公司",
+          a: "国网山西省电力公司",
           b: 56,
           c: 46,
           d: 11,

src/views/screen/official/main.vue

@@ -231,7 +231,7 @@ export default {
       company: [
         {
           "value": "10001",
-          "label": "国网山西省公司",
+          "label": "国网山西省电力公司",
           "children": [
             {
               "value": "10001",

src/views/screen/service/basicOperation.vue

@@ -10,7 +10,7 @@
           <div v-for="(item, index) in dataList" :key="index" class="data-item">
             <div class="data-fir">
               <img src="@/assets/images/service_new/img_1.png" class="icon" />
-              <div class="name">{{item.name}}</div>
+              <div class="name">{{item.name}}{{index === 1 ? '(本月)' : ''}}</div>
             </div>
             <div class="data-snd">
               <div class="num">{{item.data}}</div>

src/views/screen/service/basicOperationDialog.vue

@@ -25,7 +25,7 @@
                       src="@/assets/images/service_new/img_1.png"
                       class="icon"
                     />
-                    <div class="name">{{ item.name }}</div>
+                    <div class="name">{{ item.name }}{{index === 1 ? '(本月)' : ''}}</div>
                   </div>
                   <div class="data-snd">
                     <div class="num">{{ item.data }}</div>

src/views/screen/service/canteenDialog.vue

@@ -53,7 +53,7 @@
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
-              <span class="title">食堂服务满意度
+              <span class="title">食堂服务满意度(本月)
               </span>
             </div>
             <div class="content">
@@ -235,7 +235,7 @@
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
-              <span class="title">食堂安全管理</span>
+              <span class="title">食堂安全管理(本月)</span>
             </div>
             <div class="data-list">
               <div class="data-item">

src/views/screen/service/property.vue

@@ -3,11 +3,7 @@
     <!-- <div class="title-area">物业服务</div> -->
     <div class="content-area">
       <div class="content-title">
-        <span class="title">数据概况
-          <el-tooltip class="item" effect="dark" content="统计近三月数据" placement="top-start">
-                  <img src="@/assets/images/main/tips.png" class="tips" />
-                </el-tooltip>
-        </span>
+        <span class="title">数据概况(近三月)</span>
       </div>
       <div class="content">
         <div class="data-content">

src/views/screen/service/propertyDialog.vue

@@ -11,11 +11,7 @@
         <div class="dialog-list">
           <div class="dialog-item wid100">
             <div class="content-title">
-              <span class="title">数据概况
-                <el-tooltip class="item" effect="dark" content="统计近三月数据" placement="top-start">
-                  <img src="@/assets/images/main/tips.png" class="tips" />
-                </el-tooltip>
-              </span>
+              <span class="title">数据概况(近三月)</span>
             </div>
             <div class="data-chart">
               <div class="data-content">

src/views/screen/service/weekFoods.vue

@@ -257,11 +257,13 @@ export default {
     flex-direction: row;
     align-items: center;
     .data-list {
-      background: radial-gradient(
-        190% 71% at 50% 49%,
-        rgba(21, 105, 107, 0.54) 0%,
-        rgba(27, 95, 97, 0) 100%
-      );
+      // background: radial-gradient(
+      //   190% 71% at 50% 49%,
+      //   rgba(21, 105, 107, 0.54) 0%,
+      //   rgba(27, 95, 97, 0) 100%
+      // );
+      background: #0b0a0a;
+      opacity: 0.9;
       width: 100%;
       height: 492px;
       padding: 20px;