Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/api/safetyManagement/dosingRecord.js

@@ -42,3 +42,17 @@ export const update = row => {
   });
 };
 
+// 根据角色ID获取加药人列表
+export const getDosingManList = (data) => {
+  return request({
+    url: '/api/blade-system/user/page',
+    method: 'get',
+    params: {
+      status: 1, // 固定状态为1（启用）
+      current: data.current || 1, // 页码，默认1
+      size: data.size || 10000000, 
+      deptId: data.deptId || '',
+      roleId: data.roleId || '' 
+    }
+  })
+}

src/api/safetyManagement/testRecord.js

@@ -42,3 +42,17 @@ export const update = row => {
   });
 };
 
+// 根据角色ID获取加药人列表
+export const getUserList = (data) => {
+  return request({
+    url: '/api/blade-system/user/page',
+    method: 'get',
+    params: {
+      status: 1, // 固定状态为1（启用）
+      current: data.current || 1, // 页码，默认1
+      size: data.size || 10000000, 
+      deptId: data.deptId || '',
+      roleId: data.roleId || '' 
+    }
+  })
+}

src/views/safetyManagement/equipmentInspectionPoint/addInspectDailog.vue

@@ -177,7 +177,7 @@ export default {
 
         closeDialog() {
             this.openShow = false;
-            this.$emit('closeDialog');
+            this.$emit('closeDialog',true);
             // 重置表单
             this.form.tableData = [];
             this.formError = '';

src/views/safetyManagement/equipmentInspectionPoint/index.vue

@@ -331,9 +331,12 @@ export default {
 
     },
     // 关闭弹窗
-    closeDialog() {
+    closeDialog(isRefresh=false) {
       this.showDialog = false;
-      this.onLoad(this.page);
+      if (isRefresh) {
+        this.onLoad(this.page);
+      }
+     
     },
     // 新增
     handleAdd() {

src/views/safetyManagement/equipmentInspectionTask/index.vue

@@ -195,6 +195,8 @@ export default {
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             searchRange: true,
+            startPlaceholder: "开始时间",
+            endPlaceholder: "结束时间"
           },
           {
             label: "检验时间",

src/views/safetyManagement/wasteGasSet/components/addEditDialogDosingRecord.vue

@@ -44,7 +44,10 @@
                 </template>
                 <template #default="scope">
                     <el-select v-model="scope.row.dosingMan" placeholder="请选择" style="width: 100%">
-                        <el-option label="崔殿龙" value="541" />
+                       <el-option v-for="item in dosingManList" :key="item.id" 
+                            :label="item.name" 
+                            :value="item.id"
+                            />
                     </el-select>
                 </template>
             </el-table-column>
@@ -75,6 +78,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        dosingManList: {
+            type: Array,
+            default: () => [] // 默认空数组
+        }
     },
     data() {
         return {

src/views/safetyManagement/wasteGasSet/components/dosingRecord.vue

@@ -42,6 +42,7 @@
     :showDialog="addOpen"
     @closeDialog="closeDialog" 
     :moldAddMore="moldAddMore" 
+    :dosingManList="dosingManList"
     @submitData="handleSubmitData">
     </addEditDialogDosingRecord>
   </div>
@@ -49,7 +50,7 @@
 <script>
 import basicImport from '@/components/basic-import/main.vue';
 import addEditDialogDosingRecord from './addEditDialogDosingRecord.vue';
-import { getList , remove , add , update } from '@/api/safetyManagement/dosingRecord.js';
+import { getList , remove , add , update , getDosingManList } from '@/api/safetyManagement/dosingRecord.js';
 export default {
   components: {
     basicImport,
@@ -58,6 +59,7 @@ export default {
   
   data() {
     return {
+      dosingManList:[],
       addOpen: false, //新增弹窗
       moldAddMore: false,
       isShowImport: false,
@@ -160,7 +162,8 @@ export default {
             sortable: true,
             filter: true,
             span: 12,
-            hide:true,
+            hide: true,
+            editDisplay:false,
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -193,18 +196,13 @@ export default {
           },
           {
             label: '加药人',
-            prop: 'dosingMan.userName',
+            prop: 'dosingMan',
-            bind: 'dosingMan.userName',
+            search: true,
-            search: false,
             sortable: true,
             filter: true,
             span: 12,
-            type: 'select',
+            type: "select",
-            valueKey: 'userId', 
+            dicData: [],
-            labelKey: 'userName', 
-            dicData: [
-            { label: '测试', value: 521 },
-          ],
             rules: [
               {
                 required: true,
@@ -212,6 +210,10 @@ export default {
                 trigger: 'blur',
               },
             ],
+            props: {
+              label: 'name', 
+              value: 'id'   
+            },
           },
           {
             label: '备注',
@@ -231,7 +233,27 @@ export default {
       },
     };
   },
+  mounted() {
+    this.fetchDosingManList()
+  },
   methods: {
+    // 加药人
+    fetchDosingManList() {
+      getDosingManList({
+        current: 1,
+        size: 10000000,
+        roleId: '2008474700619563009'
+      }).then(res => {
+        const result = res.data.data.records
+        this.dosingManList = result
+        console.log("加药人result", result)
+        this.option.column.forEach(col => {
+          if (col.prop === 'dosingMan') {
+            col.dicData = this.dosingManList;
+          }
+        });
+      })
+    },
      // 新增
         moldAddFn(row, flag) {
             this.addOpen = true

src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue

@@ -9,7 +9,7 @@
     </template>
    <!-- 运行 1 停止0 -->
     <template #fan="scope">
-      <el-tag v-if="scope.row.fan===1" type="success">运行</el-tag>  
+      <el-tag v-if="scope.row.fan === 1" type="success">运行</el-tag>  
       <el-tag v-else type="danger">停止</el-tag>
     </template>
     <template #pump="scope">

src/views/safetyManagement/wastewater/components/addEditDialogDosingRecord.vue

@@ -48,7 +48,12 @@
                     </template>
                     <template #default="scope">
                         <el-select v-model="scope.row.dosingMan" placeholder="请选择" style="width: 100%">
-                            <el-option label="崔殿龙" value="541" />
+                           <el-option v-for="item in dosingManList" :key="item.id" 
+                                :label="item.name" 
+                                :value="item.id" 
+                                />
+  
+                            <el-option />
                         </el-select>
                     </template>
                 </el-table-column>
@@ -80,7 +85,6 @@
     </el-dialog>
 </template>
 <script>
-    import { add } from '@/api/safetyManagement/dosingRecord.js';
 export default {
     props: {
         showDialog: {
@@ -91,6 +95,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        dosingManList: {
+            type: Array,
+            default: () => [],
+        }
     },
     data() {
         return {
@@ -98,44 +106,35 @@ export default {
             tableData: [],
             // 统一校验规则：支持数组项校验
             formRules: {
-                // 表格数据数组的整体校验（可选：如最少1行数据）
+                // 表格整体校验：至少一行数据
                 tableData: [
                     {
                         required: true,
                         message: '请至少添加一行数据',
                         trigger: 'submit',
-                        type: 'array' // 明确类型为数组
+                        type: 'array'
-                    },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (value.length === 0) {
-                                callback(new Error('请至少添加一行数据'));
-                            } else {
-                                callback();
-                            }
-                        },
-                        trigger: 'submit'
                     }
                 ],
-
+                // 设施校验
-                // 数组中每一项的 wcId 字段校验
                 device: [
-                    { required: true, message: '请选择作业中心', trigger: ['blur', 'submit'] }
+                    { required: true, message: '请输入设施名称', trigger: ['blur', 'submit'] }
                 ],
-
+                // 药品校验
-                // 数组中每一项的 batchNo 字段校验
+                drug: [
-                batchNo: [
+                    { required: true, message: '请输入药品名称', trigger: ['blur', 'submit'] }
-                    {
-                        required: true,
-                        message: `请${this.tabPosition === 'bathInspection' ? '选择' : '输入'}${this.tabPosition === 'bathInspection' ? '槽号槽名' : '设备检查项'}`,
-                        trigger: ['change', 'submit']
-                    }
                 ],
-
+                // 剂量校验：必填 + 数字 + 大于0
-                // 数组中每一项的 preserveContent 字段校验
+                dose: [
-                preserveContent: [
+                    { required: true, message: '请输入剂量', trigger: ['blur', 'submit'] },
-                    { required: true, message: '请填写维护内容', trigger: ['blur', 'submit'] },
+               
-                    { max: 200, message: '维护内容不能超过200个字符', trigger: ['input', 'submit'] }
+                ],
+                // 加药人校验
+                dosingMan: [
+                    { required: true, message: '请选择加药人', trigger: ['change', 'submit'] }
+                ],
+                // 加药时间校验
+                dosingTime: [
+                    { required: true, message: '请选择加药时间', trigger: ['change', 'submit'] }
                 ]
             }
         };
@@ -194,7 +193,8 @@ export default {
                     dorType: 2
                 }));
                 // 如果所有必填项都填写了，则进行提交操作         
-                this.$emit("submitData"); // 通知父组件刷新表格数据
+                this.$emit("submitData", submitData); // 通知父组件刷新表格数据
+                this.closeDialog()
             }
         },
     },

src/views/safetyManagement/wastewater/components/addEditDialogTestRecord.vue

@@ -47,7 +47,10 @@
                     <template #default="scope">
                         <el-form-item :prop="`tableData[${scope.$index}].dosingMan`" :rules="formRules.dosingMan">
                             <el-select v-model="scope.row.dosingMan" placeholder="请选择" style="width: 100%">
-                                <el-option label="崔殿龙" value="541" />
+                               <el-option v-for="item in dosingManList" :key="item.id" 
+                                    :label="item.name"
+                                    :value="item.id"
+                                    />
                             </el-select>
                         </el-form-item>
                     </template>
@@ -130,6 +133,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        dosingManList: {
+            type: Array,
+            default: ()=>[],
+        },
     },
     data() {
         return {
@@ -198,7 +205,7 @@ export default {
         },
         closeDialog() {
             this.openShow = false;
-            this.$emit('closeDialog');
+            this.$emit('closeDialog',true);
             this.form.tableData = [];
             this.formError = '';
             this.$refs.tableForm?.resetFields();
@@ -224,7 +231,7 @@ export default {
 
                 try {
                     add(submitData).then(res => {
-                        // this.$message.success('提交成功');
+                        this.$message.success('提交成功');
                         this.closeDialog();
                     });
                 } catch (err) {

src/views/safetyManagement/wastewater/components/dischargeRec.vue

@@ -27,8 +27,8 @@
     
     <!-- 导入 -->
     <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
-      templateUrl="/blade-safety/bsDosingRec/downloadExcelTemplate" templateName="废水排放记录模板.xlsx"
+      templateUrl="/blade-desk/bsDischargeRec/downloadExcelTemplate" templateName="槽液排放记录模板.xlsx"
-      importUrl="/blade-safety/bsDosingRec/importExcel" @closeDialog="closeDialog"></basic-import>
+      importUrl="/blade-desk/bsDischargeRec/importExcel" @closeDialog="closeDialog"></basic-import>
   </div>
 </template>
 <script>
@@ -51,6 +51,7 @@ export default {
       isShowImport: false,
       loading: false,
       selectionList: [],
+      handleManList: [], // 水处理工选项
       option: {
         addBtn: false,
         height: "auto",
@@ -95,7 +96,6 @@ export default {
         gridBtn: false,
         searchMenuPosition: "right",
         align: "center",
-        handleManList: [], // 水处理工选项
         column: [
           {
             label: "报废槽液类型",
@@ -161,10 +161,33 @@ export default {
           },
           {
             label: "日期",
-            prop: "dirDate",
+            prop: "queryDirDate",
             search: true,
             sortable: true,
             filter: true,
+            hide: true,
+            editDisplay:false,
+            span: 12,
+            type: "datetime",
+            searchRange: true,
+            format: 'YYYY-MM-DD HH:mm:ss',
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
+            startPlaceholder: "开始时间",
+            endPlaceholder: "结束时间",
+            rules: [
+              {
+                required: true,
+                message: "请输入选择日期",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "日期",
+            prop: "dirDate",
+            // search: true,
+            sortable: true,
+            filter: true,
             span: 12,
             type: "datetime",
             format: 'YYYY-MM-DD HH:mm:ss',
@@ -186,7 +209,7 @@ export default {
             filter: true,
             span: 12,
             type: "select",
-            dicData: this.handleManList,
+            dicData: [],
             props: {
               label: 'name',
               value: 'id',
@@ -245,7 +268,11 @@ export default {
       }).then(res => {
         const result = res.data.data.records
         this.handleManList = result
-       
+        this.option.column.forEach(col => {
+          if (col.prop === 'handleMan') {
+            col.dicData = this.handleManList;
+          }
+        });
       })
     },
      // 新增
@@ -313,26 +340,28 @@ export default {
       this.onLoad(this.page, params)
       done()
 
-    }
+    },
-
+    //更新
-  },
-  //更新
   rowUpdate(row, index, done, loading) {
-    update(row).then(
+      console.log("aaaaaaaaaaaaaa")
-      () => {
+      update(row).then(
-        this.onLoad(this.page);
+        () => {
-        this.$message({
+          this.onLoad(this.page);
-          type: 'success',
+          this.$message({
-          message: '操作成功!',
+            type: 'success',
-        });
+            message: '操作成功!',
-        done();
+          });
-      },
+          done();
-      error => {
+        },
-        window.console.log(error);
+        error => {
-        loading();
+          window.console.log(error);
-      }
+          loading();
-    );
+        }
+      );
+    },
+
   },
+  
  
 };
 </script>

src/views/safetyManagement/wastewater/components/dosingRecord.vue

@@ -17,16 +17,17 @@
     <addEditDialogDosingRecord ref="addEditDialogDosingRecord"  
     @closeDialog="closeDialog"
     @submitData="handleSubmitData"
+    :dosingManList ="dosingManList"
     :moldAddMore="moldAddMore" >
     </addEditDialogDosingRecord>
     <!-- 导入 -->
     <basic-import v-if="isShowImport" title="导入" :isShow="isShowImport"
-      templateUrl="/blade-safety/wasteWaterDosingRecord/download-excel-template" templateName="废水加药记录模板.xlsx"
+      templateUrl="/blade-desk/bsDosingRec/downloadExcelTemplate" templateName="废水加药记录模板.xlsx"
-      importUrl="/blade-safety/wasteWaterDosingRecord/import-excel" @closeDialog="closeDialog"></basic-import>
+      importUrl="/blade-desk/bsDosingRec/importExcel" @closeDialog="closeDialog"></basic-import>
   </div>
 </template>
 <script>
-import { getList, update } from '@/api/safetyManagement/dosingRecord.js';
+import { getList, update , getDosingManList,add } from '@/api/safetyManagement/dosingRecord.js';
 import basicImport from '@/components/basic-import/main.vue';
 import addEditDialogDosingRecord from './addEditDialogDosingRecord.vue';
 
@@ -41,6 +42,7 @@ export default {
       isShowImport: false,
       loading: false,
       selectionList: [],
+      dosingManList:[],
       option: {
         addBtn: false,
         height: 'auto',
@@ -135,39 +137,60 @@ export default {
           },
           {
             label: '加药时间',
-            prop: 'dosingTime',
+            prop: 'queryDosingTime',
             search: true,
             sortable: true,
             filter: true,
+            display: false,
+            editDisplay:false,
             span: 12,
             type: 'datetime',
             rules: [
               {
                 required: true,
-                message: '请输入报警阙值',
+                message: '请选择加药时间',
+                trigger: 'blur',
+              },
+            ],
+            searchRange: true,
+            startPlaceholder: "开始时间",
+            endPlaceholder: "结束时间",
+          },
+          {
+            label: '加药时间',
+            prop: 'dosingTime',
+            sortable: true,
+            filter: true,
+            span: 12,
+            type: 'datetime',
+            rules: [
+              {
+                required: true,
+                message: '请选择加药时间',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '加药人',
-            prop: 'dosingMan.userId',
+            prop: 'dosingMan',
-            bind: 'dosingMan.userName',
             search: true,
             sortable: true,
             filter: true,
             span: 12,
             type: "select",
-            dicData: [
+            dicData: [],
-              { label: '崔殿龙', value: '541' },
-            ],
             rules: [
               {
                 required: true,
-                message: '请输入PH报警点位',
+                message: '请选择加药人',
                 trigger: 'blur',
               },
             ],
+            props: {
+              label: 'name', 
+              value: 'id'   
+            },
           },
           {
             label: '备注',
@@ -187,6 +210,9 @@ export default {
       },
     };
   },
+  mounted() {
+    this.fetchDosingManList()
+  },
   methods: {
      // 新增
         moldAddFn(row, flag) {
@@ -197,7 +223,24 @@ export default {
         closeDialog() {
           this.addOpen = false
           this.onLoad(this.page);
-        },
+    },
+        // 加药人
+    fetchDosingManList() {
+      getDosingManList({
+        current: 1,
+        size: 10000000,
+        roleId: '2008474700619563009'
+      }).then(res => {
+        const result = res.data.data.records
+        this.dosingManList = result
+        console.log("加药人result", result)
+        this.option.column.forEach(col => {
+          if (col.prop === 'dosingMan') {
+            col.dicData = this.dosingManList;
+          }
+        });
+      })
+    },
     // 点击导入按钮
     handleImport() {
       this.isShowImport = true

src/views/safetyManagement/wastewater/components/testRecord.vue

@@ -31,9 +31,9 @@
       v-if="isShowImport"
       title="导入"
       :isShow="isShowImport"
-      templateUrl="/blade-safety/wasteWaterDosingRecord/download-excel-template"
+      templateUrl="/blade-desk/bsInsTest/downloadExcelTemplate"
       templateName="废水加药记录模板.xlsx"
-      importUrl="/blade-safety/wasteWaterDosingRecord/import-excel"
+      importUrl="/blade-desk/bsInsTest/importExcel"
       @closeDialog="closeDialog"
     ></basic-import>
       <!-- 新增 -->
@@ -42,12 +42,13 @@
     :showDialog="addOpen"
     @closeDialog="closeDialog" 
     :moldAddMore="moldAddMore" 
+    :dosingManList="dosingManList"
     @submitData="handleSubmitData">
     </addEditDialogTestRecord>
   </div>
 </template>
 <script>
-import { getList , update } from '@/api/safetyManagement/testRecord.js';
+import { getList , update , getUserList } from '@/api/safetyManagement/testRecord.js';
 import basicImport from '@/components/basic-import/main.vue';
 import addEditDialogTestRecord from './addEditDialogTestRecord.vue';
 export default {
@@ -55,8 +56,12 @@ export default {
     basicImport,
     addEditDialogTestRecord
   },
+  mounted() {
+    this.fetchUserList()
+  },
   data() {
     return {
+      dosingManList:[],
       addOpen: false, //新增弹窗
       moldAddMore: false,
       isShowImport: false,
@@ -143,18 +148,18 @@ export default {
           },
           {
             label: '化验人',
-            prop: 'dosingMan.userId',
+            prop: 'dosingMan',
-            bind: 'dosingMan.userName',
             search: true,
             sortable: true,
             filter: true,
             span: 12,
             searchLabelWidth: 140,
             type: 'select',
-            dicData: [
+            dicData: [],
-            { label: '测试', value: '测试' },
+            props: {
-            { label: '测试1', value: '测试1' },
+              label: 'name',
-          ],
+              value: 'id',
+            },
             rules: [
               {
                 required: true,
@@ -257,6 +262,23 @@ export default {
     };
   },
   methods: {
+    // 化验人
+    fetchUserList() {
+      getUserList({
+        current: 1,
+        size: 10000000,
+        roleId: '2008473492483850242'
+      }).then(res => {
+        const result = res.data.data.records
+        this.dosingManList = result
+        console.log("化验人", result)
+        this.option.column.forEach(col => {
+          if (col.prop === 'dosingMan') {
+            col.dicData = this.dosingManList;
+          }
+        });
+      })
+    },
       // 新增
         moldAddFn(row, flag) {
             this.addOpen = true
@@ -266,6 +288,7 @@ export default {
         closeDialog() {
           this.addOpen = false;
           this.onLoad(this.page);
+          
         },
         // 处理子组件提交的数据
         handleSubmitData(data) {