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

src/assets/styles/element-ui.scss

@@ -85,7 +85,7 @@
 
 .tree-container{
   .el-tree-node>.el-tree-node__children{
-    -overflow: visible!important; /* 添加横向滚动条*/
+    overflow: visible!important; /* 添加横向滚动条*/
   }
 }
 

src/assets/styles/ruoyi.scss

@@ -302,8 +302,8 @@
     font-size: 13px;
     height: 32px!important;
   }
- .el-submenu__title{
+ .el-submenu__title,.el-menu-item{
    font-size: 13px!important;
-   height: 48px!important;
-   line-height: 48px!important;
+   height: 42px!important;
+   line-height: 42px!important;
  }

src/components/orgTree/index.vue

@@ -191,7 +191,6 @@ export default {
   overflow: auto;
 }
 .el-tree-ex {
-  // overflow: auto;
   ::v-deep .is-current > .el-tree-node__content {
     background-color: #d1e0f1 !important;
   }

src/components/userSelector/index.vue

@@ -38,10 +38,10 @@
             <!-- 搜索 -->
             <template slot="searchs">
               <el-form-item  prop="ruleId" label="用户账号">
-                <el-input v-model="search.username"></el-input>
+                <el-input v-model="search.username" clearable></el-input>
               </el-form-item>
               <el-form-item prop="name" label="用户姓名">
-                <el-input v-model="search.name"></el-input>
+                <el-input v-model="search.name" clearable></el-input>
               </el-form-item>
               <el-form-item>
                 <el-button

src/views/check/dialog.edit.vue

@@ -19,6 +19,7 @@
             <el-col :span="6">
               <el-form-item prop="planName" label="任务名称:">
                 <el-input
+                :disabled="isChildren()"
                   v-model.trim="formData.planName"
                   :maxlength="50"
                   name="planName"
@@ -258,9 +259,9 @@
         </el-form>
         <el-button @click="openSelect">选择检查内容</el-button>
         <el-button @click="deleteSelected">批量删除</el-button>
-        <el-table
+        <el-table 
           :data="tableData"
-          style="width: 100%"
+          style="width: 100%;margin-top: 15px;"
           height="400px"
           @selection-change="handleSelectionChange"
         >
@@ -572,7 +573,7 @@ export default {
       }
     },
     onSelect(selectList) {
-      // console.log(selectList,"selectList");
+      console.log(selectList,"selectList");
       for (let i = 0; i < selectList.length; i++) {
         let tem = {
           ofOrgId: this.orgId,
@@ -589,8 +590,10 @@ export default {
         if (this.tableData == null) {
           this.tableData = [];
         }
+        if(tem.itemName!=null&&tem.itemName!=undefined){
         this.tableData.push(tem);
       }
+      }
     },
 
     async show(id, other = {}) {
@@ -604,7 +607,14 @@ export default {
       this.isShow = true;
     },
     removeRow(row) {
-      this.tableData = this.tableData.filter((item) => item !== row);
+      this.$modal
+        .confirm("是否确认删除？")
+        .then(function () {})
+        .then(() => {
+          this.tableData = this.tableData.filter((item) => item !== row);
+          this.$modal.msgSuccess("删除成功");
+        });
+      // this.tableData = this.tableData.filter((item) => item !== row);
     },
     // 事件
     onHide() {

src/views/check/index.vue

@@ -469,7 +469,8 @@ export default {
         (row.planOfOrgType == 3 &&
           row.planStatus != 1 &&
           row.planCreateOrgId == this.orgId) ||
-        (row.planStatus == 2 && row.parentId != -1 && row.planOfOrgType == 1)
+        (row.planStatus == 2 && row.parentId != -1 && row.planOfOrgType == 1)||
+        (row.planStatus != 1&&(row.execOrgType == 1||row.execOrgType == 2))
       ) {
         return true;
       }

src/views/check/task/index.vue

@@ -211,9 +211,10 @@
           >
             <template slot-scope="r">
               <span>
-                <i class="circle" :style="statusColor(r.row.status, true)" />
-                <label :style="statusColor(r.row.status, false)">
-                  {{
+                <!-- <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
                 >

src/views/core/edu/plan/index.vue

@@ -181,7 +181,7 @@
         <el-row>
           <el-col :span="12" v-show="form.planCycle == 0">
             <el-form-item prop="startDate" label="开始日期">
-              <el-date-picker v-model="form.startDate" @change="startDateChanged"
+              <el-date-picker style="width: 100%" v-model="form.startDate" @change="startDateChanged"
                               :picker-options="startDatepickerOptions"
                               align="right" type="date" placeholder="选择开始日期">
               </el-date-picker>

src/views/resumption/ruleManager/index.vue

@@ -314,4 +314,8 @@ export default {
     width: 60px !important;
   }
 }
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 0;
+  padding-left: 47px;
+}
 </style>

src/views/safetycheck/ruleManager/index.vue

@@ -27,7 +27,7 @@
           v-show="showSearch && rule"
           label-width="100px"
         >
-          <el-form-item prop="itemName" label="检查项">
+          <el-form-item prop="itemName" label="检查项" class="search_itemname">
             <el-input
               v-model="queryParams.itemName"
               placeholder="请输入内容"
@@ -43,7 +43,10 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item>
+        </el-form>
+        <!--    按纽    -->
+        <el-row :gutter="10" class="mb8"  v-show="showSearch && rule">
+          <el-col :span="1.5">
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -55,13 +58,9 @@
             <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"
+              size="mini"
               @click="onAddItem()"
               :disabled="rule ? false : true"
               v-hasPermi="['safetycheck:ruleManager:add']"
@@ -76,6 +75,7 @@
             <el-button
               type="warning"
               @click="dakai"
+              size="mini"
               :disabled="rule ? false : true"
               >{{ expandAll ? "收起所有行" : "展开所有行" }}</el-button
             >
@@ -113,10 +113,6 @@
                   v-if="columns[4].visible"
                 >
                 </el-table-column>
-                <!-- <el-table-column prop="dataTypeName" label="数据类型">
-                </el-table-column>
-                <el-table-column prop="degreeRiskName" label="风险等级">
-                </el-table-column> -->
               </el-table>
             </template>
           </el-table-column>
@@ -129,8 +125,6 @@
           </el-table-column>
           <el-table-column prop="name" label="检查项" v-if="columns[1].visible">
           </el-table-column>
-          <!-- <el-table-column prop="itemDesc" label="标准及要求">
-          </el-table-column> -->
           <el-table-column
             prop="pointNums"
             label="检查内容数量"
@@ -379,71 +373,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.show-ellipsis {
-  display: block;
-  width: 180px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.search {
-  display: flex;
-  flex-wrap: wrap;
-  & > div {
-    width: 25%;
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    & > span:first-child {
-      display: inline-block;
-      min-width: 70px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(2),
-    &:nth-child(3) {
-      margin-left: 15px;
-    }
-    &:nth-child(3) > span {
-      display: inline-block;
-      min-width: 100px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(1) > span {
-      display: inline-block;
-      min-width: 100px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(1) {
-    }
-  }
-}
-.box {
-  border: 1px solid #eee;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  padding: 10px;
-  min-height: 120px;
-  & > p {
-    font-size: 16px;
-    font-weight: bold;
-    margin-bottom: 15px;
+.search_itemname {
+  ::v-deep .el-form-item__label {
+    width: 60px !important;
   }
 }
-.item {
-  margin-bottom: 14px;
-}
 ::v-deep .el-table__expanded-cell[class*="cell"] {
   padding: 0;
   padding-left: 47px;
 }
-::v-deep .formbox {
-  display: flex;
-  flex-wrap: wrap;
-  .el-form-item {
-    width: 50%;
-  }
-}
 </style>

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

@@ -31,24 +31,29 @@
           style="width: 80%; margin-top: -8px"
           placeHolder="请输入检查组成员"
           v-model="taskInfo.checkTeam"
+          maxlength="255"
           v-if="isRegister"
         ></el-input>
         <span v-else>{{ taskInfo.checkTeam }}</span>
       </el-descriptions-item>
       <el-descriptions-item label="检查状态"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
+        >{{ getLabel(dict.type.safety_check_status,taskInfo.status) }}
       </el-descriptions-item>
     </el-descriptions>
-    <div>
-      <span style="margin-right: 20px">巡检区域</span>
-      <el-button
-        type="primary"
-        size="mini"
-        @click="onAddPoint()"
-        v-if="isRegister"
-        >新增检查内容</el-button
-      >
-    </div>
+    <el-row class="el-row-button">
+      <el-col>
+        <span style="margin-right: 20px">巡检区域</span>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="onAddPoint()"
+          v-if="isRegister"
+          >新增检查内容</el-button
+        >
+      </el-col>
+      
+    </el-row>
+    
     <div class="content">
       <div class="area_content" v-for="area in taskInfo.checkList">
         <div>
@@ -204,7 +209,7 @@ export default {
       mode: null,
     };
   },
-  dicts: ["rectification_deadline", "sys_user_is_lock"],
+  dicts: ["rectification_deadline", "sys_user_is_lock","safety_check_status"],
   components: { SelectPoint, imgUpload, UserSelector },
   computed: {
     ...mapGetters(["orgId", "roleList", "userId"]),
@@ -409,6 +414,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.el-row-button{
+    margin-top:20px;
+  }
 .content {
   max-height: calc(100% - 300px);
   overflow-y: auto;

src/views/system/user/index.vue

@@ -192,7 +192,7 @@
               align="center"
               key="username"
               prop="username"
-              width="100"
+              width="120"
               v-if="columns[0].visible"
             />
             <el-table-column
@@ -200,7 +200,7 @@
               align="center"
               key="name"
               prop="name"
-              width="100"
+              width="120"
               v-if="columns[1].visible"
               :show-overflow-tooltip="true"
             />
@@ -241,12 +241,12 @@
               :show-overflow-tooltip="true"
             /> -->
             <el-table-column
-              label="状态"
+              label="账号状态"
               align="center"
               key="isLock"
               prop="isLock"
               v-if="columns[4].visible"
-              width="60"
+              width="100"
             >
               <template slot-scope="scope">
                 <dict-tag
@@ -255,18 +255,7 @@
                 />
               </template>
             </el-table-column>
-            <el-table-column
-              label="安保部门从业人员"
-              align="center"
-              key="isManager"
-              prop="isManager"
-              v-if="columns[5].visible"
-              width="160"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.isManage === "Y" ? "是" : "否" }}
-              </template>
-            </el-table-column>
+            
             <el-table-column
               label="登录IP"
               align="center"
@@ -284,6 +273,18 @@
               width="140"
             />
             <el-table-column
+              label="安保部门从业人员"
+              align="center"
+              key="isManager"
+              prop="isManager"
+              v-if="columns[5].visible"
+              width="160"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.isManage === "Y" ? "是" : "否" }}
+              </template>
+            </el-table-column>
+            <el-table-column
               label="操作"
               align="left"
               header-align="center"
@@ -362,8 +363,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination
-            v-show="total > 0"
+          <pagination            
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"