Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/common/utils/export/JxlsView.java

@@ -45,9 +45,11 @@ public class JxlsView extends AbstractView {
     }
 
     protected final void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        response.setContentType(this.getContentType());
-        response.setHeader("Content-Disposition", "attachment;filename="
-                + EncodeTools.encodeFileNameByBrowser(template.getName(), request));
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+//        response.setHeader("Content-Disposition", "attachment;filename="
+//                + EncodeTools.encodeFileNameByBrowser(template.getName(), request));
+        response.setHeader("Content-Disposition", "attachment;filename=" + new String(template.getName().getBytes("UTF-8"), "iso-8859-1"));
+
         InputStream is = null;
         try {
             is = JxlsView.class.getResourceAsStream(template.getPath());

ui/src/assets/styles/index.scss

@@ -427,7 +427,7 @@ aside {
   margin-top: 0.3rem;
   margin-left: 0.01rem;
   color: #4a7d87;
-  font:40px/20px 'ds-digitalbold';
+  font:35px/25px 'ds-digitalbold';
 }
 
 .ModelFont {

ui/src/lang/en.js

@@ -1192,6 +1192,7 @@ export default {
   设备使用地点: 'Place Of Equipment Use',
   在用: 'In Use',
   特种设备: 'Special Equipment',
+  特种设备2: 'Special',
   压力管道定期检验计划: 'PpQty by Year and Plant',
   锅炉定期检验计划: 'BiolerQty by Year and Plant',
   压力容器定期检验计划: 'PvQty by Year and Plant',

ui/src/lang/zh.js

@@ -1192,6 +1192,7 @@ export default {
   设备使用地点: '设备使用地点',
   在用: '在用',
   特种设备: '特种设备',
+  特种设备2: '特种设备',
   压力管道定期检验计划: '压力管道定期检验计划',
   锅炉定期检验计划: '锅炉定期检验计划',
   压力容器定期检验计划: '压力容器定期检验计划',

ui/src/views/approve/approveDetail/spec-detail.vue

@@ -51,176 +51,103 @@
           :data="devList"
           border
           style="width: 100%;">
-          <el-table-column
-            prop="devEntity.plantCode"
-            header-align="center"
-            align="center"
-            :label="$t('装置')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.unit"
-            header-align="center"
-            align="center"
-            :label="$t('单元')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.devno"
-            header-align="center"
-            align="center"
-            :label="$t('位号')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.devname"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            width="150"
-            :label="$t('设备名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.useno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('使用证号码')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.regno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('注册编号')">
-          </el-table-column>
-          <el-table-column
-            prop="nextCheckDate"
-            header-align="center"
-            align="center"
-            :label="$t('下次年检时间')">
-          </el-table-column>
-          <el-table-column
-            prop="medium"
-            header-align="center"
-            align="center"
-            :label="$t('介质')">
-          </el-table-column>
-          <el-table-column
-            prop="desPressure"
-            header-align="center"
-            align="center"
-            :label="$t('设计压力')">
-          </el-table-column>
-          <el-table-column
-            prop="desTemp"
-            header-align="center"
-            align="center"
-            :label="$t('设计温度')">
-          </el-table-column>
-          <el-table-column
-            prop="optPressure"
-            header-align="center"
-            align="center"
-            :label="$t('操作压力')">
-          </el-table-column>
-          <el-table-column
-            prop="optTemp"
-            header-align="center"
-            align="center"
-            :label="$t('操作温度')">
-          </el-table-column>
-          <el-table-column
-            prop="checkUnit"
-            header-align="center"
-            align="center"
-            :label="$t('检验单位')">
-          </el-table-column>
-          <el-table-column
-            prop="yearReportNo"
-            header-align="center"
-            align="center"
-            :label="$t('报告编号')">
+          <el-table-column :label="$t('装置')" align="center" fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('单元')" align="center" fixed="left" prop="unit" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('位号')" align="center" fixed="left" prop="devno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="safeClass"
-            header-align="center"
-            align="center"
-            :label="$t('安全等级')">
-          </el-table-column>
-          <el-table-column
-            prop="pj1"
-            header-align="center"
-            align="center"
-            label="1">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('管理制度、操作规程、运行记录')" placement="top">
-                <span>1</span>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="pj2"
-            header-align="center"
-            align="center"
-            label="2">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('设计文件、竣工图样、产品合格证、质量证明文件、安装使用说明')" placement="top">
-                <span>2</span>
-              </el-tooltip>
-            </template>
+          <el-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="pj3"
-            header-align="center"
-            align="center"
-            label="3">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('监督检验证书以及安装、改造、修理等资料')" placement="top">
-                <span>3</span>
-              </el-tooltip>
-            </template>
+          <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="pj4"
-            header-align="center"
-            align="center"
-            label="4">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('使用登记证，使用登记表是否与实际相符')" placement="top">
-                <span>4</span>
-              </el-tooltip>
-            </template>
+          <el-table-column :label="$t('操作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="pj5"
-            header-align="center"
-            align="center"
-            label="5">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('日常维护保养、定期安全检查记录')" placement="top">
-                <span>5</span>
-              </el-tooltip>
-            </template>
+          <el-table-column :label="$t('操作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="pj6"
-            header-align="center"
-            align="center"
-            label="6">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('年度检查、定期检验报告齐全，报告中问题解决')" placement="top">
-                <span>6</span>
-              </el-tooltip>
-            </template>
+          <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
           </el-table-column>
-          <el-table-column
-            prop="pj7"
-            header-align="center"
-            align="center"
-            label="7">
-            <template slot-scope="scope" slot="header">
-              <el-tooltip effect="dark" :content="$t('作业人员定期培训情况')" placement="top">
-                <span>7</span>
-              </el-tooltip>
-            </template>
+          <el-table-column  :label="$t('容器管理')" header-align="center">
+            <el-table-column
+              prop="pj1"
+              header-align="center"
+              align="center"
+              label="1">
+              <template slot-scope="scope" slot="header">
+                <el-tooltip effect="dark" :content="$t('管理制度、操作规程、运行记录')" placement="top">
+                  <span>1</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="pj2"
+              header-align="center"
+              align="center"
+              label="2">
+              <template slot-scope="scope" slot="header">
+                <el-tooltip effect="dark" :content="$t('设计文件、竣工图样、产品合格证、质量证明文件、安装使用说明')" placement="top">
+                  <span>2</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="pj3"
+              header-align="center"
+              align="center"
+              label="3">
+              <template slot-scope="scope" slot="header">
+                <el-tooltip effect="dark" :content="$t('监督检验证书以及安装、改造、修理等资料')" placement="top">
+                  <span>3</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="pj4"
+              header-align="center"
+              align="center"
+              label="4">
+              <template slot-scope="scope" slot="header">
+                <el-tooltip effect="dark" :content="$t('使用登记证，使用登记表是否与实际相符')" placement="top">
+                  <span>4</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="pj5"
+              header-align="center"
+              align="center"
+              label="5">
+              <template slot-scope="scope" slot="header">
+                <el-tooltip effect="dark" :content="$t('日常维护保养、定期安全检查记录')" placement="top">
+                  <span>5</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="pj6"
+              header-align="center"
+              align="center"
+              label="6">
+              <template slot-scope="scope" slot="header">
+                <el-tooltip effect="dark" :content="$t('年度检查、定期检验报告齐全，报告中问题解决')" placement="top">
+                  <span>6</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="pj7"
+              header-align="center"
+              align="center"
+              label="7">
+              <template slot-scope="scope" slot="header">
+                <el-tooltip effect="dark" :content="$t('作业人员定期培训情况')" placement="top">
+                  <span>7</span>
+                </el-tooltip>
+              </template>
+            </el-table-column>
           </el-table-column>
           <el-table-column  :label="$t('容器本体及运行情况')" header-align="center">
             <el-table-column

ui/src/views/approve/pending/spec-detail.vue

@@ -51,99 +51,24 @@
           :data="devList"
           border
           style="width: 100%;">
-          <el-table-column
-            prop="devEntity.plantCode"
-            header-align="center"
-            align="center"
-            :label="$t('装置名称')">
+          <el-table-column :label="$t('装置')" align="center" fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('单元')" align="center" fixed="left" prop="unit" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('位号')" align="center" fixed="left" prop="devno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="devEntity.unit"
-            header-align="center"
-            align="center"
-            :label="$t('单元')">
+          <el-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="devEntity.devno"
-            header-align="center"
-            align="center"
-            :label="$t('管道编号')">
+          <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="devEntity.devname"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            width="150"
-            :label="$t('管道名称')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.useno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('使用证号码')">
-          </el-table-column>
-          <el-table-column
-            prop="devEntity.regno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('注册编号')">
+          <el-table-column :label="$t('操作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="nextCheckDate"
-            header-align="center"
-            align="center"
-            :label="$t('下次年检时间')">
+          <el-table-column :label="$t('操作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="medium"
-            header-align="center"
-            align="center"
-            :label="$t('介质')">
-          </el-table-column>
-          <el-table-column
-            prop="desPressure"
-            header-align="center"
-            align="center"
-            :label="$t('设计压力')+' (MPa)'">
-          </el-table-column>
-          <el-table-column
-            prop="desTemp"
-            header-align="center"
-            align="center"
-            :label="$t('设计温度')+' (℃)'">
-          </el-table-column>
-          <el-table-column
-            prop="optPressure"
-            header-align="center"
-            align="center"
-            :label="$t('操作压力')+' (MPa)'">
-          </el-table-column>
-          <el-table-column
-            prop="optTemp"
-            header-align="center"
-            align="center"
-            :label="$t('操作温度')+' (℃)'">
-          </el-table-column>
-          <el-table-column
-            prop="checkUnit"
-            header-align="center"
-            align="center"
-            :label="$t('检验单位')">
-          </el-table-column>
-          <el-table-column
-            prop="yearReportNo"
-            header-align="center"
-            align="center"
-            :label="$t('报告编号')">
-          </el-table-column>
-          <el-table-column
-            prop="safeClass"
-            header-align="center"
-            align="center"
-            :label="$t('安全等级')">
+          <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
           </el-table-column>
           <el-table-column  :label="$t('容器管理')" header-align="center">
           <el-table-column

ui/src/views/sems/reportYlrq/yearapprove.vue

@@ -7,37 +7,24 @@
           :data="devList"
           border
           style="width: 100%">
-          <el-table-column
-            prop="plantCode"
-            header-align="center"
-            align="center"
-            :label="$t('装置名称')">
+          <el-table-column :label="$t('装置')" align="center" fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('单元')" align="center" fixed="left" prop="unit" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('位号')" align="center" fixed="left" prop="devno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="devno"
-            header-align="center"
-            align="center"
-            :label="$t('管道编号')">
+          <el-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="useno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('使用证编号')">
+          <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="regno"
-            header-align="center"
-            align="center"
-            :show-overflow-tooltip="true"
-            :label="$t('注册代码')">
+          <el-table-column :label="$t('操作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true" :render-header="renderHeader">
           </el-table-column>
-          <el-table-column
-            prop="medium"
-            header-align="center"
-            align="center"
-            :label="$t('介质')">
+          <el-table-column :label="$t('操作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true" :render-header="renderHeader">
+          </el-table-column>
+          <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
+          <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
           </el-table-column>
           <el-table-column :label="$t('容器管理')" header-align="center">
             <el-table-column
@@ -625,7 +612,35 @@ export default {
         }
       });
     },
-
+//结论备注
+    renderHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                if (column.label == 1) {
+                  return `管理制度、操作规程、运行记录`
+                }else {
+                  return `如果是多腔压力容器，应分别填写各压力腔的信息和参数，说明填写的信息和参数是哪一个压力腔的信息和参数，并用“/”分隔。`
+                }
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
 
 }
 }

ui/src/views/sems/specanalysis/index.vue

@@ -33,7 +33,7 @@
             <div class="bg-color-spec">
               <div style="float: left">
                 <svg-icon icon-class="boiler"
-                          style="width: 0.8rem; height: 0.8rem; margin-top: 0.3rem; margin-left: 0.2rem"></svg-icon>
+                          style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
               <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
                 <div style="font-size: 14px; color: #5470c6; font-weight:bold">{{ $t('锅炉') }}</div>
@@ -48,7 +48,7 @@
             <div class="bg-color-spec">
               <div style="float: left">
                 <svg-icon icon-class="vessel"
-                          style="width: 0.8rem; height: 0.8rem; margin-top: 0.3rem; margin-left: 0.2rem"></svg-icon>
+                          style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
               <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
                 <div style="font-size: 14px; color: #92D050; font-weight:bold">{{ $t('压力容器') }}</div>
@@ -63,7 +63,7 @@
             <div class="bg-color-spec">
               <div style="float: left">
                 <svg-icon icon-class="pipe"
-                          style="width: 0.8rem; height: 0.8rem; margin-top: 0.3rem; margin-left: 0.2rem"></svg-icon>
+                          style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
               <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
                 <div style="font-size: 14px; color: #e4da3a; font-weight:bold">{{ $t('压力管道') }}</div>
@@ -81,12 +81,12 @@
             <div class="bg-color-spec">
               <div style="float: left">
                 <svg-icon icon-class="forklift"
-                          style="width: 0.8rem; height: 0.8rem; margin-top: 0.3rem; margin-left: 0.2rem"></svg-icon>
+                          style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
               <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
                 <div style="font-size: 14px; color: #5470c6; font-weight:bold">{{ $t('叉车') }}</div>
                 <div class="specFont">{{ devDatas.ccData.ccAll_num }}<span
-                  style="font-size: 12px; color: #4a7d87; margin-left: 0.1rem">{{ $t('辆') }}</span></div>
+                  style="font-size: 10px; color: #4a7d87; margin-left: 0.05rem">{{ $t('辆') }}</span></div>
               </div>
             </div>
           </div>
@@ -96,12 +96,12 @@
             <div class="bg-color-spec">
               <div style="float: left">
                 <svg-icon icon-class="machinery"
-                          style="width: 0.8rem; height: 0.8rem; margin-top: 0.3rem; margin-left: 0.2rem"></svg-icon>
+                          style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
-              <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
+              <div style="float: right;margin-top: 0.3rem">
                 <div style="font-size: 14px; color: #92D050; font-weight:bold">{{ $t('起重机械') }}</div>
                 <div class="specFontSmall"><span
-                  style="font-size: 10px; color: #4a7d87;margin-right: 0.1rem">{{ $t('特种设备') }}</span>{{
+                  style="font-size: 10px; color: #4a7d87;margin-right: 0.1rem">{{ $t('特种设备2') }}</span>{{
                     devDatas.dzsbData.dzsbAll_num
                   }}<span style="font-size: 10px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>
                 <div class="specFontSmall"><span
@@ -117,7 +117,7 @@
             <div class="bg-color-spec">
               <div style="float: left">
                 <svg-icon icon-class="elevator"
-                          style="width: 0.8rem; height: 0.8rem; margin-top: 0.3rem; margin-left: 0.2rem"></svg-icon>
+                          style="width: 0.6rem; height: 0.6rem; margin-top: 0.1rem; margin-left: 0.1rem"></svg-icon>
               </div>
               <div style="float: left; margin-left: 0.2rem; margin-top: 0.3rem">
                 <div style="font-size: 14px; color: #e4da3a; font-weight:bold">{{ $t('电梯') }}</div>