Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/THiddenDangerStandingBookController.java

@@ -50,7 +50,6 @@ public class THiddenDangerStandingBookController extends BaseController
     /**
      * 导出隐患整治台账列表
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:hidden:export')")
     @Log(title = "隐患整治台账", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(THiddenDangerStandingBookForm tHiddenDangerStandingBook)
@@ -63,7 +62,6 @@ public class THiddenDangerStandingBookController extends BaseController
     /**
      * 获取隐患整治台账详细信息
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:hidden:query')")
     @GetMapping(value = "/{hiddenId}")
     public AjaxResult getInfo(@PathVariable("hiddenId") Long hiddenId)
     {
@@ -73,7 +71,6 @@ public class THiddenDangerStandingBookController extends BaseController
     /**
      * 新增隐患整治台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:hidden:add')")
     @Log(title = "隐患整治台账", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody THiddenDangerStandingBook tHiddenDangerStandingBook)
@@ -84,7 +81,6 @@ public class THiddenDangerStandingBookController extends BaseController
     /**
      * 修改隐患整治台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:hidden:edit')")
     @Log(title = "隐患整治台账", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody THiddenDangerStandingBook tHiddenDangerStandingBook)
@@ -95,7 +91,6 @@ public class THiddenDangerStandingBookController extends BaseController
     /**
      * 删除隐患整治台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:hidden:remove')")
     @Log(title = "隐患整治台账", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{hiddenIds}")
     public AjaxResult remove(@PathVariable Long[] hiddenIds)

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/TSafeEquipmentStandingBookController.java

@@ -50,7 +50,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
     /**
      * 导出用户加装安全装置台账列表
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:equipment:export')")
     @Log(title = "用户加装安全装置台账", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook)
@@ -63,7 +62,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
     /**
      * 获取用户加装安全装置台账详细信息
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:equipment:query')")
     @GetMapping(value = "/{safeEquipmentId}")
     public AjaxResult getInfo(@PathVariable("safeEquipmentId") Long safeEquipmentId)
     {
@@ -73,7 +71,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
     /**
      * 新增用户加装安全装置台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:equipment:add')")
     @Log(title = "用户加装安全装置台账", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TSafeEquipmentStandingBook tSafeEquipmentStandingBook)
@@ -84,7 +81,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
     /**
      * 修改用户加装安全装置台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:equipment:edit')")
     @Log(title = "用户加装安全装置台账", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TSafeEquipmentStandingBook tSafeEquipmentStandingBook)
@@ -95,7 +91,6 @@ public class TSafeEquipmentStandingBookController extends BaseController
     /**
      * 删除用户加装安全装置台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:equipment:remove')")
     @Log(title = "用户加装安全装置台账", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{safeEquipmentIds}")
     public AjaxResult remove(@PathVariable Long[] safeEquipmentIds)

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/TTroubleStandingBookController.java

@@ -50,7 +50,6 @@ public class TTroubleStandingBookController extends BaseController
     /**
      * 导出事故台账列表
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:trouble:export')")
     @Log(title = "事故台账", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TTroubleStandingBookForm tTroubleStandingBook)
@@ -63,7 +62,6 @@ public class TTroubleStandingBookController extends BaseController
     /**
      * 获取事故台账详细信息
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:trouble:query')")
     @GetMapping(value = "/{troubleId}")
     public AjaxResult getInfo(@PathVariable("troubleId") Long troubleId)
     {
@@ -73,7 +71,6 @@ public class TTroubleStandingBookController extends BaseController
     /**
      * 新增事故台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:trouble:add')")
     @Log(title = "事故台账", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTroubleStandingBook tTroubleStandingBook)
@@ -84,7 +81,6 @@ public class TTroubleStandingBookController extends BaseController
     /**
      * 修改事故台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:trouble:edit')")
     @Log(title = "事故台账", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTroubleStandingBook tTroubleStandingBook)
@@ -95,7 +91,6 @@ public class TTroubleStandingBookController extends BaseController
     /**
      * 删除事故台账
      */
-    @PreAuthorize("@ss.hasPermi('standingBook:trouble:remove')")
     @Log(title = "事故台账", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{troubleIds}")
     public AjaxResult remove(@PathVariable Long[] troubleIds)

gassafetyprogress-web/src/views/standingBook/equipment/index.vue

@@ -87,21 +87,18 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['standingBook:equipment:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
-            v-hasPermi="['standingBook:equipment:query']"
           >详情</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['standingBook:equipment:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

gassafetyprogress-web/src/views/standingBook/hidden/index.vue

@@ -103,21 +103,18 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['standingBook:hidden:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
-            v-hasPermi="['standingBook:hidden:query']"
           >详情</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['standingBook:hidden:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

gassafetyprogress-web/src/views/standingBook/trouble/index.vue

@@ -107,21 +107,18 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['standingBook:trouble:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="showDetail(scope.row)"
-            v-hasPermi="['standingBook:trouble:query']"
           >详情</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['standingBook:trouble:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

gassafetyprogress-web/vue.config.js

@@ -34,7 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://222.223.203.154:8092/gassafety`,
+        target: `http://localhost:8903/gassafety`,
+        // target: `http://222.223.203.154:8092/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''