Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/views/check/distribute.vue

@@ -38,7 +38,7 @@
           >
         </el-col>
       </el-row>
-      <el-table :data="tableData" height="400px">
+      <el-table :data="tableData" height="400px" size="small">
         <el-table-column type="index" label="序号" width="80"></el-table-column>
         <el-table-column prop="orgName" label="机构名称"></el-table-column>
         <el-table-column prop="status" label="计划状态" width="150px">
@@ -58,9 +58,9 @@
       </el-table>
     </div>
 
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="onHide">关闭</el-button>
+    <div slot="footer" class="dialog-footer">     
       <el-button type="primary" @click="onSubmit">确定</el-button>
+      <el-button @click="onHide">关闭</el-button>
     </div>
  </DialogCom>
 </template>

src/views/check/index.vue

@@ -143,44 +143,43 @@
                   />
                 </el-form-item>
               </el-row>
-              <el-row>
-              </el-row>
+              <el-row> </el-row>
             </el-form>
-        <el-row :gutter="10" >
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-            >搜索</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery"
-            >重置</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['core:checkplan:add']"
-            >新增任务</el-button
-            >
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="getList"
+                  >搜索</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd()"
+                  v-hasPermi="['core:checkplan:add']"
+                  >新增任务</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
           </div>
           <el-table
             border
@@ -193,15 +192,16 @@
             :tree-props="{ children: 'children' }"
           >
             <el-table-column
-              align="center"
               type="index"
               label="序号"
+              align="center"
               width="80px"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
               prop="planName"
               label="任务名称"
+              width="250px"
               :show-overflow-tooltip="true"
               v-if="columns[1].visible"
             ></el-table-column>
@@ -209,7 +209,8 @@
             <el-table-column
               prop="checkType"
               label="任务类型"
-
+              align="center"
+              width="180px"
               v-if="columns[2].visible"
             >
               <template slot-scope="r"
@@ -219,23 +220,37 @@
             <el-table-column
               prop="planCreateOrgName"
               label="创建机构"
+              align="center"
+              width="180px"
               v-if="columns[3].visible"
             >
             </el-table-column>
             <el-table-column
               prop="planOfOrgName"
               label="行社名称"
+              align="center"
+              width="180px"
               v-if="columns[4].visible"
             >
             </el-table-column>
 
-            <el-table-column prop="execOrgType" label="检查主体">
+            <el-table-column
+              prop="execOrgType"
+              align="center"
+              width="180px"
+              label="检查主体"
+            >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
               </template>
             </el-table-column>
 
-            <el-table-column prop="checkOrgType" label="受检机构" width="120px">
+            <el-table-column
+              prop="checkOrgType"
+              align="center"
+              width="180px"
+              label="受检机构"
+            >
               <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
               </template>
@@ -243,6 +258,8 @@
 
             <el-table-column
               prop="roleNames"
+              align="center"
+              width="180px"
               label="检查人员"
               v-if="columns[6].visible"
             >
@@ -255,7 +272,8 @@
             <el-table-column
               prop="planCycle"
               label="任务周期"
-              width="80px"
+              align="center"
+              width="180px"
               v-if="columns[6].visible"
             >
               <template slot-scope="r"
@@ -264,16 +282,18 @@
             </el-table-column>
 
             <el-table-column
-              align="center"
               prop="count"
               label="任务次数"
+              align="center"
+              width="180px"
               v-if="columns[6].visible"
             ></el-table-column>
 
             <el-table-column
               prop="planStatus"
               label="任务状态"
-              width="80px"
+              align="center"
+              width="180px"
               v-if="columns[6].visible"
             >
               <template slot-scope="r"
@@ -300,7 +320,12 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" min-width="200">
+            <el-table-column
+              label="操作"
+              width="200"
+              fixed="right"
+              align="center"
+            >
               <template slot-scope="r">
                 <el-button
                   v-if="eqOrg(r.row)"

src/views/check/task/index.vue

@@ -13,76 +13,75 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <div class="main-right-box">
-        <div class="main-search-box">
-        <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="queryParams"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="100px"
-        >
-          <el-form-item label="任务名称" prop="title">
-            <el-input
-              style="width: 200px"
-              v-model="queryParams.title"
-              placeholder="请输入任务名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-              :maxlength="50"
-              @input="inputTitle"
-            />
-          </el-form-item>
-          <el-form-item label="检查人员" prop="roleId">
-            <el-select
-              v-model="queryParams.roleId"
-              placeholder="请选择用户角色"
-              clearable
+          <div class="main-search-box">
+            <!--    搜索条件    -->
+            <el-form
+              :model="queryParams"
+              ref="queryParams"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
             >
-              <el-option
-                v-for="item in selectRoleOptions"
-                :key="item.id"
-                :label="item.roleName"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="受检机构" prop="orgName">
-            <!-- <el-input
+              <el-form-item label="任务名称" prop="title">
+                <el-input
+                  style="width: 200px"
+                  v-model="queryParams.title"
+                  placeholder="请输入任务名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :maxlength="50"
+                  @input="inputTitle"
+                />
+              </el-form-item>
+              <el-form-item label="检查人员" prop="roleId">
+                <el-select
+                  v-model="queryParams.roleId"
+                  placeholder="请选择用户角色"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in selectRoleOptions"
+                    :key="item.id"
+                    :label="item.roleName"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="受检机构" prop="orgName">
+                <!-- <el-input
               v-model="queryParams.orgName"
               placeholder="请输入受检机构"
               clearable
               @keyup.enter.native="handleQuery"
               :maxlength="50" @input="inputRestriction"
             /> -->
-            <div style="width: 200px; height: 30px">
-              <org-tree-select
-                size="mini"
-                v-model="queryParams.checkOrgIds"
-                ref="checkorgTreeSelect"
-                :disable="true"
-                @change="getList"
-              >
-              </org-tree-select>
-            </div>
-          </el-form-item>
-          <el-form-item label="任务进度" prop="status">
-            <el-select
-              style="width: 200px"
-              v-model="queryParams.status"
-              placeHolder="请选择任务进度"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.safety_check_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item label="检查周期" prop="executeCycle">
+                <div style="width: 200px; height: 30px">
+                  <org-tree-select
+                    size="mini"
+                    v-model="queryParams.checkOrgIds"
+                    ref="checkorgTreeSelect"
+                    :disable="true"
+                    @change="getList"
+                  >
+                  </org-tree-select>
+                </div>
+              </el-form-item>
+              <el-form-item label="任务进度" prop="status">
+                <el-select
+                  style="width: 200px"
+                  v-model="queryParams.status"
+                  placeHolder="请选择任务进度"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.type.safety_check_status"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <!-- <el-form-item label="检查周期" prop="executeCycle">
             <el-select
               v-model="queryParams.executeCycle"
               placeHolder="请选择检查周期"
@@ -97,7 +96,7 @@
             </el-select>
           </el-form-item> -->
 
-          <!-- <el-form-item
+              <!-- <el-form-item
             class="searchTitle"
             label="开始日期"
             prop="planStartTime"
@@ -113,165 +112,195 @@
             >
             </el-date-picker>
           </el-form-item> -->
-          <el-form-item
-            class="searchTitle"
-            label="任务时间"
-            prop="planStartTime"
-          >
-            <DataRangePicker
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              :default-time="['00:00:00', '23:59:59']"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              v-model="queryParams.range"
-              :picker-options="pickerOptions"
-            >
-            </DataRangePicker>
-          </el-form-item>
-          <el-row>
-            <el-form-item style="margin-left: 35px">
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="getList"
-                >搜索</el-button
+              <el-form-item
+                class="searchTitle"
+                label="任务时间"
+                prop="planStartTime"
               >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
-              <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['core:safetycheck:tempregister']"
-                >临时登记</el-button
-              >
-            </el-form-item>
-          </el-row>
-        </el-form>
-        <!--    按纽    -->
-      </div>
-        <el-table
-          border
-          height="700"
-          size="small"
-          v-loading="loading"
-          :data="pageData"
-        >
-          <el-table-column
-            align="center"
-            type="index"
-            fixed
-            min-width="50"
-            label="序号"
-            v-if="columns[0].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="title"
-            label="任务名称"
-            min-width="120"
-            v-if="columns[1].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="checkOrgName"
-            label="检查主体"
-            min-width="140"
-            v-if="columns[5].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="roleName"
-            label="检查人员"
-            min-width="150"
-            v-if="columns[6].visible"
-          >
-            <template slot-scope="r">
-              {{
-                r.row.roles ? r.row.roles.map((r) => r.roleName).join("||") : ""
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="status"
-            label="任务进度"
-            width="100px"
-            v-if="columns[10].visible"
-          >
-            <template slot-scope="r">
-              <span>
-                <!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
-                <!-- <label :style="statusColor(r.row.status, false)"> -->
-                <label>
-                  {{
-                    getLabel(dict.type.safety_check_status, r.row.status)
-                  }}</label
+                <DataRangePicker
+                  type="daterange"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  :default-time="['00:00:00', '23:59:59']"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  v-model="queryParams.range"
+                  :picker-options="pickerOptions"
                 >
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="orgName"
-            label="受检机构"
-            min-width="140"
-            v-if="columns[4].visible"
+                </DataRangePicker>
+              </el-form-item>
+              <el-row>
+                <el-form-item style="margin-left: 35px">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="getList"
+                    >搜索</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                  >
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['core:safetycheck:tempregister']"
+                    >临时登记</el-button
+                  >
+                </el-form-item>
+              </el-row>
+            </el-form>
+            <!--    按纽    -->
+          </div>
+          <el-table
+            border
+            height="596"
+            size="small"
+            v-loading="loading"
+            :data="pageData"
           >
-          </el-table-column>
+            <el-table-column
+              type="index"
+              fixed
+              align="center"
+              width="80px"
+              label="序号"
+              v-if="columns[0].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="title"
+              label="任务名称"
+              width="250px"
+              :show-overflow-tooltip="true"
+              v-if="columns[1].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="checkOrgName"
+              label="检查主体"
+              align="center"
+              width="180px"
+              v-if="columns[5].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="roleName"
+              label="检查人员"
+              align="center"
+              width="180px"
+              v-if="columns[6].visible"
+            >
+              <template slot-scope="r">
+                {{
+                  r.row.roles
+                    ? r.row.roles.map((r) => r.roleName).join("||")
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="status"
+              label="任务进度"
+              align="center"
+              width="180px"
+              v-if="columns[10].visible"
+            >
+              <template slot-scope="r">
+                <span>
+                  <!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
+                  <!-- <label :style="statusColor(r.row.status, false)"> -->
+                  <label>
+                    {{
+                      getLabel(dict.type.safety_check_status, r.row.status)
+                    }}</label
+                  >
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="orgName"
+              label="受检机构"
+              align="center"
+              width="180px"
+              v-if="columns[4].visible"
+            >
+            </el-table-column>
 
-          <el-table-column
-            prop="planStartTime"
-            label="任务时间"
-            min-width="200"
-            v-if="columns[2].visible"
-            ><template slot-scope="r">
-              {{
-                r.row.planStartTime
-                  ? dayjs(r.row.planStartTime).format("YYYY年-MM月-DD日")
-                  : ""
-              }}~{{
-                r.row.planEndTime
-                  ? dayjs(r.row.planEndTime).format("YYYY年-MM月-DD日")
-                  : ""
-              }}
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="planEndTime"
-            label="截止日期"
-            min-width="100"
-            v-if="false"
-            ><template slot-scope="r">
-              {{
-                r.row.planEndTime
-                  ? dayjs(r.row.planEndTime).format("YYYY-MM-DD")
-                  : ""
-              }}
-            </template></el-table-column
-          >
+            <el-table-column
+              prop="planStartTime"
+              label="任务时间"
+              align="center"
+              width="300px"
+              v-if="columns[2].visible"
+              ><template slot-scope="r">
+                {{
+                  r.row.planStartTime
+                    ? dayjs(r.row.planStartTime).format("YYYY年-MM月-DD日")
+                    : ""
+                }}~{{
+                  r.row.planEndTime
+                    ? dayjs(r.row.planEndTime).format("YYYY年-MM月-DD日")
+                    : ""
+                }}
+              </template></el-table-column
+            >
+            <el-table-column
+              prop="planEndTime"
+              label="截止日期"
+              align="center"
+              width="180px"
+              v-if="false"
+              ><template slot-scope="r">
+                {{
+                  r.row.planEndTime
+                    ? dayjs(r.row.planEndTime).format("YYYY-MM-DD")
+                    : ""
+                }}
+              </template></el-table-column
+            >
 
-          <el-table-column
-            prop="submitBy"
-            label="检查人"
-            min-width="100"
-            v-if="false"
-          ></el-table-column>
-          <el-table-column label="检查时间" min-width="120" v-if="false">
-            <template slot-scope="r">{{
-              r.row.submitTime | dateTime
-            }}</template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="exceptionCount"
-            label="隐患问题数"
-            min-width="80"
-            v-if="columns[9].visible"
-          >
-          </el-table-column>
-          <el-table-column prop="des" label="备注" min-width="80" v-if="false">
-          </el-table-column>
-          <el-table-column label="操作" fixed="right" min-width="200">
-            <template slot-scope="r">
-              <!-- <el-button v-if="
+            <el-table-column
+              prop="submitBy"
+              label="检查人"
+              align="center"
+              width="180px"
+              v-if="false"
+            ></el-table-column>
+            <el-table-column label="检查时间" min-width="120" v-if="false">
+              <template slot-scope="r">{{
+                r.row.submitTime | dateTime
+              }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="exceptionCount"
+              label="隐患问题数"
+              width="180px"
+              v-if="columns[9].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="des"
+              label="备注"
+              align="center"
+              width="180px"
+              v-if="false"
+            >
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              fixed="right"
+              align="center"
+              width="180px"
+            >
+              <template slot-scope="r">
+                <!-- <el-button v-if="
                             r.row.status == 'WAIT' &&
                             queryParams.type == 'QUARTER'
                         " type="text" @click="onEdit(r.row.id)">检查</el-button>
@@ -280,41 +309,40 @@
                             r.row.status != 'NOT' &&
                             r.row.status != 'WAIT'
                         " type="text" @click="onEdit(r.row.id, { isRead: true })">查看</el-button> -->
-              <el-button
-                type="text"
-                @click="showDetail(r.row)"
-                v-hasPermi="['resumption:taskManager:query']"
-                >详情</el-button
-              >
-              <el-button
-                type="text"
-                @click="showscanRecord(r.row)"
-                v-hasPermi="['resumption:taskManager:query']"
-                >扫描记录</el-button
-              >
-              <el-button
-                type="text"
-                @click="showRegister(r.row)"
-                v-if="showRegisterBtn(r.row)"
-                >任务登记</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+                <el-button
+                  type="text"
+                  @click="showDetail(r.row)"
+                  v-hasPermi="['resumption:taskManager:query']"
+                  >详情</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="showscanRecord(r.row)"
+                  v-hasPermi="['resumption:taskManager:query']"
+                  >扫描记录</el-button
+                >
+                <el-button
+                  type="text"
+                  @click="showRegister(r.row)"
+                  v-if="showRegisterBtn(r.row)"
+                  >任务登记</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
         </div>
       </el-col>
     </el-row>
     <!-- 详情 -->
     <dialog-detail ref="detaildialog"></dialog-detail>
     <dialog-scan-record ref="scanrecorddialog"></dialog-scan-record>
-
   </div>
 </template>
 
@@ -339,7 +367,6 @@ export default {
     DataRangePicker,
     OrgTreeSelect,
     OrgTree,
-    
   },
   data() {
     return {
@@ -477,7 +504,7 @@ export default {
       this.resetForm("queryParams");
       this.getList();
     },
-    handleAdd(){
+    handleAdd() {
       let path = "/safetycheck/tempregister/add";
       this.$router.push(path);
     },

src/views/core/drill/plan/dialog.select.file.vue

@@ -59,8 +59,8 @@
     </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>
     </div>
  </DialogCom>
 </template>

src/views/core/drill/task/dialog.select.drillDictionary.vue

@@ -65,9 +65,9 @@
       </g-search-table>
     </div>
 
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="onHide">关闭</el-button>
+    <div slot="footer" class="dialog-footer">      
       <el-button type="primary" @click="onSubmit">确定</el-button>
+      <el-button @click="onHide">关闭</el-button>
     </div>
   </DialogCom>
 </template>

src/views/resumption/plan/distribute.vue

@@ -38,7 +38,7 @@
           >
         </el-col>
       </el-row>
-      <el-table :data="tableData" height="400px">
+      <el-table :data="tableData" height="400px" size="small">
         <el-table-column type="index" label="序号" width="80"></el-table-column>
         <el-table-column prop="orgName" label="机构名称"></el-table-column>
         <el-table-column prop="status" label="计划状态" width="150px">
@@ -58,9 +58,9 @@
       </el-table>
     </div>
 
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="onHide">关闭</el-button>
+    <div slot="footer" class="dialog-footer">      
       <el-button type="primary" @click="onSubmit">确定</el-button>
+      <el-button @click="onHide">关闭</el-button>
     </div>
   </DialogCom>
 </template>
@@ -138,7 +138,7 @@ export default {
 .el-dialog-div {
   overflow: auto;
 }
-.dialog-footer{
-  margin-top:20px;
+.dialog-footer {
+  margin-top: 20px;
 }
 </style>

src/views/resumption/plan/index.vue

@@ -117,6 +117,7 @@
                     >搜索</el-button
                   >
                   <el-button
+                    type="primary"
                     icon="el-icon-refresh"
                     size="mini"
                     @click="resetQuery"
@@ -146,8 +147,9 @@
           <!--    按纽    -->
 
           <el-table
+          
             border
-            height="700"
+            height="596"
             size="small"
             v-loading="loading"
             :data="pageData"
@@ -155,22 +157,25 @@
             row-key="id"
           >
             <el-table-column
-              align="center"
+            label="序号"
               fixed
               type="index"
-              label="序号"
-              width="80"
+              align="center"
+              width="80px"
               v-if="columns[0].visible"
             ></el-table-column>
             <el-table-column
               prop="planName"
               label="任务名称"
+              width="250px"
+              :show-overflow-tooltip="true"
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
               prop="planType"
               label="任务类型"
-              width="120"
+              align="center"
+              width="180px"
               v-if="columns[2].visible"
             >
               <template slot-scope="r"
@@ -182,7 +187,8 @@
             <el-table-column
               prop="planCreateOrgName"
               label="创建机构"
-              width="120"
+              align="center"
+              width="180px"
               v-if="columns[3].visible"
             >
               <!-- <template slot-scope="r"
@@ -192,14 +198,16 @@
             <el-table-column
               prop="planOfOrgName"
               label="行社名称"
-              width="120"
+              align="center"
+              width="180px"
               v-if="columns[4].visible"
             ></el-table-column>
 
             <el-table-column
               prop="execOrgType"
               label="机构类型"
-              width="100px"
+              align="center"
+              width="180px"
               v-if="columns[5].visible"
             >
               <template slot-scope="r"
@@ -210,12 +218,15 @@
             <el-table-column
               prop="roleNames"
               label="履职人员"
+              align="center"
+              width="180px"
               v-if="columns[6].visible"
             ></el-table-column>
             <el-table-column
               prop="planCycle"
               label="任务周期"
-              width="80px"
+              align="center"
+              width="180px"
               v-if="columns[7].visible"
             >
               <template slot-scope="r"
@@ -231,7 +242,8 @@
             <el-table-column
               prop="planExec"
               label="任务时间"
-              width="80px"
+              align="center"
+              width="180px"
               v-if="columns[8].visible"
             >
               <template slot-scope="r"
@@ -241,15 +253,17 @@
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
               prop="count"
               label="任务次数"
+              align="center"
+              width="180px"
               v-if="columns[7].visible"
             ></el-table-column>
             <el-table-column
               prop="planStatus"
               label="任务状态"
-              width="80px"
+              align="center"
+              width="180px"
               v-if="columns[10].visible"
             >
               <template slot-scope="r"
@@ -264,7 +278,8 @@
             <el-table-column
               prop="updateName"
               label="修改人"
-              width="100px"
+              align="center"
+              width="180px"
               v-if="false"
             ></el-table-column>
 

src/views/resumption/taskManager/index.vue

@@ -150,7 +150,7 @@
               header-align="center"
               prop="roleName"
               label="履职人员"
-              min-width="120"
+              width="150"
               v-if="columns[3].visible"
             >
             </el-table-column>
@@ -170,7 +170,7 @@
               header-align="center"
               prop="planStartTime"
               label="任务时间"
-              width="200px"
+              width="270px"
               v-if="columns[5].visible"
             >
               <template slot-scope="r">
@@ -184,7 +184,7 @@
               align="center"
               prop="abnormalDataNums"
               label="隐患数量"
-              min-width="80"
+              width="90"
               v-if="columns[6].visible"
             >
               <template slot-scope="r">
@@ -369,7 +369,7 @@ export default {
       this.queryParams.orgId = node.id;
       this.selectedOrgName = node.shortName;
       this.getList();
-      this.loadRoles(key);
+      this.loadRoles(node.id);
       this.loadPlanList();
     },
     //单选框状态改变

src/views/safetycheck/taskManager/components/register.vue

@@ -37,7 +37,7 @@
         <span v-else>{{ taskInfo.checkTeam }}</span>
       </el-descriptions-item>
       <el-descriptions-item label="检查状态"
-        >{{ getLabel(dict.type.safety_check_status,taskInfo.status) }}
+        >{{ getLabel(dict.type.safety_check_status, taskInfo.status) }}
       </el-descriptions-item>
     </el-descriptions>
     <el-row class="el-row-button">
@@ -51,9 +51,8 @@
           >新增检查内容</el-button
         >
       </el-col>
-      
     </el-row>
-    
+
     <div class="content">
       <div class="area_content" v-for="area in taskInfo.checkList">
         <div>
@@ -65,7 +64,7 @@
             <div class="safetycheck_point" v-for="point in item.pointList">
               <div>
                 <div class="pointName">
-                  <div style="display:flex;flex-direction:row">
+                  <div style="display: flex; flex-direction: row">
                     <i class="circle" />
                     <pre>{{ point.pointName }}</pre>
                   </div>
@@ -163,17 +162,17 @@
     </div>
 
     <div class="dialog-footer">
-      <el-button @click="onClose">关闭</el-button>
+      <el-button type="primary" @click="onSubmit()" v-if="showSaveBtn"
+        >提交</el-button
+      >
+      <el-button @click="onSave" v-if="showSaveBtn">保存</el-button>
       <el-button
         @click="onGrant"
         v-if="showGrantBtn"
         v-hasPermi="['core:safetycheck:grant']"
         >授权</el-button
       >
-      <el-button @click="onSave" v-if="showSaveBtn">保存</el-button>
-      <el-button type="primary" @click="onSubmit()" v-if="showSaveBtn"
-        >提交</el-button
-      >
+      <el-button @click="onClose">关闭</el-button>
     </div>
     <SelectPoint
       ref="SelectPoint"
@@ -209,7 +208,7 @@ export default {
       mode: null,
     };
   },
-  dicts: ["rectification_deadline", "sys_user_is_lock","safety_check_status"],
+  dicts: ["rectification_deadline", "sys_user_is_lock", "safety_check_status"],
   components: { SelectPoint, imgUpload, UserSelector },
   computed: {
     ...mapGetters(["orgId", "roleList", "userId"]),
@@ -414,9 +413,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.el-row-button{
-    margin-top:20px;
-  }
+.el-row-button {
+  margin-top: 20px;
+}
 .content {
   max-height: calc(100% - 300px);
   overflow-y: auto;
@@ -475,7 +474,7 @@ export default {
 
 .pointName pre {
   margin-left: 10px;
-  width:calc(100% - 15px)
+  width: calc(100% - 15px);
 }
 .dialog-footer {
   width: 100%;
@@ -495,6 +494,6 @@ export default {
   background-color: #b8bdc0;
   border: none;
   margin-bottom: 3px;
-  margin-top:6px;
+  margin-top: 6px;
 }
 </style>

src/views/scorestatistics/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row slot="rightBar">
+    <el-row >
       <!--用户数据-->
       <el-col>
         <div class="main-search-box">

src/views/system/area/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="app-container">
-
-
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <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="orgType">
             <el-select
               v-model="queryParams.orgType"
@@ -29,11 +30,6 @@
         />
       </el-form-item>
 
-
-      <!-- <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -63,42 +59,12 @@
           v-hasPermi="['system:area:add']"
         >新增</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit-outline"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:area:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:area:remove']"
-        >删除</el-button>
-      </el-col> -->
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:area:export']"
-        >导出</el-button>
-      </el-col> -->
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
+           </div>
+           <el-table
       border
       height="600"
       size="small"
@@ -140,6 +106,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+          </div>
+   
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>

src/views/system/check/index.vue

@@ -1,30 +1,10 @@
 <template>
   <div class="app-container">
+    <div class="main-right-box">
+           <!--    搜索条件    -->
+           <div class="main-search-box">
 
-    <!-- <el-row :gutter="20"> -->
-      <!--部门数据-->
-      <!-- <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入机构名称" clearable size="small" prefix-icon="el-icon-search"
-                    style="margin-bottom: 20px"/>
-        </div>
-        <div class="tree-container">
-          <div style="margin-bottom: 10px;">
-            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox">关联下级</el-checkbox>
-          </div>
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-                   :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="defaultKeys"
-                   :default-checked-keys="defaultKeys" @node-click="handleNodeClick"/>
-        </div>
-      </el-col> -->
-  <!--机构数据-->
-  <!-- <el-col :span="4" :xs="24">
-<org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-  @click="clickTreeNode" businessTree></org-tree> 
-</el-col> -->
-
-      <!-- <el-col :span="20" :xs="24"> -->
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="NFC点位" prop="checkName">
             <el-input v-model="queryParams.checkName" placeholder="请输入NFC点位名称" clearable
                       @keyup.enter.native="handleQuery"/>
@@ -46,10 +26,6 @@
             </el-select>
           </el-form-item>
 
-          <!-- <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item> -->
         </el-form>
 
         <el-row :gutter="10" class="mb8">
@@ -72,18 +48,19 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table
+    
+       
+           </div>
+           <el-table
           border
           height="600"
           size="small"
           v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
-          <!--<el-table-column type="selection" width="55" align="center" />-->
-          <el-table-column label="序号" align="center" min-width="50">
+  <el-table-column label="序号" align="center" min-width="50">
             <template v-slot:default="scope">
               <span v-text="getPageIndex(scope.$index)"> </span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="所属机构" align="left" prop="orgName"/> -->
           <el-table-column label="机构类型" align="center" prop="orgType" />
           <el-table-column label="NFC点位" align="left" prop="checkName"/>
           <el-table-column label="修改人" align="center" prop="updateBy"/>
@@ -101,10 +78,9 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
-      <!-- </el-col>
 
-
-    </el-row> -->
+          </div>
+        
 
 
     <!-- 添加或修改区域采集点对话框 -->

src/views/system/config/index.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <div class="main-search-box">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      
       <el-form-item label="参数名称" prop="configName">
         <el-input
           v-model="queryParams.configName"
@@ -40,14 +42,13 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary"  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -58,8 +59,8 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+        type="primary"
+          
           icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
@@ -69,8 +70,8 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+        type="primary"
+          
           icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
@@ -90,8 +91,8 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+        type="primary"
+          
           icon="el-icon-refresh"
           size="mini"
           @click="handleRefreshCache"
@@ -100,6 +101,8 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    </div>
+   
 
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -115,7 +118,7 @@
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
 
        <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/dept/index.vue

@@ -67,19 +67,6 @@
                    />
                  </el-select>
                </el-form-item>
- 
-<!--               <el-form-item>-->
-<!--                 <el-button-->
-<!--                   type="primary"-->
-<!--                   icon="el-icon-search"-->
-<!--                   size="mini"-->
-<!--                   @click="handleQuery"-->
-<!--                 >搜索</el-button-->
-<!--                 >-->
-<!--                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"-->
-<!--                 >重置</el-button-->
-<!--                 >-->
-<!--               </el-form-item>-->
              </el-form>
              <el-row :gutter="10">
                <el-col :span="1.5">

src/views/system/dict/index.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <div class="main-search-box">
+      
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
       <el-form-item label="字典名称" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -35,13 +37,14 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button  type="primary"  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -84,8 +87,8 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+        type="primary"
+         
           icon="el-icon-refresh"
           size="mini"
           @click="handleRefreshCache"
@@ -95,6 +98,10 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
+    </div>
+
+
+
     <el-table v-loading="loading"
     border
     height="700"
@@ -117,7 +124,7 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/menu/index.vue

@@ -1,10 +1,12 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+   
+    <div class="main-search-box">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="PC端" name="1"></el-tab-pane>
       <el-tab-pane label="移动端" name="0"></el-tab-pane>
     </el-tabs>
-    <el-form
+      <el-form
       :model="queryParams"
       ref="queryForm"
       size="small"
@@ -46,7 +48,7 @@
         >
       </el-form-item> -->
     </el-form>
-
+    
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -80,7 +82,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
+          
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
@@ -92,6 +94,9 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
+    </div>
+  
+
 
     <el-table
       v-if="refreshTable"
@@ -105,14 +110,16 @@
       <el-table-column
         prop="menuName"
         label="菜单名称"
+        align="center"
         :show-overflow-tooltip="true"
         width="180"
       ></el-table-column>
       <el-table-column
         prop="platformType"
         label="平台类型"
+        align="center"
         :show-overflow-tooltip="true"
-        width="80"
+        width="120"
       >
         <template slot-scope="scope">
           <dict-tag
@@ -121,32 +128,52 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="icon" v-if="activeName==1" label="图标" align="center" width="100">
+      <el-table-column
+        prop="icon"
+        v-if="activeName == 1"
+        label="图标"
+        align="center"
+        width="100"
+      >
         <template slot-scope="scope">
           <svg-icon v-if="scope.row.icon" :icon-class="scope.row.icon" />
         </template>
       </el-table-column>
-      <el-table-column prop="icon" v-if="activeName==0" label="图标" align="center" width="100">
+      <el-table-column
+        prop="icon"
+        v-if="activeName == 0"
+        label="图标"
+        align="center"
+        width="100"
+      >
         <template slot-scope="scope">
-          <img v-if="scope.row.icon != '#'" style="width: 20px;height: 20px;" :src="scope.row.icon" alt="">
+          <img
+            v-if="scope.row.icon != '#'"
+            style="width: 20px; height: 20px"
+            :src="scope.row.icon"
+            alt=""
+          />
         </template>
       </el-table-column>
       <el-table-column
         prop="orderNum"
         label="排序"
         width="60"
+        align="center"
       ></el-table-column>
       <el-table-column
         prop="perms"
+        align="center"
         label="权限标识"
         :show-overflow-tooltip="true"
       ></el-table-column>
       <el-table-column
         prop="component"
         label="组件路径"
+        align="center"
         :show-overflow-tooltip="true"
       ></el-table-column>
-      <el-table-column prop="status" label="状态" width="80">
+      <el-table-column prop="status"  align="center" label="状态" width="80">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.sys_normal_disable"
@@ -161,7 +188,7 @@
       </el-table-column>-->
       <el-table-column
         label="操作"
-        align="center"
+        align="left"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
@@ -262,8 +289,8 @@
                   />
                 </el-input>
               </el-popover>
-<!--                <imgUpload type="radioIcon" :value="form.icon" @input="inputHandler"></imgUpload>-->
-                <base-image v-else v-model="form.icon" ></base-image>
+              <!--                <imgUpload type="radioIcon" :value="form.icon" @input="inputHandler"></imgUpload>-->
+              <base-image v-else v-model="form.icon"></base-image>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -442,11 +469,11 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import IconSelect from "@/components/IconSelect";
 import imgUpload from "@/components/ImageUpload/index.vue";
-import  BaseImage from "@/components/BaseImage"
+import BaseImage from "@/components/BaseImage";
 export default {
   name: "Menu",
   dicts: ["sys_show_hide", "sys_normal_disable", "sys_platform_type"],
-  components: { Treeselect, IconSelect, imgUpload,BaseImage },
+  components: { Treeselect, IconSelect, imgUpload, BaseImage },
   data() {
     return {
       // platformType 平台类型 0APP 1PC
@@ -497,8 +524,8 @@ export default {
   },
   methods: {
     //上传成功回调
-    inputHandler(list){
-      this.form.icon=list
+    inputHandler(list) {
+      this.form.icon = list;
     },
     //切换tab栏刷新数据
     handleClick() {
@@ -536,7 +563,7 @@ export default {
         this.menuOptions = [];
         const menu = { id: 0, menuName: "主类目", children: [] };
         menu.children = this.handleTree(response.data, "id");
-        console.log(menu,'menu')
+        console.log(menu, "menu");
         this.menuOptions.push(menu);
       });
     },
@@ -640,8 +667,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-  .el-upload-dragger{
-    width: 100%;
-    height: 100%;
-  }
+.el-upload-dragger {
+  width: 100%;
+  height: 100%;
+}
 </style>

src/views/system/role/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+    <div class="main-right-box">
+           <!--    搜索条件    -->
+           <div class="main-search-box">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="角色名称" prop="roleName">
         <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
           @keyup.enter.native="handleQuery" />
@@ -12,14 +15,7 @@
             :value="dict.value" />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item> -->
-      <!-- <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item> -->
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -36,34 +32,18 @@
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['system:role:add']">新增</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['system:role:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:role:remove']">删除</el-button>
-      </el-col> -->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="warning"-->
-      <!--          plain-->
-      <!--          icon="el-icon-download"-->
-      <!--          size="mini"-->
-      <!--          @click="handleExport"-->
-      <!--          v-hasPermi="['system:role:export']"-->
-      <!--        >导出</el-button>-->
-      <!--      </el-col>-->
+  
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
-    <el-table
+           </div>
+ 
+           <el-table
           border
           height="650"
           size="small"
     v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="50" align="center" /> -->
-      <el-table-column label="序号" align="center" width="50">
+      <el-table-column label="序号" align="center" width="100">
         <template v-slot:default="scope">
           <span v-text="getPageIndex(scope.$index)"> </span>
         </template>
@@ -75,16 +55,14 @@
             </template>
           </el-table-column>
           <el-table-column label="更新人" prop="createBy" :show-overflow-tooltip="true"  />
-<!--      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true"  />-->
+
       <el-table-column label="状态" align="center" >
         <template slot-scope="scope">
-<!--          <el-switch v-model="scope.row.status" active-text inactive-text active-value="0" inactive-value="1"
-            @change="handleStatusChange(scope.row)">
-          </el-switch>-->
+
             <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="150">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.id !== 1">
@@ -92,16 +70,6 @@
             v-hasPermi="['system:role:edit']">编辑</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']">删除</el-button>
-          <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-            v-hasPermi="['system:role:edit']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
-                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
-              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
-                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
         </template>
       </el-table-column>
     </el-table>
@@ -109,6 +77,9 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
+          </div>
+   
+
     <!-- 添加或修改角色配置对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="750px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -153,19 +124,6 @@
           </el-col>
         </el-row>
 
-
-
-<!--        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            权限字符
-          </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-        </el-form-item>-->
-
-
         <el-form-item label="菜单权限">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>