李扬

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

@@ -42,7 +42,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 查询装置会议执行列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:actionlist:list')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtActionlist tMtActionlist)
     {
@@ -80,7 +80,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 导出装置会议执行列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:actionlist:export')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
     @Log(title = "装置会议执行", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtActionlist tMtActionlist)
@@ -93,7 +93,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 获取装置会议执行详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:actionlist:query')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -103,7 +103,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 新增装置会议执行
      */
-    @PreAuthorize("@ss.hasPermi('plant:actionlist:add')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
     @Log(title = "装置会议执行", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtActionlist tMtActionlist)
@@ -114,7 +114,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 修改装置会议执行
      */
-    @PreAuthorize("@ss.hasPermi('plant:actionlist:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
     @Log(title = "装置会议执行", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtActionlist tMtActionlist)
@@ -125,7 +125,7 @@ public class TMtActionlistController extends BaseController
     /**
      * 删除装置会议执行
      */
-    @PreAuthorize("@ss.hasPermi('plant:actionlist:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
     @Log(title = "装置会议执行", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 查询EHS开项跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:ehsopenitem:list')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtEhsopenitem tMtEhsopenitem)
     {
@@ -48,7 +48,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 查询EHS开项跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:ehsopenitem:list')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
     @GetMapping("/ehsData")
     public List<TMtEhsopenitem> ehsData(TMtEhsopenitem tMtEhsopenitem)
     {
@@ -60,7 +60,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 导出EHS开项跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:ehsopenitem:export')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtEhsopenitem tMtEhsopenitem)
@@ -73,7 +73,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 获取EHS开项跟踪详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:ehsopenitem:query')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -83,7 +83,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 新增EHS开项跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:ehsopenitem:add')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtEhsopenitem tMtEhsopenitem)
@@ -94,7 +94,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 修改EHS开项跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:ehsopenitem:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtEhsopenitem tMtEhsopenitem)
@@ -105,7 +105,7 @@ public class TMtEhsopenitemController extends BaseController
     /**
      * 删除EHS开项跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:ehsopenitem:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
     @Log(title = "EHS开项跟踪", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 查询关键机组联锁旁路列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:interlock:list')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtInterlock tMtInterlock)
     {
@@ -48,7 +48,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 导出关键机组联锁旁路列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:interlock:export')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
     @Log(title = "关键机组联锁旁路", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtInterlock tMtInterlock)
@@ -61,7 +61,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 获取关键机组联锁旁路详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:interlock:query')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 新增关键机组联锁旁路
      */
-    @PreAuthorize("@ss.hasPermi('plant:interlock:add')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
     @Log(title = "关键机组联锁旁路", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtInterlock tMtInterlock)
@@ -82,7 +82,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 修改关键机组联锁旁路
      */
-    @PreAuthorize("@ss.hasPermi('plant:interlock:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
     @Log(title = "关键机组联锁旁路", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtInterlock tMtInterlock)
@@ -93,7 +93,7 @@ public class TMtInterlockController extends BaseController
     /**
      * 删除关键机组联锁旁路
      */
-    @PreAuthorize("@ss.hasPermi('plant:interlock:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
     @Log(title = "关键机组联锁旁路", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 查询信息提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:messageattention:list')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtMessageattention tMtMessageattention)
     {
@@ -48,7 +48,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 导出信息提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:messageattention:export')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
     @Log(title = "信息提醒", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtMessageattention tMtMessageattention)
@@ -61,7 +61,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 获取信息提醒详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:messageattention:query')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 新增信息提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:messageattention:add')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
     @Log(title = "信息提醒", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtMessageattention tMtMessageattention)
@@ -82,7 +82,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 修改信息提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:messageattention:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
     @Log(title = "信息提醒", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtMessageattention tMtMessageattention)
@@ -93,7 +93,7 @@ public class TMtMessageattentionController extends BaseController
     /**
      * 删除信息提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:messageattention:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
     @Log(title = "信息提醒", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 查询OpEx项目跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:opextrack:list')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtOpextrack tMtOpextrack)
     {
@@ -48,7 +48,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 导出OpEx项目跟踪列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:opextrack:export')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
     @Log(title = "OpEx项目跟踪", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtOpextrack tMtOpextrack)
@@ -61,7 +61,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 获取OpEx项目跟踪详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:opextrack:query')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 新增OpEx项目跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:opextrack:add')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
     @Log(title = "OpEx项目跟踪", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtOpextrack tMtOpextrack)
@@ -82,7 +82,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 修改OpEx项目跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:opextrack:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
     @Log(title = "OpEx项目跟踪", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtOpextrack tMtOpextrack)
@@ -93,7 +93,7 @@ public class TMtOpextrackController extends BaseController
     /**
      * 删除OpEx项目跟踪
      */
-    @PreAuthorize("@ss.hasPermi('plant:opextrack:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
     @Log(title = "OpEx项目跟踪", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -43,7 +43,7 @@ public class TMtPersonController extends BaseController
     /**
      * 查询会议人员列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:person:list')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtPerson tMtPerson)
     {
@@ -55,7 +55,7 @@ public class TMtPersonController extends BaseController
     /**
      * 导出会议人员列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:person:export')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
     @Log(title = "会议人员", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtPerson tMtPerson)
@@ -68,7 +68,7 @@ public class TMtPersonController extends BaseController
     /**
      * 获取会议人员详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:person:query')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -78,7 +78,7 @@ public class TMtPersonController extends BaseController
     /**
      * 新增会议人员
      */
-    @PreAuthorize("@ss.hasPermi('plant:person:add')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
     @Log(title = "会议人员", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtPerson tMtPerson)
@@ -98,7 +98,7 @@ public class TMtPersonController extends BaseController
     /**
      * 修改会议人员
      */
-    @PreAuthorize("@ss.hasPermi('plant:person:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
     @Log(title = "会议人员", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtPerson tMtPerson)
@@ -109,7 +109,7 @@ public class TMtPersonController extends BaseController
     /**
      * 删除会议人员
      */
-    @PreAuthorize("@ss.hasPermi('plant:person:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
     @Log(title = "会议人员", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -36,7 +36,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 查询风险提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:riskreminder:list')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtRiskreminder tMtRiskreminder)
     {
@@ -48,7 +48,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 导出风险提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:riskreminder:export')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:export')")
     @Log(title = "风险提醒", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtRiskreminder tMtRiskreminder)
@@ -61,7 +61,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 获取风险提醒详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:riskreminder:query')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +71,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 新增风险提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:riskreminder:add')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:add')")
     @Log(title = "风险提醒", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtRiskreminder tMtRiskreminder)
@@ -82,7 +82,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 修改风险提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:riskreminder:edit')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:edit')")
     @Log(title = "风险提醒", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtRiskreminder tMtRiskreminder)
@@ -93,7 +93,7 @@ public class TMtRiskreminderController extends BaseController
     /**
      * 删除风险提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:riskreminder:remove')")
+    @PreAuthorize("@ss.hasPermi('plant:keymaintenance:remove')")
     @Log(title = "风险提醒", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/production/mapper/TAccidentMapper.java

@@ -70,6 +70,7 @@ public interface TAccidentMapper
      * @param month 需要查询的月份
      * @return 结果
      */
+    @DataScope(deptAlias = "d")
     public int selectHomeData(String month);
 
     List<DataEntity> selectYearData(Map param);

master/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java

@@ -44,7 +44,6 @@ public class SysMenuController extends BaseController
     /**
      * 获取菜单列表
      */
-    @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu)
     {

master/src/main/resources/application.yml

@@ -69,7 +69,7 @@ spring:
       enabled: true
   # redis 配置
   redis:
-    # 地址
+#    # 地址
     host: 47.114.101.16
     # 端口，默认为6379
     port: 6379

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

@@ -1430,7 +1430,16 @@
         this.dataForm.delayNotice = response.data.delayNotice
         this.dataForm.govDate = response.data.govDate
       });
-
+    },
+    recordLetter(){
+      var name = row.fileName;
+      var url = row.fileUrl;
+      var suffix = url.substring(url.lastIndexOf("."), url.length);
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+      a.click()
     },
     // 设备类型：字典翻译
     devTypeFormat(row, column) {

ui/src/views/front/materialBalance.vue

@@ -345,10 +345,6 @@
 
             </div>
           </div>
-
-
-
-
         </div>
       </div>
   </div>

ui/src/views/login.vue

@@ -100,6 +100,11 @@ export default {
   created() {
     this.getCode();
     this.getCookie();
+    if (!this.$store.getters.language){
+      console.log("默认中文")
+      this.$i18n.locale = 'zh'
+      this.$store.dispatch('app/setLanguage', 'zh')
+    }
   },
   methods: {
     getCode() {
@@ -153,8 +158,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/sems/specfile/index.vue

@@ -153,6 +153,7 @@
             :on-progress="handleFileDocProgress"
             :on-success="handleFileDocSuccess"
             :auto-upload="true"
+            :file-list="fileList"
             drag
           >
             <i class="el-icon-upload"></i>
@@ -235,6 +236,7 @@ export default {
       total: 0,
       // 特种设备文件表格数据
       specfileList: [],
+      fileList: [],
       fileTips: '',
       showDelay: false,
       // 弹出层标题
@@ -399,6 +401,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = this.$t('添加')+this.$t('特种设备文件');
+      this.fileList = []
     },
     /** 修改按钮操作 */
     handleUpdate(row) {