Bladeren bron

样式调整

lizhouming 7 maanden geleden
bovenliggende
commit
bdae258b30

+ 0 - 10
src/types/components.d.ts

@@ -23,13 +23,9 @@ declare module 'vue' {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
     ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
@@ -42,25 +38,21 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
-    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -69,8 +61,6 @@ declare module 'vue' {
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']

+ 8 - 8
src/views/agent/one_network_shared_proxy/agent.vue

@@ -79,36 +79,36 @@
         </div>
         <div class="common-dialog-box">
           <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="100px">
-            <el-form-item label="接口名称" prop="servername">
+            <el-form-item label="接口名称" prop="servername">
               <!--  reportNumber -->
               <el-input v-model="form.servername" placeholder="请输入接口名称" />
             </el-form-item>
-            <el-form-item label="接口参数" prop="passid">
+            <el-form-item label="接口参数" prop="passid">
               <!--  reportName -->
               <el-input v-model="form.passid" placeholder="请输入接口参数" />
             </el-form-item>
-            <el-form-item label="接口令牌" prop="passtoken">
+            <el-form-item label="接口令牌" prop="passtoken">
               <!--  keyword -->
               <el-input v-model="form.passtoken" placeholder="请输入接口令牌" />
             </el-form-item>
-            <el-form-item label="接口编码" prop="servercode">
+            <el-form-item label="接口编码" prop="servercode">
               <!--  新增的一个 -->
               <el-input v-model="form.servercode" placeholder="请输入接口编码" />
             </el-form-item>
-            <el-form-item label="接口类型" prop="eventType">
+            <el-form-item label="接口类型" prop="eventType">
               <el-select v-model="form.eventType" placeholder="请选择接口类型" clearable>
                 <el-option v-for="item in data.eventTypeSelection" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="默认参数" prop="params_default">
+            <el-form-item label="默认参数" prop="params_default">
               <!--  新增的一个 -->
               <el-input v-model="form.params_default" placeholder="请输入默认参数" />
             </el-form-item>
-            <el-form-item label="默认请求体" prop="body_default">
+            <el-form-item label="默认请求体" prop="body_default">
               <!--  新增的一个 -->
               <el-input v-model="form.body_default" placeholder="请输入默认请求体" />
             </el-form-item>
-            <el-form-item label="默认请求头" prop="header_default">
+            <el-form-item label="默认请求头" prop="header_default">
               <!--  新增的一个 -->
               <el-input v-model="form.header_default" placeholder="请输入默认请求头" />
             </el-form-item>

+ 13 - 13
src/views/riskPrevention/planManage/DrillRecord.vue

@@ -3,7 +3,7 @@
     <template #header>
       <el-row :gutter="10">
         <el-col :span="1.5">
-          <el-button type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+          <el-button type="primary" icon="Plus" @click="handleAdd()">新增</el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()"> 删除 </el-button>
@@ -52,11 +52,11 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="220" align="center">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">编辑</el-button>
-          <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)">下载</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+          <el-text v-hasPermi="['system:menu:Edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">编辑</el-text>
+          <el-text v-hasPermi="['system:menu:Download']" class="common-btn-text-primary" @click="handleDownload(scope.row)">下载</el-text>
+          <el-text v-hasPermi="['system:menu:Delete']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
         </template>
       </el-table-column>
     </el-table>
@@ -71,16 +71,16 @@
   <!-- 添加或修改演练记录配置对话框 -->
   <el-dialog ref="formDialogRef" v-model="visible" :title="title" width="500px" append-to-body @close="closeDialog">
     <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="演练名称" prop="drillName">
+      <el-form-item label="演练名称" prop="drillName">
         <el-input v-model="form.drillName" placeholder="请输入演练名称" />
       </el-form-item>
-      <el-form-item label="演练单位" prop="drillUnit">
+      <el-form-item label="演练单位" prop="drillUnit">
         <el-input v-model="form.drillUnit" placeholder="请输入演练单位" />
       </el-form-item>
-      <el-form-item label="年度" prop="year">
+      <el-form-item label="年度" prop="year">
         <el-input v-model="form.year" placeholder="请输入演练年度" />
       </el-form-item>
-      <el-form-item label="演练时间" prop="drillTime">
+      <el-form-item label="演练时间" prop="drillTime">
         <el-date-picker
           v-model="form.drillTime"
           type="datetime"
@@ -89,20 +89,20 @@
           style="width: 100%"
         />
       </el-form-item>
-      <el-form-item label="演练地点" prop="drillAddress">
+      <el-form-item label="演练地点" prop="drillAddress">
         <el-input v-model="form.drillAddress" placeholder="请选择演练地点" readonly>
           <template #append>
             <div style="cursor: pointer" @click="openMapDialog">地图定位</div>
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item label="演练方案" prop="drillProject">
+      <el-form-item label="演练方案" prop="drillProject">
         <FileUpload v-model="form.drillProject" :file-type="['pdf', 'xls', 'xlsx', 'doc', 'docx']" :limit="1" />
       </el-form-item>
-      <el-form-item label="演练视频" prop="drillVideo">
+      <el-form-item label="演练视频" prop="drillVideo">
         <FileUpload v-model="form.drillVideo" :file-type="['mp4', 'avi', 'wmv']" :limit="3" :file-size="5 * 1024" />
       </el-form-item>
-      <el-form-item label="演练图片" prop="drillPicture">
+      <el-form-item label="演练图片" prop="drillPicture">
         <FileUpload v-model="form.drillPicture" :file-type="['jpg', 'jpeg', 'png']" :limit="12" :file-size="3" />
       </el-form-item>
     </el-form>

+ 1 - 1
src/views/riskPrevention/planManage/ResponseRecord.vue

@@ -8,7 +8,7 @@
         </template>
       </el-table-column>
       <el-table-column label="响应单位" align="center" prop="responseUnit" :show-overflow-tooltip="true" />
-      <el-table-column label="事件地点" align="center" prop="eventAddress"/>
+      <el-table-column label="事件地点" align="center" prop="eventAddress" />
       <el-table-column label="响应级别" align="center" prop="responseLevel">
         <template #default="scope">
           <dict-tag :options="response_level" :value="scope.row.responseLevel" />

+ 22 - 21
src/views/riskPrevention/planManage/TrainingRecord.vue

@@ -3,7 +3,7 @@
     <template #header>
       <el-row :gutter="10">
         <el-col :span="1.5">
-          <el-button type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+          <el-button type="primary" icon="Plus" @click="handleAdd()">新增</el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete()"> 删除 </el-button>
@@ -15,7 +15,8 @@
       v-loading="loading"
       :default-sort="{ prop: 'startTime,endTime', order: 'descending' }"
       :data="dataList"
-      @selection-change="handleSelectionChange">
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="培训主题" align="center" prop="theme" :show-overflow-tooltip="true" />
       <el-table-column label="培训单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
@@ -37,10 +38,10 @@
         </template>
       </el-table-column>
       <el-table-column key="address" label="培训地点" align="center" prop="address" :show-overflow-tooltip="true" />
-      <el-table-column label="操作" width="150" align="center">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">编辑</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+          <el-text v-hasPermi="['system:menu:Edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">编辑</el-text>
+          <el-text v-hasPermi="['system:menu:Delete']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
         </template>
       </el-table-column>
     </el-table>
@@ -55,34 +56,40 @@
   <!-- 添加或修改培训记录配置对话框 -->
   <el-dialog ref="formDialogRef" v-model="visible" :title="title" width="500px" append-to-body>
     <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="培训主题" prop="theme">
+      <el-form-item label="培训主题" prop="theme">
         <el-input v-model="form.theme" placeholder="请输入培训主题" />
       </el-form-item>
-      <el-form-item label="培训单位" prop="unitName">
+      <el-form-item label="培训单位" prop="unitName">
         <el-input v-model="form.unitName" placeholder="请输入培训单位" />
       </el-form-item>
-      <el-form-item label="培训方式" prop="trainingWay">
+      <el-form-item label="培训方式" prop="trainingWay">
         <el-select v-model="form.trainingWay" placeholder="请选择培训方式">
           <el-option v-for="item in training_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="参与人数" prop="peopleNum">
+      <el-form-item label="参与人数" prop="peopleNum">
         <el-input v-model="form.peopleNum" placeholder="请输入参与人数" />
       </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker v-model="form.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" style="width: 100%" />
+      <el-form-item label="开始时间:" prop="startTime">
+        <el-date-picker
+          v-model="form.startTime"
+          type="datetime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择开始时间"
+          style="width: 100%"
+        />
       </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
+      <el-form-item label="结束时间" prop="endTime">
         <el-date-picker v-model="form.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="结束时间" style="width: 100%" />
       </el-form-item>
-      <el-form-item label="培训地点" prop="address">
+      <el-form-item label="培训地点" prop="address">
         <el-input v-model="form.address" placeholder="请选择培训地点" readonly>
           <template #append>
             <div style="cursor: pointer" @click="openMapDialog">地图定位</div>
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item label="培训内容" prop="Content">
+      <el-form-item label="培训内容" prop="Content">
         <el-input v-model="form.Content" type="textarea" placeholder="请输入培训内容"></el-input>
       </el-form-item>
     </el-form>
@@ -97,13 +104,7 @@
   <company-map v-model:visible="mapDialogVisible" :address="form.address" @confirm="handleMapChange"></company-map>
 </template>
 <script setup lang="ts">
-import {
-  getTrainingList,
-  addTraining,
-  updateTraining,
-  getTrainingDetail,
-  deleteTraining
-} from '@/api/riskPrevention/planManage';
+import { getTrainingList, addTraining, updateTraining, getTrainingDetail, deleteTraining } from '@/api/riskPrevention/planManage';
 import { to } from 'await-to-js';
 import { ref } from 'vue';
 

+ 42 - 50
src/views/riskPrevention/planManage/UnitRecord.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="ya_bar">
-        <h3>单位职责</h3>
-        <el-button type="primary" @click="importDoc()"> 导入职责 </el-button>
-    </div>
+    <h3>单位职责</h3>
+    <el-button type="primary" @click="importDoc()"> 导入职责 </el-button>
+  </div>
 
   <el-card shadow="hover">
     <template #header>
       <el-row :gutter="10">
         <el-col :span="1.5">
-          <el-button type="primary" plain icon="Plus" @click="handleAdd()">新增</el-button>
+          <el-button type="primary" icon="Plus" @click="handleAdd()">新增</el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete(null)"> 删除 </el-button>
@@ -27,8 +27,8 @@
       <el-table-column label="职能说明" align="left" prop="content" :show-overflow-tooltip="true" />
       <el-table-column label="操作" width="150" align="center">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">编辑</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+          <el-text v-hasPermi="['system:menu:Edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">编辑</el-text>
+          <el-text v-hasPermi="['system:menu:Delete']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
         </template>
       </el-table-column>
     </el-table>
@@ -43,15 +43,15 @@
   <!-- 添加或修改培训记录配置对话框 -->
   <el-dialog ref="formDialogRef" v-model="visible" :title="title" width="500px" append-to-body>
     <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="单位名称" prop="dept_id">
+      <el-form-item label="单位名称" prop="dept_id">
         <el-select v-model="form.dept_id" placeholder="请选择单位">
           <el-option v-for="item in depts" :key="item.deptId" :label="item.deptName" :value="item.deptId"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="职能说明" prop="content">
+      <el-form-item label="职能说明" prop="content">
         <el-input v-model="form.content" type="textarea" placeholder="请输入职能说明" :rows="5"></el-input>
       </el-form-item>
-      <el-form-item label="排序" prop="dept_order">
+      <el-form-item label="排序" prop="dept_order">
         <el-input v-model="form.dept_order" placeholder="请输入排序" />
       </el-form-item>
     </el-form>
@@ -63,33 +63,26 @@
     </template>
   </el-dialog>
 
-  <el-dialog ref="importFormDialogRef" v-model="showImportDlg"  title="导入单位职责" width="500px" append-to-body>
-      <el-form ref="importFormRef" :model="importForm" :rules="importRules">
-          <FileUpload v-model="importForm.filename" :file-type="['xls', 'xlsx']" :limit="1" />
-      </el-form>
-      <template #footer>
-          <div class="dialog-footer">
-              <el-button type="primary" @click="submitImportForm">确 定</el-button>
-              <el-button @click="cancelImport">取 消</el-button>
-          </div>
-      </template>
+  <el-dialog ref="importFormDialogRef" v-model="showImportDlg" title="导入单位职责" width="500px" append-to-body>
+    <el-form ref="importFormRef" :model="importForm" :rules="importRules">
+      <FileUpload v-model="importForm.filename" :file-type="['xls', 'xlsx']" :limit="1" />
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitImportForm">确 定</el-button>
+        <el-button @click="cancelImport">取 消</el-button>
+      </div>
+    </template>
   </el-dialog>
-  
 </template>
 <script setup lang="ts">
-import {listDept} from '@/api/system/dept';
-import {
-  getUnitList,
-  addUnit,
-  updateUnit,
-  getUnitDetail,
-  deleteUnit,
-  importUnitXls
-} from '@/api/riskPrevention/planManage';
+import { listDept } from '@/api/system/dept';
+import { getUnitList, addUnit, updateUnit, getUnitDetail, deleteUnit, importUnitXls } from '@/api/riskPrevention/planManage';
 import { to } from 'await-to-js';
 import { ref } from 'vue';
 
 const props = defineProps({
+  // eslint-disable-next-line vue/require-default-prop
   id: String
 });
 
@@ -126,7 +119,7 @@ const rules = reactive({
 });
 
 // 获取列表数据
-const getList = async() => {
+const getList = async () => {
   loading.value = true;
   const res = await listDept();
   depts.value = res.data;
@@ -214,7 +207,7 @@ const handleDelete = async (row) => {
   const deleteIds = row && row.id ? [row?.id] : ids.value;
   const [err] = await to(proxy?.$modal.confirm('是否确认删除选择的单位职能记录?') as any);
   if (!err) {
-    await deleteUnit({ids: deleteIds});
+    await deleteUnit({ ids: deleteIds });
     getList();
     proxy?.$modal.msgSuccess('删除成功');
   }
@@ -226,41 +219,40 @@ const formDialogRef = ref(null);
 const importFormRef = ref<ElFormInstance>();
 
 const importForm = ref({
-    filename: ''
+  filename: ''
 });
 
 const importRules = reactive({
-    filename: [{ required: true, message: '导入文件不能为空', trigger: 'blur' }]
+  filename: [{ required: true, message: '导入文件不能为空', trigger: 'blur' }]
 });
 
 const importDoc = () => {
-    resetImportForm();
-    showImportDlg.value = true;
-}
+  resetImportForm();
+  showImportDlg.value = true;
+};
 
 const resetImportForm = () => {
   importForm.value = {
-    filename:''
-  }
+    filename: ''
+  };
   importFormRef.value?.resetFields();
   importFormRef.value?.clearValidate();
-}
+};
 
 /**提交按钮 */
 const submitImportForm = () => {
   importFormRef.value?.validate(async (valid) => {
     if (valid) {
       try {
-          await importUnitXls({ ...importForm.value, plan_id: props.id })
-          proxy?.$modal.msgSuccess('导入成功');
-          showImportDlg.value = false;
-          getList();
+        await importUnitXls({ ...importForm.value, plan_id: props.id });
+        proxy?.$modal.msgSuccess('导入成功');
+        showImportDlg.value = false;
+        getList();
       } finally {
       }
     }
-  })
-}
-
+  });
+};
 
 /** 取消按钮 */
 const cancelImport = () => {
@@ -271,10 +263,10 @@ const cancelImport = () => {
 
 <style lang="scss" scoped>
 .ya_bar {
-  display:flex;
-  flex-direction: row; 
+  display: flex;
+  flex-direction: row;
   flex-wrap: nowrap;
-  justify-content:space-between;
+  justify-content: space-between;
   align-items: center;
 }
-</style>
+</style>

+ 10 - 13
src/views/riskPrevention/planManage/planList.vue

@@ -40,7 +40,7 @@
             <el-descriptions-item key="organizingUnit" label="编制单位:">{{ detailData.organizingUnit }}</el-descriptions-item>
             <el-descriptions-item key="document" label="发文字号:">{{ detailData.document }}</el-descriptions-item>
             <el-descriptions-item key="event_type" label="对应事件类型:">
-              <dict-tag :options="mm_event_type" :value="detailData.event_type"  style="display: inline-block" />
+              <dict-tag :options="mm_event_type" :value="detailData.event_type" style="display: inline-block" />
             </el-descriptions-item>
           </el-descriptions>
         </el-card>
@@ -71,29 +71,29 @@
     <!-- 修改弹窗 -->
     <el-dialog v-model="visible" title="修改预案" width="500px" append-to-body>
       <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="预案名称" prop="planName">
+        <el-form-item label="预案名称" prop="planName">
           <el-input v-model="form.planName" placeholder="请输入预案名称" />
         </el-form-item>
-        <el-form-item label="预案类型" prop="planType">
+        <el-form-item label="预案类型" prop="planType">
           <el-select v-model="form.planType" placeholder="请选择预案类型" clearable>
             <el-option v-for="item in plan_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="发布日期" prop="publishDate">
+        <el-form-item label="发布日期" prop="publishDate">
           <el-date-picker v-model="form.publishDate" type="date" placeholder="选择发布日期" value-format="YYYY-MM-DD"></el-date-picker>
         </el-form-item>
-        <el-form-item label="编制单位" prop="organizingUnit">
+        <el-form-item label="编制单位" prop="organizingUnit">
           <el-input v-model="form.organizingUnit" placeholder="请输入编制单位" />
         </el-form-item>
-        <el-form-item label="发文字号" prop="document">
+        <el-form-item label="发文字号" prop="document">
           <el-input v-model="form.document" placeholder="请输入发文字号" />
         </el-form-item>
-        <el-form-item label="事件类型" prop="event_type">
+        <el-form-item label="事件类型" prop="event_type">
           <el-select v-model="form.event_type" placeholder="请输入对应事件类型" clearable>
             <el-option v-for="item in mm_event_type" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="预案附件" prop="fileList">
+        <el-form-item label="预案附件" prop="fileList">
           <file-upload v-model="form.fileList" :limit="1" :file-type="['pdf', 'doc', 'docx', 'xls', 'xlsx']" />
         </el-form-item>
       </el-form>
@@ -115,7 +115,7 @@ import TrainingRecord from './TrainingRecord.vue';
 import DrillRecord from './DrillRecord.vue';
 import ResponseRecord from './ResponseRecord.vue';
 import UnitRecord from './UnitRecord.vue';
-import DocRecord from './DocRecord.vue'
+import DocRecord from './DocRecord.vue';
 
 const router = useRouter();
 
@@ -123,7 +123,6 @@ const goBack = () => {
   proxy?.$tab.closePage();
 };
 
-
 /***培训记录编辑界面时间选择 */
 const route = useRoute();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -229,6 +228,4 @@ onMounted(() => {
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

+ 109 - 103
src/views/system/user/index.vue

@@ -124,111 +124,117 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog ref="formDialogRef" v-model="dialog.visible" :title="dialog.title" width="600px" append-to-body @close="closeDialog">
-      <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称:" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门:" prop="deptId">
-              <el-tree-select
-                v-model="form.deptId"
-                :data="deptOptions"
-                :props="{ value: 'id', label: 'label', children: 'children' }"
-                value-key="id"
-                placeholder="请选择归属部门"
-                check-strictly
-                @change="handleDeptChange"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码:" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱:" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别:">
-              <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态:">
-              <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位:">
-              <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == '1'"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色:" prop="roleIds">
-              <el-select v-model="form.roleIds" filterable multiple placeholder="请选择">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == '1'"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注:">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
+    <div v-show="dialog.visible" class="common-dialog">
+      <div class="common-dialog-content">
+        <div class="common-dialog-title-box">
+          <i class="common-dialog-title-icon" />
+          <div>{{ dialog.title }}</div>
+        </div>
+        <div class="common-dialog-box">
+          <el-form ref="userFormRef" :model="form" :rules="rules" label-width="80px">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="用户昵称:" prop="nickName">
+                  <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="归属部门:" prop="deptId">
+                  <el-tree-select
+                    v-model="form.deptId"
+                    :data="deptOptions"
+                    :props="{ value: 'id', label: 'label', children: 'children' }"
+                    value-key="id"
+                    placeholder="请选择归属部门"
+                    check-strictly
+                    @change="handleDeptChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="手机号码:" prop="phonenumber">
+                  <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="邮箱:" prop="email">
+                  <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item v-if="form.userId == undefined" label="用户名称:" prop="userName">
+                  <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item v-if="form.userId == undefined" label="用户密码:" prop="password">
+                  <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="用户性别:">
+                  <el-select v-model="form.sex" placeholder="请选择">
+                    <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="状态:">
+                  <el-radio-group v-model="form.status">
+                    <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="岗位:">
+                  <el-select v-model="form.postIds" multiple placeholder="请选择">
+                    <el-option
+                      v-for="item in postOptions"
+                      :key="item.postId"
+                      :label="item.postName"
+                      :value="item.postId"
+                      :disabled="item.status == '1'"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="角色:" prop="roleIds">
+                  <el-select v-model="form.roleIds" filterable multiple placeholder="请选择">
+                    <el-option
+                      v-for="item in roleOptions"
+                      :key="item.roleId"
+                      :label="item.roleName"
+                      :value="item.roleId"
+                      :disabled="item.status == '1'"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="备注:">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <div class="common-dialog-footer" style="display: flex; justify-content: center">
           <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel()">取 消</el-button>
+          <el-button @click="cancel">取 消</el-button>
         </div>
-      </template>
-    </el-dialog>
+      </div>
+    </div>
 
     <!-- 用户导入对话框 -->
     <el-dialog v-model="upload.open" :title="upload.title" width="400px" append-to-body>