update permi

ruoyi-ui/src/views/JiHeExpressway/components/ChartExport/index.vue

@@ -1,5 +1,5 @@
 <template>
- <img :src="require('./chartDl.png')" class="iconDl" @click="$emit('export')" v-hasPremi="['service:publicService:export']" />
+ <img :src="require('./chartDl.png')" class="iconDl" @click="$emit('export')" v-hasPermi="['service:publicService:export']" />
 </template>
 
 <script>

ruoyi-ui/src/views/JiHeExpressway/components/DialogDeviceOffline/index.vue

@@ -28,7 +28,7 @@
         <el-col :span="6">{{info.stateName}}</el-col>
       </el-row>
     </div>
-    <template #footer v-hasPremi="['home:notice:processDeviceOffline']">
+    <template #footer v-hasPermi="['home:notice:processDeviceOffline']">
       <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"
         @click.native="modelVisible = false">取消</Button>
       <Button :loading="submitLoading"  v-if="info.status==='0'" style="margin-top: 30px;padding: 0 24px"

ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/EarlyWarning.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="early_warning" v-hasPremi="['home:notice:event']">
+  <div class="early_warning" v-hasPermi="['home:notice:event']">
     <div @click="onShowCtt" class="warningNum" v-if="warningNum > 0">{{ warningNum>99?'99+':warningNum }}</div>
     <p @click="onShowCtt">
       <i class="el-icon-message-solid" v-if="isShowCtt"></i>

ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="warning_list">
     <el-tabs v-model="activeTab" @tab-click="onChangeTab">
-      <el-tab-pane label="预警事件" name="four" v-hasPremi="['home:notice:event']" />
-      <el-tab-pane label="感知事件" name="first"  v-hasPremi="['home:notice:warningEvent']"/>
-      <el-tab-pane label="待确认事件" name="second" v-hasPremi="['home:notice:warningEvent']" />
-      <el-tab-pane label="处置中事件" name="third" v-hasPremi="['home:notice:disposeEvent']" />
-      <el-tab-pane label="设备异常" name="fifth" v-hasPremi="['home:notice:deviceOffline']" />
+      <el-tab-pane label="预警事件" name="four" v-hasPermi="['home:notice:event']" />
+      <el-tab-pane label="感知事件" name="first"  v-hasPermi="['home:notice:warningEvent']"/>
+      <el-tab-pane label="待确认事件" name="second" v-hasPermi="['home:notice:warningEvent']" />
+      <el-tab-pane label="处置中事件" name="third" v-hasPermi="['home:notice:disposeEvent']" />
+      <el-tab-pane label="设备异常" name="fifth" v-hasPermi="['home:notice:deviceOffline']" />
     </el-tabs>
     <div>
       <Table :data="tableData" :show-header="false" @cell-click="onCellClick" height="400px">

ruoyi-ui/src/views/JiHeExpressway/components/broadcast/BroadcastTplList.vue

@@ -24,10 +24,10 @@
                     </el-tooltip>
                     <template v-if="page!='home'">
                         <el-tooltip content="编辑" placement="top">
-                            <p  v-hasPremi="['service:broadcast:updateTemplate']" @click="____onEditTemplate(itm)" class="btn btnEdit"></p>
+                            <p  v-hasPermi="['service:broadcast:updateTemplate']" @click="____onEditTemplate(itm)" class="btn btnEdit"></p>
                         </el-tooltip>
                         <el-tooltip content="删除" placement="top">
-                            <p  v-hasPremi="['service:broadcast:delTemplate']" @click="____onDeleteTemplate(itm)" class="btn btnDelete"></p>
+                            <p  v-hasPermi="['service:broadcast:delTemplate']" @click="____onDeleteTemplate(itm)" class="btn btnDelete"></p>
                         </el-tooltip>
                     </template>
                 </div>

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue

@@ -15,7 +15,7 @@
       </ElTabs>
 
       <div class="bottom">
-        <Button @click.native="releaseVisible = true" v-hasPremi="['business:home:broadcast']">广播发布</Button>
+        <Button @click.native="releaseVisible = true" v-hasPermi="['business:home:broadcast']">广播发布</Button>
       </div>
     </div>
 

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue

@@ -5,7 +5,7 @@
       <ElTabs v-model="activeName" class="tabs">
         <ElTabPane label="基本信息" name="first">
           <Descriptions :list="list" :data="data" style="gap: 18px">
-            <template #content-deviceName  v-hasPremi="['business:home:camera']">
+            <template #content-deviceName  v-hasPermi="['business:home:camera']">
               <span>{{ dialogData.deviceName || "-" }}</span>
               <img
                 @click="controlDialogVisible = true"
@@ -22,7 +22,7 @@
               />
             </template>
           </Descriptions>
-          <template v-hasPremi="['business:home:camera']">
+          <template v-hasPermi="['business:home:camera']">
           <div
             v-if="PanoramicCameraTypes.indexOf(dialogData.childType) == -1"
             style="width: 50%; display: flex; margin-top: 18px"

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue

@@ -14,7 +14,7 @@
       </ElTabs>
 
       <div class="bottom">
-        <Button v-hasPremi="['business:home:drivingGuidance']" @click.native="onControlClick" :style="dialogData.useState ? '':'background-color:grey'">设备操作</Button>
+        <Button v-hasPermi="['business:home:drivingGuidance']" @click.native="onControlClick" :style="dialogData.useState ? '':'background-color:grey'">设备操作</Button>
       </div>
     </div>
     <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" :id="dialogData.id"

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue

@@ -6,7 +6,7 @@
       <ElTabs v-model="activeName" class="tabs">
         <ElTabPane label="基本信息" name="first">
           <Descriptions :list="list" :data="data" style="gap: 18px" />
-           <div class="jsdcontrol" v-hasPremi="['business:home:guardrailCollision']">
+           <div class="jsdcontrol" v-hasPermi="['business:home:guardrailCollision']">
               <span style="
                     color: #3de8ff;
                     font-size: 12px;

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RemoteMachine/index.vue

@@ -16,7 +16,7 @@
                 </ElTabPane>
             </ElTabs>
         </div>
-        <template #footer v-hasPremi="['business:home:equipmentBox']">
+        <template #footer v-hasPermi="['business:home:equipmentBox']">
             <Button v-if="activeName != 'first' && data.deviceState == '1'" @click.native="deviceControlVisible = true">
                 设备操作
             </Button>

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue

@@ -16,7 +16,7 @@
         </ElTabPane>
       </ElTabs>
     </div>
-    <template #footer v-hasPremi="['business:home:equipmentBox']">
+    <template #footer v-hasPermi="['business:home:equipmentBox']">
       <Button  v-if="activeName != 'first' && data.deviceState == '1'" @click.native="deviceControlVisible = true">
         设备操作
       </Button>

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/InfoBoard.vue

@@ -31,7 +31,7 @@
                   <!-- 模板内容 -->
                   <BoardPreview class="boardPreview" :boardWH="selectedSize" :tpl="itm"></BoardPreview>
                   <!-- 操作按钮 -->
-                  <div class="infoBtnBox" v-hasPremi="['business:home:boardTemplate']">
+                  <div class="infoBtnBox" v-if="check(['business:home:boardTemplate'])">
                     <el-tooltip content="编辑" placement="top">
                       <p @click="____onEditBoardItem(itm, indx)" class="btn btnEdit"></p>
                     </el-tooltip>
@@ -84,8 +84,8 @@
               </el-tabs>
             </div>
             <div class="dialogContent_bottom_btn">
-              <el-button  v-hasPremi="['business:home:board']" class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()" >添加信息</el-button>
-              <el-button  v-hasPremi="['business:home:boardTemplate']" class="btnInfoBoard" type="publish" @click="____publishInfo" :disabled="selectedBdMsg.length <= 0 ||
+              <el-button  v-hasPermi="['business:home:board']" class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()" >添加信息</el-button>
+              <el-button  v-hasPermi="['business:home:boardTemplate']" class="btnInfoBoard" type="publish" @click="____publishInfo" :disabled="selectedBdMsg.length <= 0 ||
     (isMultiControl && selectItems.length === 0) ||
     (!isMultiControl && [undefined, null].indexOf(selectedDevice.iotDeviceId) !== -1
     )
@@ -176,6 +176,7 @@ import CameraShower from "@screen/components/CameraShower";
 
 import InfoBoard from "@screen/mixins/InfoBoard";
 import LineChart from "../LineChart/index.vue";
+import { checkPermi } from "@/utils/permission.js";
 import { batchFunctions } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
 import { multiResultShow } from "@screen/utils/common";
 export default {
@@ -282,6 +283,9 @@ export default {
     // }
   },
   methods: {
+    check(arr){
+      return checkPermi(arr);
+    },
     // 获取信息模板分类
     async ____getTemplateCategory() {
       const res = await this.getDicts("iot_template_category");

ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue

@@ -16,9 +16,9 @@
         <div class="home-icons" >
           <HomeFilter class="item" />
           <HomeFrame class="item" />
-          <HomeVector class="item" v-hasPremi="['business:home:exportOperationalReport']" />
+          <HomeVector class="item" v-hasPermi="['business:home:exportOperationalReport']" />
           <HomeWord class="item" />
-          <HomeFrameControl class="item" v-hasPremi="['business:home:batchControl']"  />
+          <HomeFrameControl class="item" v-hasPermi="['business:home:batchControl']"  />
           <HomeWeather class="item" />
           <HomeWeatherLayer class="item" />
           <HomeTraffic class="item" />

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/index.vue

@@ -5,7 +5,7 @@
     element-loading-background="rgba(0, 0, 0, 0.3)">
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="onAddEdit()" v-hasPremi="['control:device:strategy:add']">
+        <ButtonGradient @click.native="onAddEdit()" v-hasPermi="['control:device:strategy:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
@@ -45,12 +45,12 @@
               <!-- <Switcher class="switcher" :activeOption="activeOption"
                 @change="(value) => handleSwitcherChange(value, item) " /> -->
               <el-switch v-model="item.status" active-color="#0BD" inactive-color="#999" active-value="0"
-                inactive-value="1" @change="(value) => handleSwitcherChange(value, item) "  v-hasPremi="['control:device:strategy:openOrClose']">
+                inactive-value="1" @change="(value) => handleSwitcherChange(value, item) "  v-hasPermi="['control:device:strategy:openOrClose']">
               </el-switch>
-              <Button @click.native="() => onAddEdit(item)" v-hasPremi="['control:device:strategy:update']">
+              <Button @click.native="() => onAddEdit(item)" v-hasPermi="['control:device:strategy:update']">
                 编辑
               </Button>
-              <Button style="background-color: #ff5f5f" @click.native="onDelete(item)" v-hasPremi="['control:device:strategy:delete']">
+              <Button style="background-color: #ff5f5f" @click.native="onDelete(item)" v-hasPermi="['control:device:strategy:delete']">
                 删除
               </Button>
             </template>

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/PeopleCard/index.vue

@@ -9,8 +9,8 @@
       </p>
     </div>
     <div class="btns">
-      <Button v-hasPremi="['business:employees:update']" @click.native="$emit('edit', cardData)" :style="{ background: '#00B3CC' }">修改</Button>
-      <Button v-hasPremi="['business:employees:delete']" @click.native="$emit('delete', cardData)" :style="{ background: '#FF5F5F' }">删除</Button>
+      <Button v-hasPermi="['business:employees:update']" @click.native="$emit('edit', cardData)" :style="{ background: '#00B3CC' }">修改</Button>
+      <Button v-hasPermi="['business:employees:delete']" @click.native="$emit('delete', cardData)" :style="{ background: '#FF5F5F' }">删除</Button>
     </div>
   </BorderRadiusImage>
 </template>

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/PoliceCard/index.vue

@@ -8,8 +8,8 @@
       </p>
     </div>
     <div class="btns">
-      <Button v-hasPremi="['business:trafficPolice:update']" @click.native="$emit('edit', cardData)" :style="{ background: '#00B3CC' }">修改</Button>
-      <Button v-hasPremi="['business:trafficPolice:delete']" @click.native="$emit('delete', cardData)" :style="{ background: '#FF5F5F' }">删除</Button>
+      <Button v-hasPermi="['business:trafficPolice:update']" @click.native="$emit('edit', cardData)" :style="{ background: '#00B3CC' }">修改</Button>
+      <Button v-hasPermi="['business:trafficPolice:delete']" @click.native="$emit('delete', cardData)" :style="{ background: '#FF5F5F' }">删除</Button>
     </div>
   </BorderRadiusImage>
 </template>

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue

@@ -2,25 +2,25 @@
   <div class="DutyOfficer">
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['business:shifts:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['business:shifts:export']">
           <template #prefix>
             <img src="@screen/images/import.svg" />
           </template>
           机构值班表
         </ButtonGradient>
-        <ButtonGradient @click.native="handleExportTemplate" v-hasPremi="['business:shifts:exportTemplate']">
+        <ButtonGradient @click.native="handleExportTemplate" v-hasPermi="['business:shifts:exportTemplate']">
           <template #prefix>
             <img src="@screen/images/import.svg" />
           </template>
           机构值班表模板
         </ButtonGradient>
-        <ButtonGradient @click.native="uploadFile" v-hasPremi="['business:shifts:upload']">
+        <ButtonGradient @click.native="uploadFile" v-hasPermi="['business:shifts:upload']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>
           上传
         </ButtonGradient>
-        <ButtonGradient @click.native="handleModifyDutyInformationTable(true)" v-hasPremi="['business:shifts:add']">
+        <ButtonGradient @click.native="handleModifyDutyInformationTable(true)" v-hasPermi="['business:shifts:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
@@ -102,7 +102,7 @@
           <div class="no-data" v-else>无值班人员</div>
         </template>
         <template #operation-content="{ data }">
-          <ButtonGradient v-hasPremi="['business:shifts:update']"
+          <ButtonGradient v-hasPermi="['business:shifts:update']"
             class="operate-button"
             @click.native="handleModifyDutyInformationTable(true, data)"
           >
@@ -120,7 +120,7 @@
             </template>
             记录
           </ButtonGradient>
-          <ButtonGradient v-hasPremi="['business:shifts:delet']"
+          <ButtonGradient v-hasPermi="['business:shifts:delet']"
             class="operate-button"
             @click.native="handleDelete(data)"
           >

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue

@@ -2,13 +2,13 @@
   <div class="EmergencyAgencies">
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleOpenDialogAddEdit()" v-hasPremi="['business:organization:add']">
+        <ButtonGradient @click.native="handleOpenDialogAddEdit()" v-hasPermi="['business:organization:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
           新增
         </ButtonGradient>
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['business:organization:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['business:organization:export']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>
@@ -49,10 +49,10 @@
           :key="index"
         >
           <template #button>
-            <Button @click.native="() => handleOpenDialogAddEdit(item)" v-hasPremi="['business:organization:update']">
+            <Button @click.native="() => handleOpenDialogAddEdit(item)" v-hasPermi="['business:organization:update']">
               修改
             </Button>
-            <Button  v-hasPremi="['business:organization:delete']"
+            <Button  v-hasPermi="['business:organization:delete']"
               style="background-color: #ff5f5f"
               @click.native="handleDelete(item)"
             >

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue

@@ -2,13 +2,13 @@
   <div class="FirstResponders">
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleOpenDialogAddEdit()" v-hasPremi="['business:employees:add']">
+        <ButtonGradient @click.native="handleOpenDialogAddEdit()" v-hasPermi="['business:employees:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
           新增
         </ButtonGradient>
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['business:employees:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['business:employees:export']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue

@@ -2,13 +2,13 @@
   <div class='JurisdictionalManagement'>
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleAddEdit(true)" v-hasPremi="['business:section:add']">
+        <ButtonGradient @click.native="handleAddEdit(true)" v-hasPermi="['business:section:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
           新增
         </ButtonGradient>
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['business:section:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['business:section:export']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>
@@ -52,10 +52,10 @@
             </div>
           </template>
           <template #button>
-            <Button @click.native="() => handleAddEdit(true, item)" v-hasPremi="['business:section:update']">
+            <Button @click.native="() => handleAddEdit(true, item)" v-hasPermi="['business:section:update']">
               修改
             </Button>
-            <Button style="background-color: #FF5F5F;" @click.native="handleDelete(item)" v-hasPremi="['business:section:delete']">
+            <Button style="background-color: #FF5F5F;" @click.native="handleDelete(item)" v-hasPermi="['business:section:delete']">
               删除
             </Button>
           </template>

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/police/index.vue

@@ -2,13 +2,13 @@
   <div class="FirstResponders">
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleOpenDialogAddEdit()" v-hasPremi="['business:trafficPolice:add']">
+        <ButtonGradient @click.native="handleOpenDialogAddEdit()" v-hasPermi="['business:trafficPolice:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
           新增
         </ButtonGradient>
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['business:trafficPolice:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['business:trafficPolice:export']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/vehicles/index.vue

@@ -2,13 +2,13 @@
   <div class="Vehicles">
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleOpenDialogAddEdit()" v-hasPremi="['business:car:add']">
+        <ButtonGradient @click.native="handleOpenDialogAddEdit()" v-hasPermi="['business:car:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
           新增
         </ButtonGradient>
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['business:car:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['business:car:export']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>
@@ -49,10 +49,10 @@
           :key="index"
         >
           <template #button>
-            <Button @click.native="() => handleOpenDialogAddEdit(item)" v-hasPremi="['business:car:update']">
+            <Button @click.native="() => handleOpenDialogAddEdit(item)" v-hasPermi="['business:car:update']">
               修改
             </Button>
-            <Button v-hasPremi="['business:car:delete']"
+            <Button v-hasPermi="['business:car:delete']"
               style="background-color: #ff5f5f"
               @click.native="handleDelete(item)"
             >

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/index.vue

@@ -28,7 +28,7 @@
           <template slot-scope="scope">
             <!--<ElButton type="text" style="color: #00D1FF;" @click="showDisposal(scope.row.eventType)">流程配置</ElButton>-->
             <ElButton
-              v-hasPremi="['control:emergencyProcessManagement:configuration']"
+              v-hasPermi="['control:emergencyProcessManagement:configuration']"
               type="text"
               style="color: #00ebc1"
               @click="showPhrases(scope.row)"

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue

@@ -58,16 +58,14 @@
   }
     " @close="onCloseAddNew" />
 
-    <template #footer v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent'])">
-      <template v-if="check(['home:notice:closeEvent'])">
-      <Button :loading="submitLoading"  v-if="activeName == '1'" style="margin-top: 30px;padding: 0 24px"
+    <template #footer>
+      <Button :loading="submitLoading"  v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent','home:notice:closeEvent']) && activeName == '1'" style="margin-top: 30px;padding: 0 24px"
         @click.native="onEnd">终止</Button>
-      </template>
-      <Button :loading="submitLoading"  v-if="check(['home:notice:closeEvent']) && (activeName == '-1' || activeName == '0')" style="margin-top: 30px;padding: 0 24px"
+      <Button :loading="submitLoading"  v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent']) && (activeName == '-1' || activeName == '0')" style="margin-top: 30px;padding: 0 24px"
         @click.native="onDelete">解除</Button>
       <Button :style="{ marginTop: '30px', backgroundColor: '#0e708b', padding: '0 24px' }"
         @click.native="modelVisible = false">取消</Button>
-      <template v-if="check(['home:notice:disposeEvent'])">
+      <template v-if="check(['business:home:event','control:event:event:disposalAndRelease','control:event:event:disposeOf','home:notice:releaseEvent','home:notice:disposeEvent'])">
       <Button :loading="submitLoading" v-if="!isError && (activeName == '-1')" style="margin-top: 30px;padding: 0 24px"
         @click.native="updateEvent">处置</Button>
       <Button :loading="submitLoading" v-if="!isError && ( activeName == '0')" style="margin-top: 30px;padding: 0 24px"

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="RoadNetworkMonitoring2">
     <Tabs :panels="panels" :default-active="activeName" @select="handleSelect" />
-    <ButtonGradient @click="onAddNew" class="btnAdd" v-hasPremi="['control:event:event:enter']">
+    <ButtonGradient @click="onAddNew" class="btnAdd" v-hasPermi="['control:event:event:enter']">
       <template #prefix>
         <img src="./images/insert.svg" />
       </template>
@@ -11,7 +11,7 @@
     <div class="filter">
       <div>
         
-        <ButtonGradient @click="onExport" v-hasPremi="['control:event:event:export']">
+        <ButtonGradient @click="onExport" v-hasPermi="['control:event:event:export']">
 
           <template #prefix>
             <img src="./images/export.svg" />

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue

@@ -4,7 +4,7 @@
         <!-- 搜索栏 -->
         <div class="filter">
             <div>
-                <ButtonGradient @click="onAdd" v-hasPremi="['control:event:plan:add']">
+                <ButtonGradient @click="onAdd" v-hasPermi="['control:event:plan:add']">
                     <template #prefix>
                         <img src="@screen/images/insert.svg" />
                     </template>
@@ -40,8 +40,8 @@
                 <ElTableColumn prop="controlCommand" label="控制指令" />
                 <ElTableColumn label="操作" width="210" align="center">
                     <template slot-scope="scope">
-                        <ElButton v-hasPremi="['control:event:plan:update']" type="text" style="color: #00D1FF;" @click="showDisposal(scope.row)">修改</ElButton>
-                        <ElButton v-hasPremi="['control:event:plan:delete']" type="text" style="color: #00EBC1;" @click="handleDelete(scope.row)">删除</ElButton>
+                        <ElButton v-hasPermi="['control:event:plan:update']" type="text" style="color: #00D1FF;" @click="showDisposal(scope.row)">修改</ElButton>
+                        <ElButton v-hasPermi="['control:event:plan:delete']" type="text" style="color: #00EBC1;" @click="handleDelete(scope.row)">删除</ElButton>
                     </template>
                 </ElTableColumn>
             </Table>

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue

@@ -3,7 +3,7 @@
     <!-- 搜索栏 -->
     <div class="filter">
       <div class="filter-btn">
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['control:manual:events:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['control:manual:events:export']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue

@@ -5,7 +5,7 @@
       :formList="searchFormList"
       @handleSearch="handleSearch"
     />
-    <ButtonGradient @click="onExportClick" style="width:50px" v-hasPremi="['control:manual:statistic:export']">导出</ButtonGradient>
+    <ButtonGradient @click="onExportClick" style="width:50px" v-hasPermi="['control:manual:statistic:export']">导出</ButtonGradient>
     <div class="Eventfiltering-content">
       <div class="Eventfiltering-left" ref="trafficIncidents"></div>
       <div class="Eventfiltering-right" ref="trafficIncidentsPie"></div>

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue

@@ -5,7 +5,7 @@
       :formList="searchFormList"
       @handleSearch="handleSearch"
     />
-    <ButtonGradient @click="onExportClick" style="width:50px" v-hasPremi="['control:manual:statistic:export']">导出</ButtonGradient>
+    <ButtonGradient @click="onExportClick" style="width:50px" v-hasPermi="['control:manual:statistic:export']">导出</ButtonGradient>
     <div class="Eventfiltering-content">
       <div class="Eventfiltering-left" ref="trafficIncidents"></div>
       <div class="Eventfiltering-right" ref="trafficIncidentsPie"></div>

ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue

@@ -5,7 +5,7 @@
       :formList="searchFormList"
       @handleSearch="handleSearch"
     />
-    <ButtonGradient @click="onExportClick" style="width:50px" v-hasPremi="['control:manual:statistic:export']">导出</ButtonGradient>
+    <ButtonGradient @click="onExportClick" style="width:50px" v-hasPermi="['control:manual:statistic:export']">导出</ButtonGradient>
     <div class="entity"><div></div>{{ sfzname }}</div>
     <div class="Eventfiltering-content">
       <div class="Eventfiltering-left" ref="trafficIncidents"></div>

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/index.vue

@@ -31,7 +31,7 @@
      
         <ElTableColumn label="状态" width="150" prop="stateName"  />
 
-        <ElTableColumn label="操作" width="130" align="center" v-hasPremi="['maintain:abnormal:updateStatus']">
+        <ElTableColumn label="操作" width="130" align="center" v-hasPermi="['maintain:abnormal:updateStatus']">
             <template slot-scope="scope">
                 <ElButton type="text" v-if="scope.row.status==='0'" style="color: #00D1FF;" @click="showDisposal(scope.row)">处理</ElButton>
             </template>

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue

@@ -3,7 +3,7 @@
     <!-- 搜索栏 -->
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['maintain:manage:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['maintain:manage:export']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>
@@ -66,7 +66,7 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button v-hasPremi="['maintain:manage:update']"
+          <el-button v-hasPermi="['maintain:manage:update']"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['device:protocol:edit']"

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/index.vue

@@ -3,7 +3,7 @@
     <div class="topdiv">
       <div class="left-div">
         <el-button size="mini" icon="el-icon-refresh-left" class="btnSearch" @click="onRefreshData">刷新</el-button>
-        <el-button v-hasPremi="['maintain:equipmentOnlineAnalysis:export']" size="mini" icon="el-icon-download" class="btnSearch" @click="SystemStatusExport">导出Excel</el-button>
+        <el-button v-hasPermi="['maintain:equipmentOnlineAnalysis:export']" size="mini" icon="el-icon-download" class="btnSearch" @click="SystemStatusExport">导出Excel</el-button>
       </div>
       <div class="right-div">
         <InputSearch 

ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue

@@ -3,7 +3,7 @@
     <!-- 搜索栏 -->
     <div class="filter">
       <div>
-        <ButtonGradient @click="onExport" v-hasPremi="['perception:eventDetection:export']">
+        <ButtonGradient @click="onExport" v-hasPermi="['perception:eventDetection:export']">
 
           <template #prefix>
             <img src="./images/export.svg" />

ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/query/index.vue

@@ -8,7 +8,7 @@
         </template>
         刷新
       </ButtonGradient>
-      <ButtonGradient @click="onExport" class="button" v-hasPremi="['business:roadSection:export']">
+      <ButtonGradient @click="onExport" class="button" v-hasPermi="['business:roadSection:export']">
         <template #prefix>
           <i class="el-icon-upload2"></i>
         </template>

ruoyi-ui/src/views/JiHeExpressway/pages/safe/files/index.vue

@@ -3,7 +3,7 @@
     <!-- 搜索栏 -->
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleAddEdit(true)" v-hasPremi="['safe:safeFiles:add']">
+        <ButtonGradient @click.native="handleAddEdit(true)" v-hasPermi="['safe:safeFiles:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
@@ -44,12 +44,12 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button v-hasPremi="['safe:safeFiles:download']"
+          <el-button v-hasPermi="['safe:safeFiles:download']"
             type="text"
             @click="handleDownload(scope)"
             >下载
           </el-button>
-          <el-button v-hasPremi="['safe:safeFiles:delete']"
+          <el-button v-hasPermi="['safe:safeFiles:delete']"
             type="text"
             style="color:#ff0000;margin-left: 20px;"
             @click="handleDelete(scope.row)"

ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="searchPanel">
-    <template  v-hasPremi="['datav:sdhsEvent:download']">
+    <template  v-hasPermi="['datav:sdhsEvent:download']">
       <div style="margin-right: 30px;" v-if="fileInfo">上次上传：<a style="text-decoration: underline;" :download="fileInfo.fileName" target="_blank" :href="urlRoot+fileInfo.fileUrl">{{ fileInfo.fileName }}</a> <span class="el-icon-time" style="margin:0px 5px;"></span>{{ fileInfo.uploadTime }}</div>
     </template>
     <!-- 路段选择 -->
@@ -35,9 +35,9 @@
         :headers="headers"
         :action="uploadUrl"
             >
-    <el-button class="btnReset" size="mini" v-hasPremi="['datav:sdhsEvent:import']">导入</el-button>
+    <el-button class="btnReset" size="mini" v-hasPermi="['datav:sdhsEvent:import']">导入</el-button>
     </el-upload>
-    <el-button class="btnReset" size="mini" @click="onExport" v-hasPremi="['datav:sdhsEvent:export']">导出</el-button>
+    <el-button class="btnReset" size="mini" @click="onExport" v-hasPermi="['datav:sdhsEvent:export']">导出</el-button>
     <el-button class="btnReset" size="mini" @click="handledDialogCalendar(true)">日历</el-button>
     <DialogCalendar :visible="dialogVisibleCalendar" @close="handledDialogCalendar(false)" />
   </div>

ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

@@ -103,7 +103,7 @@
           <div class="titleBtnBox">
             <el-button class="btnInfoBoard" type="add" :disabled="!selectedSize"
               @click.native="____onAddDeviceItem()">添加信息</el-button>
-            <el-button v-hasPremi="['service:board:publish']" class="btnInfoBoard" type="publish" @click="____onPublish"
+            <el-button v-hasPermi="['service:board:publish']" class="btnInfoBoard" type="publish" @click="____onPublish"
               :disabled="selectedBdMsg.length <= 0 || selectedDevices.length <= 0">发布信息</el-button>
           </div>
         </WgtTitle>
@@ -162,7 +162,7 @@
         </div> -->
         <WgtTitle :title="`信息模板 ${selectedSize ? selectedSize : ''}`">
           <div class="titleBtnBox">
-            <el-button v-hasPremi="['service:board:addTemplate']" class="btnInfoBoard" type="add" @click="____onAddTemplate">添加模板</el-button>
+            <el-button v-hasPermi="['service:board:addTemplate']" class="btnInfoBoard" type="add" @click="____onAddTemplate">添加模板</el-button>
           </div>
         </WgtTitle>
         <div class="partCon">
@@ -189,10 +189,10 @@
                     <p @click="____onTplToDevice(itm, false)" :class="disabledButton && !selectedSize ? 'disabledClass' : ''
           " class="btn btnApply"></p>
                   </el-tooltip>
-                  <el-tooltip v-hasPremi="['service:board:updateTemplate']" content="编辑" placement="top">
+                  <el-tooltip v-hasPermi="['service:board:updateTemplate']" content="编辑" placement="top">
                     <p @click="____onEditTemplate(itm)" class="btn btnEdit"></p>
                   </el-tooltip>
-                  <el-tooltip v-hasPremi="['service:board:delTemplate']" content="删除" placement="top">
+                  <el-tooltip v-hasPermi="['service:board:delTemplate']" content="删除" placement="top">
                     <p @click="____onDeleteTemplate(itm)" class="btn btnDelete"></p>
                   </el-tooltip>
                 </div>

ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue

@@ -98,7 +98,7 @@
           <div class="titleBtnBox">
             <el-button class="btnInfoBoard" type="add" @click.native="____onAddDeviceItem()"
               :disabled="selectedBdMsg.length>=1">添加信息</el-button>
-            <el-button v-hasPremi="['service:broadcast:publish']" class="btnInfoBoard" type="publish" @click="____onPublish"
+            <el-button v-hasPermi="['service:broadcast:publish']" class="btnInfoBoard" type="publish" @click="____onPublish"
               :disabled="selectedBdMsg.length <= 0 || selectedDevices.length <= 0">发布信息</el-button>
           </div>
         </WgtTitle>
@@ -146,7 +146,7 @@
       <div style="width: 42.2%;" class="part partRight tpl_box">
         <WgtTitle :title="`信息模板`" class="tpl_title">
           <div class="titleBtnBox">
-            <el-button v-hasPremi="['service:broadcast:addTemplate']" class="btnInfoBoard" type="add" @click="____onAddTemplate">添加模板</el-button>
+            <el-button v-hasPermi="['service:broadcast:addTemplate']" class="btnInfoBoard" type="add" @click="____onAddTemplate">添加模板</el-button>
           </div>
         </WgtTitle>
         <BroadcastTplList class="tpl_list" ref="tpl_list" @onAddToDevice="____onAddFromTpl" />

ruoyi-ui/src/views/JiHeExpressway/pages/service/sensitive/index.vue

@@ -7,25 +7,25 @@
   >
     <div class="filter">
       <div>
-        <ButtonGradient @click.native="handleAddEdit(true)" v-hasPremi="['service:sensitive:add']">
+        <ButtonGradient @click.native="handleAddEdit(true)" v-hasPermi="['service:sensitive:add']">
           <template #prefix>
             <img src="@screen/images/insert.svg" />
           </template>
           新增
         </ButtonGradient>
-        <ButtonGradient @click.native="handleExportTemplate" v-hasPremi="['service:sensitive:exportTemplate']">
+        <ButtonGradient @click.native="handleExportTemplate" v-hasPermi="['service:sensitive:exportTemplate']">
           <template #prefix>
             <img src="@screen/images/import.svg" />
           </template>
           敏感词模板
         </ButtonGradient>
-        <ButtonGradient @click.native="uploadFile" v-hasPremi="['service:sensitive:import']">
+        <ButtonGradient @click.native="uploadFile" v-hasPermi="['service:sensitive:import']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>
           批量导入
         </ButtonGradient>
-        <ButtonGradient @click.native="handleExport" v-hasPremi="['service:sensitive:export']">
+        <ButtonGradient @click.native="handleExport" v-hasPermi="['service:sensitive:export']">
           <template #prefix>
             <img src="@screen/images/export.svg" />
           </template>
@@ -69,10 +69,10 @@
           >
             <div class="keyword">{{ item.word }}</div>
             <div class="actions">
-              <Button @click.native="() => handleAddEdit(true, item)" v-hasPremi="['service:sensitive:update']">
+              <Button @click.native="() => handleAddEdit(true, item)" v-hasPermi="['service:sensitive:update']">
                   修改
                 </Button>
-                <Button v-hasPremi="['service:sensitive:delete']"
+                <Button v-hasPermi="['service:sensitive:delete']"
                   style="background-color: #ff5f5f"
                   @click.native="handleDelete(item)"
                 >