Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.3

src/assets/styles/ruoyi.scss

@@ -336,9 +336,6 @@
 .el-checkbox__label{
   font-size: 16px!important;
 }
-.el-form-item__content{
-  font-size: 16px!important;
-}
 .el-input__inner{
   font-size: 14px!important;
 }
@@ -374,3 +371,4 @@
      }
    }
  }
+

src/assets/styles/sidebar.scss

@@ -15,7 +15,7 @@
     -webkit-transition: width .28s;
     transition: width 0.28s;
     width: $base-sidebar-width !important;
-    background-color: $base-menu-background;
+    //background-color: $base-menu-background;
     height: 100%;
     position: fixed;
     font-size: 0px;
@@ -24,8 +24,8 @@
     left: 0;
     z-index: 1001;
     overflow: hidden;
-    -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    //-webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    //box-shadow: 2px 0 6px rgba(0,21,41,.35);
 
     // reset element-ui css
     .horizontal-collapse-transition {
@@ -93,7 +93,7 @@
       min-width: $base-sidebar-width !important;
 
       &:hover {
-        background-color: rgba(0, 0, 0, 0.06) !important;
+        background-color: rgba(196, 46, 46, 0.06) !important;
       }
     }
 

src/assets/styles/variables.scss

@@ -11,15 +11,16 @@ $panGreen: #30B08F;
 // 默认菜单主题风格
 $base-menu-color:#bfcbd9;
 $base-menu-color-active:#f4f4f5;
-$base-menu-background:#f0f2f5;
+//$base-menu-background:#f0f2f5;
+$base-menu-background:#133f6f;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:rgba(0,0,0,.70);
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background:#1f2d3d;
-$base-sub-menu-hover:#001528;
+$base-sub-menu-background:#182c4e;
+$base-sub-menu-hover:#005bac;
 
 // 自定义暗色菜单风格
 /**

src/components/Hamburger/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 0 15px;" @click="toggleClick">
+  <div style="padding: 0 10px;height: 100%" @click="toggleClick">
     <svg
       :class="{'is-active':isActive}"
       class="hamburger"
@@ -7,6 +7,7 @@
       xmlns="http://www.w3.org/2000/svg"
       width="64"
       height="64"
+      :style=" {fill: settings.sideTheme === 'theme-dark'? '#fff' : '#000' }"
     >
       <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
     </svg>
@@ -14,14 +15,19 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
   name: 'Hamburger',
   props: {
     isActive: {
       type: Boolean,
-      default: false
+      default: false,
     }
   },
+  computed:{
+    ...mapState(["settings"]),
+  },
   methods: {
     toggleClick() {
       this.$emit('toggleClick')
@@ -32,8 +38,10 @@ export default {
 
 <style scoped>
 .hamburger {
+  position: absolute;
   display: inline-block;
   vertical-align: middle;
+  margin-bottom: -1px;
   width: 20px;
   height: 20px;
 }
@@ -41,4 +49,5 @@ export default {
 .hamburger.is-active {
   transform: rotate(180deg);
 }
+
 </style>

src/layout/components/Navbar.vue

@@ -126,10 +126,10 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 50px;
+  height: 51px;
   overflow: hidden;
   position: relative;
-  background-color: #008CD6 !important;  /* 修改导航栏背景色*/
+  background-color: #005bac !important;  /* 修改导航栏背景色*/
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
   .hamburger-container {
     line-height: 46px;
@@ -158,7 +158,7 @@ export default {
     width: 360px;
     height: 50px;
     color: #fff;
-    padding-left:12px;
+    //padding-left:12px;
     display: inline-grid;
     align-items: center;
   }

src/layout/components/Sidebar/Logo.vue

@@ -3,7 +3,7 @@
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? '#ffffff' : '#001529' }">{{ title }} </h1>
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? '#ffffff' : '#001529' }">{{ title }}</h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
@@ -58,7 +58,7 @@ export default {
   width: 100%;
   height: 50px;
   line-height: 50px;
-  background-color: #008CD6 !important;  /* 修改logo背景色*/
+  background-color: #005bac !important;  /* 修改logo背景色*/
   text-align: center;
   overflow: hidden;
 

src/layout/components/Sidebar/index.vue

@@ -4,20 +4,20 @@
       :class="{ 'has-logo': showLogo,  }"
       :style="{
         backgroundColor:
-          settings.sideTheme === 'theme-dark' ? '#f0f2f5' : '#ffffff',
+          settings.sideTheme === 'theme-dark' ? '#133f6f' : '#ffffff',
       }"
     >
       <logo v-if="showLogo" :collapse="isCollapse" />
       <div class="scro">
-        <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
+        <el-scrollbar :class="settings.sideTheme" style="height: 100%" wrap-class="scrollbar-wrapper">
         <el-menu
           :default-active="activeMenu"
           :collapse="isCollapse"
           :background-color="
-            settings.sideTheme === 'theme-dark' ? '#f0f2f5' : '#ffffff'
+            settings.sideTheme === 'theme-dark' ? '#133f6f' : '#ffffff'
           "
           :text-color="
-            settings.sideTheme === 'theme-dark' ? '#bfcbd9' : 'rgba(0,0,0,.70)'
+            settings.sideTheme === 'theme-dark' ? '#bfcbd9' : '#182c4e'
           "
           :unique-opened="true"
           :active-text-color="settings.theme"
@@ -34,7 +34,7 @@
       </el-scrollbar>
       </div>
 
-      <div class="bottomBox">
+      <div class="bottomBox" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? '#133f6f' : '#ffffff' }">
         <hamburger
           id="hamburger-container"
           :is-active="sidebar.opened"
@@ -81,9 +81,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .hamburger {
+  margin-bottom: -1px;
   width: 100%;
   height: 100%;
-  background-color: #f0f2f5;
+  background-color: #133f6f;
 }
 .scro {
   position: relative;
@@ -92,13 +93,14 @@ export default {
   overflow-y: auto !important;
 }
 .bottomBox {
-  //   position: absolute;
   position: relative;
+  height: 10vh;
   width: 100%;
-  margin-top: 10px;
+  //margin-top: 10px;
   padding-left: 10px;
+  color: #FFFFFF;
 
-  bottom: 2%;
+  bottom: 1%;
   border-top: #ccc;
   .hamburger-container {
     // text-align: center;

src/settings.js

@@ -2,7 +2,7 @@ module.exports = {
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    */
-  sideTheme: 'theme-light',
+  sideTheme: 'theme-dark',
 
   /**
    * 是否系统布局配置

src/views/check/dialog.edit.vue

@@ -577,12 +577,22 @@ export default {
     },
     NowBuild() {
       //如果新增或者是草稿状态的立即生效的编辑
+      // if (
+      //   this.formData.planCycle != 6 &&
+      //   (this.id == null ||
+      //     this.id == undefined ||
+      //     (this.defbuildTaskNow && this.formData.planStatus == 0))
+      // )
       if (
         this.formData.planCycle != 6 &&
         (this.id == null ||
           this.id == undefined ||
-          (this.defbuildTaskNow && this.formData.planStatus == 0))
+          ( this.formData.planStatus == 0))
       )
+      // if (
+      //   this.formData.planCycle != 6 
+      //   )
+      
         return true;
       else return false;
     },

src/views/check/index.vue

@@ -174,6 +174,7 @@
                   >新增任务</el-button
                 >
               </el-col>
+             
               <right-toolbar
                 :showSearch.sync="showSearch"
                 @queryTable="getList"

src/views/check/task/index.vue

@@ -126,33 +126,53 @@
                 >
                 </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>
+            <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:safetycheck:tempregister']"
+                  >临时登记</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['system:user:export']"
+                  >导出</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+
             <!--    按纽    -->
           </div>
           <el-table
@@ -380,6 +400,7 @@ import { getLabel } from "@/views/commonOption.js";
 import OrgTreeSelect from "@/components/orgTreeSelect";
 import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
+import request from "@/utils/request";
 export default {
   name: "checkTaskList",
   dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
@@ -478,6 +499,7 @@ export default {
     getLabel,
     showDetail(row) {
       let path = "/core/safetycheck/register/" + row.id;
+      console.log(path,"path")
       this.$router.push(path);
     },
     showscanRecord(row) {
@@ -488,30 +510,22 @@ export default {
       let taskRoleId = row.roles.map((r) => r.roleId);
 
       return (
-        row.status != 3  &&
+        row.status != 3 &&
         ((row.checkOrgId == this.orgId &&
           userRoleId.find((ur) => taskRoleId.includes(ur)) &&
-          checkPermi([
-            "core:safetycheck:register",
-          ])) ||
+          checkPermi(["core:safetycheck:register"])) ||
           row.grantUserId === this.userId)
       );
     },
-    showRegister(row) {    
+    showRegister(row) {
       if (
-        dayjs()
-          .startOf("day")
-          .isBefore(dayjs(row.planStartTime).startOf("day"))
+        dayjs().startOf("day").isBefore(dayjs(row.planStartTime).startOf("day"))
       ) {
         this.$modal.alert("任务未到开始时间，不能操作");
         return;
       }
 
-      if (
-        dayjs()
-          .endOf("day")
-          .isAfter(dayjs(row.planEndTime).endOf("day"))
-      ) {
+      if (dayjs().endOf("day").isAfter(dayjs(row.planEndTime).endOf("day"))) {
         this.$modal.alert("任务已逾期，不能操作");
         return;
       }
@@ -601,7 +615,20 @@ export default {
     //       this.planList = r.data;
     //     });
     // },
-
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "core/safetyTask/export",
+        {
+          ...this.queryParams,
+        },
+        `${
+          this.orgName +
+          "-检查登记跟踪-" +
+          this.formatTime(new Date(), "YYYYMMDD")
+        }.xlsx`
+      );
+    },
     statusColor(status, isBackground) {
       let color = "";
       switch (status) {

src/views/core/reportForms/safetyInspectReport.vue

@@ -26,6 +26,13 @@
             />
           </el-form-item>
 
+          <el-form-item label="机构类型" prop="orgType">
+              <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择机构类型" @change="changeSelect">
+                <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
+                           :value="`${dict.value}`"></el-option>
+              </el-select>
+            </el-form-item>
+
 <el-form-item label="年份" prop="year">
     <el-date-picker
       value-format='yyyy'
@@ -60,14 +67,18 @@
                 <span v-text="getPageIndex(scope.$index)"> </span>
               </template>
             </el-table-column>
-
+            <el-table-column label="地区" align="center" prop="city" />
             <el-table-column label="单位名称" align="center" prop="orgName" />
-            <el-table-column label="网点数量" align="left" prop="networkNumber"/>
-            <el-table-column label="应检查次数" align="center" prop="planInspectNumber"/>
-            <el-table-column label="已检查次数" align="center" prop="realityInspectNumber"/>
-            <el-table-column label="检查率" align="center" prop="inspectRate"/>
-            <el-table-column label="隐患问题数" align="center" prop="pitfallNumber"/>
+            <el-table-column label="被查机构数量" align="left" prop="planInspectOrg"/>
+            <el-table-column label="已查机构数量" align="left" prop="realityInspectOrg"/>
+            <el-table-column label="检查覆盖率" align="left" prop="inspectCoverRate"/>
 
+            <el-table-column label="应检次数" align="center" prop="planInspectNumber"/>
+            <el-table-column label="已检次数" align="center" prop="realityInspectNumber"/>
+            <el-table-column label="检查完成率" align="center" prop="inspectRate"/>
+            <el-table-column label="隐患数量" align="center" prop="pitfallNumber"/>
+            <el-table-column label="已整改数量" align="center" prop="rectificationNumber"/>
+            <el-table-column label="整改完成率" align="center" prop="rectificationRate"/>
           </el-table>
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                       :limit.sync="queryParams.pageSize"

src/views/resumption/plan/dialog.edit.vue

@@ -403,10 +403,15 @@ export default {
     },
     NowBuild() {
       //如果新增或者是草稿状态的立即生效的编辑
+      // if (
+      //   this.id == null ||
+      //   this.id == undefined ||
+      //   (this.defbuildTaskNow && this.formData.planStatus == 0)
+      // )
       if (
         this.id == null ||
         this.id == undefined ||
-        (this.defbuildTaskNow && this.formData.planStatus == 0)
+        ( this.formData.planStatus == 0)
       )
         return true;
       else return false;

src/views/system/device/index.vue

@@ -252,7 +252,7 @@
             <el-form-item label="设备名称" prop="deviceName">
               <el-input
                 v-model="form.deviceName"
-                placeholder="请进行设备命名"
+                placeholder="请输入设备名称"
                 maxlength="50"
               />
             </el-form-item>
@@ -497,6 +497,7 @@ export default {
   created() {
     this.getDeptTree();
     //this.getList();
+    this.searchChangeSelectDevice(1);
   },
 
   watch: {

src/views/system/workTimeSet/workTimeWeek.vue

@@ -190,6 +190,7 @@ export default {
     },
     /** 下穿状态改变*/
     changeCheckBox(){
+      this.queryParams.checkSub = !this.queryParams.checkSub;
       this.getList();
     },
     /** 查询列表 */