Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/SmzSspProblemmodifyMapper.java

@@ -67,4 +67,11 @@ public interface SmzSspProblemmodifyMapper
      * @return
      */
     List<SmzSspProblemmodify> getListCount(SmzSspProblemmodify where);
+
+    /**
+     *  分组查询 全部数据、待整改、待复检、整改完成、整改超时的数量
+     * @param where
+     * @return
+     */
+    List<SmzSspProblemmodify> selectList(SmzSspProblemmodify where);
 }

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml

@@ -244,4 +244,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select 'e' projectName, count(1) id,'整改超时' remark from smz_ssp_problemmodify where projectId=#{projectId} and comId=#{comId} and infoType=#{infoType} and isDel=0 and checkState not in (4) and date(nickedTime) <= curdate()
         <include refid="countUserWhere"></include>
     </select>
+
+    <select id="selectList" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">
+        <include refid="selectSmzSspProblemmodifyVo"/>
+        where isDel=0 and projectId=#{projectId} and comId=#{comId} and infoType=#{infoType}
+        <if test="projectName==1">
+
+        </if>
+        <if test="projectName==2">
+            and checkState in (0,3)
+        </if>
+        <if test="projectName==3">
+            and checkState in (1)
+        </if>
+        <if test="projectName==4">
+            and checkState in (4)
+        </if>
+        <if test="projectName==5">
+            and checkState not in (4) and date(nickedTime) &lt;= curdate()
+        </if>
+        <include refid="countUserWhere"></include>
+    </select>
 </mapper>

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java

@@ -43,10 +43,18 @@ public class SmzSspProblemmodifyController extends BaseController
      */
     @RequiresPermissions("trouble:problemmodify:list")
     @GetMapping("/list")
-    public TableDataInfo list(SmzSspProblemmodify smzSspProblemmodify)
+    public TableDataInfo list(SmzSspProblemmodify where)
     {
+        SysUser user=SecurityUtils.getLoginUser().getSysUser();
+        where.setProjectId(user.getActiveProjectId());
+        where.setComId(user.getActiveComId());
+        if(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || SecurityUtils.isGSAdmin()) {
+            where.setCurrentUserId(null);
+        }else{
+            where.setCurrentUserId(user.getUserId());
+        }
         startPage();
-        List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectSmzSspProblemmodifyList(smzSspProblemmodify);
+        List<SmzSspProblemmodify> list = smzSspProblemmodifyService.selectList(where);
         return getDataTable(list);
     }
 

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISmzSspProblemmodifyService.java

@@ -69,4 +69,11 @@ public interface ISmzSspProblemmodifyService
      * @return
      */
     List<SmzSspProblemmodify> getListCount(SmzSspProblemmodify where);
+
+    /**
+     *  分组查询 全部数据、待整改、待复检、整改完成、整改超时的数量
+     * @param where
+     * @return
+     */
+    List<SmzSspProblemmodify> selectList(SmzSspProblemmodify where);
 }

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SmzSspProblemmodifyServiceImpl.java

@@ -124,4 +124,14 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
     public List<SmzSspProblemmodify> getListCount(SmzSspProblemmodify where) {
         return smzSspProblemmodifyMapper.getListCount(where);
     }
+
+    /**
+     * 分组查询 全部数据、待整改、待复检、整改完成、整改超时的数量
+     * @param where
+     * @return
+     */
+    @Override
+    public List<SmzSspProblemmodify> selectList(SmzSspProblemmodify where) {
+        return smzSspProblemmodifyMapper.selectList(where);
+    }
 }

yanzhu-ui-vue3/src/views/login.vue

@@ -25,7 +25,8 @@
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
-        <el-button :loading="loading" class="btn-login" size="large" type="primary" style="width:100%;" @click.prevent="handleLogin">
+        <el-button :loading="loading" class="btn-login" size="large" type="primary" style="width:100%;"
+          @click.prevent="handleLogin">
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
@@ -149,8 +150,10 @@ getCookie();
     margin: 0px auto 30px auto;
     text-align: center;
     color: #707070;
+    font-size: 28px;
   }
-  .login-form-bg{
+
+  .login-form-bg {
     background-image: url("../assets/images/loginbg3.png");
     position: absolute;
     top: 0%;
@@ -161,26 +164,33 @@ getCookie();
     background-repeat: no-repeat;
     filter: opacity(0.8);
   }
+
   .login-form {
     border-radius: 6px;
     background-image: url("../assets/images/loginbg2.png");
     background-size: 100% 100%;
-    width: 360px;
+    width: 420px;
-    padding: 50px 25px 5px 25px;
+    padding: 50px;
     position: absolute;
-    height: 480px;
+    height: 560px;
     right: 10%;
-    .el-form-item{
+
+    .el-form-item {
       position: relative;
       z-index: 10;
     }
+
     .title {
       position: relative;
-      top: -62px;
+      top: -68px;
       color: #336699;
       font-weight: bold;
     }
 
+    .el-form-item--default {
+      margin-bottom: 40px;
+    }
+
     .el-input {
       height: 30px;
 
@@ -188,9 +198,10 @@ getCookie();
         background: #113356;
         box-shadow: 0px 0px 0px 1px #1262b5;
         border-radius: 15px;
-        .el-input__prefix-inner{
+
-          svg{
+        .el-input__prefix-inner {
-            fill:#45C4DD;
+          svg {
+            fill: #45C4DD;
           }
         }
       }
@@ -219,14 +230,16 @@ getCookie();
     height: 30px;
     float: right;
     position: relative;
-    .login-code-bg{
+
-      position:absolute;
+    .login-code-bg {
+      position: absolute;
       background: #113356;
       box-shadow: 0px 0px 0px 1px #1262b5;
       width: 70px;
-    height: 30px;
+      height: 30px;
-    left: 20px;
+      left: 20px;
     }
+
     img {
       position: relative;
       z-index: 10;
@@ -234,23 +247,27 @@ getCookie();
       vertical-align: middle;
     }
   }
-  .el-checkbox__inner{
+
+  .el-checkbox__inner {
     background: #113356;
     border: solid 1px #1262b5;
   }
-  .el-checkbox__input+.el-checkbox__label
+
-  {
+  .el-checkbox__input+.el-checkbox__label {
-    color:#aaa;
+    color: #aaa;
   }
-  .el-checkbox__input.is-checked+.el-checkbox__label{
+
+  .el-checkbox__input.is-checked+.el-checkbox__label {
     color: var(--el-checkbox-checked-text-color) !important;
   }
-  .btn-login{
+
+  .btn-login {
     background: #113356;
     border: solid 1px #1262b5;
     height: 36px;
     line-height: 36px;
   }
+
   .el-login-footer {
     height: 40px;
     line-height: 40px;

yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue

@@ -22,14 +22,20 @@
       </el-form-item>
       <el-form-item label="提交时间" prop="dateRange">
         <el-date-picker v-model="queryParams.dataRange" type="daterange" style="width: 300px;" range-separator="--"
-          start-placeholder="开始日期" end-placeholder="结束日期" :size="size" />
+          start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+    <el-tabs v-model="data.activeName" class="main-tabs">
+      <el-tab-pane :label="data.tabInfo['a']" name="a"></el-tab-pane>
+      <el-tab-pane :label="data.tabInfo['b']" name="b"></el-tab-pane>
+      <el-tab-pane :label="data.tabInfo['c']" name="c"></el-tab-pane>
+      <el-tab-pane :label="data.tabInfo['d']" name="d"></el-tab-pane>
+      <el-tab-pane :label="data.tabInfo['e']" name="e"></el-tab-pane>
+    </el-tabs>
     <el-table v-loading="loading" :data="problemmodifyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="${comment}" align="center" prop="id" />
@@ -127,7 +133,9 @@ const data = reactive({
     comId: [
       { required: true, message: "租户ID不能为空", trigger: "blur" }
     ],
-  }
+  },
+  activeName: 'a',
+  tabInfo: {}
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -135,7 +143,19 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询安全隐患整改列表 */
 function getList() {
   loading.value = true;
-  listProblemmodify(queryParams.value).then(response => {
+  let postData = {
+    infoType: 0,
+    problemType: queryParams.value.problemType,
+    dangerType: queryParams.value.dangerType,
+    lordSent: queryParams.value.lordSent,
+    createUser: queryParams.value.createUser,
+    projectName: " abcde".indexOf(data.activeName)
+  };
+  if (queryParams.value.dataRange && queryParams.value.dataRange.length > 0) {
+    postData.createTime = queryParams.value.dataRange[0];
+    postData.updateTime = queryParams.value.dataRange[1];
+  }
+  listProblemmodify(postData).then(response => {
     problemmodifyList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -254,13 +274,41 @@ function handleDelete(row) {
   }).catch(() => { });
 }
 
-/** 导出按钮操作 */
+function getCount() {
-function handleExport() {
+  let postData = {
-  proxy.download('trouble/problemmodify/export', {
+    infoType: 0,
-    ...queryParams.value
+    problemType: queryParams.value.problemType,
-  }, `problemmodify_${new Date().getTime()}.xlsx`)
+    dangerType: queryParams.value.dangerType,
+    lordSent: queryParams.value.lordSent,
+    createUser: queryParams.value.createUser
+  };
+  if (queryParams.value.dataRange && queryParams.value.dataRange.length > 0) {
+    postData.createTime = queryParams.value.dataRange[0];
+    postData.updateTime = queryParams.value.dataRange[1];
+  }
+  data.tabInfo = {
+    a: '全部数据(0)',
+    b: '待整改(0)',
+    c: '待复检(0)',
+    d: '整改完成(0)',
+    e: '整改超时(0)',
+  };
+  getListCount(postData).then(response => {
+    let obj = {
+      a: '全部数据',
+      b: '待整改',
+      c: '待复检',
+      d: '整改完成',
+      e: '整改超时',
+    };
+    (response.data || []).forEach(it => {
+      data.tabInfo[it.projectName] = obj[it.projectName] + `(${it.id || 0})`
+    });
+  });
+  handleQuery();
 }
 
+getCount();
 </script>
 <style lang="scss">
 .trouble-problemodify-index {