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

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

@@ -17,7 +17,7 @@
           <el-form-item label="演练场景" prop="drillProjects">
             <el-input v-model="queryParams.drillProjects" placeholder="请输入关键字" clearable
                       @keyup.enter.native="handleQuery"/>
-          </el-form-item> 
+          </el-form-item>
           <el-form-item label="演练项目" prop="drillType">
             <el-select v-model="queryParams.drillType" placeholder="请选择演练项目" clearable>
               <el-option
@@ -29,7 +29,7 @@
             </el-select>
           </el-form-item>
           <!-- <el-form-item>
-           
+
           </el-form-item> -->
         </el-form>
 
@@ -118,7 +118,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改预案演练库对话框 -->
-    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom  :title="title" :visible.sync="open" width="1000px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="演练项目" prop="drillType" style="width:100%;">
           <el-select v-model="form.drillType" placeholder="请选择演练项目" style="width:100%;">

src/views/core/drill/task/dialog.newtask.vue

@@ -95,9 +95,10 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">取消</el-button>
+        <el-button type="primary" @click="onSubmit">确 定</el-button>
+        <el-button @click="onHide">取 消</el-button>
 <!--        <el-button type="primary" @click="onSave">暂存</el-button>-->
-        <el-button type="primary" @click="onSubmit">提交</el-button>
+
       </div>
     </DialogCom>
     <dialog-drill-dictionary-select

src/views/core/edu/task/dialog.newTask.vue

@@ -108,7 +108,7 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="onSubmit">提 交</el-button>
+        <el-button type="primary" @click="onSubmit">确 定</el-button>
         <el-button @click="onHide">取 消</el-button>
 <!--        <el-button type="primary" @click="onSave">暂存</el-button>-->
 

src/views/system/device/index.vue

@@ -100,7 +100,7 @@
                     icon="el-icon-download"
                     size="mini"
                     @click="handleOut"
-                    v-hasPermi="['system:user:export']"
+                    v-hasPermi="['system:device:export']"
                   >导出模版</el-button
                   >
                 </el-col>