Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into develop

package.json

@@ -57,6 +57,7 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "jspdf": "^2.5.1",
+    "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "postcss-pxtorem": "^5.1.1",
     "quill": "1.3.7",

src/api/risk/riskUserPatrol.js

+import request from '@/utils/request'
+
+// 查询巡查执行管理列表
+export function riskUserPatrolList(query) {
+  return request({
+    url: '/risk/riskUserPatrol/list',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

src/router/index.js

@@ -181,6 +181,20 @@ export const dynamicRoutes = [
       },
     ],
   },
+  {
+    path: "/riskLedger/detail",
+    component: Layout,
+    hidden: true,
+    permissions: ["system:dict:list"],
+    children: [
+      {
+        path: "riskDetail",
+        component: () => import("@/views/riskLedger/detail"),
+        name: "riskDetail",
+        meta: { title: "风险台账", activeMenu: "/riskLedger/detail" },
+      },
+    ],
+  },
   {
     path: "/risk/plan/inherentdata",
     component: Layout,

src/views/risk/currentProject/projectPost.vue

@@ -77,14 +77,14 @@
       <p>暂无数据请通过添加方式创建巡查岗位</p>
     </div>
     <!-- 添加或修改现状风险岗位对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-tabs v-model="activeName">
         <el-tab-pane label="基础信息" name="first">
           <el-form ref="form" :model="form" :rules="rules" label-width="84px">
           <el-form-item label="岗位名称" prop="riskPostName">
             <el-input v-model="form.riskPostName" placeholder="请输入岗位名称" />
           </el-form-item>
-          <el-form-item label="岗位类型" prop="patrolType">
+          <!-- <el-form-item label="岗位类型" prop="patrolType">
             <el-select v-model="form.patrolType" placeholder="请选择岗位类型" style="width:100%">
               <el-option
                 v-for="dict in patrolTypeList"
@@ -93,7 +93,7 @@
                 :value="dict.value"
               ></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="岗位描述" prop="riskPostDesc">
             <el-input type="textarea" v-model="form.riskPostDesc" placeholder="请输入岗位描述" />
           </el-form-item>
@@ -109,7 +109,40 @@
           </el-form-item>
         </el-form>
         </el-tab-pane>
-        <el-tab-pane label="清单匹配" name="second"></el-tab-pane>
+        <el-tab-pane label="清单匹配" name="second">
+          <el-form ref="listForm" :model="listForm" :rules="listRules" label-width="120px"  label-position="top">
+             <el-form-item label="匹配模式" prop="postState">
+                <el-radio-group v-model="listForm.postState" @change="radioChange">
+                  <el-radio label="1">一岗一人巡查模式</el-radio>
+                  <el-radio label="0">一岗多人巡查模式</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="岗位清单配置" prop="hdType" v-if="listForm.postState == '1'">
+                <el-input v-model="listForm.hdType" style="width:80%;margin-right:20px"></el-input>
+                <el-button type="primary">隐患清单库</el-button>
+              </el-form-item>
+              <el-form-item label="岗位清单配置" prop="hdType" v-if="listForm.postState == '0'">
+                 <el-table :data="listUserTabel" >
+                    <el-table-column type="index" label="序号" width="50"/>
+                    <el-table-column label="姓名" align="center" prop="userName" width="140" :show-overflow-tooltip="true"/>
+                    <el-table-column label="工号" align="center" prop="nickName" width="140" :show-overflow-tooltip="true" />
+                    <el-table-column label="状态" align="center" prop="postName" width="140" :show-overflow-tooltip="true" />
+                    <el-table-column label="巡查清单" align="center" prop="postName" :show-overflow-tooltip="true" />
+                    <el-table-column label="操作" align="center" width="140">
+                      <template slot-scope="scope">
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-edit"
+                          @click="selectList(scope.row)"
+                        >清单库选择</el-button>
+                      </template>
+                    </el-table-column>
+                 </el-table>
+              </el-form-item>
+              <p> <span style="color: red;">系统提示：可根据工程进度调整巡查类型及内容。</span></p>
+          </el-form>
+        </el-tab-pane>
       </el-tabs>
       
       <div slot="footer" class="dialog-footer">
@@ -157,7 +190,14 @@ export default {
       rules:{
         riskPostName:[{ required: true, message: '请输入岗位名称', trigger: 'blur' }]
       },
-      activeName:'first'
+      activeName:'first',
+      listRules:{
+        postState:[{ required: true, message: '请选择匹配模式', trigger: 'change' }]
+      }, 
+      listForm:{//清单匹配
+        postState:'1'
+      } ,
+      listUserTabel:[]
     };
   },
   created() {
@@ -356,4 +396,7 @@ export default {
       margin-left: 10px;
       cursor: pointer;
   }
+  ::v-deep .el-form-item--medium .el-form-item__content{
+    margin-left: 20px;
+  }
 </style>

src/views/riskLedger/list.vue

+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="项目名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入项目名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="经营状态" prop="businessStatus">
+        <el-input
+          v-model="queryParams.businessStatus"
+          placeholder="请输入经营状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目业态" prop="business">
+        <el-select
+          v-model="queryParams.business"
+          placeholder="请选择项目业态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.risk_project_business"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="所属区域" prop="deptId">
+        <treeselect
+          v-model="queryParams.deptId"
+          :options="deptOptions"
+          :show-count="true"
+          placeholder="请选择所属区域"
+          style="width: 250px"
+        />
+      </el-form-item>
+      <el-form-item label="所在城市" prop="city">
+        <el-input
+          v-model="queryParams.city"
+          placeholder="请输入所在城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="详细地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入详细地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物业" prop="propertyManagement">
+        <el-select
+          v-model="queryParams.propertyManagement"
+          placeholder="请选择是否为物业"
+          clearable
+        >
+          <el-option key="1" label="是" value="true" />
+          <el-option key="0" label="否" value="false" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </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>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="projectList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" align="center" prop="name" />
+      <el-table-column label="项目类型" align="center" prop="type" />
+      <el-table-column label="项目业态" align="center" prop="business" />
+      <el-table-column label="所属区域" align="center" prop="deptName" />
+      <el-table-column label="所在城市" align="center" prop="city" />
+      <el-table-column label="详细地址" align="center" prop="address" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_normal_disable"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="showDetail(scope.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>
+</template>
+
+<script>
+import { listProject } from "@/api/ledger/project/";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Project",
+  dicts: ["sys_normal_disable", "data_source", "risk_project_business"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      userTotal: 0,
+      // 基础数据-项目表格数据
+      projectList: [],
+      // 部门树选项
+      deptOptions: undefined,
+      // 弹出层标题
+      title: "",
+      // 用户表格数据
+      userList: null,
+      // 是否显示弹出层
+      open: false,
+      powerOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        type: null,
+        deptId: null,
+        city: null,
+        address: null,
+        source: null,
+        status: null,
+      },
+      queryUserParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: undefined,
+        userName: undefined,
+      },
+      // 表单参数
+      form: {
+        businessStatus: "",
+      },
+      // 表单校验
+      rules: {},
+      projectId: "",
+      userPost: null,
+      postList: [],
+      userInfoData: {},
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询基础数据-项目列表 */
+    getList() {
+      this.loading = true;
+      listProject(this.queryParams).then((response) => {
+        this.projectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        type: null,
+        deptId: null,
+        city: null,
+        address: null,
+        source: null,
+        status: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    showDetail(obj) {
+      this.$router.push({
+        name: "/riskLe",
+        params: {
+          projectId: obj.id,
+        },
+      });
+    },
+  },
+};
+</script>