Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/drill/plan/index.vue

@@ -49,7 +49,7 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                       v-hasPermi="['core:plan:add']">新增
+                       v-hasPermi="['core:drillPlan:add']">新增
             </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -92,17 +92,17 @@
           </el-table-column>
           <el-table-column label="演练次数" align="center" prop="execTimes"/>
           <el-table-column label="备注" align="center" prop="remark"/>
-          <el-table-column label="修改人" align="center" width="100" prop="updateBy"/>        
+          <el-table-column label="修改人" align="center" width="100" prop="updateBy"/>
           <el-table-column label="操作" align="center" width="180" fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-edit"
-                         @click="handlePublish(scope.row)" v-hasPermi="['core:plan:publish']">下发
+                         @click="handlePublish(scope.row)" v-hasPermi="['core:drillPlan:publish']">下发
               </el-button>
               <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit"
-                         @click="handleUpdate(scope.row)" v-hasPermi="['core:plan:edit']">修改
+                         @click="handleUpdate(scope.row)" v-hasPermi="['core:drillPlan:edit']">修改
               </el-button>
               <el-button v-if="checkCanDel(scope.row)" size="mini" type="text" icon="el-icon-delete"
-                         @click="handleDelete(scope.row)" v-hasPermi="['core:plan:remove']">删除
+                         @click="handleDelete(scope.row)" v-hasPermi="['core:drillPlan:remove']">删除
               </el-button>
             </template>
           </el-table-column>

src/views/core/drill/task/index.vue

@@ -92,7 +92,7 @@
                 type="text"
                 icon="el-icon-view"
                 @click="handleDetail(scope.row.id)"
-                v-hasPermi="['system:eduTask:query']"
+                v-hasPermi="['core:drillTask:query']"
               >详情</el-button>
               <el-button
                 size="mini"
@@ -100,7 +100,7 @@
                 icon="el-icon-document-add"
                 v-if="canPerform(scope.row)"
                 @click="handleRecorded(scope.row.id)"
-                v-hasPermi="['system:eduTask:evaluate']"
+                v-hasPermi="['core:drillTask:evaluate']"
               >评价</el-button>
               <el-button
                 size="mini"
@@ -108,7 +108,7 @@
                 icon="el-icon-document-add"
                 v-if="canPerform(scope.row)"
                 @click="handleRecorded(scope.row.id)"
-                v-hasPermi="['system:eduTask:remove']"
+                v-hasPermi="['core:drillTask:remove']"
               >演练登记</el-button>
               <el-button type="text" v-if="scope.row.pdfUrl" @click="onDown(scope.row.pdfUrl)"
               >演练登记簿</el-button>