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

@@ -279,9 +279,11 @@
    font-size:13px!important;
  }
  .el-input__inner{
-   font-size:13px!important;
+   font-size:12px!important;
+ }
+ input[type=text]::placeholder{
+   font-size: 12px;
  }
-
  .el-button--mini{
    font-size: 13px!important;
  }

src/components/orgTreeSelect/index.vue

@@ -2,10 +2,10 @@
   <!--  弹出框  -->
   <el-popover placement="bottom-start" :disabled="disabled" v-model="visible">
     <!--  tag盒子  -->
-    <div slot="reference" class="tags-box" :class="!disabled|| 'tags-box-disabled'">
+    <div slot="reference" class="tags-box" :class="{'tags-box-disabled':!disabled,'tags-box-mini':size === 'mini'}">
       <span v-show="sNodeList.length > 0" class="tags-num">{{sNodeList.length}}</span>
       <i v-if="sNodeList.length > 0 && !disabled" class="el-icon-circle-close close-icon" @click="clear"></i>
-      <el-tag type="success" v-for="v in sNodeList" :key="v.id">{{ v.shortName }}</el-tag>
+      <el-tag type="success" :size="size==='mini' && 'mini'" v-for="v in sNodeList" :key="v.id">{{ v.shortName }}</el-tag>
     </div>
     <!--  文本框    -->
     <el-input style="width: 100%; margin-bottom: 20px" v-model="queryForm.value" @input="serchTreeHandler"
@@ -61,6 +61,10 @@ export default {
     customRequest: {
       type: Function,
     },
+    size:{
+      type: String,
+      default: 'default',
+    },
     //组件禁用
     disabled: {
       type: Boolean,
@@ -323,6 +327,17 @@ export default {
 .tags-box-disabled{
   cursor: default;
 }
+.tags-box-mini{
+  min-height: 32px;
+  max-height: 32px;
+  line-height: 32px;
+  > span {
+    margin: 0 5px;
+  }
+  >.tags-num{
+    line-height: 38px;
+  }
+}
 .tags-num{
   color:#ccc;
   position: absolute;

src/views/check/task/index.vue

@@ -23,6 +23,7 @@
         >
           <el-form-item label="检查名称" prop="title">
             <el-input
+              style="width: 200px;"
               v-model="queryParams.title"
               placeholder="请输入检查名称"
               clearable
@@ -66,6 +67,7 @@
             prop="planStartTime"
           >
             <el-date-picker
+              style="width: 200px;"
               v-model="queryParams.planStartTime"
               :clearable="timeClearable"
               type="date"
@@ -77,6 +79,7 @@
           </el-form-item>
           <el-form-item label="检查状态" prop="status">
             <el-select
+              style="width: 200px;"
               v-model="queryParams.status"
               placeHolder="请选择"
               clearable
@@ -89,36 +92,37 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-row>
-            <el-form-item label="受检机构" prop="orgName">
-              <!-- <el-input
-                v-model="queryParams.orgName"
-                placeholder="请输入受检机构"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :maxlength="50" @input="inputRestriction"
-              /> -->
+          <el-form-item label="受检机构" prop="orgName">
+            <!-- <el-input
+              v-model="queryParams.orgName"
+              placeholder="请输入受检机构"
+              clearable
+              @keyup.enter.native="handleQuery"
+              :maxlength="50" @input="inputRestriction"
+            /> -->
+            <div style="width: 200px;height: 30px;">
               <org-tree-select
+                size="mini"
                 v-model="queryParams.checkOrgIds"
                 ref="checkorgTreeSelect"
                 :disable="true"
                 @change="getList"
               >
               </org-tree-select>
-            </el-form-item>
-            <el-form-item style="margin-left: 50px">
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="getList"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
-            </el-form-item>
-          </el-row>
+            </div>
+          </el-form-item>
+          <el-form-item style="margin-left: 35px">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="getList"
+            >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+            >
+          </el-form-item>
         </el-form>
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
@@ -423,7 +427,7 @@ export default {
     showRegisterBtn(row) {
       let userRoleId = this.roleList.map((r) => r.roleId);
       let taskRoleId = row.roles.map((r) => r.roleId);
- 
+
       return (
         row.status != 3 &&
         ((row.checkOrgId == this.orgId &&

src/views/evaluationRule/index.vue

@@ -332,38 +332,7 @@ export default {
     },
     //树形数据点击事件
     handleNodeClick() {},
-    reset() {
-      return {
-        planName: null,
-        planType: null,
-        planCycle: null,
-        planStatus: null,
-        orgType: null,
-        roleNames: null,
-        count: null,
-        description: null,
-        tableData: null,
-        itemList: null,
-        planExec: null,
-        count: 0,
-        note: null,
-        planCreateOrgId: null,
-        planCreateOrgName: null,
-        roleList: null,
-        roleId: null,
-        execOrg: null,
-        checkOrg: null,
-        buildTaskNow: false,
-        checkOrgList: [],
-        execOrgList: [],
-        rulePointList: null,
-        checkOrgIds: null,
-        execOrgIds: null,
-        rulePointIds: null,
-        checkOrgType: null,
-        checkType: null,
-      };
-    },
+    
   },
 };
 </script>

src/views/safetycheck/checkRegister/index.vue

@@ -62,13 +62,13 @@
           </el-form-item>
           <el-row>
             <el-form-item label="受检机构" prop="orgName">
-              <org-tree-select
-                v-model="queryParams.checkOrgIds"
-                ref="checkorgTreeSelect"
-                :disable="true"
-                @change="getList"
-              >
-              </org-tree-select>
+                <org-tree-select
+                  v-model="queryParams.checkOrgIds"
+                  ref="checkorgTreeSelect"
+                  :disable="true"
+                  @change="getList"
+                >
+                </org-tree-select>
             </el-form-item>
             <el-form-item style="margin-left: 50px">
               <el-button

src/views/scorestatistics/index.vue

@@ -0,0 +1,280 @@
+<template>
+    <div class="app-container">
+      <el-row slot="rightBar">
+        <!--用户数据-->
+        <el-col>
+          <!--    搜索条件    -->
+          <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="100px"
+          >
+            <el-form-item label="机构类型">
+              <el-select
+                @change="cleanExecOrgList"
+                prop="orgType"
+                label="机构类型"
+                v-model="queryParams.orgType"
+                placeholder="请选择机构类型"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.sys_org_type"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+  
+          </el-form>
+  
+             <!-- 按纽   
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['system:user:add']"
+                >新增</el-button
+              >
+            </el-col>
+          </el-row> -->
+          <el-table
+            border
+            height="650"
+            size="small"
+            v-loading="loading"
+            :data="dataList"
+            align="center"
+            fixed
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column
+              label="序号"
+              type="index"
+              width="50"
+            ></el-table-column>
+            <el-table-column label="机构类型" prop="orgTypeText" />
+            <el-table-column label="指标分类" prop="typeCodeText" />
+            <el-table-column label="指标项目" prop="projectCodeText" />
+            <el-table-column label="指标要点" prop="pointCodeText" />
+            <el-table-column
+              label="扣分方式"
+              prop="evaluateCycle"
+              :formatter="formatterScore"
+            />
+            <el-table-column label="分值" prop="score" />
+  
+            <el-table-column
+              label="操作"
+              width="180"
+              fixed="right"
+              class-name="small-padding fixed-width"
+            >
+              <template slot-scope="{ row }">
+                <el-button
+                  size="mini"
+                  @click="editHandler(row)"
+                  type="text"
+                  icon="el-icon-plus"
+                  >查看</el-button
+                ><el-button
+                  size="mini"
+                  @click="deleteHandler(row)"
+                  type="text"
+                  icon="el-icon-plus"
+                  >重新计算</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"
+          />
+        </el-col>
+      </el-row>
+  
+      <scorestatisticsDialog ref="Evaluate" :targetList="targetList" @success="getList()"></scorestatisticsDialog>
+    </div>
+  </template>
+  <script>
+  import { mapGetters } from "vuex";
+  import { findAllRole } from "@/api/system/role";
+  import { list, getTargetList ,delelteEvaluate} from "@/api/evaluateRule/rule.js";
+  import OrgTree from "@/components/orgTree";
+  import { toTree } from "@/api/tool/tree.js";
+  import scorestatisticsDialog from "./scorestatisticsDialog.vue";
+ 
+  
+  export default {
+    name: "SocWebIndex",
+    dicts: ["sys_org_type", "plan_status"],
+   
+    components: {
+      OrgTree,
+      scorestatisticsDialog,
+    },
+    data() {
+      const { params, query } = this.$route;
+      return {
+        targetList: [],
+        targetListChild: [],
+        targetListGrandson: [],
+        loading: false,
+        selectedValues: [],
+        planRoles: [],
+  
+        queryParams: {
+          orgType: null,
+          typeCode: null,
+          projectCode: null,
+          pointCode: null,
+          pageNum: 1,
+          pageSize: 10,
+        },
+        // 显示搜索条件
+        showSearch: true,
+        total: 0,
+        dataList: [],
+      };
+    },
+    created() {
+      this.getList();
+      this.getTargetListHandler();
+    },
+    mounted() {},
+    computed: {
+      ...mapGetters(["orgId"]),
+    },
+    methods: {
+      formatterScore({ deductionType }) {
+        switch (deductionType) {
+          case 1:
+            return "直接扣分";
+            break;
+          case 2:
+            return "最高扣分";
+            break;
+  
+          default:
+            break;
+        }
+      },
+      //获取指标列表
+      getTargetListHandler() {
+        getTargetList().then((res) => {
+          let { msg, code, rows } = res;
+          if (code == 200) {
+            this.targetList = toTree(rows, {
+              id: "code",
+              children: "children",
+              pid: "parentCode",
+            });
+          }
+        });
+      },
+      
+      //获取列表
+      getList() {
+        this.loading = true;
+        // this.queryParams.orgId=this.orgId
+        list(this.queryParams).then((res) => {
+          this.dataList = res?.rows || [];
+          this.total = res?.total || [];
+          this.loading = false;
+        });
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {},
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.$refs.Evaluate.show();
+      },
+      editHandler(row) {
+       
+        this.$refs.Evaluate.show(row.id);
+      },
+  
+      deleteHandler(row) {
+        this.$modal
+          .confirm("是否确认删除？")
+          .then(function () {})
+          .then(() => {
+            delelteEvaluate(row.id).then((res) => {
+              let { code, msg } = res;
+              if (code == 200) {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+              } else {
+                this.$modal.msgSuccess(msg);
+              }
+            });
+          });
+      },
+      //单选框状态改变
+      checkChange(state) {
+        this.queryParams.checkSub = state;
+        this.getList();
+      },
+      // 节点单击事件
+      clickTreeNode(data) {
+        this.queryParams.orgId = data.id;
+        this.getList();
+      },
+      getRolesByOrg() {
+        let params = {
+          orgType: null,
+        };
+        findAllRole(params).then((res) => {
+          this.planRoles = res.data;
+        });
+      },
+      cleanExecOrgList() {
+        this.execOrgIds = null;
+        this.queryParams.execOrgList = [];
+      },
+      handleRolesChange(val) {
+        this.selectedValues = val.toString().split(",");
+      },
+      getDefaultKey(key) {
+        this.queryParams.orgId = key;
+        this.getList();
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          orgType: null,
+          typeCode: null,
+          projectCode: null,
+          pointCode: null,
+          pageNum: 1,
+          pageSize: 10,
+        };
+  
+        this.getList();
+      },
+     
+    
+    },
+  };
+  </script>
+  <style lang="scss" scoped></style>
+  

src/views/scorestatistics/scorestatisticsDialog.vue

@@ -0,0 +1,386 @@
+<template>
+    <div class="rule-type">
+      <DialogCom
+        @colse="onHide"
+        :title="`${id ? '编辑' : '新增'}评价规则`"
+        :visible.sync="isShow"
+        width="900px"
+        destroy-on-close
+      >
+        <div class="page-body">
+          <el-form
+            :model="queryParams"
+            :rules="formDataRules"
+            size="small"
+            ref="form"
+            label-position="right"
+            label-width="130px"
+            label-prefix=":"
+          >
+            <el-row>
+              <el-col :span="12">
+                <el-form-item prop="orgType" label="机构类型:">
+                  <el-select
+                    label="机构类型"
+                    name="orgType"
+                    v-model="queryParams.orgType"
+                    placeholder="请选择机构类型"
+                    @change="onOrgTypeChanged"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in dict.type.sys_org_type"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item prop="typeCode" label="指标类型:">
+                  <el-select
+                    label="指标类型"
+                    v-model="queryParams.typeCode"
+                    placeholder="请选择指标类型"
+                    @change="changeTargetList"
+                  >
+                    <el-option
+                      v-for="item in targetList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.code"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item prop="projectCode" label="指标项目:">
+                  <el-select
+                    label="指标项目"
+                    v-model="queryParams.projectCode"
+                    placeholder="请选择指标项目"
+                    @change="changeTargetListChild"
+                  >
+                    <el-option
+                      v-for="item in targetListChild"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.code"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item prop="pointCode" label="指标要点:">
+                  <el-select
+                    label="指标要点"
+                    v-model="queryParams.pointCode"
+                    placeholder="请选择指标要点"
+                  >
+                    <el-option
+                      v-for="item in targetListGrandson"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.code"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="扣分方式:">
+                  <el-radio-group v-model="queryParams.deductionType">
+                    <el-radio :label="1">直接扣分</el-radio>
+                    <el-radio :label="2">最高扣分</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item prop="score" label="分值:">
+                  <el-input
+                    placeholder="请输入分值"
+                    v-model.number="queryParams.score"
+                    clearable
+                  >
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item prop="formula" label="公式说明:">
+                  <el-input
+                    v-model="queryParams.formula"
+                    clearable
+                    type="textarea"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="备注:">
+                  <el-input
+                    v-model="queryParams.remark"
+                    type="textarea"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <el-button @click="openSelect">新增扣分规则</el-button>
+  
+          <el-table :data="tableData" style="width: 100%" height="400px">
+            <el-table-column label="序号" type="index" width="50">
+            </el-table-column>
+            <el-table-column prop="indicatorNote" label="计算项目">
+            </el-table-column>
+            <el-table-column
+              prop="calculateType"
+              label="计算类型"
+              :formatter="formatterCalculateType"
+            >
+            </el-table-column>
+            <el-table-column prop="indicatorDays" label="连续数">
+            </el-table-column>
+            <el-table-column prop="itemValue" label="系数"> </el-table-column>
+            <el-table-column label="操作">
+              <template v-slot="{ row }">
+                <el-button type="text" @click="removeRow(row)">移除</el-button>
+                <el-button type="text" @click="editRow(row)">编辑</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+  
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="onHide">取消</el-button>
+          <el-button type="primary" @click="onSubmit">确定</el-button>
+        </div>
+      </DialogCom>
+     
+    </div>
+  </template>
+  
+  <script>
+  import dayjs from "dayjs";
+  import { mapGetters } from "vuex";
+  import { findAllRole } from "@/api/system/role";
+  import { guid } from "@/utils/index.js";
+  import {
+    addTargetEvaluate,
+    getEvaluateById,
+    editTargetEvaluate,
+  } from "@/api/evaluateRule/rule.js";
+  
+  export default {
+    dicts: ["evaluate_cycle", "sys_org_type"],
+    data() {
+      return {
+        input: "",
+        evaluateName: null,
+        planType: null,
+        typeCode: null,
+        planStatus: null,
+        orgType: null,
+        roleNames: null,
+  
+        tableData: [],
+        id: null,
+        isShow: false,
+        queryParams: {
+          pointCode: "",
+          typeCode: "",
+          orgType: "",
+          projectCode: "",
+          deductionType: 1,
+          formula: "",
+          score:'',
+          remark:'',
+        },
+        formDataRules: {
+          pointCode: [{ required: true, message: "请选择指标要点" }],
+          score: [
+            { type: "number", message: "分值只能为数字" },
+            { required: true, message: "请输入分值" },
+          ],
+          orgType: [{ required: true, message: "请选择评价机构类型" }],
+          typeCode: [{ required: true, message: "请选择指标类型" }],
+          projectCode: [{ required: true, message: "请选择指标项目" }],
+        },
+      };
+    },
+    props: {
+      targetList: {
+        type: Array,
+      },
+    },
+    watch: {},
+    computed: {
+      ...mapGetters(["orgId", "orgName"]),
+    },
+    mounted() {},
+    methods: {
+      //数据格式化
+      formatterCalculateType(row) {
+        switch (row.calculateType) {
+          case 1:
+            return "累计数";
+            break;
+          case 2:
+            return "连续数";
+            break;
+          case 3:
+            return "分类";
+            break;
+          case 4:
+            return "固化值";
+            break;
+  
+          default:
+            break;
+        }
+      },
+  
+     
+      onOrgTypeChanged() {},
+      async show(id = "", other = {}) {
+        this.id = id;
+        this.tableData = [];
+  
+        // await this.refresh(id, other);
+  
+        if (id) {
+          await getEvaluateById(id).then((res) => {
+            let { code, msg, data } = res;
+            if (code == 200) {
+              Object.assign(this.queryParams, data);
+              this.changeTargetList(this.queryParams.typeCode,1)
+              this.changeTargetListChild(this.queryParams.projectCode,1)
+              this.tableData = data.itemList;
+              this.tableData.forEach(item=>{
+                item.uid=guid()
+              })
+              delete this.queryParams.itemList;
+              console.log(this.queryParams);
+            } else {
+              this.$message.error(msg);
+            }
+          });
+        }
+        this.isShow = true;
+      },
+      removeRow(row) {
+        this.$modal
+          .confirm("是否确认删除？")
+          .then(function () {})
+          .then(() => {
+            this.tableData = this.tableData.filter(
+              (item) => item.uid !== row.uid
+            );
+            this.$modal.msgSuccess("删除成功");
+          });
+      },
+      editRow(row) {
+        this.$refs.dialogEvaluate.show();
+        this.$refs.dialogEvaluate.ruleForm = JSON.parse(JSON.stringify(row));
+      },
+      // 事件
+      onHide() {
+        this.$refs.form.resetFields();
+        this.isShow = false;
+        this.queryParams = {
+          pointCode: "",
+          typeCode: "",
+          orgType: "",
+          score:'',
+          projectCode: "",
+          deductionType: 1,
+          formula: "",
+          remark:'',
+        };
+  
+        this.tableData = [];
+      },
+  
+      openSelect() {
+        this.$refs.dialogEvaluate.show();
+      },
+      onSubmit() {
+        this.$refs.form.validate(async (isValidate) => {
+          if (isValidate) {
+            if (this.tableData.length == 0) {
+              return this.$message.error("扣分规则项不能为空");
+            }
+  
+            let obj = {
+              ...this.queryParams,
+              itemList: this.tableData,
+            };
+  
+            if (this.queryParams.id) {
+              //编辑
+  
+              editTargetEvaluate(obj).then((res) => {
+                let { code, msg } = res;
+                if (code == 200) {
+                  this.$message.success(msg);
+                  this.$emit("success");
+                  this.onHide();
+                } else {
+                  this.$message.error(msg);
+                }
+              });
+            } else {
+              //新增
+              addTargetEvaluate(obj).then((res) => {
+                let { code, msg } = res;
+                if (code == 200) {
+                  this.$message.success(msg);
+                  this.$emit("success");
+                  this.onHide();
+                } else {
+                  this.$message.error(msg);
+                }
+              });
+            }
+            // this.$emit("success");
+            // this.onHide();
+          }
+        });
+      },
+  
+      // 事件
+      //apimark//
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  .brand_info {
+    .el-form {
+      width: 600px;
+      padding-top: 40px;
+    }
+  }
+  .form-item-comment {
+    font-size: 12px;
+    color: #999;
+    height: 10px;
+  }
+  .el-select {
+    width: 100%;
+  }
+  </style>
+