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

src/assets/styles/ruoyi.scss

@@ -106,7 +106,7 @@
   display: flex;
   justify-content: flex-end;
   align-items: center;
-	height: 50px;
+	height: 54px;
 	padding: 10px;
   background-color: #fff;
   border:1px solid #f1f1f1;

src/layout/components/Sidebar/index.vue

@@ -33,7 +33,7 @@
         </el-menu>
       </el-scrollbar>
       </div>
-      
+
       <div class="bottomBox">
         <hamburger
           id="hamburger-container"
@@ -89,7 +89,7 @@ export default {
   position: relative;
   height: 90vh;
   width: 100%;
-  overflow-y: scroll !important;
+  overflow-y: auto !important;
 }
 .bottomBox {
   //   position: absolute;
@@ -97,7 +97,7 @@ export default {
   width: 100%;
   margin-top: 10px;
   padding-left: 10px;
- 
+
   bottom: 2%;
   border-top: #ccc;
   .hamburger-container {

src/views/check/index.vue

@@ -286,7 +286,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作">
+          <el-table-column label="操作" min-width="200">
             <template slot-scope="r">
               <el-button
                 v-if="eqOrg(r.row)"

src/views/check/task/index.vue

@@ -21,31 +21,31 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item label="检查名称" prop="title">
+          <el-form-item label="任务名称" prop="title">
             <el-input
               style="width: 200px;"
               v-model="queryParams.title"
-              placeholder="请输入检查名称"
+              placeholder="请输入任务名称"
               clearable
               @keyup.enter.native="handleQuery"
               :maxlength="50"
               @input="inputTitle"
             />
           </el-form-item>
-          <!-- <el-form-item label="检查角色" prop="executeRole">
+          <el-form-item label="检查人员" prop="roleId">
             <el-select
-              v-model="queryParams.executeRole"
-              placeHolder="请选择检查角色"
+              v-model="queryParams.roleId"
+              placeholder="请选择用户角色"
               clearable
             >
               <el-option
-                v-for="item in roleList"
+                v-for="item in selectRoleOptions"
                 :key="item.id"
-                :label="item.name"
+                :label="item.roleName"
                 :value="item.id"
               ></el-option>
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!-- <el-form-item label="检查周期" prop="executeCycle">
             <el-select
               v-model="queryParams.executeCycle"
@@ -267,7 +267,7 @@
             v-if="columns[9].visible"
           >
           </el-table-column>
-          <el-table-column label="操作" fixed="right" min-width="120px">
+          <el-table-column label="操作" fixed="right" min-width="200">
             <template slot-scope="r">
               <!-- <el-button v-if="
                             r.row.status == 'WAIT' &&
@@ -316,6 +316,7 @@
 
 <script>
 import { mapGetters } from "vuex";
+import { allRole } from "@/api/system/role";
 import DialogDetail from "./dialog.detail";
 import DialogScanRecord from "./dialog.scanrecord";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
@@ -344,6 +345,7 @@ export default {
       timeClearable: false,
       options: [],
       roleOptions: [],
+      selectRoleOptions:[],
       planList: [],
 
       queryParams: {
@@ -492,7 +494,10 @@ export default {
         })
         .then((r) => (this.roleOptions = r.data));
     },
-
+    selectLoadRoles() {
+      allRole()
+        .then((r) => (this.selectRoleOptions = r.data));
+    },
     // loadPlanList() {
     //   api
     //     .getPlans({
@@ -528,7 +533,9 @@ export default {
       }
     },
   },
-  async mounted() {},
+  async mounted() {
+    this.selectLoadRoles();
+  },
 };
 </script>
 

src/views/resumption/plan/index.vue

@@ -252,7 +252,7 @@
             v-if="false"
           ></el-table-column>
 
-          <el-table-column fixed="right" width="120" label="操作">
+          <el-table-column fixed="right" width="200" label="操作">
             <template slot-scope="r">
               <el-button
                 v-if="eqOrg(r.row)"