Merge branch 'V0.0.2' into V0.0.3

src/views/check/dialog.edit.vue

@@ -599,6 +599,7 @@ export default {
       this.checkOrgIds = null;
       this.formData.checkOrgList = [];
       this.formData.checkOrgIds = [];
+      this.tableData=[];
     },
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {

src/views/core/edu/task/dialog.newTask.vue

@@ -272,10 +272,23 @@ export default {
     fileSelected(list) {
       if (!list) return;
       let tempArry = [];
+      let fileNameList=[]
+      let addFileNameList=[]
+      this.formData.fileList.forEach(x => {
+        let fileObj= JSON.parse(x);
+        fileNameList.push(fileObj.name);
+      })
       list.forEach(x => {
-        tempArry = tempArry.concat(x.fileList);
+        tempArry.forEach(s => {
+          addFileNameList.push(JSON.parse(s).name);
+        })
+        x.fileList.forEach(y => {
+          let fileObj= JSON.parse(y);
+          if (fileNameList.indexOf(fileObj.name) == -1&&addFileNameList.indexOf(fileObj.name) == -1) {
+            tempArry.push(y);
+          }
+        })
       })
-      console.log("tempArry", tempArry, this.formData.fileList);
       if (this.formData.fileList) {
         this.formFileListDefualtValue = this.formData.fileList.concat(tempArry);
       } else {

src/views/core/edu/task/dialog.perform.vue

@@ -394,18 +394,27 @@ export default {
       }
     },
     fileSelected(list) {
-
       if (!list) return;
       let tempArry = [];
+      let fileNameList=[]
+      let addFileNameList=[]
+      this.formData.fileList.forEach(x => {
+        let fileObj= JSON.parse(x);
+        fileNameList.push(fileObj.name);
+      })
       list.forEach(x => {
-        tempArry = tempArry.concat(x.fileList);
+        tempArry.forEach(s => {
+          addFileNameList.push(JSON.parse(s).name);
+        })
+        x.fileList.forEach(y => {
+          let fileObj= JSON.parse(y);
+          if (fileNameList.indexOf(fileObj.name) == -1&&addFileNameList.indexOf(fileObj.name) == -1) {
+            tempArry.push(y);
+          }
+        })
       })
-      console.log("tempArry", tempArry, this.formData.fileList);
       if (this.formData.fileList) {
-        console.log("12312312121212121212121")
         this.formFileListDefualtValue = this.formData.fileList.concat(tempArry);
-        this.formData.fileList = this.formData.fileList.concat(tempArry);
-        console.log("this.formFileListDefualtValue", this.formFileListDefualtValue)
       } else {
         this.formFileListDefualtValue = tempArry;
       }

src/views/core/safeLevel/index.vue

@@ -1,66 +1,5 @@
 <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="安全等级名称：L1,L2,L3，l4" prop="levelName">
-            <el-input
-              v-model="queryParams.levelName"
-              placeholder="请输入安全等级名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </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 :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['core.safetyIndex:safeLevel:add']"
-            >新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['core.safetyIndex:safeLevel:edit']"
-            >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['core.safetyIndex:safeLevel:remove']"
-            >删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['core.safetyIndex:safeLevel:export']"
-            >导出</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>-->
-
     <el-table v-loading="loading" :data="safeLevelList" @selection-change="handleSelectionChange">
 
       <el-table-column label="安全等级" align="center" prop="levelName"/>
@@ -69,7 +8,7 @@
           <dict-tag :options="dict.type.risk_level" :value="scope.row.riskLevel"/>
         </template>
       </el-table-column>
-      <el-table-column label="得分区间:" align="center" prop="description"/>
+      <el-table-column label="得分区间:"  align="center" prop="description"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -83,10 +22,10 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['core.safetyIndex:safeLevel:remove']"
-          >删除
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            v-hasPermi="['core.safetyIndex:safeLevel:edit']"
+          >查看
           </el-button>
         </template>
       </el-table-column>
@@ -103,8 +42,8 @@
     <!-- 添加或修改安全等级配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="安全等级名称" prop="levelName">
-          <el-input v-model="form.levelName" placeholder="请输入安全等级名称" disabled/>
+        <el-form-item label="等级名称" prop="levelName">
+          <el-input  v-model="form.levelName" placeholder="请输入安全等级名称" disabled/>
         </el-form-item>
         <el-form-item label="等级风险" prop="riskLevel">
           <el-select disabled style="width: 100%" v-model="form.riskLevel" placeholder="请选择等级风险">
@@ -114,15 +53,15 @@
         </el-form-item>
 
         <el-form-item label="最小值" prop="minValue">
-          <el-input v-model="form.minValue" placeholder="请输入最小值"/>
+          <el-input-number style="width: 100%" :max="100" :min="0"  :disabled="this.title=='查看安全等级配置'" v-model="form.minValue" placeholder="请输入最小值"/>
         </el-form-item>
         <el-form-item label="最大值" prop="maxValue">
-          <el-input v-model="form.maxValue" placeholder="请输入最大值"/>
+          <el-input-number style="width: 100%"  :max="100" :min="0" :disabled="this.title=='查看安全等级配置'" v-model="form.maxValue" placeholder="请输入最大值"/>
         </el-form-item>
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button v-if="this.title!='查看安全等级配置'" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -233,10 +172,22 @@ export default {
         this.title = "修改安全等级配置";
       });
     },
+    /** 查看按钮操作 */
+    handleDetail(row){
+      this.reset();
+      const id = row.id || this.ids
+      getSafeLevel(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看安全等级配置";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          console.log("this.form.minValue",this.form.minValue)
+          console.log("this.form.maxValue",this.form.maxValue)
           if (this.form.minValue > this.form.maxValue) {
             this.$modal.msgError("最小值不能大于最大值");
             return;

src/views/evaluationRule/addEvaluate.vue

@@ -5,7 +5,7 @@
       :width="'500px'"
       :title="`${id ? '编辑' : '新增'}扣分规则`"
       @close="closeHandler"
-      
+
     >
       <el-form
         :model="ruleForm"
@@ -88,7 +88,7 @@ export default {
         indicatorNote: "",
       },
       rules: {
-        indicatorNote: [{ required: true, message: "请选择评价类型" }],
+        indicatorNote: [{ required: true, message: "请选择计算项目" }],
         indicatorDays: [
           { type: "number", message: "连续数只能为数字" },
           { required: true, message: "请输入连续数" },
@@ -112,7 +112,7 @@ export default {
     closeHandler() {
       if(this.$refs.ruleForm){
 
-       
+
         this.$refs.ruleForm.resetFields()
       }
       this.ruleForm = {};

src/views/evaluationRule/editEvaluationRuleDialog.vue

@@ -264,6 +264,7 @@ export default {
     onSelect(form) {
       let isAdd = true;
       this.tableData?.forEach((item) => {
+        console.log("item",item)
         if (item.uid == form.uid) {
           Object.assign(item, form);
           //当前是编辑

src/views/question/list/dialog.vue

@@ -234,7 +234,7 @@ export default {
     setTitle(type) {
       switch (type) {
         case "detail":
-          this.title = "详情";
+          this.title = "隐患问题详情";
           break;
         case "confirm":
           this.title = "隐患确认";

src/views/question/list/index.vue

@@ -124,7 +124,7 @@
             ></el-table-column>
             <el-table-column
               header-align="center"
-              label="所属机构"
+              label="机构名称"
               prop="orgName"
               v-if="columns[1].visible"
             />

src/views/question/reform/dialog.vue

@@ -226,7 +226,7 @@ export default {
     setTitle(type) {
       switch (type) {
         case "detail":
-          this.title = "详情";
+          this.title = "问题整改详情";
           break;
         case "confirm":
           this.title = "隐患确认";

src/views/question/reform/index.vue

@@ -107,7 +107,7 @@
             ></el-table-column>
             <el-table-column
               header-align="center"
-              label="所属机构"
+              label="机构名称"
               prop="orgName"
               v-if="columns[1].visible"
             />
@@ -278,7 +278,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.submitRange = null;
+      this.queryParams.reformRange = null;
       this.handleQuery();
     },
     // // 多选框选中数据

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

@@ -638,7 +638,6 @@ export default {
           this.formData.count = 1;
           //履职内容
           this.tableData = null;
-          this.$refs["form"].resetFields();
       }
       this.changeBuildTime();
     },

src/views/resumption/plan/index.vue

@@ -77,8 +77,8 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-              </el-row>
-              <el-row>
+              <!-- </el-row>
+              <el-row> -->
                 <el-form-item prop="planStatus" label="任务状态">
                   <el-select
                     prop="planStatus"

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-descriptions title="检查任务">
+    <el-descriptions title="检查任务" border>
       <el-descriptions-item label="任务名称">{{
         taskInfo.taskName
       }}</el-descriptions-item>

src/views/scorestatistics/pointsDialog.vue

@@ -43,20 +43,20 @@
         align="center"
         fixed
       >
-        <el-table-column label="事件单号" prop="resumptionTaskName"> </el-table-column>
-        <el-table-column label="事件名称" prop="resumptionTaskName"> </el-table-column>
+        <el-table-column label="事件单号" prop="id"> </el-table-column>
+        <el-table-column label="事件名称" prop="taskName"> </el-table-column>
         <el-table-column label="执行机构" prop="orgName"> </el-table-column>
-        <el-table-column label="执行人员" prop="execManName"> </el-table-column>
+<!--        <el-table-column label="执行人员" prop="execManName"> </el-table-column>-->
         <el-table-column label="执行岗位" prop="execPostName"> </el-table-column>
         <el-table-column label="计划开始时间" prop="planTimeStart">
         </el-table-column>
         <el-table-column label="计划结束时间" prop="planTimeEnd">
         </el-table-column>
-        <el-table-column label="执行开始时间" prop="execTimeStart">
+<!--        <el-table-column label="执行开始时间" prop="execTimeStart">
         </el-table-column>
         <el-table-column label="执行结束时间" prop="execTimeEnd">
         </el-table-column>
-        <el-table-column label="状态" prop="execStatusText"> </el-table-column>
+        <el-table-column label="状态" prop="execStatusText"> </el-table-column>-->
       </el-table>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->

src/views/system/user/index.vue

@@ -68,7 +68,7 @@
                   style="width: 200px"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_user_is_lock"
+                    v-for="dict in dict.type.sys_normal_disable"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -248,7 +248,7 @@
             >
               <template slot-scope="scope">
                 <dict-tag
-                  :options="dict.type.sys_user_is_lock"
+                  :options="dict.type.sys_normal_disable"
                   :value="scope.row.isLock"
                 />
               </template>