李扬

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

@@ -253,7 +253,9 @@ public class TMeasureThicknessController extends BaseController
             map.put("result", result);
             logger.info("result:" + result);
             String name = measureThicknessEntity.getPlantCode() +"-" +measureThicknessEntity.getTagno() + "-" + measureThicknessEntity.getPosition();
-            PDFTemplateUtil.exportPdf("measureFMaker.ftl", name + ".pdf","file:/"+RuoYiConfig.getProfile(), map, response);
+            PDFTemplateUtil.exportPdf("measureFMaker.ftl", name + ".pdf","file:"+RuoYiConfig.getProfile(), map, response);
+//             PDFTemplateUtil.exportPdf("measureFMaker.ftl", name + ".pdf",RuoYiConfig.getProfile(), map, response);
+
         } catch (Exception e) {
             e.printStackTrace();
         }finally {

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

@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.document.PDFTemplateUtil;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.project.sems.domain.TReportPatrol;
 import com.ruoyi.project.sems.service.ITReportPatrolService;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricTaskInstanceQuery;
@@ -47,6 +48,8 @@ public class TReportMonthController extends BaseController
 
     @Autowired
     private HistoryService historyService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 查询月度检查列表
@@ -136,11 +139,12 @@ public class TReportMonthController extends BaseController
             logger.info("历史任务：" + JSON.toJSONString(htiLists));
             if( htiLists != null && htiLists.size() > 0 ){
                 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                map.put("jxwxSign",htiLists.get(0).getName());
+                //获取用户名称
+                map.put("jxwxSign",sysUserService.selectUserById(Long.parseLong(htiLists.get(0).getAssignee())).getNickName());
                 map.put("jxwxEndTime",sdf2.format(htiLists.get(0).getEndTime()));
-                map.put("dywxSign",htiLists.get(1).getName());
+                map.put("dywxSign",sysUserService.selectUserById(Long.parseLong(htiLists.get(1).getAssignee())).getNickName());
                 map.put("dywxEndTime",sdf2.format(htiLists.get(1).getEndTime()));
-                map.put("gybmSign",htiLists.get(2).getName());
+                map.put("gybmSign",sysUserService.selectUserById(Long.parseLong(htiLists.get(2).getAssignee())).getNickName());
                 map.put("gybmEndTime",sdf2.format(htiLists.get(2).getEndTime()));
             }
             PDFTemplateUtil.exportPdf("monthFMaker.ftl", "承压类特种设备月度检查记录.pdf","file:/"+ RuoYiConfig.getProfile(), map, response);

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecCheckMapper.java

@@ -2,19 +2,20 @@ package com.ruoyi.project.sems.mapper;
 
 import java.util.List;
 import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScopePlant;
 import com.ruoyi.project.sems.domain.TSpecCheck;
 
 /**
  * 特种设备检验记录Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-08-23
  */
-public interface TSpecCheckMapper 
+public interface TSpecCheckMapper
 {
     /**
      * 查询特种设备检验记录
-     * 
+     *
      * @param id 特种设备检验记录ID
      * @return 特种设备检验记录
      */
@@ -22,16 +23,16 @@ public interface TSpecCheckMapper
 
     /**
      * 查询特种设备检验记录列表
-     * 
+     *
      * @param tSpecCheck 特种设备检验记录
      * @return 特种设备检验记录集合
      */
-    @DataScope(deptAlias = "d")
+    @DataScopePlant(deptAlias = "d")
     public List<TSpecCheck> selectTSpecCheckList(TSpecCheck tSpecCheck);
 
     /**
      * 新增特种设备检验记录
-     * 
+     *
      * @param tSpecCheck 特种设备检验记录
      * @return 结果
      */
@@ -39,7 +40,7 @@ public interface TSpecCheckMapper
 
     /**
      * 修改特种设备检验记录
-     * 
+     *
      * @param tSpecCheck 特种设备检验记录
      * @return 结果
      */
@@ -47,7 +48,7 @@ public interface TSpecCheckMapper
 
     /**
      * 删除特种设备检验记录
-     * 
+     *
      * @param id 特种设备检验记录ID
      * @return 结果
      */
@@ -55,7 +56,7 @@ public interface TSpecCheckMapper
 
     /**
      * 批量删除特种设备检验记录
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

master/src/main/resources/freeMaker/measureFMaker.ftl

@@ -910,4 +910,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>

ui/src/assets/iconfont/demo_index.html

@@ -38,7 +38,7 @@
   <div class="main">
     <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
       <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
-      
+
     </a></h1>
     <div class="nav-tabs">
       <ul id="tabs" class="dib-box">
@@ -46,50 +46,62 @@
         <li class="dib"><span>Font class</span></li>
         <li class="dib"><span>Symbol</span></li>
       </ul>
-      
+
       <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2877683" target="_blank" class="nav-more">查看项目</a>
-      
+
     </div>
     <div class="tab-container">
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
-          
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe62c;</span>
+                <div class="name">设备图标_阀门</div>
+                <div class="code-name">&amp;#xe62c;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe657;</span>
+                <div class="name">圆角六角星</div>
+                <div class="code-name">&amp;#xe657;</div>
+              </li>
+
             <li class="dib">
               <span class="icon iconfont">&#xe620;</span>
                 <div class="name">三角形</div>
                 <div class="code-name">&amp;#xe620;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe610;</span>
                 <div class="name">添加</div>
                 <div class="code-name">&amp;#xe610;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe612;</span>
                 <div class="name">喜欢</div>
                 <div class="code-name">&amp;#xe612;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe613;</span>
                 <div class="name">星星</div>
                 <div class="code-name">&amp;#xe613;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe63e;</span>
                 <div class="name">圆圈</div>
                 <div class="code-name">&amp;#xe63e;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe650;</span>
                 <div class="name">tx-正方形</div>
                 <div class="code-name">&amp;#xe650;</div>
               </li>
-          
+
           </ul>
           <div class="article markdown">
           <h2 id="unicode-">Unicode 引用</h2>
@@ -108,9 +120,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1634625351781') format('woff2'),
-       url('iconfont.woff?t=1634625351781') format('woff'),
-       url('iconfont.ttf?t=1634625351781') format('truetype');
+  src: url('iconfont.woff2?t=1638751065452') format('woff2'),
+       url('iconfont.woff?t=1638751065452') format('woff'),
+       url('iconfont.ttf?t=1638751065452') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -135,7 +147,25 @@
       </div>
       <div class="content font-class">
         <ul class="icon_lists dib-box">
-          
+
+          <li class="dib">
+            <span class="icon iconfont icon-shebeitubiao_famen"></span>
+            <div class="name">
+              设备图标_阀门
+            </div>
+            <div class="code-name">.icon-shebeitubiao_famen
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-yuanjiaoliujiaoxing"></span>
+            <div class="name">
+              圆角六角星
+            </div>
+            <div class="code-name">.icon-yuanjiaoliujiaoxing
+            </div>
+          </li>
+
           <li class="dib">
             <span class="icon iconfont icon-triangle"></span>
             <div class="name">
@@ -144,7 +174,7 @@
             <div class="code-name">.icon-triangle
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-plus"></span>
             <div class="name">
@@ -153,7 +183,7 @@
             <div class="code-name">.icon-plus
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-love"></span>
             <div class="name">
@@ -162,7 +192,7 @@
             <div class="code-name">.icon-love
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-star"></span>
             <div class="name">
@@ -171,7 +201,7 @@
             <div class="code-name">.icon-star
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-round"></span>
             <div class="name">
@@ -180,7 +210,7 @@
             <div class="code-name">.icon-round
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-square"></span>
             <div class="name">
@@ -189,7 +219,7 @@
             <div class="code-name">.icon-square
             </div>
           </li>
-          
+
         </ul>
         <div class="article markdown">
         <h2 id="font-class-">font-class 引用</h2>
@@ -216,7 +246,23 @@
       </div>
       <div class="content symbol">
           <ul class="icon_lists dib-box">
-          
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shebeitubiao_famen"></use>
+                </svg>
+                <div class="name">设备图标_阀门</div>
+                <div class="code-name">#icon-shebeitubiao_famen</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yuanjiaoliujiaoxing"></use>
+                </svg>
+                <div class="name">圆角六角星</div>
+                <div class="code-name">#icon-yuanjiaoliujiaoxing</div>
+            </li>
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-triangle"></use>
@@ -224,7 +270,7 @@
                 <div class="name">三角形</div>
                 <div class="code-name">#icon-triangle</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-plus"></use>
@@ -232,7 +278,7 @@
                 <div class="name">添加</div>
                 <div class="code-name">#icon-plus</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-love"></use>
@@ -240,7 +286,7 @@
                 <div class="name">喜欢</div>
                 <div class="code-name">#icon-love</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-star"></use>
@@ -248,7 +294,7 @@
                 <div class="name">星星</div>
                 <div class="code-name">#icon-star</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-round"></use>
@@ -256,7 +302,7 @@
                 <div class="name">圆圈</div>
                 <div class="code-name">#icon-round</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-square"></use>
@@ -264,7 +310,7 @@
                 <div class="name">tx-正方形</div>
                 <div class="code-name">#icon-square</div>
             </li>
-          
+
           </ul>
           <div class="article markdown">
           <h2 id="symbol-">Symbol 引用</h2>

ui/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2877683 */
-  src: url('iconfont.woff2?t=1634625351781') format('woff2'),
-       url('iconfont.woff?t=1634625351781') format('woff'),
-       url('iconfont.ttf?t=1634625351781') format('truetype');
+  src: url('iconfont.woff2?t=1638751065452') format('woff2'),
+       url('iconfont.woff?t=1638751065452') format('woff'),
+       url('iconfont.ttf?t=1638751065452') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shebeitubiao_famen:before {
+  content: "\e62c";
+}
+
+.icon-yuanjiaoliujiaoxing:before {
+  content: "\e657";
+}
+
 .icon-triangle:before {
   content: "\e620";
 }

ui/src/assets/iconfont/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "4652163",
+      "name": "设备图标_阀门",
+      "font_class": "shebeitubiao_famen",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "16055348",
+      "name": "圆角六角星",
+      "font_class": "yuanjiaoliujiaoxing",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
     {
       "icon_id": "886908",
       "name": "三角形",

ui/src/lang/en.js

@@ -1,8 +1,8 @@
 // en.js
 export default {
   login: {
-    title: '系统测试平台',
-    logo: 'SSY',
+    title: 'Chemical Plant Management System',
+    logo: 'CPMS',
     logIn: 'Log in',
     username: 'Username',
     password: 'Password',

ui/src/lang/zh.js

@@ -1,8 +1,8 @@
 // zh.js
 export default {
   login: {
-    title: '系统测试平台',
-    logo: '系统测试平台',
+    title: 'CPMS管理系统',
+    logo: 'CPMS管理系统',
     logIn: '登  录',
     username: '账号',
     password: '密码',

ui/src/layout/components/Sidebar/Logo.vue

@@ -14,8 +14,8 @@
 </template>
 
 <script>
-// import logoImg from '@/assets/logo/logo1.png'
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/logo1.png'
+// import logoImg from '@/assets/logo/logo.png'
 
 export default {
   name: 'SidebarLogo',

ui/src/views/homepage.vue

@@ -217,8 +217,8 @@
       }
     },
     created() {
-      this.$i18n.locale = 'zh'
-      this.$store.dispatch('app/setLanguage', 'zh')
+      // this.$i18n.locale = 'zh'
+      // this.$store.dispatch('app/setLanguage', 'zh')
     },
     methods: {
       /** 获取当前年份 */

ui/src/views/login.vue

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

ui/src/views/plant/organization/branch.vue

@@ -12,6 +12,8 @@
             <i v-if="item.bz4" class="iconfont icon-square"></i>
             <i v-if="item.bz5" class="iconfont icon-plus"></i>
             <i v-if="item.bz6" class="iconfont icon-round"></i>
+            <i v-if="item.bz7" class="iconfont icon-yuanjiaoliujiaoxing"></i>
+            <i v-if="item.bz8" class="iconfont icon-shebeitubiao_famen"></i>
           </div>
         </div>
         <template v-if="item.secretary">
@@ -20,7 +22,7 @@
               <li v-if="child.children" :key="cIndex">
                 <div class="branch-box" @click.prevent="clickHandle(child)">
                   <div class="branch-title">{{child.post}}</div>
-                  <img class="branch-pic" :src=item.img>
+                  <img class="branch-pic" :src=child.img>
                   <div class="branch-name">{{child.label}}</div>
                   <div class="bz-box">
                     <i v-if="child.bz1" class="iconfont icon-star"></i>
@@ -29,13 +31,15 @@
                     <i v-if="child.bz4" class="iconfont icon-square"></i>
                     <i v-if="child.bz5" class="iconfont icon-plus"></i>
                     <i v-if="child.bz6" class="iconfont icon-round"></i>
+                    <i v-if="child.bz7" class="iconfont icon-yuanjiaoliujiaoxing"></i>
+                    <i v-if="child.bz8" class="iconfont icon-shebeitubiao_famen"></i>
                   </div>
                 </div>
                 <ul :style="{'width': ulWidth + 'px'}">
                   <li v-for="(schild, chIndex) in child.children" :key="chIndex">
                     <div class="branch-box" @click.prevent="clickHandle(schild)">
                       <div class="branch-title">{{schild.post}}</div>
-                      <img class="branch-pic" :src=item.img>
+                      <img class="branch-pic" :src=schild.img>
                       <div class="branch-name">{{schild.label}}</div>
                       <div class="bz-box">
                         <i v-if="schild.bz1" class="iconfont icon-star"></i>
@@ -44,6 +48,8 @@
                         <i v-if="schild.bz4" class="iconfont icon-square"></i>
                         <i v-if="schild.bz5" class="iconfont icon-plus"></i>
                         <i v-if="schild.bz6" class="iconfont icon-round"></i>
+                        <i v-if="schild.bz7" class="iconfont icon-yuanjiaoliujiaoxing"></i>
+                        <i v-if="schild.bz8" class="iconfont icon-shebeitubiao_famen"></i>
                       </div>
                     </div>
                   </li>
@@ -52,7 +58,7 @@
               <li v-else :key="cIndex" :class="{'odd': ((secretary.length%2) === 1&&!child.children)}">
                 <div class="branch-box" @click.prevent="clickHandle(child)">
                   <div class="branch-title">{{child.post}}</div>
-                  <img class="branch-pic" :src=item.img>
+                  <img class="branch-pic" :src=child.img>
                   <div class="branch-name">{{child.label}}</div>
                   <div class="bz-box">
                     <i v-if="child.bz1" class="iconfont icon-star"></i>
@@ -61,6 +67,8 @@
                     <i v-if="child.bz4" class="iconfont icon-square"></i>
                     <i v-if="child.bz5" class="iconfont icon-plus"></i>
                     <i v-if="child.bz6" class="iconfont icon-round"></i>
+                    <i v-if="child.bz7" class="iconfont icon-yuanjiaoliujiaoxing"></i>
+                    <i v-if="child.bz8" class="iconfont icon-shebeitubiao_famen"></i>
                   </div>
                 </div>
                 <div :style="{width: ulWidth + 'px'}"></div>

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

@@ -239,13 +239,16 @@ export default {
               label: this.staffmgrList[i].name ,
               post: post,
               secretary: [[],[]],
-              img: 'http://47.114.101.16:8080' + process.env.VUE_APP_BASE_API +　this.staffmgrList[i].photo,
+              // img: 'http://47.114.101.16:8080' + process.env.VUE_APP_BASE_API +　this.staffmgrList[i].photo,
+              img: 'https://cpms.basf-ypc.net.cn' + process.env.VUE_APP_BASE_API +　this.staffmgrList[i].photo,
               bz1: false,
               bz2: false,
               bz3: false,
               bz4: false,
               bz5: false,
-              bz6: false
+              bz6: false,
+              bz7: false,
+              bz8: false
             }
             this.list2.push(nodeData)
           }else {
@@ -254,28 +257,37 @@ export default {
               pId: this.staffmgrList[i].pId ,
               label: this.staffmgrList[i].name ,
               post: post,
-              img: 'http://47.114.101.16:8080' + process.env.VUE_APP_BASE_API +　this.staffmgrList[i].photo,
+              img: 'https://cpms.basf-ypc.net.cn' + process.env.VUE_APP_BASE_API +　this.staffmgrList[i].photo,
+              // img: 'http://47.114.101.16:8080' + process.env.VUE_APP_BASE_API +　this.staffmgrList[i].photo,
               bz1: false,
               bz2: false,
               bz3: false,
               bz4: false,
               bz5: false,
-              bz6: false
+              bz6: false,
+              bz7: false,
+              bz8: false
             }
             if (this.staffmgrList[i].specialDuty) {
               console.log(this.staffmgrList[i].specialDuty)
               let dutyArr = this.staffmgrList[i].specialDuty.split(",")
               for (let i = 0; i < dutyArr.length; i++) {
                 if (dutyArr[i] == "10") {
-                  nodeData.bz3 = true
+                  nodeData.bz4 = true
                 }else if (dutyArr[i] == "12") {
-                  nodeData.bz1 = true
+                  nodeData.bz3 = true
                 }else if (dutyArr[i] == "14") {
                   nodeData.bz5 = true
                 }else if (dutyArr[i] == "16") {
                   nodeData.bz6 = true
                 }else if (dutyArr[i] == "18") {
                   nodeData.bz2 = true
+                }else if (dutyArr[i] == "20") {
+                  nodeData.bz1 = true
+                }else if (dutyArr[i] == "22") {
+                  nodeData.bz8 = true
+                }else if (dutyArr[i] == "24") {
+                  nodeData.bz7 = true
                 }
               }
             }

ui/src/views/tool/build/index.vue

@@ -157,8 +157,8 @@ import {
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import drawingDefalut from '@/utils/generator/drawingDefalut'
-// import logo from '@/assets/logo/logo1.png'
-import logo from '@/assets/logo/logo.png'
+import logo from '@/assets/logo/logo1.png'
+// import logo from '@/assets/logo/logo.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'