李扬

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -189,7 +189,7 @@ public class TSpecdevCcController extends BaseController
                     } else if (j == 9) {
                         entity.setCapacity(cellValue);//工作能力
                     } else if (j == 10) {
-                        entity.setDevClass(cellValue);//类别
+                        entity.setDevname(cellValue);//设备名称
                     } else if (j == 11) {
                         entity.setEngineType(cellValue);//动力形式
                     } else if (j == 12) {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -193,7 +193,7 @@ public class TSpecdevYlgdController extends BaseController {
                     } else if (j == 12) {//安装年月
                         logger.info("日期格式：" + cellValue);
                         if (cellValue.length() > 3) {
-                            entity.setCreatedate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
+                            entity.setInstallDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
                     } else if (j == 13) {//投用年月
                         logger.info("日期格式：" + cellValue);

master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /data/cpmsfile/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /data/cpmsfile/uploadPath
   # 邮件中链接跳转路径 示例（本地：http://localhost/#，服务器：http://47.114.101.16:8080/cpms/index.html#）
   requestJumpPath: https://cpms.basf-ypc.net.cn/cpms/index.html#
   # 获取ip地址开关

ui/src/router/index.js

@@ -61,6 +61,11 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/monitor/elec/index'], resolve),
     hidden: true
   },
+  {
+    path: '/elecDashboard',
+    component: (resolve) => require(['@/views/monitor/elec/elecindex'], resolve),
+    hidden: true
+  },
   {
     path: '',
     component: Layout,

ui/src/views/monitor/elec/elecindex.vue

@@ -29,12 +29,15 @@
         <div class="d-flex" style="width: 40%">
           <div
             class="react-right ml-4"
-            style="width: 6.25rem; text-align: left;background-color: #0f1325;"
+            style="width: 3.25rem; text-align: left;background-color: #0f1325;"
           >
             <span class="react-before"></span>
             <span class="text"></span>
           </div>
-          <div class="react-right ml-3" style="background-color: #0f1325;">
+          <div class="react-right ml-3" style="background-color: #0f1325;" >
+            <span class="text colorBlue"></span>
+          </div>
+          <div class="react-right ml-3" style="background-color: #0f1325;" >
             <span class="text colorBlue"></span>
           </div>
         </div>
@@ -43,11 +46,13 @@
             <span class="text fw-b">北京时间</span>
           </div>
           <div
-            class="react-left mr-4"
-            style="width: 6.25rem; background-color: #0f1325; text-align: right;"
+            class="react-left mr-3"
+            style="width: 6.25rem; background-color: #0f1325;"
           >
-            <span class="react-after"></span>
-            <span class="text">{{dateYear}} {{dateWeek}} {{dateDay}}</span>
+            <span style="text-align: center" class="text">{{dateYear}} {{dateWeek}} {{dateDay}}</span>
+          </div>
+          <div class="react-left  mr-3" style="width: 2.25rem; background-color: #0f1325;" @click="openNewWindow">
+            <span class="text fw-b"> <svg-icon icon-class="fullscreen" /></span>
           </div>
         </div>
       </div>
@@ -175,6 +180,12 @@ export default {
         }, delays);
       };
     },
+    openNewWindow() {
+      let routeData = this.$router.resolve({
+        path: "/elecDashboard",
+      });
+      window.open(routeData.href, '_blank');
+    }
   }
 };
 </script>