值班人员 修改提交

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/utils.js

@@ -0,0 +1,30 @@
+import request from "@/utils/request";
+
+/**
+ * 获取 select options 格式的数据
+ * @param {1 | 2} type 1: 路管中心; 2: 驻点
+ * @returns
+ */
+export function getSelectOptionsStation(type) {
+  return request({
+    url: `/business/employees/organization`,
+    method: "POST",
+    data: {},
+  })
+    .then((result) => {
+      if (result.code != 200) return;
+
+      const data = [];
+      result.data.forEach((item) => {
+        if (!type || type == item.organizationType)
+          data.push({
+            key: item.id,
+            label: item.organizationName,
+            disabled: false,
+          });
+      });
+
+      return data;
+    })
+    .catch((err) => {});
+}

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable copy.vue

@@ -1,119 +0,0 @@
-<template>
-  <Dialog v-model="visibleModel" title="修改值班信息表">
-    <div class="ModifyDutyInformationTable">
-      <div class="search">
-        <Form :formList="formList" :rules="{ '桩号:': [{ required: true, message: '年龄不能为空' }] }" column="2"
-          style="flex: 1;" />
-
-        <ButtonGradient>
-          <template #prefix>
-            <img src="@screen/images/form/search.svg" />
-          </template>
-          刷新
-        </ButtonGradient>
-      </div>
-      <div class="body">
-        <SelectList v-for="item in list" :data="item" />
-      </div>
-      <div class="bottom">
-        <Button>确认</Button>
-        <Button :style="{ backgroundColor: '#C9C9C9' }"> 取消</Button>
-      </div>
-    </div>
-  </Dialog>
-</template>
-
-<script>
-import Dialog from "@screen/components/Dialog/index.vue";
-import Button from "@screen/components/Buttons/Button.vue"
-import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
-import Form from '@screen/components/FormConfig';
-
-import SelectList from "./../../../components/SelectList.vue"
-
-export default {
-  name: 'ModifyDutyInformationTable',
-  components: {
-    Dialog,
-    Button,
-    ButtonGradient,
-    SelectList,
-    Form
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  emit: ['close'],
-  data() {
-    return {
-      formList: [{
-        label: "值班时间:",
-        key: "事件源",
-        type: "timePicker",
-      },
-      {
-        label: "操作人员:",
-        key: "桩号:",
-        type: "input",
-      }],
-      list: Array.from({ length: 15 }).map(item => ({
-        title: "123456",
-        list: Array.from({ length: 15 }).map((_, index) => ({
-          name: index,
-          phone: "12345678901"
-        }))
-      }))
-    }
-  },
-  computed: {
-    visibleModel: {
-      get() {
-        return this.visible
-      },
-      set(bool) {
-        this.$emit('close', bool);
-      }
-    }
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-.ModifyDutyInformationTable {
-  width: 947px;
-  height: 658px;
-  color: #fff;
-  display: flex;
-  flex-direction: column;
-  gap: 15px;
-
-  .search {
-    display: flex;
-    gap: 24px;
-    align-items: center;
-    justify-content: space-between;
-
-  }
-
-  .body {
-    display: flex;
-    gap: 9px;
-    height: 100%;
-    overflow-x: auto;
-    overflow-y: hidden;
-  }
-
-  .bottom {
-    display: flex;
-    gap: 15px;
-    justify-content: end;
-
-    >div {
-      width: 96px;
-    }
-  }
-}
-</style>

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue

@@ -5,7 +5,8 @@
         <Form v-if="!data" :formList="formList" column="2" ref="FormRef" />
 
         <div v-if="peopleList.length" class="people">
-          <div v-for=" item in peopleList " :key="item.id" @click="chooseDutyPerson(item)">
+          <div v-for=" item in peopleList" :class="{ active: getActive(item) }" :key="item.id"
+            @click="chooseDutyPerson(item)">
             <span>{{ item.name || '-' }}</span>
             <span>{{ item.contactNumber || '-' }}</span>
           </div>
@@ -48,7 +49,7 @@ import InputSearch from '@screen/components/InputSearch/index.vue';
 import Form from '@screen/components/FormConfig';
 
 import { loadingMessage } from '@screen/utils/common';
-
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
 import request from "@/utils/request";
 import { Message } from "element-ui";
 
@@ -111,42 +112,21 @@ export default {
       set(bool) {
         this.$emit('close', bool);
       }
+    },
+    getActive() {
+      return data => this[this.active].findIndex(item => item.id === data.id) != -1;
     }
   },
   watch: {
     visible: {
       immediate: true,
-      handler(bool) {
+      async handler(bool) {
         if (!bool) return;
         if (!this.data) {
-          // 机构
-          request({
-            url: `/business/employees/organization`,
-            method: "POST",
-            data: {}
-          })
-            .then((result) => {
-              if (result.code != 200) return;
-
-              const data = [];
-
-              result.data.forEach(item => {
-
-                if (item.organizationType == 2) {
-                  data.push({
-                    key: item.id,
-                    label: item.organizationName,
-                    disabled: false
-                  })
-                }
-              })
-
-              this.formList[0].options.options = data;
-            })
-            .catch((err) => {
 
-            });
+          const result = await getSelectOptionsStation(2);
 
+          this.formList[0].options.options = (result || []);
           return;
         }
 

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue

@@ -152,7 +152,17 @@ export default {
         },
       ],
       data: [],
-      searchFormList: [],
+      searchFormList: [
+        {
+          label: "值班日期:",
+          key: "date",
+          required: true,
+          type: "datePicker",
+          options: {
+            valueFormat: "yyyy-MM-dd"
+          }
+        },
+      ],
       operateRecordVisible: false,
       modifyDutyInformationTableVisible: false,
       dialogData: null

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue

@@ -25,6 +25,7 @@ import request from "@/utils/request";
 import { CameraDirectionEnumList } from "@screen/utils/enum.js"
 import { Message } from "element-ui";
 import { cloneDeep, merge } from 'lodash';
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
 
 export default {
   name: 'DeviceControlDialog',
@@ -186,34 +187,11 @@ export default {
     }
   },
   methods: {
-    getOptions() {
+    async getOptions() {
-      // 机构
-      request({
-        url: `/business/employees/organization`,
-        method: "post",
-        data: {}
-      })
-        .then((result) => {
-          if (result.code != 200) return;
 
-          const data = [];
+      const result = await getSelectOptionsStation(1);
 
-          result.data.forEach(item => {
+      this.formList[0].options.options = result;
-
-            if (item.organizationType == 1) {
-              data.push({
-                key: item.id,
-                label: item.organizationName,
-                disabled: false
-              })
-            }
-          })
-
-          this.formList[0].options.options = data;
-        })
-        .catch((err) => {
-
-        });
     },
     handleSubmit() {
       this.$refs.FormConfigRef.validate()

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue

@@ -21,7 +21,7 @@ import Button from "@screen/components/Buttons/Button.vue"
 import Form from '@screen/components/FormConfig';
 
 import request from "@/utils/request";
-
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
 import { Message } from "element-ui";
 
 export default {
@@ -116,11 +116,8 @@ export default {
         }),
 
         // 机构
-        request({
+        getSelectOptionsStation()
-          url: `/business/employees/organization`,
+
-          method: "post",
-          data: {}
-        })
       ])
         .then(([post, organization]) => {
           if (post.status === 'fulfilled' && post.value.code == 200) {
@@ -129,11 +126,9 @@ export default {
               label: item.postName,
             }))
           }
-          if (organization.status === 'fulfilled' && organization.value.code == 200) {
+
-            this.formList[3].options.options = organization.value.data.map(item => ({
+          if (organization.status === 'fulfilled' && Array.isArray(organization.value)) {
-              key: item.id,
+            this.formList[3].options.options = organization.value;
-              label: item.organizationName,
-            }))
           }
         })
     },

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue

@@ -49,6 +49,7 @@ import { searchFormList } from "./data";
 import request from "@/utils/request";
 import { setLoading } from "@screen/utils/index.js"
 import { delay, exportFile, confirm } from "@screen/utils/common";
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
 
 // 应急人员
 export default {
@@ -104,11 +105,7 @@ export default {
         }),
 
         // 机构
-        request({
+        getSelectOptionsStation()
-          url: `/business/employees/organization`,
-          method: "post",
-          data: {}
-        })
       ])
         .then(([post, organization]) => {
           if (post.status === 'fulfilled' && post.value.code == 200) {
@@ -117,11 +114,9 @@ export default {
               label: item.postName,
             }))
           }
-          if (organization.status === 'fulfilled' && organization.value.code == 200) {
+          if (organization.status === 'fulfilled' && Array.isArray(organization.value)) {
-            this.searchFormList[1].options.options = organization.value.data.map(item => ({
+            console.log("%c [ organization ]-119-「index.vue」", "font-size:15px; background:#317507; color:#75b94b;", organization);
-              key: item.id,
+            this.searchFormList[1].options.options = organization.value;
-              label: item.organizationName,
-            }))
           }
         })
     },

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddDialog.vue

@@ -25,6 +25,7 @@ import request from "@/utils/request";
 import { CameraDirectionEnumList } from "@screen/utils/enum.js"
 import { Message } from "element-ui";
 import { cloneDeep, merge } from 'lodash';
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
 
 export default {
   name: 'DeviceControlDialog',
@@ -186,34 +187,10 @@ export default {
     }
   },
   methods: {
-    getOptions() {
+    async getOptions() {
-      // 机构
+      const result = await getSelectOptionsStation(1)
-      request({
-        url: `/business/employees/organization`,
-        method: "post",
-        data: {}
-      })
-        .then((result) => {
-          if (result.code != 200) return;
 
-          const data = [];
+      this.formList[0].options.options = result || [];
-
-          result.data.forEach(item => {
-
-            if (item.organizationType == 1) {
-              data.push({
-                key: item.id,
-                label: item.organizationName,
-                disabled: false
-              })
-            }
-          })
-
-          this.formList[0].options.options = data;
-        })
-        .catch((err) => {
-
-        });
     },
     handleSubmit() {
       this.$refs.FormConfigRef.validate()