优化界面

src/views/core/message/index.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
     <el-col :span="4" :xs="24">
       <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey"  @checkChange="checkChange"
                 @click="clickTreeNode"></org-tree>
     </el-col>
     <el-col :span="20" :xs="24">
-
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <div class="main-right-box">
+        <div class="main-search-box">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="关键字" prop="title">
           <el-input v-model="queryParams.title" placeholder="请输入关键字" />
         </el-form-item>
@@ -67,22 +68,24 @@
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
+        </div>
+
 
       <el-table v-loading="loading" :data="notificationList"border
-                height="600"
+                height="700"
                 size="small">
-        <el-table-column label="序号" type="index" align="center">
+        <el-table-column label="序号" width="80" type="index" align="center">
           <template slot-scope="scope">
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建机构" align="center" width="160" prop="orgName" />
-        <el-table-column label="消息类型" align="center"  prop="messagType">
+        <el-table-column label="创建机构" align="center" width="250" prop="orgName" />
+        <el-table-column label="消息类型" align="center" width="200" prop="messagType">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.messag_type" :value="scope.row.messagType"/>
           </template>
         </el-table-column>
-        <el-table-column label="机构类型" align="center" prop="execOrgType">
+        <el-table-column label="机构类型" width="200" align="center" prop="execOrgType">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.sys_org_type" :value="scope.row.tagOrgType"/>
           </template>
@@ -107,44 +110,50 @@
             <dict-tag :options="dict.type.message_status" :value="scope.row.messagStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="left"
+                         header-align="center"
+                         width="280"
+                         fixed="right"
+                         class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
               @click="lookThisOne(scope.row)"
+              icon="el-icon-info"
               v-hasPermi="['core:notification:query']"
             >详情</el-button>
-            <div v-if="loginOrgId==scope.row.orgId">
             <el-button
               size="mini"
               type="text"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['core:notification:edit']"
               v-if="scope.row.messagStatus=='0'"
+              icon="el-icon-edit-outline"
             >编辑</el-button>
             <el-button
               size="mini"
               type="text"
               @click="handleDelete(scope.row)"
               v-hasPermi="['core:notification:remove']"
-              v-if="scope.row.messagStatus=='0'"
+              v-if="scope.row.messagStatus=='0' &&　loginOrgId==scope.row.orgId"
+              icon="el-icon-delete"
             >删除</el-button>
             <el-button
               size="mini"
               type="text"
               @click="publish(scope.row)"
               v-hasPermi="['core:notification:publish']"
-              v-if="scope.row.messagStatus=='0'"
+              v-if="scope.row.messagStatus=='0'　&&　loginOrgId==scope.row.orgId"
             >发布</el-button>
             <el-button
               size="mini"
               type="text"
               @click="publish(scope.row)"
               v-hasPermi="['core:notification:cancelPublish']"
-              v-if="scope.row.messagStatus=='1'"
+              v-if="scope.row.messagStatus=='1'　&&　loginOrgId==scope.row.orgId"
+              icon="el-icon-arrow-down"
             >取消发布</el-button>
-            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -156,16 +165,18 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
+      </div>
     </el-col>
+    </el-row>
     <!-- 添加或修改公告通知对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body @close="handleClose">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入标题" :disabled="!isSubmit" :maxlength="100"/>
         </el-form-item>
         <el-form-item label="消息类型" prop="messagType">
-          <el-select v-model="form.messagType" placeholder="请选择消息类型" :disabled="!isSubmit" @change="showOrHidden()">
+          <el-select v-model="form.messagType" placeholder="请选择消息类型" style="width: 100%"  :disabled="!isSubmit" @change="showOrHidden()">
             <el-option
               v-for="dict in dict.type.messag_type"
               :key="dict.value"
@@ -175,9 +186,11 @@
           </el-select>
         </el-form-item>
           <el-form-item label="机构类型" prop="tagOrgType">
-            <el-select v-model="form.tagOrgType" placeholder="请选择机构类型" :disabled="!isSubmit" @change="execOrgTypeChanged()">
+            <el-select v-model="form.tagOrgType" placeholder="请选择机构类型" :disabled="!isSubmit"  style="width: 100%"  @change="execOrgTypeChanged()">
               <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
-                         :value="dict.value"></el-option>
+                         :value="dict.value">
+
+              </el-option>
             </el-select>
 
           </el-form-item>
@@ -213,7 +226,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
    </DialogCom>
-    </el-row>
+
   </div>
 </template>
 

src/views/core/send/index.vue

@@ -40,20 +40,20 @@
                     size="small"
                     v-loading="loading" :data="sendList">
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="类型" align="center" key="type" prop="type" width="80">
+      <el-table-column label="类型" align="center" key="type" prop="type" width="130">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.message_type" :value="scope.row.type" />
         </template>
       </el-table-column>
 
-      <el-table-column label="发送状态" align="center" key="sendStatus" prop="sendStatus" width="80">
+      <el-table-column label="发送状态" align="center" key="sendStatus" prop="sendStatus" width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.send_status" :value="scope.row.sendStatus" />
         </template>
       </el-table-column>
 
 
-      <el-table-column label="发送时间" align="center" prop="sendTime" width="150">
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
@@ -65,7 +65,7 @@
           <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-delete"
             @click="handleDelete(scope.row)" v-hasPermi="['core:send:remove']">删除</el-button>
 
-          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 1" icon="el-icon-search"
+          <el-button size="mini" type="text" v-if="scope.row.sendStatus == 1" icon="el-icon-info"
             @click="handleSelect(scope.row)" v-hasPermi="['core:send:query']">详情</el-button>
         </template>
       </el-table-column>
@@ -94,7 +94,7 @@
         <el-form-item label="发送目标" prop="sendUser" label-width="100px">
           <el-select mode="multiple"  v-model="form.sendUser" filterable placeholder="按用户选择" clearable>
             <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select> 
+          </el-select>
 
           <el-select mode="multiple"  v-model="form.sendRole" filterable placeholder="按角色选择" clearable>
             <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
@@ -161,7 +161,7 @@
       </el-form>
     <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
-      </div> 
+      </div>
    </DialogCom>
   </div>
 </template>
@@ -249,7 +249,7 @@ export default {
   },
   created() {
     this.getList();
-   
+
     this.getAllRole();
   },
   methods: {

src/views/safetyBook/aqbwbndjh/index.vue

@@ -12,7 +12,7 @@
         ></org-tree>
       </el-col>
       <!--用户数据-->
-      <el-col :span="20" :xs="24">
+      <el-col :span="24" :xs="24">
         <el-form
           :model="queryParams"
           ref="queryForm"
@@ -67,7 +67,7 @@
           <el-table-column
             label="机构名称"
             align="left"
-            width="200"
+            width="300"
             prop="orgName"
           />
           <el-table-column
@@ -80,10 +80,10 @@
           <el-table-column
             label="记录时间"
             align="center"
-            width="160"
+            width="180"
             prop="date"
           />
-         
+
 
           <el-table-column
             label="操作"
@@ -95,7 +95,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit-outline"
+                icon="el-icon-edit-view"
                 @click="showImages(scope.row.images)"
                 v-hasPermi="['core:hsggbsdj:query']"
                 >查看照片

src/views/safetyBook/dialog.edit.vue

@@ -4,7 +4,7 @@
       :title="id ? '编辑安全责任书' : '新增安全责任书'"
       :visible.sync="isShow"
       @close="onHide"
-      width="700px"
+      width="800px"
     >
       <div class="page-body">
         <el-form
@@ -13,7 +13,7 @@
           size="small"
           ref="form"
           label-position="right"
-          label-width="130px"
+          label-width="180px"
           label-prefix=":"
         >
           <el-form-item prop="orgId" label="签署责任人所在机构:">

src/views/safetyBook/hsggbsdj/index.vue

@@ -12,7 +12,7 @@
         ></org-tree>
       </el-col>
       <!--用户数据-->
-      <el-col :span="20" :xs="24">
+      <el-col :span="24" :xs="24">
         <el-form
           :model="queryParams"
           ref="queryForm"
@@ -67,7 +67,8 @@
           <el-table-column
             label="工作主题"
             align="left"
-            width="200"
+            header-align="center"
+            width="300"
             prop="title"
           />
           <el-table-column label="参与人" align="center" prop="userNames">
@@ -75,19 +76,15 @@
           <el-table-column
             label="开会日期"
             align="left"
-            width="160"
+            header-align="center"
+            width="260"
             prop="date"
           >
-            <!-- <template slot-scope="r"
-              >{{
-                getLabel(dict.type.safety_book_type, `${r.row.type}`)
-              }}
-            </template> -->
           </el-table-column>
 
           <el-table-column
             label="操作"
-            width="180"
+            width="240"
             fixed="right"
             align="center"
             class-name="small-padding fixed-width"
@@ -96,7 +93,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit-outline"
+                icon="el-icon-view"
                 @click="showImages(scope.row.images)"
                 v-hasPermi="['core:hsggbsdj:query']"
                 >查看照片

src/views/safetyBook/index.vue

@@ -13,47 +13,52 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form
-          :model="queryParams"
-          ref="queryForm"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-        >
-          <el-form-item label="所属年份" prop="year">
-            <el-date-picker
-              v-model="queryParams.year"
-              :clearable="timeClearable"
-              type="year"
-              placeholder="选择时间"
-              value-format="yyyy"
-              @change="handleQuery"
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="120px"
             >
-            </el-date-picker>
-          </el-form-item>
-        </el-form>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd(null)"
-              v-hasPermi="['core:book:add']"
-              >新增
-            </el-button>
-          </el-col>
+              <el-form-item label="所属年份" prop="year">
+                <el-date-picker
+                  v-model="queryParams.year"
+                  :clearable="timeClearable"
+                  type="year"
+                  placeholder="选择时间"
+                  value-format="yyyy"
+                  @change="handleQuery"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-form>
+
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd(null)"
+                  v-hasPermi="['core:book:add']"
+                  >新增
+                </el-button>
+              </el-col>
 
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
-        </el-row>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+              ></right-toolbar>
+            </el-row>
+          </div>
         <!-- 表格数据 -->
         <el-table
           border
-          height="600"
+          height="700"
           size="small"
           v-loading="loading"
           :data="dataList"
@@ -86,7 +91,7 @@
           <el-table-column
             label="责任书所属年份"
             align="center"
-            width="120"
+            width="140"
             prop="year"
           />
           <el-table-column label="签署人" align="center" prop="userName">
@@ -137,6 +142,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
     <dialog-edit ref="editDialog" @success="getList()"></dialog-edit>

src/views/system/device/index.vue

@@ -188,13 +188,13 @@
     <DialogCom
       :title="title"
       :visible.sync="open"
-      width="700px"
+      width="850px"
       @close="closeHandler"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="20">
+          <el-col :span="22">
             <el-form-item label="所属机构" prop="orgId">
               <tree-select
                 v-model="form.orgId"

src/views/system/menu/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-   
+
     <div class="main-search-box">
       <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="PC端" name="1"></el-tab-pane>
@@ -48,7 +48,7 @@
         >
       </el-form-item> -->
     </el-form>
-    
+
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -82,7 +82,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          
+
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
@@ -95,7 +95,7 @@
       ></right-toolbar>
     </el-row>
     </div>
-  
+
 
 
     <el-table
@@ -111,7 +111,8 @@
       <el-table-column
         prop="menuName"
         label="菜单名称"
-        align="center"
+        align="left"
+        header-align="center"
         :show-overflow-tooltip="true"
         width="180"
       ></el-table-column>

src/views/system/user/extend.vue

@@ -1,18 +1,27 @@
 <template>
   <div class="app-container">
     <div class="user-extend">
-      <h3 class="title">基础信息</h3>
       <div class="info-box">
-        <el-descriptions>
+        <el-descriptions size="medium" border>
+          <template #title>
+            <h3 class="title">
+              <i class="el-icon-collection-tag"></i>
+              基础信息
+            </h3>
+          </template>
           <el-descriptions-item v-for="v in dataInfo" :label="v.label" :key="v.key">{{ v.value }}</el-descriptions-item>
           <el-descriptions-item label="角色">{{ roleName }}</el-descriptions-item>
           <el-descriptions-item label="性别">{{ sex }}</el-descriptions-item>
           <el-descriptions-item label="状态">{{ status }}</el-descriptions-item>
         </el-descriptions>
       </div>
-      <h3 class="title">安保部门从业人员补充信息</h3>
+
       <div class="info-box">
-        <el-form inline :model="formData" :rules="rules" ref="form" label-position="left" label-width="120px">
+        <h3 class="title">
+          <i class="el-icon-collection-tag"></i>
+          安保部门从业人员补充信息
+        </h3>
+        <el-form inline :model="formData" :rules="rules" ref="form" label-position="left" label-width="140px">
           <el-row>
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
               <!-- <el-form-item label="是否专职" prop="isFullTime">
@@ -58,7 +67,7 @@
 
           </el-row>
           <el-row>
-     
+
 
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
               <el-form-item label="所属部门" prop="deptId">
@@ -115,7 +124,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-        
+
           </el-row>
           <el-row>
 
@@ -738,8 +747,7 @@ export default {
 .title {
   font-size: 18px;
   text-align: left;
-  background: #008CD6ff;
-  color: #fff;
+  color: #008CD6ff;
   height: 36px;
   line-height: 36px;
   padding-left: 8px;