LY 会议修改

master/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.cpms</groupId>
     <artifactId>cpms</artifactId>
     <version>3.2.0</version>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
 
     <name>cpms</name>
     <description>cpms管理系统</description>

master/src/main/java/com/ruoyi/project/plant/controller/TMtMeetingController.java

@@ -164,7 +164,7 @@ public class TMtMeetingController extends BaseController {
     public String getReport(Long year, Long meetingId) {
         logger.info("meetingId:" + meetingId);
         String tempUrl = "";
-        tempUrl = "static/word/meeting.docx"; // 经理模板文件
+        tempUrl = "static/word/meeting.docx"; // 模板文件
         // 保存结果文
         InputStream is = null;
         try {

master/src/main/java/com/ruoyi/project/plant/service/impl/TMtMeetingServiceImpl.java

@@ -9,6 +9,7 @@ import com.ruoyi.project.plant.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.plant.service.ITMtMeetingService;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -75,6 +76,7 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertTMtMeeting(TMtMeeting tMtMeeting)
     {
         tMtMeetingMapper.insertTMtMeeting(tMtMeeting);
@@ -84,12 +86,17 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         List<TMtActionlist> actionlists =  tMtActionlistMapper.selectTMtActionlistList(t);
         for (TMtActionlist a : actionlists
              ) {
+            if ("3".equals(a.getStatus())  ) { //已经完成的项目删除
+                tMtActionlistMapper.deleteTMtActionlistById(a.getId());
+            }
+
             a.setMeetingId(tMtMeeting.getId());
             a.setIsHis(1l);
             if (areDatesInSameWeek(a.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
                 a.setIsNew(1l);
             }
             tMtActionlistMapper.insertTMtActionlist(a);
+
         }
 
         TMtEhsopenitem tMtEhsopenitem = new TMtEhsopenitem();
@@ -110,12 +117,17 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         List<TMtKeymaintenance> tMtKeymaintenanceList = tMtKeymaintenanceMapper.selectTMtKeymaintenanceList(tk);
         for (TMtKeymaintenance m : tMtKeymaintenanceList
              ) {
+            //已经完成的项目删除
+            if ("3".equals(m.getStatus())  ) { //已经完成的项目删除
+                tMtKeymaintenanceMapper.deleteTMtKeymaintenanceById(m.getId());
+            }
             m.setMeetingId(tMtMeeting.getId());
             m.setIsHis(1l);
             if (areDatesInSameWeek(m.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
                 m.setIsNew(1l);
             }
             tMtKeymaintenanceMapper.insertTMtKeymaintenance(m);
+
         }
 
         TMtMessageattention tMtMessageattention = new TMtMessageattention();
@@ -123,12 +135,17 @@ public class TMtMeetingServiceImpl implements ITMtMeetingService
         List<TMtMessageattention> tMtMessageattentionList = tMtMessageattentionMapper.selectTMtMessageattentionList(tMtMessageattention);
         for (TMtMessageattention m : tMtMessageattentionList
         ) {
+            //已经完成的项目删除
+            if ("3".equals(m.getStatus())  ) { //已经完成的项目删除
+                tMtMessageattentionMapper.deleteTMtMessageattentionById(m.getId());
+            }
             m.setMeetingId(tMtMeeting.getId());
             m.setIsHis(1l);
             if (areDatesInSameWeek(m.getUpdatedate(),tMtMeeting.getMeetingDate()) == true) {
                 m.setIsNew(1l);
             }
             tMtMessageattentionMapper.insertTMtMessageattention(m);
+
         }
 
         TMtInterlock tMtInterlock = new TMtInterlock();

master/src/main/java/com/ruoyi/project/training/elearn/controller/TElUserBookController.java

@@ -44,6 +44,7 @@ public class TElUserBookController extends BaseController
     public TableDataInfo list(TElUserBook tElUserBook)
     {
         startPage();
+        tElUserBook.setUserId(getUserId());
         List<TElUserBook> list = tElUserBookService.selectTElUserBookList(tElUserBook);
         return getDataTable(list);
     }
@@ -82,7 +83,9 @@ public class TElUserBookController extends BaseController
         }
         //继续答题
         TElUserBook userbook =  tElUserBookMapper.selectTElUserBookByLast(book);
-
+        if (userbook == null) {
+            AjaxResult.error("已经是最后一题");
+        }
         return AjaxResult.success(userbook.getQuId());
     }
 

master/src/main/resources/mybatis/training/elearn/TElUserBookMapper.xml

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null "> and user_id = #{userId}</if>
             and d.del_flag = 0
         </where>
-        order by d.qu_id desc)
+        order by d.updatedate desc)
         where rownum = 1
     </select>
 

ui/package.json

@@ -87,7 +87,7 @@
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vuedraggable": "2.20.0",
-    "vuex": "3.1.0"
+    "vuex": "3.6.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.4",

ui/src/assets/styles/style.scss

@@ -186,3 +186,20 @@ a {
     #{$type}: 0;
   }
 }
+.fc-toolbar .fc-today-button,
+.fc-toolbar .fc-prev-button,
+.fc-toolbar .fc-next-button,
+.fc-toolbar .fc-listWeek-button,
+.fc-toolbar .fc-dayGridMonth-button,
+.fc-toolbar .fc-timeGridWeek-button,
+.fc-toolbar .fc-timeGridDay-button
+{
+  font-size: 14px !important; /* 设置按钮字体大小 */
+  padding: 8px 12px !important; /* 设置按钮内边距 */
+  height: 40px; /* 设置按钮高度 */
+  line-height: 24px; /* 设置按钮行高，使文本居中 */
+  border-radius: 3px;
+}
+.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled).active:active,.btn-primary:not(:disabled):not(.disabled).active:hover{
+  box-shadow: 0 0 0 0 !important;
+}

ui/src/views/front/materialBalanceHome.vue

@@ -20,7 +20,7 @@
                             <img src="@/assets/img/arror1.png" class="arror1 move ar-animated">
                         </div>
                     </div>
-    
+
                     <div class="flex">
                         <span class="box_one">乙烷</span>
                         <div class="arror_one">
@@ -28,7 +28,7 @@
                             <img src="@/assets/img/arror1.png" class="arror1 move ar-animated">
                         </div>
                     </div>
-    
+
                     <div class="flex">
                         <span class="box_one">C5</span>
                         <div class="arror_one">
@@ -36,7 +36,7 @@
                             <img src="@/assets/img/arror1.png" class="arror1 move ar-animated">
                         </div>
                     </div>
-    
+
                     <div class="flex">
                         <span class="box_one">C6-C8</span>
                         <div class="arror_one">
@@ -44,7 +44,7 @@
                             <img src="@/assets/img/arror1.png" class="arror1 move ar-animated">
                         </div>
                     </div>
-    
+
                     <div class="flex">
                         <span class="box_one">LPG</span>
                         <div class="arror_one">
@@ -53,7 +53,7 @@
                         </div>
                     </div>
                 </div>
-    
+
                 <div class="layout_left">
                     <div class="box_two">
                         <div class="luziBox" @click="newTabClick">
@@ -129,10 +129,10 @@
                             <p class="text2">310-H-109B</p>
                         </div>
                     </div>
-    
+
                     <div class="furnace">Furnace</div>
                 </div>
-    
+
                 <div class="layout_left">
                     <img src="@/assets/img/arror4.png" class="arror4 move ar-animated ar-delay-4s">
                 </div>
@@ -140,40 +140,40 @@
                     <div class="luzi2">
                         <div class="ebo2Box">EBO</div>
                         <div class="imgBox">
-    
+
                             <img src="@/assets/img/luzi2-img-arror2.png" class="luzi2-img2 move2 ar-animated">
                             <img src="@/assets/img/arror4.png" class="arror4 luzi2-img3 move3 ar-animated">
                             <img src="@/assets/img/arror4.png" class="arror4 luzi2-img4 move3 ar-animated">
-    
+
                             <img src="@/assets/img/arror5.png" class="arror5 luzi2-img8 move7 ar-animated">
-    
+
                             <img src="@/assets/img/arrorDown.png" class="arrorDown1 luzi2-img5 move4 ar-animated">
                             <img src="@/assets/img/arrorDown.png" class="arrorDown1 luzi2-img6 move5 ar-animated">
                             <img src="@/assets/img/arrorDown.png" class="arrorDown2 luzi2-img7 move6 ar-animated">
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/luzi2-img-arror1.png" class="luzi2-img1">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao1 move8 ar-animated">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror6.png" class="arror6">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao2 move9 ar-animated1">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror7.png" class="arror7">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao3 move10 ar-animated1">
                             </div>
-    
+
                             <img src="@/assets/img/arror8.png" class="arror8">
-    
-    
+
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror9.png" class="arror9">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao4 move11 ar-animated">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror9.png" class="arror10">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao5 move12 ar-animated">
@@ -186,13 +186,13 @@
                                 <img src="@/assets/img/arror9.png" class="arror12">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao7 move14 ar-animated">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror10.png" class="arror13">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao8 move15 ar-animated">
                             </div>
                         </div>
-    
+
                         <div class="wordBox">
                             <span class="location loc1">Compressor</span>
                             <span class="location loc2">Cold Section</span>
@@ -207,23 +207,23 @@
                             <span class="section4" @click="newTabClick1"></span>
                             <span class="section5" @click="newTabClick2"></span>
                             <span class="section7" @click="newTabClick1"></span>
-    
+
                             <span class="location loc9">{{ dashboarddata.energyRpg }}</span>
                         </div>
-    
+
                         <div class="elementBox elementBoxLoc1">
                             <div class="box_one elementItem">RPG</div>
                             <div class="box_one elementItem">H2</div>
-    
+
                         </div>
-    
+
                         <div class="elementBox elementBoxLoc2">
                             <div class="box_one elementItem">Washoil</div>
                             <div class="box_one elementItem">C5</div>
                             <div class="box_one elementItem">RMA</div>
                             <div class="box_one elementItem">C9</div>
-    
-    
+
+
                             <div class="sekuaiBox">
                                 <span class="item blue pos1">
                              {{ dashboarddata.energyWashoil }}
@@ -239,8 +239,8 @@
                           </span>
                             </div>
                         </div>
-    
-    
+
+
                         <div class="elementBox elementBoxLoc3">
                             <div class="box_one elementItem">H2</div>
                             <div class="box_one elementItem">C2H4</div>
@@ -253,8 +253,8 @@
                             <div class="box_one elementItem">Toluene</div>
                             <div class="box_one elementItem">Xylene</div>
                             <div class="box_one elementItem">C6-C8 NA</div>
-    
-    
+
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror11.png" class="arror14">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao9 move16 ar-animated3">
@@ -267,43 +267,43 @@
                                 <img src="@/assets/img/arror11.png" class="arror16">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao11 move16 ar-animated3">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror12.png" class="arror17">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao12 move17 ar-animated1">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror11.png" class="arror18">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao13 move16 ar-animated3">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror11.png" class="arror19">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao14 move16 ar-animated3">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror14.png" class="arror20">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao15 move16 ar-animated3">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror11.png" class="arror21">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao16 move16 ar-animated3">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror11.png" class="arror22">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao17 move16 ar-animated3">
                             </div>
-    
+
                             <div class="xixian">
                                 <img src="@/assets/img/arror13.png" class="arror23">
                                 <img src="@/assets/img/sanjiao.png" class="sanjiao18 move16 ar-animated3">
                             </div>
-    
-    
+
+
                             <div class="sekuaiBox">
                                 <span class="item blue pos5">
                              {{ dashboarddata.energyQingqi }}
@@ -339,9 +339,9 @@
                              {{ dashboarddata.energyTanliu }}
                           </span>
                             </div>
-    
+
                         </div>
-    
+
                         <div class="elementBox elementBoxLoc4">
                             <div class="dizuo dizuoelementItem">TM</div>
                             <div class="dizuo dizuoelementItem">TS</div>
@@ -349,27 +349,27 @@
                             <div class="dizuo dizuoelementItem">OXO</div>
                             <div class="dizuo dizuoelementItem">YBS</div>
                             <div class="dizuo dizuoelementItem">TM</div>
-    
-    
+
+
                             <div class="dizuo dizuoelementItem">AA/AE</div>
                             <div class="dizuo dizuoelementItem">GAA</div>
                             <div class="dizuo dizuoelementItem">OXO</div>
                             <div class="dizuo dizuoelementItem">YPC</div>
                             <div class="dizuo dizuoelementItem">Logistic</div>
                             <div class="dizuo dizuoelementItem">BD</div>
-    
+
                         </div>
-    
+
                         <div class="elementBox elementBoxLoc5">
-    
+
                             <img src="@/assets/img/arror15.png" class="arror24">
-    
+
                             <img src="@/assets/img/arror16.png" class="arror25">
-    
+
                             <img src="@/assets/img/arror17.png" class="arror26">
-    
+
                         </div>
-    
+
                     </div>
                 </div>
             </div>
@@ -405,19 +405,21 @@ export default {
     created() {},
     methods: {
         handleLuzi() {
-            this.$router.push({ path: '/process/pfd' });
+          this.$router.push({ path: '/monitor/pfd', query: { pageId: 'LJL' }});
         },
         newTabClick() {
             // window.open(this.url, '_blank')
-            this.$router.push({ path: '/monitor/model1' });
+          this.$router.push({ path: '/monitor/pfd', query: { pageId: 'LJL' }});
+
         },
         newTabClick1() {
             // window.open(this.url1, '_blank')
-            this.$router.push({ path: '/monitor/model2' });
+          this.$router.push({ path: '/monitor/pfd', query: { pageId: 'LJL' }});
+
         },
         newTabClick2() {
             // window.open(this.url1, '_blank')
-            this.$router.push({ path: '/monitor/model3' });
+          this.$router.push({ path: '/monitor/pfd', query: { pageId: 'LJL' }});
         }
         /** 查询dashboard抓取数据列表 */
         // getList()

ui/src/views/login.vue

@@ -260,8 +260,8 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  //background-image: url("../assets/image/CPMS20210107.jpg");
-  background-image: url("../assets/image/cpms-test.jpg");
+  background-image: url("../assets/image/CPMS20210107.jpg");
+  //background-image: url("../assets/image/cpms-test.jpg");
   background-size: cover;
 }
 

ui/src/views/plant/confInfo/index.vue

@@ -741,6 +741,31 @@ export default {
   .el-col-slotBtn .el-form-item__content {
     margin-left: 40px !important;
   }
+.fc {
+  width: 100%; /* 固定宽度 */
+  height: 600px; /* 固定高度 */
+}
 
+.fc-toolbar .fc-center h2 {
+  font-size: 20px; /* 根据需要调整字体大小 */
+}
+.fc-toolbar .fc-today-button,.fc-toolbar .fc-prev-button,.fc-toolbar .fc-next-button,
+.fc-toolbar .fc-listWeek-button,
+.fc-toolbar .fc-dayGridMonth-button,
+.fc-toolbar .fc-timeGridWeek-button,
+.fc-toolbar .fc-timeGridDay-button
+{
+  font-size: 14px !important; /* 设置按钮字体大小 */
+  padding: 8px 12px !important; /* 设置按钮内边距 */
+  height: 40px; /* 设置按钮高度 */
+  line-height: 24px; /* 设置按钮行高，使文本居中 */
+  border-radius: 3px;
+}
+.fc-view-container {
+  overflow: hidden; /* 禁用溢出滚动 */
+}
+.fc-toolbar.btn-primary:not(:disabled):not(.disabled).active:focus{
+  box-shadow: 0 0 0 0 !important;
+}
 
 </style>

ui/src/views/plant/confRoom/index.vue

@@ -75,7 +75,7 @@
       <el-table-column label="设备" align="center" prop="deviceList" :show-overflow-tooltip="true"/>
       <el-table-column label="会议室管理员" align="center" prop="roomManageUser" :show-overflow-tooltip="true"/>
       <el-table-column label="会议室管理员姓名" align="center" prop="roomManageName" :show-overflow-tooltip="true"/>
-      <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true"/>-->
 
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
 <!--      <el-table-column label="会议室照片" align="center" prop="roomPic" :show-overflow-tooltip="true"/>-->
@@ -128,11 +128,11 @@
         <el-form-item label="会议室管理员姓名" prop="roomManageName">
           <el-input v-model="form.roomManageName" placeholder="请输入会议室管理员姓名" />
         </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="状态">-->
+<!--          <el-radio-group v-model="form.status">-->
+<!--            <el-radio label="1">请选择字典生成</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
 
 
         <el-form-item label="备注" prop="remarks">