diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js
index 32f2dc0..e263923 100644
--- a/src/api/RQWarning.js
+++ b/src/api/RQWarning.js
@@ -43,3 +43,39 @@
     data: data,
   });
 }
+
+
+// /commonWarning/list
+export function commonWarningList(query) {
+  return request({
+    url: "/business/commonWarning/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// /commonWarning/{id}
+export function commonWarningGet(id) {
+  return request({
+    url: `/business/commonWarning/${id}`,
+    method: "get",
+  });
+}
+
+// /alarmWorkOrder/add
+export function alarmWorkOrderAdd(data) {
+  return request({
+    url: "/business/alarmWorkOrder/add",
+    method: "POST",
+    data: data,
+  });
+}
+
+// /alarmWorkOrder/list
+export function alarmWorkOrderList(query) {
+  return request({
+    url: "/business/alarmWorkOrder/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file

diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js
index 32f2dc0..e263923 100644
--- a/src/api/RQWarning.js
+++ b/src/api/RQWarning.js
@@ -43,3 +43,39 @@
     data: data,
   });
 }
+
+
+// /commonWarning/list
+export function commonWarningList(query) {
+  return request({
+    url: "/business/commonWarning/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// /commonWarning/{id}
+export function commonWarningGet(id) {
+  return request({
+    url: `/business/commonWarning/${id}`,
+    method: "get",
+  });
+}
+
+// /alarmWorkOrder/add
+export function alarmWorkOrderAdd(data) {
+  return request({
+    url: "/business/alarmWorkOrder/add",
+    method: "POST",
+    data: data,
+  });
+}
+
+// /alarmWorkOrder/list
+export function alarmWorkOrderList(query) {
+  return request({
+    url: "/business/alarmWorkOrder/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js
new file mode 100644
index 0000000..7b6d12f
--- /dev/null
+++ b/src/api/system/tanchuang.js
@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// /callRecords/list
+export function callRecordsList(query) {
+  return request({
+    url: "/business/callRecords/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file

diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js
index 32f2dc0..e263923 100644
--- a/src/api/RQWarning.js
+++ b/src/api/RQWarning.js
@@ -43,3 +43,39 @@
     data: data,
   });
 }
+
+
+// /commonWarning/list
+export function commonWarningList(query) {
+  return request({
+    url: "/business/commonWarning/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// /commonWarning/{id}
+export function commonWarningGet(id) {
+  return request({
+    url: `/business/commonWarning/${id}`,
+    method: "get",
+  });
+}
+
+// /alarmWorkOrder/add
+export function alarmWorkOrderAdd(data) {
+  return request({
+    url: "/business/alarmWorkOrder/add",
+    method: "POST",
+    data: data,
+  });
+}
+
+// /alarmWorkOrder/list
+export function alarmWorkOrderList(query) {
+  return request({
+    url: "/business/alarmWorkOrder/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js
new file mode 100644
index 0000000..7b6d12f
--- /dev/null
+++ b/src/api/system/tanchuang.js
@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// /callRecords/list
+export function callRecordsList(query) {
+  return request({
+    url: "/business/callRecords/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index b9fd757..5f48c79 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -1,23 +1,23 @@
 <template>
   <div id="GongDanPaiFa">
-    <el-form :model="AllData.form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
+    <el-form :model="form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
       <el-form-item label="工单类型：" class="cell2">
-        <el-input v-model="AllData.form.GDType" />
+        <el-input v-model="form.moduleTypeName" />
       </el-form-item>
       <el-form-item label="警情时间：" class="cell2">
-        <el-input v-model="AllData.form.JQTimer" />
+        <el-input v-model="form.requestFeedbackTime" />
       </el-form-item>
       <el-form-item label="风险位置：" class="cell1">
-        <el-input v-model="AllData.form.FXWZ" />
+        <el-input v-model="form.eventAddress" />
       </el-form-item>
       <el-form-item label="辅助研判：" class="cell1">
-        <el-input v-model="AllData.form.FZYP" />
+        <el-input v-model="form.eventDetails" />
       </el-form-item>
       <el-form-item label="要求反馈时间：" class="cell2">
-        <el-input v-model="AllData.form.FKSJ" />
+        <el-input v-model="form.requestFeedbackHour" />
       </el-form-item>
       <el-form-item label="要求完成时间：" class="cell2">
-        <el-input v-model="AllData.form.WCSJ" />
+        <el-input v-model="form.requiredCompletionTime" />
       </el-form-item>
     </el-form>
     <el-button color="#03B6A0" style="width: 110px; height: 34px" @click="CloseDialog()">派发工单</el-button>
@@ -27,6 +27,10 @@
 <script setup name="GongDanPaiFa">
 import { ref, reactive, toRefs, onMounted } from 'vue';
 import bus from '@/bus';
+
+// 辅助决策
+import { commonWarningGet, alarmWorkOrderAdd, alarmWorkOrderList } from '@/api/RQWarning';
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -35,47 +39,117 @@
 });
 import { unitVoiceTemplateCall } from '@/api/OutgoingCall/templateList';
 const { proxy } = getCurrentInstance();
+const { module_type } = proxy.useDict('module_type');
+const { order_type } = proxy.useDict('order_type');
+console.log('🚀 ~ module_type,order_type:', module_type, order_type);
 const AllData = reactive({
   form: {
-    GDType: '预警工单',
-    JQTimer: '2024-09-26  17:26',
-    FXWZ: '宝塔区凤凰山街道二道街',
-    FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
-    FKSJ: '2小时内',
-    WCSJ: '2024-09-30',
+    // GDType: '预警工单',
+    // JQTimer: '2024-09-26 17:26:00',
+    // FXWZ: '宝塔区凤凰山街道二道街',
+    // FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
+    // FKSJ: '2小时内',
+    // WCSJ: '2024-09-30',
   },
 });
+const { form } = toRefs(AllData);
 // 关闭弹窗
 const CloseDialog = () => {
-  unitVoiceTemplateCall({
-    robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
-    phones: '13129919657,13638648812,13332926003',
-    templateDesc: {
-      title: '延安城市生命线通知',
-      notice: `在${AllData.form.FXWZ}出现了${AllData.form.FZYP},请于${AllData.form.FKSJ}进行确认与反馈`,
-    },
-  }).then(response => {
-    proxy.$modal.msgSuccess('派发成功');
-    bus.emit('publicDialog_Close');
-  });
+  alarmWorkOrderAdd(form.value)
+    .then(res => {
+      // console.log('🚀 ~ CloseDialog ~ res:', res);
+      unitVoiceTemplateCall({
+        robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+        phones: '13129919657,13638648812,13332926003',
+        templateDesc: {
+          title: '延安城市生命线通知',
+          // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+          notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+        },
+      }).then(response => {
+        proxy.$modal.msgSuccess('派发成功');
+        bus.emit('publicDialog_Close');
+      });
+    })
+    .catch(err => {
+      console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
+    });
+
+  // unitVoiceTemplateCall({
+  //   robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+  //   phones: '13129919657,13638648812,13332926003',
+  //   templateDesc: {
+  //     title: '延安城市生命线通知',
+  //     // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+  //     notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+  //   },
+  // }).then(response => {
+  //   proxy.$modal.msgSuccess('派发成功');
+  //   bus.emit('publicDialog_Close');
+  // });
 };
+
+// 工单信息
+const getWarningData = async () => {
+  try {
+    const res = await commonWarningGet(props.dataID);
+
+    form.value.requestFeedbackTime = res.data.warnTime;
+    form.value.warnId = res.data.id;
+    form.value.eventAddress = res.data.wranLocation;
+    form.value.eventDetails = res.data.riskProfile + ',' + res.data.assessment;
+    form.value.orderType = 'early_warning';
+    form.value.moduleTypeName = module_type.value.find(item => item.value == res.data.moduleType)?.label;
+    form.value.moduleType = res.data.moduleType;
+    form.value.requestFeedbackHour = '2';
+    form.value.requiredCompletionTime = getCalculatedTime(form.value.warnTime, '2小时');
+    console.log('🚀 ~ getWarningData ~ res:', res);
+  } catch (error) {
+    console.log('🚀 ~ getWarningData ~ error:', error);
+  }
+};
+// 定义一个方法来计算新的时间
+const getCalculatedTime = (v1, v2) => {
+  const time = proxy.moment(v1);
+  const durationParts = v2.match(/(\d+)\s*(小时|分钟|秒)/);
+  // console.log("🚀 ~ getCalculatedTime ~ durationParts:", durationParts)
+  if (durationParts) {
+    const value = parseInt(durationParts[1], 10);
+    const unit = durationParts[2];
+    // console.log(value, unit);
+
+    switch (unit) {
+      case '小时':
+        return time.add(value, 'hours').format('YYYY-MM-DD HH:mm:ss');
+      case '分钟':
+        return time.add(value, 'minutes').format('YYYY-MM-DD HH:mm:ss');
+      case '秒':
+        return time.add(value, 'seconds').format('YYYY-MM-DD HH:mm:ss');
+      default:
+        return time.format('YYYY-MM-DD HH:mm:ss');
+    }
+  }
+  return time.format('YYYY-MM-DD HH:mm:ss');
+};
+
 onMounted(() => {
   console.log(123123123, props.dataID);
+  getWarningData();
   if (props.dataID == '001') {
-    AllData.form.FZYP = '压力监测异常波动,可能是设施故障';
+    form.value.FZYP = '压力监测异常波动,可能是设施故障';
   } else if (props.dataID == '002') {
-    AllData.form.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
+    form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
   } else if (props.dataID == '003') {
-    AllData.form.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
+    form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
   } else if (props.dataID == '004') {
-    AllData.form.FXWZ = '东大街管网';
-    AllData.form.FZYP = '高水位，水深250mm';
+    form.value.FXWZ = '东大街管网';
+    form.value.FZYP = '高水位，水深250mm';
   } else if (props.dataID == '005') {
-    AllData.form.FXWZ = '枣园南路与枣园五路管网';
-    AllData.form.FZYP = '满管，水深400mm';
+    form.value.FXWZ = '枣园南路与枣园五路管网';
+    form.value.FZYP = '满管，水深400mm';
   } else if (props.dataID == '006') {
-    AllData.form.FXWZ = '王家坪旧址门口';
-    AllData.form.FZYP = '积水，水深120mm';
+    form.value.FXWZ = '王家坪旧址门口';
+    form.value.FZYP = '积水，水深120mm';
   }
 });
 </script>

diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js
index 32f2dc0..e263923 100644
--- a/src/api/RQWarning.js
+++ b/src/api/RQWarning.js
@@ -43,3 +43,39 @@
     data: data,
   });
 }
+
+
+// /commonWarning/list
+export function commonWarningList(query) {
+  return request({
+    url: "/business/commonWarning/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// /commonWarning/{id}
+export function commonWarningGet(id) {
+  return request({
+    url: `/business/commonWarning/${id}`,
+    method: "get",
+  });
+}
+
+// /alarmWorkOrder/add
+export function alarmWorkOrderAdd(data) {
+  return request({
+    url: "/business/alarmWorkOrder/add",
+    method: "POST",
+    data: data,
+  });
+}
+
+// /alarmWorkOrder/list
+export function alarmWorkOrderList(query) {
+  return request({
+    url: "/business/alarmWorkOrder/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js
new file mode 100644
index 0000000..7b6d12f
--- /dev/null
+++ b/src/api/system/tanchuang.js
@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// /callRecords/list
+export function callRecordsList(query) {
+  return request({
+    url: "/business/callRecords/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index b9fd757..5f48c79 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -1,23 +1,23 @@
 <template>
   <div id="GongDanPaiFa">
-    <el-form :model="AllData.form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
+    <el-form :model="form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
       <el-form-item label="工单类型：" class="cell2">
-        <el-input v-model="AllData.form.GDType" />
+        <el-input v-model="form.moduleTypeName" />
       </el-form-item>
       <el-form-item label="警情时间：" class="cell2">
-        <el-input v-model="AllData.form.JQTimer" />
+        <el-input v-model="form.requestFeedbackTime" />
       </el-form-item>
       <el-form-item label="风险位置：" class="cell1">
-        <el-input v-model="AllData.form.FXWZ" />
+        <el-input v-model="form.eventAddress" />
       </el-form-item>
       <el-form-item label="辅助研判：" class="cell1">
-        <el-input v-model="AllData.form.FZYP" />
+        <el-input v-model="form.eventDetails" />
       </el-form-item>
       <el-form-item label="要求反馈时间：" class="cell2">
-        <el-input v-model="AllData.form.FKSJ" />
+        <el-input v-model="form.requestFeedbackHour" />
       </el-form-item>
       <el-form-item label="要求完成时间：" class="cell2">
-        <el-input v-model="AllData.form.WCSJ" />
+        <el-input v-model="form.requiredCompletionTime" />
       </el-form-item>
     </el-form>
     <el-button color="#03B6A0" style="width: 110px; height: 34px" @click="CloseDialog()">派发工单</el-button>
@@ -27,6 +27,10 @@
 <script setup name="GongDanPaiFa">
 import { ref, reactive, toRefs, onMounted } from 'vue';
 import bus from '@/bus';
+
+// 辅助决策
+import { commonWarningGet, alarmWorkOrderAdd, alarmWorkOrderList } from '@/api/RQWarning';
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -35,47 +39,117 @@
 });
 import { unitVoiceTemplateCall } from '@/api/OutgoingCall/templateList';
 const { proxy } = getCurrentInstance();
+const { module_type } = proxy.useDict('module_type');
+const { order_type } = proxy.useDict('order_type');
+console.log('🚀 ~ module_type,order_type:', module_type, order_type);
 const AllData = reactive({
   form: {
-    GDType: '预警工单',
-    JQTimer: '2024-09-26  17:26',
-    FXWZ: '宝塔区凤凰山街道二道街',
-    FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
-    FKSJ: '2小时内',
-    WCSJ: '2024-09-30',
+    // GDType: '预警工单',
+    // JQTimer: '2024-09-26 17:26:00',
+    // FXWZ: '宝塔区凤凰山街道二道街',
+    // FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
+    // FKSJ: '2小时内',
+    // WCSJ: '2024-09-30',
   },
 });
+const { form } = toRefs(AllData);
 // 关闭弹窗
 const CloseDialog = () => {
-  unitVoiceTemplateCall({
-    robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
-    phones: '13129919657,13638648812,13332926003',
-    templateDesc: {
-      title: '延安城市生命线通知',
-      notice: `在${AllData.form.FXWZ}出现了${AllData.form.FZYP},请于${AllData.form.FKSJ}进行确认与反馈`,
-    },
-  }).then(response => {
-    proxy.$modal.msgSuccess('派发成功');
-    bus.emit('publicDialog_Close');
-  });
+  alarmWorkOrderAdd(form.value)
+    .then(res => {
+      // console.log('🚀 ~ CloseDialog ~ res:', res);
+      unitVoiceTemplateCall({
+        robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+        phones: '13129919657,13638648812,13332926003',
+        templateDesc: {
+          title: '延安城市生命线通知',
+          // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+          notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+        },
+      }).then(response => {
+        proxy.$modal.msgSuccess('派发成功');
+        bus.emit('publicDialog_Close');
+      });
+    })
+    .catch(err => {
+      console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
+    });
+
+  // unitVoiceTemplateCall({
+  //   robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+  //   phones: '13129919657,13638648812,13332926003',
+  //   templateDesc: {
+  //     title: '延安城市生命线通知',
+  //     // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+  //     notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+  //   },
+  // }).then(response => {
+  //   proxy.$modal.msgSuccess('派发成功');
+  //   bus.emit('publicDialog_Close');
+  // });
 };
+
+// 工单信息
+const getWarningData = async () => {
+  try {
+    const res = await commonWarningGet(props.dataID);
+
+    form.value.requestFeedbackTime = res.data.warnTime;
+    form.value.warnId = res.data.id;
+    form.value.eventAddress = res.data.wranLocation;
+    form.value.eventDetails = res.data.riskProfile + ',' + res.data.assessment;
+    form.value.orderType = 'early_warning';
+    form.value.moduleTypeName = module_type.value.find(item => item.value == res.data.moduleType)?.label;
+    form.value.moduleType = res.data.moduleType;
+    form.value.requestFeedbackHour = '2';
+    form.value.requiredCompletionTime = getCalculatedTime(form.value.warnTime, '2小时');
+    console.log('🚀 ~ getWarningData ~ res:', res);
+  } catch (error) {
+    console.log('🚀 ~ getWarningData ~ error:', error);
+  }
+};
+// 定义一个方法来计算新的时间
+const getCalculatedTime = (v1, v2) => {
+  const time = proxy.moment(v1);
+  const durationParts = v2.match(/(\d+)\s*(小时|分钟|秒)/);
+  // console.log("🚀 ~ getCalculatedTime ~ durationParts:", durationParts)
+  if (durationParts) {
+    const value = parseInt(durationParts[1], 10);
+    const unit = durationParts[2];
+    // console.log(value, unit);
+
+    switch (unit) {
+      case '小时':
+        return time.add(value, 'hours').format('YYYY-MM-DD HH:mm:ss');
+      case '分钟':
+        return time.add(value, 'minutes').format('YYYY-MM-DD HH:mm:ss');
+      case '秒':
+        return time.add(value, 'seconds').format('YYYY-MM-DD HH:mm:ss');
+      default:
+        return time.format('YYYY-MM-DD HH:mm:ss');
+    }
+  }
+  return time.format('YYYY-MM-DD HH:mm:ss');
+};
+
 onMounted(() => {
   console.log(123123123, props.dataID);
+  getWarningData();
   if (props.dataID == '001') {
-    AllData.form.FZYP = '压力监测异常波动,可能是设施故障';
+    form.value.FZYP = '压力监测异常波动,可能是设施故障';
   } else if (props.dataID == '002') {
-    AllData.form.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
+    form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
   } else if (props.dataID == '003') {
-    AllData.form.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
+    form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
   } else if (props.dataID == '004') {
-    AllData.form.FXWZ = '东大街管网';
-    AllData.form.FZYP = '高水位，水深250mm';
+    form.value.FXWZ = '东大街管网';
+    form.value.FZYP = '高水位，水深250mm';
   } else if (props.dataID == '005') {
-    AllData.form.FXWZ = '枣园南路与枣园五路管网';
-    AllData.form.FZYP = '满管，水深400mm';
+    form.value.FXWZ = '枣园南路与枣园五路管网';
+    form.value.FZYP = '满管，水深400mm';
   } else if (props.dataID == '006') {
-    AllData.form.FXWZ = '王家坪旧址门口';
-    AllData.form.FZYP = '积水，水深120mm';
+    form.value.FXWZ = '王家坪旧址门口';
+    form.value.FZYP = '积水，水深120mm';
   }
 });
 </script>
diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index 9847df8..4eb717f 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -1,51 +1,37 @@
 <template>
   <div id="WangJiaPIng" ref="threeDom">
-    <div
-      class="YuanDian"
-      v-for="(item, i) in labelData"
-      :key="item.id"
-      :id="item.id"
-      style="display: none"
-    >
+    <div class="YuanDian" v-for="(item, i) in labelData" :key="item.id" :id="item.id" style="display: none">
       <div class="iconBox" v-show="item.show">
         <img src="@/assets/images/ljx.png" alt="" class="iconImg" />
         <div class="ydBox">
           <div class="YuanDianText">{{ item.name }}</div>
           <div class="ydData" v-for="(val, k) in item.data" :key="k">
-            <div class="leftData">{{ val.name + ":" }}</div>
-            <div class="rightData">{{ val.value + " " + val.unit }}</div>
+            <div class="leftData">{{ val.name + ':' }}</div>
+            <div class="rightData">{{ val.value + ' ' + val.unit }}</div>
           </div>
         </div>
       </div>
-      <img
-        class="YuanDianIcon"
-        :src="item.icon"
-        @mouseenter="item.show = true"
-        @mouseleave="item.show = false"
-      />
+      <img class="YuanDianIcon" :src="item.icon" @mouseenter="item.show = true" @mouseleave="item.show = false" />
     </div>
   </div>
 </template>
 
 <script setup name="WangJiaPIng">
-import { ref, reactive, toRefs, onMounted } from "vue";
-import * as THREE from "three";
-import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js"; //控制器
-import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js"; // gltf加载器
-import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
-import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
-import { Water } from "three/examples/jsm/objects/Water.js";
+import { ref, reactive, toRefs, onMounted } from 'vue';
+import * as THREE from 'three';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; //控制器
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'; // gltf加载器
+import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
+import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
+import { Water } from 'three/examples/jsm/objects/Water.js';
 
-import {
-  CSS3DRenderer,
-  CSS3DObject,
-} from "three/examples/jsm/renderers/CSS3DRenderer.js";
-import gsap from "gsap";
-import { CSSRulePlugin } from "gsap/CSSRulePlugin";
-import bus from "@/bus";
+import { CSS3DRenderer, CSS3DObject } from 'three/examples/jsm/renderers/CSS3DRenderer.js';
+import gsap from 'gsap';
+import { CSSRulePlugin } from 'gsap/CSSRulePlugin';
+import bus from '@/bus';
 const AllData = reactive({});
 
-const show = ref("");
+const show = ref('');
 const width = ref(null);
 const height = ref(null);
 const Camera = ref(null);
@@ -57,139 +43,139 @@
 let Twater = null;
 const labelData = ref([
   {
-    name: "风速风向仪",
+    name: '风速风向仪',
     id: `YuanDian1`,
     position: {
       x: 0,
       y: 0,
       z: 2.5,
     },
-    icon: "/Three/icon/fsfx_icon.png",
+    icon: '/Three/icon/fsfx_icon.png',
     data: [
       {
-        name: "方向",
-        value: "东北风",
-        unit: "",
+        name: '方向',
+        value: '东北风',
+        unit: '',
       },
       {
-        name: "风速",
-        value: "1.3",
-        unit: "m/s",
+        name: '风速',
+        value: '1.3',
+        unit: 'm/s',
       },
     ],
     show: false,
   },
   {
-    name: "静力水准仪",
+    name: '静力水准仪',
     id: `YuanDian2`,
     position: {
       x: -46,
       y: 0,
       z: 2.5,
     },
-    icon: "/Three/icon/jlszy_icon.png",
+    icon: '/Three/icon/jlszy_icon.png',
     data: [
       {
-        name: "挠度变化值",
-        value: "-0.01",
-        unit: "mm",
+        name: '挠度变化值',
+        value: '-0.01',
+        unit: 'mm',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "静力水准仪",
+    name: '静力水准仪',
     id: `YuanDian3`,
     position: {
       x: -46,
       y: 0,
       z: -12.6,
     },
-    icon: "/Three/icon/jlszy_icon.png",
+    icon: '/Three/icon/jlszy_icon.png',
     data: [
       {
-        name: "挠度变化值",
-        value: "-0.01",
-        unit: "mm",
+        name: '挠度变化值',
+        value: '-0.01',
+        unit: 'mm',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "应变计",
+    name: '应变计',
     id: `YuanDian4`,
     position: {
       x: 0,
       y: 7.5,
       z: 0,
     },
-    icon: "/Three/icon/ybj_icon.png",
+    icon: '/Three/icon/ybj_icon.png',
     data: [
       {
-        name: "应变量",
-        value: "17",
-        unit: "με",
+        name: '应变量',
+        value: '17',
+        unit: 'με',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "应变计",
+    name: '应变计',
     id: `YuanDian5`,
     position: {
       x: 0,
       y: 7.5,
       z: -10,
     },
-    icon: "/Three/icon/ybj_icon.png",
+    icon: '/Three/icon/ybj_icon.png',
     data: [
       {
-        name: "应变量",
-        value: "17",
-        unit: "με",
+        name: '应变量',
+        value: '17',
+        unit: 'με',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "加速度计",
+    name: '加速度计',
     id: `YuanDian6`,
     position: {
       x: 0,
       y: 0,
       z: -5,
     },
-    icon: "/Three/icon/jsdj_icon.png",
+    icon: '/Three/icon/jsdj_icon.png',
     data: [
       {
-        name: "加速度",
-        value: "1.42",
-        unit: "mm/s2",
+        name: '加速度',
+        value: '1.42',
+        unit: 'mm/s²',
       },
       {
-        name: "风速",
-        value: "1.3",
-        unit: "m/s",
+        name: '风速',
+        value: '1.3',
+        unit: 'm/s',
       },
     ],
     show: false,
@@ -284,11 +270,11 @@
   const Gltfloader = new GLTFLoader();
   var dracoLoader = new DRACOLoader();
   // dracoLoader.setDecoderPath("https://zhzz.hongshan.gov.cn:8865/file/hongshan/Three_Gltf/"); //设置解压库文件路径
-  dracoLoader.setDecoderPath("/draco/"); //设置解压库文件路径
+  dracoLoader.setDecoderPath('/draco/'); //设置解压库文件路径
   Gltfloader.setDRACOLoader(dracoLoader);
   Gltfloader.load(
     url,
-    (gltf) => {
+    gltf => {
       gltf.scene.name = name;
       gltf.scene.scale.set(1, 1, 1);
       // gltf.scene.position.x = -70;
@@ -326,7 +312,7 @@
     y: position.y,
     z: position.z,
     duration: time,
-    ease: "power4.out",
+    ease: 'power4.out',
   });
   // gsap.to(Camera.value.lookAt, {
   //   x: lookAt.x,
@@ -340,7 +326,7 @@
     y: lookAt.y,
     z: lookAt.z,
     duration: time,
-    ease: "power4.out",
+    ease: 'power4.out',
   });
 };
 
@@ -349,8 +335,8 @@
  * 该函数负责创建和配置Three.js的WebGL渲染器，包括设置视口大小、抗锯齿、阴影、像素比、色调映射等
  */
 const initRenderer = () => {
-  width.value = document.getElementById("WangJiaPIng").clientWidth;
-  height.value = document.getElementById("WangJiaPIng").clientHeight;
+  width.value = document.getElementById('WangJiaPIng').clientWidth;
+  height.value = document.getElementById('WangJiaPIng').clientHeight;
   Renderer.value = new THREE.WebGLRenderer({
     antialias: true,
     // alpha: true, //开启alpha
@@ -371,8 +357,8 @@
 const initLabelRenderer = () => {
   LabelRenderer.value = new CSS3DRenderer();
   LabelRenderer.value.setSize(width.value, height.value);
-  LabelRenderer.value.domElement.style.position = "absolute";
-  LabelRenderer.value.domElement.style.top = "0px";
+  LabelRenderer.value.domElement.style.position = 'absolute';
+  LabelRenderer.value.domElement.style.top = '0px';
   threeDom.value.appendChild(LabelRenderer.value.domElement);
   // LabelRenderer.value.domElement.addEventListener("click", meshOnClick);
 };
@@ -382,12 +368,7 @@
  * 创建一个透视摄像机，并设置其位置
  */
 const initCamera = () => {
-  Camera.value = new THREE.PerspectiveCamera(
-    45,
-    window.innerWidth / window.innerHeight,
-    1,
-    4000
-  );
+  Camera.value = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 4000);
   Camera.value.position.set(500, 500, 500);
 };
 
@@ -453,7 +434,7 @@
 const initSky = () => {
   var pmremGenerator = new THREE.PMREMGenerator(Renderer.value); // 使用hdr作为背景色
   pmremGenerator.compileEquirectangularShader();
-  new RGBELoader().load("/Gltf/Skey_1K.hdr", function (texture) {
+  new RGBELoader().load('/Gltf/Skey_1K.hdr', function (texture) {
     const envMap = pmremGenerator.fromEquirectangular(texture).texture;
     envMap.isPmremTexture = true;
     Scene.environment = envMap;
@@ -478,8 +459,8 @@
   LabelRenderer.value.render(Scene, Camera.value);
   const delta = clock.getDelta();
   // 如需调试请打开这个获取Camera,Controls 的值
-  // console.log(Camera.value);
-  // console.log(Controls.value);
+  console.log('Camera.value', Camera.value);
+  console.log('Controls.value', Controls.value);
 };
 
 // 创建气泡窗
@@ -488,7 +469,7 @@
     let labelCSS3D = Scene.getObjectByName(`YuanDian${index + 1}`);
     if (labelCSS3D === undefined) {
       let lableDiv = document.getElementById(`YuanDian${index + 1}`);
-      lableDiv.style.display = "block";
+      lableDiv.style.display = 'block';
       labelCSS3D = new CSS3DObject(lableDiv);
       labelCSS3D.position.set(item.position.x, item.position.y, item.position.z);
       labelCSS3D.scale.set(0.1, 0.1, 0.1);
@@ -515,16 +496,16 @@
     }
   });
 }
-const flyTo = (data) => {
+const flyTo = data => {
   // 静立水准仪
-  if (data.name[0] == "静力水准仪") {
+  if (data.name[0] == '静力水准仪') {
     // 摄像机位置
     gsap.to(Camera.value.position, {
       x: -69.16984920750228,
       y: 9.22906292776404,
       z: 14.97197297303164,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
     // 视角
     gsap.to(Controls.value.target, {
@@ -532,16 +513,16 @@
       y: -1.2146002003091534,
       z: -14.382184358955339,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
-  } else if (data.name[0] == "应变计") {
+  } else if (data.name[0] == '应变计') {
     // 摄像机位置
     gsap.to(Camera.value.position, {
       x: -18.741902596516276,
       y: 11.41010130909887,
       z: 8.418282711965766,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
     // 视角
     gsap.to(Controls.value.target, {
@@ -549,12 +530,27 @@
       y: 7.3984913282701665,
       z: -5.438067100513153,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
+    });
+  } else if (data.name[0] == '加速度计') {
+    gsap.to(Camera.value.position, {
+      x: -17.287720948075602,
+      y: 8.016773260004873,
+      z: 11.57619028778769,
+      duration: 3,
+      ease: 'power4.out',
+    });
+    gsap.to(Controls.value.target, {
+      x: 4.538970140099083,
+      y: 2.881636781852132,
+      z: -8.354337289076433,
+      duration: 3,
+      ease: 'power4.out',
     });
   }
 
   // 打开弹窗
-  labelData.value.forEach((element) => {
+  labelData.value.forEach(element => {
     if (element.name == data.name[0]) {
       element.show = true;
     } else {
@@ -571,16 +567,16 @@
 onBeforeMount(() => {
   //   initGltfFloor();
   // initModal('ChangJing', '/Gltf/ChuWangCheng.gltf');
-  initModal("daqiao", "/Gltf/daqiao.gltf");
+  initModal('daqiao', '/Gltf/daqiao.gltf');
   // 共同弹窗触发事件
-  bus.on("WJP_BIM_flyTo", (params) => {
+  bus.on('WJP_BIM_flyTo', params => {
     // 打开弹窗
     flyTo(params);
   });
 });
 onMounted(() => {
   nextTick(() => {
-    if (document.readyState === "complete") {
+    if (document.readyState === 'complete') {
       createLable();
       // createWaterLevel();
     }
@@ -600,17 +596,17 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("WJP_BIM_flyTo");
+  bus.off('WJP_BIM_flyTo');
   // window.removeEventListener("click", BIMClick);
 
   // document.removeEventListener('click', meshOnClick);
   // window.removeEventListener("resize", onWindowResize, false);
 
-  Scene.traverse((e) => {
+  Scene.traverse(e => {
     if (e.BufferGeometry) e.BufferGeometry.dispose();
     if (e.material) {
       if (Array.isArray(e.material)) {
-        e.material.forEach((m) => {
+        e.material.forEach(m => {
           m.dispose();
         });
       } else {
@@ -664,11 +660,7 @@
       bottom: 8px;
       width: 45px;
       // height: 26px;
-      background: linear-gradient(
-        0deg,
-        rgba(12, 54, 92, 0.6) 0%,
-        rgba(12, 54, 92, 0.6) 100%
-      );
+      background: linear-gradient(0deg, rgba(12, 54, 92, 0.6) 0%, rgba(12, 54, 92, 0.6) 100%);
       border-radius: 2px;
       border: 1px solid #04d8ff;
       .ydData {
@@ -698,11 +690,7 @@
       pointer-events: none;
       font-size: 3px;
       text-align: center;
-      background: linear-gradient(
-        90deg,
-        rgba(4, 216, 255, 0.8) 0%,
-        rgba(4, 216, 255, 0.2) 100%
-      );
+      background: linear-gradient(90deg, rgba(4, 216, 255, 0.8) 0%, rgba(4, 216, 255, 0.2) 100%);
     }
 
     .YuanDianIcon {

diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js
index 32f2dc0..e263923 100644
--- a/src/api/RQWarning.js
+++ b/src/api/RQWarning.js
@@ -43,3 +43,39 @@
     data: data,
   });
 }
+
+
+// /commonWarning/list
+export function commonWarningList(query) {
+  return request({
+    url: "/business/commonWarning/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// /commonWarning/{id}
+export function commonWarningGet(id) {
+  return request({
+    url: `/business/commonWarning/${id}`,
+    method: "get",
+  });
+}
+
+// /alarmWorkOrder/add
+export function alarmWorkOrderAdd(data) {
+  return request({
+    url: "/business/alarmWorkOrder/add",
+    method: "POST",
+    data: data,
+  });
+}
+
+// /alarmWorkOrder/list
+export function alarmWorkOrderList(query) {
+  return request({
+    url: "/business/alarmWorkOrder/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js
new file mode 100644
index 0000000..7b6d12f
--- /dev/null
+++ b/src/api/system/tanchuang.js
@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// /callRecords/list
+export function callRecordsList(query) {
+  return request({
+    url: "/business/callRecords/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index b9fd757..5f48c79 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -1,23 +1,23 @@
 <template>
   <div id="GongDanPaiFa">
-    <el-form :model="AllData.form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
+    <el-form :model="form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
       <el-form-item label="工单类型：" class="cell2">
-        <el-input v-model="AllData.form.GDType" />
+        <el-input v-model="form.moduleTypeName" />
       </el-form-item>
       <el-form-item label="警情时间：" class="cell2">
-        <el-input v-model="AllData.form.JQTimer" />
+        <el-input v-model="form.requestFeedbackTime" />
       </el-form-item>
       <el-form-item label="风险位置：" class="cell1">
-        <el-input v-model="AllData.form.FXWZ" />
+        <el-input v-model="form.eventAddress" />
       </el-form-item>
       <el-form-item label="辅助研判：" class="cell1">
-        <el-input v-model="AllData.form.FZYP" />
+        <el-input v-model="form.eventDetails" />
       </el-form-item>
       <el-form-item label="要求反馈时间：" class="cell2">
-        <el-input v-model="AllData.form.FKSJ" />
+        <el-input v-model="form.requestFeedbackHour" />
       </el-form-item>
       <el-form-item label="要求完成时间：" class="cell2">
-        <el-input v-model="AllData.form.WCSJ" />
+        <el-input v-model="form.requiredCompletionTime" />
       </el-form-item>
     </el-form>
     <el-button color="#03B6A0" style="width: 110px; height: 34px" @click="CloseDialog()">派发工单</el-button>
@@ -27,6 +27,10 @@
 <script setup name="GongDanPaiFa">
 import { ref, reactive, toRefs, onMounted } from 'vue';
 import bus from '@/bus';
+
+// 辅助决策
+import { commonWarningGet, alarmWorkOrderAdd, alarmWorkOrderList } from '@/api/RQWarning';
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -35,47 +39,117 @@
 });
 import { unitVoiceTemplateCall } from '@/api/OutgoingCall/templateList';
 const { proxy } = getCurrentInstance();
+const { module_type } = proxy.useDict('module_type');
+const { order_type } = proxy.useDict('order_type');
+console.log('🚀 ~ module_type,order_type:', module_type, order_type);
 const AllData = reactive({
   form: {
-    GDType: '预警工单',
-    JQTimer: '2024-09-26  17:26',
-    FXWZ: '宝塔区凤凰山街道二道街',
-    FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
-    FKSJ: '2小时内',
-    WCSJ: '2024-09-30',
+    // GDType: '预警工单',
+    // JQTimer: '2024-09-26 17:26:00',
+    // FXWZ: '宝塔区凤凰山街道二道街',
+    // FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
+    // FKSJ: '2小时内',
+    // WCSJ: '2024-09-30',
   },
 });
+const { form } = toRefs(AllData);
 // 关闭弹窗
 const CloseDialog = () => {
-  unitVoiceTemplateCall({
-    robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
-    phones: '13129919657,13638648812,13332926003',
-    templateDesc: {
-      title: '延安城市生命线通知',
-      notice: `在${AllData.form.FXWZ}出现了${AllData.form.FZYP},请于${AllData.form.FKSJ}进行确认与反馈`,
-    },
-  }).then(response => {
-    proxy.$modal.msgSuccess('派发成功');
-    bus.emit('publicDialog_Close');
-  });
+  alarmWorkOrderAdd(form.value)
+    .then(res => {
+      // console.log('🚀 ~ CloseDialog ~ res:', res);
+      unitVoiceTemplateCall({
+        robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+        phones: '13129919657,13638648812,13332926003',
+        templateDesc: {
+          title: '延安城市生命线通知',
+          // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+          notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+        },
+      }).then(response => {
+        proxy.$modal.msgSuccess('派发成功');
+        bus.emit('publicDialog_Close');
+      });
+    })
+    .catch(err => {
+      console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
+    });
+
+  // unitVoiceTemplateCall({
+  //   robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+  //   phones: '13129919657,13638648812,13332926003',
+  //   templateDesc: {
+  //     title: '延安城市生命线通知',
+  //     // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+  //     notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+  //   },
+  // }).then(response => {
+  //   proxy.$modal.msgSuccess('派发成功');
+  //   bus.emit('publicDialog_Close');
+  // });
 };
+
+// 工单信息
+const getWarningData = async () => {
+  try {
+    const res = await commonWarningGet(props.dataID);
+
+    form.value.requestFeedbackTime = res.data.warnTime;
+    form.value.warnId = res.data.id;
+    form.value.eventAddress = res.data.wranLocation;
+    form.value.eventDetails = res.data.riskProfile + ',' + res.data.assessment;
+    form.value.orderType = 'early_warning';
+    form.value.moduleTypeName = module_type.value.find(item => item.value == res.data.moduleType)?.label;
+    form.value.moduleType = res.data.moduleType;
+    form.value.requestFeedbackHour = '2';
+    form.value.requiredCompletionTime = getCalculatedTime(form.value.warnTime, '2小时');
+    console.log('🚀 ~ getWarningData ~ res:', res);
+  } catch (error) {
+    console.log('🚀 ~ getWarningData ~ error:', error);
+  }
+};
+// 定义一个方法来计算新的时间
+const getCalculatedTime = (v1, v2) => {
+  const time = proxy.moment(v1);
+  const durationParts = v2.match(/(\d+)\s*(小时|分钟|秒)/);
+  // console.log("🚀 ~ getCalculatedTime ~ durationParts:", durationParts)
+  if (durationParts) {
+    const value = parseInt(durationParts[1], 10);
+    const unit = durationParts[2];
+    // console.log(value, unit);
+
+    switch (unit) {
+      case '小时':
+        return time.add(value, 'hours').format('YYYY-MM-DD HH:mm:ss');
+      case '分钟':
+        return time.add(value, 'minutes').format('YYYY-MM-DD HH:mm:ss');
+      case '秒':
+        return time.add(value, 'seconds').format('YYYY-MM-DD HH:mm:ss');
+      default:
+        return time.format('YYYY-MM-DD HH:mm:ss');
+    }
+  }
+  return time.format('YYYY-MM-DD HH:mm:ss');
+};
+
 onMounted(() => {
   console.log(123123123, props.dataID);
+  getWarningData();
   if (props.dataID == '001') {
-    AllData.form.FZYP = '压力监测异常波动,可能是设施故障';
+    form.value.FZYP = '压力监测异常波动,可能是设施故障';
   } else if (props.dataID == '002') {
-    AllData.form.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
+    form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
   } else if (props.dataID == '003') {
-    AllData.form.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
+    form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
   } else if (props.dataID == '004') {
-    AllData.form.FXWZ = '东大街管网';
-    AllData.form.FZYP = '高水位，水深250mm';
+    form.value.FXWZ = '东大街管网';
+    form.value.FZYP = '高水位，水深250mm';
   } else if (props.dataID == '005') {
-    AllData.form.FXWZ = '枣园南路与枣园五路管网';
-    AllData.form.FZYP = '满管，水深400mm';
+    form.value.FXWZ = '枣园南路与枣园五路管网';
+    form.value.FZYP = '满管，水深400mm';
   } else if (props.dataID == '006') {
-    AllData.form.FXWZ = '王家坪旧址门口';
-    AllData.form.FZYP = '积水，水深120mm';
+    form.value.FXWZ = '王家坪旧址门口';
+    form.value.FZYP = '积水，水深120mm';
   }
 });
 </script>
diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index 9847df8..4eb717f 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -1,51 +1,37 @@
 <template>
   <div id="WangJiaPIng" ref="threeDom">
-    <div
-      class="YuanDian"
-      v-for="(item, i) in labelData"
-      :key="item.id"
-      :id="item.id"
-      style="display: none"
-    >
+    <div class="YuanDian" v-for="(item, i) in labelData" :key="item.id" :id="item.id" style="display: none">
       <div class="iconBox" v-show="item.show">
         <img src="@/assets/images/ljx.png" alt="" class="iconImg" />
         <div class="ydBox">
           <div class="YuanDianText">{{ item.name }}</div>
           <div class="ydData" v-for="(val, k) in item.data" :key="k">
-            <div class="leftData">{{ val.name + ":" }}</div>
-            <div class="rightData">{{ val.value + " " + val.unit }}</div>
+            <div class="leftData">{{ val.name + ':' }}</div>
+            <div class="rightData">{{ val.value + ' ' + val.unit }}</div>
           </div>
         </div>
       </div>
-      <img
-        class="YuanDianIcon"
-        :src="item.icon"
-        @mouseenter="item.show = true"
-        @mouseleave="item.show = false"
-      />
+      <img class="YuanDianIcon" :src="item.icon" @mouseenter="item.show = true" @mouseleave="item.show = false" />
     </div>
   </div>
 </template>
 
 <script setup name="WangJiaPIng">
-import { ref, reactive, toRefs, onMounted } from "vue";
-import * as THREE from "three";
-import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js"; //控制器
-import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js"; // gltf加载器
-import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
-import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
-import { Water } from "three/examples/jsm/objects/Water.js";
+import { ref, reactive, toRefs, onMounted } from 'vue';
+import * as THREE from 'three';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; //控制器
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'; // gltf加载器
+import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
+import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
+import { Water } from 'three/examples/jsm/objects/Water.js';
 
-import {
-  CSS3DRenderer,
-  CSS3DObject,
-} from "three/examples/jsm/renderers/CSS3DRenderer.js";
-import gsap from "gsap";
-import { CSSRulePlugin } from "gsap/CSSRulePlugin";
-import bus from "@/bus";
+import { CSS3DRenderer, CSS3DObject } from 'three/examples/jsm/renderers/CSS3DRenderer.js';
+import gsap from 'gsap';
+import { CSSRulePlugin } from 'gsap/CSSRulePlugin';
+import bus from '@/bus';
 const AllData = reactive({});
 
-const show = ref("");
+const show = ref('');
 const width = ref(null);
 const height = ref(null);
 const Camera = ref(null);
@@ -57,139 +43,139 @@
 let Twater = null;
 const labelData = ref([
   {
-    name: "风速风向仪",
+    name: '风速风向仪',
     id: `YuanDian1`,
     position: {
       x: 0,
       y: 0,
       z: 2.5,
     },
-    icon: "/Three/icon/fsfx_icon.png",
+    icon: '/Three/icon/fsfx_icon.png',
     data: [
       {
-        name: "方向",
-        value: "东北风",
-        unit: "",
+        name: '方向',
+        value: '东北风',
+        unit: '',
       },
       {
-        name: "风速",
-        value: "1.3",
-        unit: "m/s",
+        name: '风速',
+        value: '1.3',
+        unit: 'm/s',
       },
     ],
     show: false,
   },
   {
-    name: "静力水准仪",
+    name: '静力水准仪',
     id: `YuanDian2`,
     position: {
       x: -46,
       y: 0,
       z: 2.5,
     },
-    icon: "/Three/icon/jlszy_icon.png",
+    icon: '/Three/icon/jlszy_icon.png',
     data: [
       {
-        name: "挠度变化值",
-        value: "-0.01",
-        unit: "mm",
+        name: '挠度变化值',
+        value: '-0.01',
+        unit: 'mm',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "静力水准仪",
+    name: '静力水准仪',
     id: `YuanDian3`,
     position: {
       x: -46,
       y: 0,
       z: -12.6,
     },
-    icon: "/Three/icon/jlszy_icon.png",
+    icon: '/Three/icon/jlszy_icon.png',
     data: [
       {
-        name: "挠度变化值",
-        value: "-0.01",
-        unit: "mm",
+        name: '挠度变化值',
+        value: '-0.01',
+        unit: 'mm',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "应变计",
+    name: '应变计',
     id: `YuanDian4`,
     position: {
       x: 0,
       y: 7.5,
       z: 0,
     },
-    icon: "/Three/icon/ybj_icon.png",
+    icon: '/Three/icon/ybj_icon.png',
     data: [
       {
-        name: "应变量",
-        value: "17",
-        unit: "με",
+        name: '应变量',
+        value: '17',
+        unit: 'με',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "应变计",
+    name: '应变计',
     id: `YuanDian5`,
     position: {
       x: 0,
       y: 7.5,
       z: -10,
     },
-    icon: "/Three/icon/ybj_icon.png",
+    icon: '/Three/icon/ybj_icon.png',
     data: [
       {
-        name: "应变量",
-        value: "17",
-        unit: "με",
+        name: '应变量',
+        value: '17',
+        unit: 'με',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "加速度计",
+    name: '加速度计',
     id: `YuanDian6`,
     position: {
       x: 0,
       y: 0,
       z: -5,
     },
-    icon: "/Three/icon/jsdj_icon.png",
+    icon: '/Three/icon/jsdj_icon.png',
     data: [
       {
-        name: "加速度",
-        value: "1.42",
-        unit: "mm/s2",
+        name: '加速度',
+        value: '1.42',
+        unit: 'mm/s²',
       },
       {
-        name: "风速",
-        value: "1.3",
-        unit: "m/s",
+        name: '风速',
+        value: '1.3',
+        unit: 'm/s',
       },
     ],
     show: false,
@@ -284,11 +270,11 @@
   const Gltfloader = new GLTFLoader();
   var dracoLoader = new DRACOLoader();
   // dracoLoader.setDecoderPath("https://zhzz.hongshan.gov.cn:8865/file/hongshan/Three_Gltf/"); //设置解压库文件路径
-  dracoLoader.setDecoderPath("/draco/"); //设置解压库文件路径
+  dracoLoader.setDecoderPath('/draco/'); //设置解压库文件路径
   Gltfloader.setDRACOLoader(dracoLoader);
   Gltfloader.load(
     url,
-    (gltf) => {
+    gltf => {
       gltf.scene.name = name;
       gltf.scene.scale.set(1, 1, 1);
       // gltf.scene.position.x = -70;
@@ -326,7 +312,7 @@
     y: position.y,
     z: position.z,
     duration: time,
-    ease: "power4.out",
+    ease: 'power4.out',
   });
   // gsap.to(Camera.value.lookAt, {
   //   x: lookAt.x,
@@ -340,7 +326,7 @@
     y: lookAt.y,
     z: lookAt.z,
     duration: time,
-    ease: "power4.out",
+    ease: 'power4.out',
   });
 };
 
@@ -349,8 +335,8 @@
  * 该函数负责创建和配置Three.js的WebGL渲染器，包括设置视口大小、抗锯齿、阴影、像素比、色调映射等
  */
 const initRenderer = () => {
-  width.value = document.getElementById("WangJiaPIng").clientWidth;
-  height.value = document.getElementById("WangJiaPIng").clientHeight;
+  width.value = document.getElementById('WangJiaPIng').clientWidth;
+  height.value = document.getElementById('WangJiaPIng').clientHeight;
   Renderer.value = new THREE.WebGLRenderer({
     antialias: true,
     // alpha: true, //开启alpha
@@ -371,8 +357,8 @@
 const initLabelRenderer = () => {
   LabelRenderer.value = new CSS3DRenderer();
   LabelRenderer.value.setSize(width.value, height.value);
-  LabelRenderer.value.domElement.style.position = "absolute";
-  LabelRenderer.value.domElement.style.top = "0px";
+  LabelRenderer.value.domElement.style.position = 'absolute';
+  LabelRenderer.value.domElement.style.top = '0px';
   threeDom.value.appendChild(LabelRenderer.value.domElement);
   // LabelRenderer.value.domElement.addEventListener("click", meshOnClick);
 };
@@ -382,12 +368,7 @@
  * 创建一个透视摄像机，并设置其位置
  */
 const initCamera = () => {
-  Camera.value = new THREE.PerspectiveCamera(
-    45,
-    window.innerWidth / window.innerHeight,
-    1,
-    4000
-  );
+  Camera.value = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 4000);
   Camera.value.position.set(500, 500, 500);
 };
 
@@ -453,7 +434,7 @@
 const initSky = () => {
   var pmremGenerator = new THREE.PMREMGenerator(Renderer.value); // 使用hdr作为背景色
   pmremGenerator.compileEquirectangularShader();
-  new RGBELoader().load("/Gltf/Skey_1K.hdr", function (texture) {
+  new RGBELoader().load('/Gltf/Skey_1K.hdr', function (texture) {
     const envMap = pmremGenerator.fromEquirectangular(texture).texture;
     envMap.isPmremTexture = true;
     Scene.environment = envMap;
@@ -478,8 +459,8 @@
   LabelRenderer.value.render(Scene, Camera.value);
   const delta = clock.getDelta();
   // 如需调试请打开这个获取Camera,Controls 的值
-  // console.log(Camera.value);
-  // console.log(Controls.value);
+  console.log('Camera.value', Camera.value);
+  console.log('Controls.value', Controls.value);
 };
 
 // 创建气泡窗
@@ -488,7 +469,7 @@
     let labelCSS3D = Scene.getObjectByName(`YuanDian${index + 1}`);
     if (labelCSS3D === undefined) {
       let lableDiv = document.getElementById(`YuanDian${index + 1}`);
-      lableDiv.style.display = "block";
+      lableDiv.style.display = 'block';
       labelCSS3D = new CSS3DObject(lableDiv);
       labelCSS3D.position.set(item.position.x, item.position.y, item.position.z);
       labelCSS3D.scale.set(0.1, 0.1, 0.1);
@@ -515,16 +496,16 @@
     }
   });
 }
-const flyTo = (data) => {
+const flyTo = data => {
   // 静立水准仪
-  if (data.name[0] == "静力水准仪") {
+  if (data.name[0] == '静力水准仪') {
     // 摄像机位置
     gsap.to(Camera.value.position, {
       x: -69.16984920750228,
       y: 9.22906292776404,
       z: 14.97197297303164,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
     // 视角
     gsap.to(Controls.value.target, {
@@ -532,16 +513,16 @@
       y: -1.2146002003091534,
       z: -14.382184358955339,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
-  } else if (data.name[0] == "应变计") {
+  } else if (data.name[0] == '应变计') {
     // 摄像机位置
     gsap.to(Camera.value.position, {
       x: -18.741902596516276,
       y: 11.41010130909887,
       z: 8.418282711965766,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
     // 视角
     gsap.to(Controls.value.target, {
@@ -549,12 +530,27 @@
       y: 7.3984913282701665,
       z: -5.438067100513153,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
+    });
+  } else if (data.name[0] == '加速度计') {
+    gsap.to(Camera.value.position, {
+      x: -17.287720948075602,
+      y: 8.016773260004873,
+      z: 11.57619028778769,
+      duration: 3,
+      ease: 'power4.out',
+    });
+    gsap.to(Controls.value.target, {
+      x: 4.538970140099083,
+      y: 2.881636781852132,
+      z: -8.354337289076433,
+      duration: 3,
+      ease: 'power4.out',
     });
   }
 
   // 打开弹窗
-  labelData.value.forEach((element) => {
+  labelData.value.forEach(element => {
     if (element.name == data.name[0]) {
       element.show = true;
     } else {
@@ -571,16 +567,16 @@
 onBeforeMount(() => {
   //   initGltfFloor();
   // initModal('ChangJing', '/Gltf/ChuWangCheng.gltf');
-  initModal("daqiao", "/Gltf/daqiao.gltf");
+  initModal('daqiao', '/Gltf/daqiao.gltf');
   // 共同弹窗触发事件
-  bus.on("WJP_BIM_flyTo", (params) => {
+  bus.on('WJP_BIM_flyTo', params => {
     // 打开弹窗
     flyTo(params);
   });
 });
 onMounted(() => {
   nextTick(() => {
-    if (document.readyState === "complete") {
+    if (document.readyState === 'complete') {
       createLable();
       // createWaterLevel();
     }
@@ -600,17 +596,17 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("WJP_BIM_flyTo");
+  bus.off('WJP_BIM_flyTo');
   // window.removeEventListener("click", BIMClick);
 
   // document.removeEventListener('click', meshOnClick);
   // window.removeEventListener("resize", onWindowResize, false);
 
-  Scene.traverse((e) => {
+  Scene.traverse(e => {
     if (e.BufferGeometry) e.BufferGeometry.dispose();
     if (e.material) {
       if (Array.isArray(e.material)) {
-        e.material.forEach((m) => {
+        e.material.forEach(m => {
           m.dispose();
         });
       } else {
@@ -664,11 +660,7 @@
       bottom: 8px;
       width: 45px;
       // height: 26px;
-      background: linear-gradient(
-        0deg,
-        rgba(12, 54, 92, 0.6) 0%,
-        rgba(12, 54, 92, 0.6) 100%
-      );
+      background: linear-gradient(0deg, rgba(12, 54, 92, 0.6) 0%, rgba(12, 54, 92, 0.6) 100%);
       border-radius: 2px;
       border: 1px solid #04d8ff;
       .ydData {
@@ -698,11 +690,7 @@
       pointer-events: none;
       font-size: 3px;
       text-align: center;
-      background: linear-gradient(
-        90deg,
-        rgba(4, 216, 255, 0.8) 0%,
-        rgba(4, 216, 255, 0.2) 100%
-      );
+      background: linear-gradient(90deg, rgba(4, 216, 255, 0.8) 0%, rgba(4, 216, 255, 0.2) 100%);
     }
 
     .YuanDianIcon {
diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue
index 4e0c0af..be22909 100644
--- a/src/views/oneMap/components/ZHRQ.vue
+++ b/src/views/oneMap/components/ZHRQ.vue
@@ -96,19 +96,19 @@
           <div class="JCListBox" v-for="item in AllData.JCData">
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">风险区域:</span>
-              <span class="JCListBox_List_value">{{ item.qy }}</span>
+              <span class="JCListBox_List_value">{{ item.wranLocation }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">风险特征:</span>
-              <span class="JCListBox_List_value">{{ item.tz }}</span>
+              <span class="JCListBox_List_value">{{ item.riskProfile }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">历史事件:</span>
-              <span class="JCListBox_List_value">{{ item.sj }}</span>
+              <span class="JCListBox_List_value">{{ item.warnFrequency }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">问题研判:</span>
-              <span class="JCListBox_List_value color_red">{{ item.yp }}</span>
+              <span class="JCListBox_List_value color_red">{{ item.assessment }}</span>
             </div>
             <div class="JCListBox_List JCListBox_List_BTN">
               <el-button style="background: #03b6a0; color: white; border: none" size="small" @click="GongDanPaiFa(item)"
@@ -229,7 +229,14 @@
 import no_rq_QiTa from '@/assets/no_rq_QiTa.json';
 import yanAnRQoverindex from '@/assets/yanAnRQoverindex.json';
 import yanAnWarring from '@/assets/yanAnWarring.json';
+
+// 辅助决策
+import { commonWarningList } from '@/api/RQWarning';
+
 const { proxy } = getCurrentInstance();
+const { module_type } = proxy.useDict('module_type');
+console.log('🚀 ~ module_type:', module_type);
+
 const AllData = reactive({
   xunChaStatic: null,
   showTipsData: {},
@@ -404,6 +411,8 @@
   timer: null,
 });
 
+const { JCData } = toRefs(AllData);
+
 // 预警统计echarts实例
 const myChart = shallowRef(null);
 // 管道风险评估echarts实例
@@ -740,9 +749,9 @@
 const GongDanPaiFa = item => {
   console.log(item);
   let data = {
-    title: item.qy,
+    title: item.wranLocation,
     comIDs: ['gdpf'],
-    getSiteId: item.value,
+    getSiteId: item.id,
   };
   bus.emit('publicDialog', data);
 };
@@ -980,6 +989,18 @@
     zoom: 13,
   });
 };
+
+// 辅助决策
+const getCommonWarningList = async () => {
+  try {
+    const res = await commonWarningList({ moduleType: 'Gas' });
+    JCData.value = res.data;
+    // console.log('🚀 ~ getCommonWarningList ~ res:', res);
+  } catch (error) {
+    console.log('🚀 ~ getCommonWarningList ~ error:', error);
+  }
+};
+
 onMounted(() => {
   let initeRQTimer = setInterval(() => {
     if (!newfiberMapbox) return;
@@ -1015,6 +1036,7 @@
   }, 100);
   initEcharts(1);
   initEcharts2();
+  getCommonWarningList();
 });
 onBeforeUnmount(() => {
   bus.emit('setLayerVisible', { layername: 'rq_all', isCheck: false });

diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js
index 32f2dc0..e263923 100644
--- a/src/api/RQWarning.js
+++ b/src/api/RQWarning.js
@@ -43,3 +43,39 @@
     data: data,
   });
 }
+
+
+// /commonWarning/list
+export function commonWarningList(query) {
+  return request({
+    url: "/business/commonWarning/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// /commonWarning/{id}
+export function commonWarningGet(id) {
+  return request({
+    url: `/business/commonWarning/${id}`,
+    method: "get",
+  });
+}
+
+// /alarmWorkOrder/add
+export function alarmWorkOrderAdd(data) {
+  return request({
+    url: "/business/alarmWorkOrder/add",
+    method: "POST",
+    data: data,
+  });
+}
+
+// /alarmWorkOrder/list
+export function alarmWorkOrderList(query) {
+  return request({
+    url: "/business/alarmWorkOrder/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js
new file mode 100644
index 0000000..7b6d12f
--- /dev/null
+++ b/src/api/system/tanchuang.js
@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// /callRecords/list
+export function callRecordsList(query) {
+  return request({
+    url: "/business/callRecords/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index b9fd757..5f48c79 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -1,23 +1,23 @@
 <template>
   <div id="GongDanPaiFa">
-    <el-form :model="AllData.form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
+    <el-form :model="form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
       <el-form-item label="工单类型：" class="cell2">
-        <el-input v-model="AllData.form.GDType" />
+        <el-input v-model="form.moduleTypeName" />
       </el-form-item>
       <el-form-item label="警情时间：" class="cell2">
-        <el-input v-model="AllData.form.JQTimer" />
+        <el-input v-model="form.requestFeedbackTime" />
       </el-form-item>
       <el-form-item label="风险位置：" class="cell1">
-        <el-input v-model="AllData.form.FXWZ" />
+        <el-input v-model="form.eventAddress" />
       </el-form-item>
       <el-form-item label="辅助研判：" class="cell1">
-        <el-input v-model="AllData.form.FZYP" />
+        <el-input v-model="form.eventDetails" />
       </el-form-item>
       <el-form-item label="要求反馈时间：" class="cell2">
-        <el-input v-model="AllData.form.FKSJ" />
+        <el-input v-model="form.requestFeedbackHour" />
       </el-form-item>
       <el-form-item label="要求完成时间：" class="cell2">
-        <el-input v-model="AllData.form.WCSJ" />
+        <el-input v-model="form.requiredCompletionTime" />
       </el-form-item>
     </el-form>
     <el-button color="#03B6A0" style="width: 110px; height: 34px" @click="CloseDialog()">派发工单</el-button>
@@ -27,6 +27,10 @@
 <script setup name="GongDanPaiFa">
 import { ref, reactive, toRefs, onMounted } from 'vue';
 import bus from '@/bus';
+
+// 辅助决策
+import { commonWarningGet, alarmWorkOrderAdd, alarmWorkOrderList } from '@/api/RQWarning';
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -35,47 +39,117 @@
 });
 import { unitVoiceTemplateCall } from '@/api/OutgoingCall/templateList';
 const { proxy } = getCurrentInstance();
+const { module_type } = proxy.useDict('module_type');
+const { order_type } = proxy.useDict('order_type');
+console.log('🚀 ~ module_type,order_type:', module_type, order_type);
 const AllData = reactive({
   form: {
-    GDType: '预警工单',
-    JQTimer: '2024-09-26  17:26',
-    FXWZ: '宝塔区凤凰山街道二道街',
-    FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
-    FKSJ: '2小时内',
-    WCSJ: '2024-09-30',
+    // GDType: '预警工单',
+    // JQTimer: '2024-09-26 17:26:00',
+    // FXWZ: '宝塔区凤凰山街道二道街',
+    // FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
+    // FKSJ: '2小时内',
+    // WCSJ: '2024-09-30',
   },
 });
+const { form } = toRefs(AllData);
 // 关闭弹窗
 const CloseDialog = () => {
-  unitVoiceTemplateCall({
-    robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
-    phones: '13129919657,13638648812,13332926003',
-    templateDesc: {
-      title: '延安城市生命线通知',
-      notice: `在${AllData.form.FXWZ}出现了${AllData.form.FZYP},请于${AllData.form.FKSJ}进行确认与反馈`,
-    },
-  }).then(response => {
-    proxy.$modal.msgSuccess('派发成功');
-    bus.emit('publicDialog_Close');
-  });
+  alarmWorkOrderAdd(form.value)
+    .then(res => {
+      // console.log('🚀 ~ CloseDialog ~ res:', res);
+      unitVoiceTemplateCall({
+        robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+        phones: '13129919657,13638648812,13332926003',
+        templateDesc: {
+          title: '延安城市生命线通知',
+          // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+          notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+        },
+      }).then(response => {
+        proxy.$modal.msgSuccess('派发成功');
+        bus.emit('publicDialog_Close');
+      });
+    })
+    .catch(err => {
+      console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
+    });
+
+  // unitVoiceTemplateCall({
+  //   robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+  //   phones: '13129919657,13638648812,13332926003',
+  //   templateDesc: {
+  //     title: '延安城市生命线通知',
+  //     // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+  //     notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+  //   },
+  // }).then(response => {
+  //   proxy.$modal.msgSuccess('派发成功');
+  //   bus.emit('publicDialog_Close');
+  // });
 };
+
+// 工单信息
+const getWarningData = async () => {
+  try {
+    const res = await commonWarningGet(props.dataID);
+
+    form.value.requestFeedbackTime = res.data.warnTime;
+    form.value.warnId = res.data.id;
+    form.value.eventAddress = res.data.wranLocation;
+    form.value.eventDetails = res.data.riskProfile + ',' + res.data.assessment;
+    form.value.orderType = 'early_warning';
+    form.value.moduleTypeName = module_type.value.find(item => item.value == res.data.moduleType)?.label;
+    form.value.moduleType = res.data.moduleType;
+    form.value.requestFeedbackHour = '2';
+    form.value.requiredCompletionTime = getCalculatedTime(form.value.warnTime, '2小时');
+    console.log('🚀 ~ getWarningData ~ res:', res);
+  } catch (error) {
+    console.log('🚀 ~ getWarningData ~ error:', error);
+  }
+};
+// 定义一个方法来计算新的时间
+const getCalculatedTime = (v1, v2) => {
+  const time = proxy.moment(v1);
+  const durationParts = v2.match(/(\d+)\s*(小时|分钟|秒)/);
+  // console.log("🚀 ~ getCalculatedTime ~ durationParts:", durationParts)
+  if (durationParts) {
+    const value = parseInt(durationParts[1], 10);
+    const unit = durationParts[2];
+    // console.log(value, unit);
+
+    switch (unit) {
+      case '小时':
+        return time.add(value, 'hours').format('YYYY-MM-DD HH:mm:ss');
+      case '分钟':
+        return time.add(value, 'minutes').format('YYYY-MM-DD HH:mm:ss');
+      case '秒':
+        return time.add(value, 'seconds').format('YYYY-MM-DD HH:mm:ss');
+      default:
+        return time.format('YYYY-MM-DD HH:mm:ss');
+    }
+  }
+  return time.format('YYYY-MM-DD HH:mm:ss');
+};
+
 onMounted(() => {
   console.log(123123123, props.dataID);
+  getWarningData();
   if (props.dataID == '001') {
-    AllData.form.FZYP = '压力监测异常波动,可能是设施故障';
+    form.value.FZYP = '压力监测异常波动,可能是设施故障';
   } else if (props.dataID == '002') {
-    AllData.form.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
+    form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
   } else if (props.dataID == '003') {
-    AllData.form.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
+    form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
   } else if (props.dataID == '004') {
-    AllData.form.FXWZ = '东大街管网';
-    AllData.form.FZYP = '高水位，水深250mm';
+    form.value.FXWZ = '东大街管网';
+    form.value.FZYP = '高水位，水深250mm';
   } else if (props.dataID == '005') {
-    AllData.form.FXWZ = '枣园南路与枣园五路管网';
-    AllData.form.FZYP = '满管，水深400mm';
+    form.value.FXWZ = '枣园南路与枣园五路管网';
+    form.value.FZYP = '满管，水深400mm';
   } else if (props.dataID == '006') {
-    AllData.form.FXWZ = '王家坪旧址门口';
-    AllData.form.FZYP = '积水，水深120mm';
+    form.value.FXWZ = '王家坪旧址门口';
+    form.value.FZYP = '积水，水深120mm';
   }
 });
 </script>
diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index 9847df8..4eb717f 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -1,51 +1,37 @@
 <template>
   <div id="WangJiaPIng" ref="threeDom">
-    <div
-      class="YuanDian"
-      v-for="(item, i) in labelData"
-      :key="item.id"
-      :id="item.id"
-      style="display: none"
-    >
+    <div class="YuanDian" v-for="(item, i) in labelData" :key="item.id" :id="item.id" style="display: none">
       <div class="iconBox" v-show="item.show">
         <img src="@/assets/images/ljx.png" alt="" class="iconImg" />
         <div class="ydBox">
           <div class="YuanDianText">{{ item.name }}</div>
           <div class="ydData" v-for="(val, k) in item.data" :key="k">
-            <div class="leftData">{{ val.name + ":" }}</div>
-            <div class="rightData">{{ val.value + " " + val.unit }}</div>
+            <div class="leftData">{{ val.name + ':' }}</div>
+            <div class="rightData">{{ val.value + ' ' + val.unit }}</div>
           </div>
         </div>
       </div>
-      <img
-        class="YuanDianIcon"
-        :src="item.icon"
-        @mouseenter="item.show = true"
-        @mouseleave="item.show = false"
-      />
+      <img class="YuanDianIcon" :src="item.icon" @mouseenter="item.show = true" @mouseleave="item.show = false" />
     </div>
   </div>
 </template>
 
 <script setup name="WangJiaPIng">
-import { ref, reactive, toRefs, onMounted } from "vue";
-import * as THREE from "three";
-import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js"; //控制器
-import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js"; // gltf加载器
-import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
-import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
-import { Water } from "three/examples/jsm/objects/Water.js";
+import { ref, reactive, toRefs, onMounted } from 'vue';
+import * as THREE from 'three';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; //控制器
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'; // gltf加载器
+import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
+import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
+import { Water } from 'three/examples/jsm/objects/Water.js';
 
-import {
-  CSS3DRenderer,
-  CSS3DObject,
-} from "three/examples/jsm/renderers/CSS3DRenderer.js";
-import gsap from "gsap";
-import { CSSRulePlugin } from "gsap/CSSRulePlugin";
-import bus from "@/bus";
+import { CSS3DRenderer, CSS3DObject } from 'three/examples/jsm/renderers/CSS3DRenderer.js';
+import gsap from 'gsap';
+import { CSSRulePlugin } from 'gsap/CSSRulePlugin';
+import bus from '@/bus';
 const AllData = reactive({});
 
-const show = ref("");
+const show = ref('');
 const width = ref(null);
 const height = ref(null);
 const Camera = ref(null);
@@ -57,139 +43,139 @@
 let Twater = null;
 const labelData = ref([
   {
-    name: "风速风向仪",
+    name: '风速风向仪',
     id: `YuanDian1`,
     position: {
       x: 0,
       y: 0,
       z: 2.5,
     },
-    icon: "/Three/icon/fsfx_icon.png",
+    icon: '/Three/icon/fsfx_icon.png',
     data: [
       {
-        name: "方向",
-        value: "东北风",
-        unit: "",
+        name: '方向',
+        value: '东北风',
+        unit: '',
       },
       {
-        name: "风速",
-        value: "1.3",
-        unit: "m/s",
+        name: '风速',
+        value: '1.3',
+        unit: 'm/s',
       },
     ],
     show: false,
   },
   {
-    name: "静力水准仪",
+    name: '静力水准仪',
     id: `YuanDian2`,
     position: {
       x: -46,
       y: 0,
       z: 2.5,
     },
-    icon: "/Three/icon/jlszy_icon.png",
+    icon: '/Three/icon/jlszy_icon.png',
     data: [
       {
-        name: "挠度变化值",
-        value: "-0.01",
-        unit: "mm",
+        name: '挠度变化值',
+        value: '-0.01',
+        unit: 'mm',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "静力水准仪",
+    name: '静力水准仪',
     id: `YuanDian3`,
     position: {
       x: -46,
       y: 0,
       z: -12.6,
     },
-    icon: "/Three/icon/jlszy_icon.png",
+    icon: '/Three/icon/jlszy_icon.png',
     data: [
       {
-        name: "挠度变化值",
-        value: "-0.01",
-        unit: "mm",
+        name: '挠度变化值',
+        value: '-0.01',
+        unit: 'mm',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "应变计",
+    name: '应变计',
     id: `YuanDian4`,
     position: {
       x: 0,
       y: 7.5,
       z: 0,
     },
-    icon: "/Three/icon/ybj_icon.png",
+    icon: '/Three/icon/ybj_icon.png',
     data: [
       {
-        name: "应变量",
-        value: "17",
-        unit: "με",
+        name: '应变量',
+        value: '17',
+        unit: 'με',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "应变计",
+    name: '应变计',
     id: `YuanDian5`,
     position: {
       x: 0,
       y: 7.5,
       z: -10,
     },
-    icon: "/Three/icon/ybj_icon.png",
+    icon: '/Three/icon/ybj_icon.png',
     data: [
       {
-        name: "应变量",
-        value: "17",
-        unit: "με",
+        name: '应变量',
+        value: '17',
+        unit: 'με',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "加速度计",
+    name: '加速度计',
     id: `YuanDian6`,
     position: {
       x: 0,
       y: 0,
       z: -5,
     },
-    icon: "/Three/icon/jsdj_icon.png",
+    icon: '/Three/icon/jsdj_icon.png',
     data: [
       {
-        name: "加速度",
-        value: "1.42",
-        unit: "mm/s2",
+        name: '加速度',
+        value: '1.42',
+        unit: 'mm/s²',
       },
       {
-        name: "风速",
-        value: "1.3",
-        unit: "m/s",
+        name: '风速',
+        value: '1.3',
+        unit: 'm/s',
       },
     ],
     show: false,
@@ -284,11 +270,11 @@
   const Gltfloader = new GLTFLoader();
   var dracoLoader = new DRACOLoader();
   // dracoLoader.setDecoderPath("https://zhzz.hongshan.gov.cn:8865/file/hongshan/Three_Gltf/"); //设置解压库文件路径
-  dracoLoader.setDecoderPath("/draco/"); //设置解压库文件路径
+  dracoLoader.setDecoderPath('/draco/'); //设置解压库文件路径
   Gltfloader.setDRACOLoader(dracoLoader);
   Gltfloader.load(
     url,
-    (gltf) => {
+    gltf => {
       gltf.scene.name = name;
       gltf.scene.scale.set(1, 1, 1);
       // gltf.scene.position.x = -70;
@@ -326,7 +312,7 @@
     y: position.y,
     z: position.z,
     duration: time,
-    ease: "power4.out",
+    ease: 'power4.out',
   });
   // gsap.to(Camera.value.lookAt, {
   //   x: lookAt.x,
@@ -340,7 +326,7 @@
     y: lookAt.y,
     z: lookAt.z,
     duration: time,
-    ease: "power4.out",
+    ease: 'power4.out',
   });
 };
 
@@ -349,8 +335,8 @@
  * 该函数负责创建和配置Three.js的WebGL渲染器，包括设置视口大小、抗锯齿、阴影、像素比、色调映射等
  */
 const initRenderer = () => {
-  width.value = document.getElementById("WangJiaPIng").clientWidth;
-  height.value = document.getElementById("WangJiaPIng").clientHeight;
+  width.value = document.getElementById('WangJiaPIng').clientWidth;
+  height.value = document.getElementById('WangJiaPIng').clientHeight;
   Renderer.value = new THREE.WebGLRenderer({
     antialias: true,
     // alpha: true, //开启alpha
@@ -371,8 +357,8 @@
 const initLabelRenderer = () => {
   LabelRenderer.value = new CSS3DRenderer();
   LabelRenderer.value.setSize(width.value, height.value);
-  LabelRenderer.value.domElement.style.position = "absolute";
-  LabelRenderer.value.domElement.style.top = "0px";
+  LabelRenderer.value.domElement.style.position = 'absolute';
+  LabelRenderer.value.domElement.style.top = '0px';
   threeDom.value.appendChild(LabelRenderer.value.domElement);
   // LabelRenderer.value.domElement.addEventListener("click", meshOnClick);
 };
@@ -382,12 +368,7 @@
  * 创建一个透视摄像机，并设置其位置
  */
 const initCamera = () => {
-  Camera.value = new THREE.PerspectiveCamera(
-    45,
-    window.innerWidth / window.innerHeight,
-    1,
-    4000
-  );
+  Camera.value = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 4000);
   Camera.value.position.set(500, 500, 500);
 };
 
@@ -453,7 +434,7 @@
 const initSky = () => {
   var pmremGenerator = new THREE.PMREMGenerator(Renderer.value); // 使用hdr作为背景色
   pmremGenerator.compileEquirectangularShader();
-  new RGBELoader().load("/Gltf/Skey_1K.hdr", function (texture) {
+  new RGBELoader().load('/Gltf/Skey_1K.hdr', function (texture) {
     const envMap = pmremGenerator.fromEquirectangular(texture).texture;
     envMap.isPmremTexture = true;
     Scene.environment = envMap;
@@ -478,8 +459,8 @@
   LabelRenderer.value.render(Scene, Camera.value);
   const delta = clock.getDelta();
   // 如需调试请打开这个获取Camera,Controls 的值
-  // console.log(Camera.value);
-  // console.log(Controls.value);
+  console.log('Camera.value', Camera.value);
+  console.log('Controls.value', Controls.value);
 };
 
 // 创建气泡窗
@@ -488,7 +469,7 @@
     let labelCSS3D = Scene.getObjectByName(`YuanDian${index + 1}`);
     if (labelCSS3D === undefined) {
       let lableDiv = document.getElementById(`YuanDian${index + 1}`);
-      lableDiv.style.display = "block";
+      lableDiv.style.display = 'block';
       labelCSS3D = new CSS3DObject(lableDiv);
       labelCSS3D.position.set(item.position.x, item.position.y, item.position.z);
       labelCSS3D.scale.set(0.1, 0.1, 0.1);
@@ -515,16 +496,16 @@
     }
   });
 }
-const flyTo = (data) => {
+const flyTo = data => {
   // 静立水准仪
-  if (data.name[0] == "静力水准仪") {
+  if (data.name[0] == '静力水准仪') {
     // 摄像机位置
     gsap.to(Camera.value.position, {
       x: -69.16984920750228,
       y: 9.22906292776404,
       z: 14.97197297303164,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
     // 视角
     gsap.to(Controls.value.target, {
@@ -532,16 +513,16 @@
       y: -1.2146002003091534,
       z: -14.382184358955339,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
-  } else if (data.name[0] == "应变计") {
+  } else if (data.name[0] == '应变计') {
     // 摄像机位置
     gsap.to(Camera.value.position, {
       x: -18.741902596516276,
       y: 11.41010130909887,
       z: 8.418282711965766,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
     // 视角
     gsap.to(Controls.value.target, {
@@ -549,12 +530,27 @@
       y: 7.3984913282701665,
       z: -5.438067100513153,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
+    });
+  } else if (data.name[0] == '加速度计') {
+    gsap.to(Camera.value.position, {
+      x: -17.287720948075602,
+      y: 8.016773260004873,
+      z: 11.57619028778769,
+      duration: 3,
+      ease: 'power4.out',
+    });
+    gsap.to(Controls.value.target, {
+      x: 4.538970140099083,
+      y: 2.881636781852132,
+      z: -8.354337289076433,
+      duration: 3,
+      ease: 'power4.out',
     });
   }
 
   // 打开弹窗
-  labelData.value.forEach((element) => {
+  labelData.value.forEach(element => {
     if (element.name == data.name[0]) {
       element.show = true;
     } else {
@@ -571,16 +567,16 @@
 onBeforeMount(() => {
   //   initGltfFloor();
   // initModal('ChangJing', '/Gltf/ChuWangCheng.gltf');
-  initModal("daqiao", "/Gltf/daqiao.gltf");
+  initModal('daqiao', '/Gltf/daqiao.gltf');
   // 共同弹窗触发事件
-  bus.on("WJP_BIM_flyTo", (params) => {
+  bus.on('WJP_BIM_flyTo', params => {
     // 打开弹窗
     flyTo(params);
   });
 });
 onMounted(() => {
   nextTick(() => {
-    if (document.readyState === "complete") {
+    if (document.readyState === 'complete') {
       createLable();
       // createWaterLevel();
     }
@@ -600,17 +596,17 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("WJP_BIM_flyTo");
+  bus.off('WJP_BIM_flyTo');
   // window.removeEventListener("click", BIMClick);
 
   // document.removeEventListener('click', meshOnClick);
   // window.removeEventListener("resize", onWindowResize, false);
 
-  Scene.traverse((e) => {
+  Scene.traverse(e => {
     if (e.BufferGeometry) e.BufferGeometry.dispose();
     if (e.material) {
       if (Array.isArray(e.material)) {
-        e.material.forEach((m) => {
+        e.material.forEach(m => {
           m.dispose();
         });
       } else {
@@ -664,11 +660,7 @@
       bottom: 8px;
       width: 45px;
       // height: 26px;
-      background: linear-gradient(
-        0deg,
-        rgba(12, 54, 92, 0.6) 0%,
-        rgba(12, 54, 92, 0.6) 100%
-      );
+      background: linear-gradient(0deg, rgba(12, 54, 92, 0.6) 0%, rgba(12, 54, 92, 0.6) 100%);
       border-radius: 2px;
       border: 1px solid #04d8ff;
       .ydData {
@@ -698,11 +690,7 @@
       pointer-events: none;
       font-size: 3px;
       text-align: center;
-      background: linear-gradient(
-        90deg,
-        rgba(4, 216, 255, 0.8) 0%,
-        rgba(4, 216, 255, 0.2) 100%
-      );
+      background: linear-gradient(90deg, rgba(4, 216, 255, 0.8) 0%, rgba(4, 216, 255, 0.2) 100%);
     }
 
     .YuanDianIcon {
diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue
index 4e0c0af..be22909 100644
--- a/src/views/oneMap/components/ZHRQ.vue
+++ b/src/views/oneMap/components/ZHRQ.vue
@@ -96,19 +96,19 @@
           <div class="JCListBox" v-for="item in AllData.JCData">
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">风险区域:</span>
-              <span class="JCListBox_List_value">{{ item.qy }}</span>
+              <span class="JCListBox_List_value">{{ item.wranLocation }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">风险特征:</span>
-              <span class="JCListBox_List_value">{{ item.tz }}</span>
+              <span class="JCListBox_List_value">{{ item.riskProfile }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">历史事件:</span>
-              <span class="JCListBox_List_value">{{ item.sj }}</span>
+              <span class="JCListBox_List_value">{{ item.warnFrequency }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">问题研判:</span>
-              <span class="JCListBox_List_value color_red">{{ item.yp }}</span>
+              <span class="JCListBox_List_value color_red">{{ item.assessment }}</span>
             </div>
             <div class="JCListBox_List JCListBox_List_BTN">
               <el-button style="background: #03b6a0; color: white; border: none" size="small" @click="GongDanPaiFa(item)"
@@ -229,7 +229,14 @@
 import no_rq_QiTa from '@/assets/no_rq_QiTa.json';
 import yanAnRQoverindex from '@/assets/yanAnRQoverindex.json';
 import yanAnWarring from '@/assets/yanAnWarring.json';
+
+// 辅助决策
+import { commonWarningList } from '@/api/RQWarning';
+
 const { proxy } = getCurrentInstance();
+const { module_type } = proxy.useDict('module_type');
+console.log('🚀 ~ module_type:', module_type);
+
 const AllData = reactive({
   xunChaStatic: null,
   showTipsData: {},
@@ -404,6 +411,8 @@
   timer: null,
 });
 
+const { JCData } = toRefs(AllData);
+
 // 预警统计echarts实例
 const myChart = shallowRef(null);
 // 管道风险评估echarts实例
@@ -740,9 +749,9 @@
 const GongDanPaiFa = item => {
   console.log(item);
   let data = {
-    title: item.qy,
+    title: item.wranLocation,
     comIDs: ['gdpf'],
-    getSiteId: item.value,
+    getSiteId: item.id,
   };
   bus.emit('publicDialog', data);
 };
@@ -980,6 +989,18 @@
     zoom: 13,
   });
 };
+
+// 辅助决策
+const getCommonWarningList = async () => {
+  try {
+    const res = await commonWarningList({ moduleType: 'Gas' });
+    JCData.value = res.data;
+    // console.log('🚀 ~ getCommonWarningList ~ res:', res);
+  } catch (error) {
+    console.log('🚀 ~ getCommonWarningList ~ error:', error);
+  }
+};
+
 onMounted(() => {
   let initeRQTimer = setInterval(() => {
     if (!newfiberMapbox) return;
@@ -1015,6 +1036,7 @@
   }, 100);
   initEcharts(1);
   initEcharts2();
+  getCommonWarningList();
 });
 onBeforeUnmount(() => {
   bus.emit('setLayerVisible', { layername: 'rq_all', isCheck: false });
diff --git a/src/views/oneMap/components/dynamicInformation.vue b/src/views/oneMap/components/dynamicInformation.vue
index 5476bbf..10d85a7 100644
--- a/src/views/oneMap/components/dynamicInformation.vue
+++ b/src/views/oneMap/components/dynamicInformation.vue
@@ -27,15 +27,19 @@
         </el-col>
       </el-row>
       <!-- 表格内容 -->
-      <Vue3SeamlessScroll :list="tableBodyData" :singleHeight="34" :hover="true" class="TopTableBody">
+      <Vue3SeamlessScroll :list="tableBodyData" :singleHeight="34" :hover="true" class="TopTableBody" v-loading="loading">
         <el-row class="TopTableBody_list" v-for="(item, k) in tableBodyData" :key="k">
           <template v-for="(info, j) in tableHeader.codeList" :key="info">
             <!-- 中心动态 特殊展示 operate -->
             <el-col :span="tableHeader.span[j]" v-if="info == 'operate'">
               <div class="bodySpan">
-                <el-button class="bodyBtn" link>发布</el-button>
+                <!-- <el-button class="bodyBtn" link>发布</el-button>
                 <el-button class="bodyBtn" link>解除</el-button>
-                <el-button class="bodyBtn" link>下载</el-button>
+                <el-button class="bodyBtn" link>下载</el-button> -->
+                <el-button link type="primary" @click="rowUpdate(item, 1)" v-if="item.auditStatus == 0">发布</el-button>
+                <el-button link type="primary" @click="rowUpdate(item, 2)">解除</el-button>
+                <!-- <el-button link type="primary" @click="rowUpdate(scope.row, 3)" v-if="scope.row.releaseStatus == 3">回顾</el-button> -->
+                <el-button link type="primary" @click="rowDown(item)">下载</el-button>
               </div>
             </el-col>
             <!-- 现场动态 特殊展示-->
@@ -50,17 +54,19 @@
                 />
               </div>
             </el-col>
-            <el-col :span="tableHeader.span[j]" v-if="info == 'zt'">
-              <div class="bodySpan">
-                {{ item[info] == 0 ? '未处理' : '已处理' }}
-              </div>
-            </el-col>
-            <!-- 通用展示 -->
-            <el-col :span="tableHeader.span[j]" v-else>
+            <!-- eventDetails -->
+            <el-col :span="tableHeader.span[j]" v-if="info == 'eventDetails'">
               <el-tooltip effect="dark" :content="item[info]" placement="top">
                 <div class="bodySpan">{{ item[info] }}</div>
               </el-tooltip>
             </el-col>
+            <!-- 通用展示 -->
+            <el-col :span="tableHeader.span[j]" v-else>
+              <div class="bodySpan">{{ item[info] }}</div>
+              <!-- <el-tooltip effect="dark" :content="item[info]" placement="top">
+                <div class="bodySpan">{{ item[info] }}</div>
+              </el-tooltip> -->
+            </el-col>
           </template>
         </el-row>
       </Vue3SeamlessScroll>
@@ -80,10 +86,20 @@
 import dddt_icon from '@/assets/images/tanchuang/dddt_icon.png';
 import zxdt_icon from '@/assets/images/tanchuang/zxdt_icon.png';
 import xcdt_icon from '@/assets/images/tanchuang/xcdt_icon.png';
+import { callRecordsList } from '@/api/system/tanchuang';
+import {
+  warningLevelResposeList,
+  personnelPage,
+  warningReleaseDatailAdd,
+  warningReleaseDatailPage,
+  warningReleaseDatailEditfb,
+} from '@/api/RQWarning.js';
+import { alarmWorkOrderList } from '@/api/RQWarning';
 
 const infoIndex = ref(0);
 const showInfo = ref(false); // 改变 dynamicInformation 宽度
 const showPanel = ref(true); //面板展开收起  改变定位left
+const loading = ref(false);
 // 面板内容展开收起控制
 const props = defineProps({
   showPanel: {
@@ -188,7 +204,7 @@
   },
 ];
 
-const allData = [TopTableData, TopTableData1, TopTableData2];
+const allData = [[], TopTableData1, []];
 
 const AllData = reactive({
   // 当前动态 表头数据
@@ -197,17 +213,17 @@
   tableHeaderData: [
     {
       titleList: ['序号', '应急响应名称', '启动时间', '结束时间', '状态', '审核方式', '应急响应操作'], //表头
-      codeList: ['xh', 'name', 'startTime', 'endTime', 'zt', 'type', 'operate'], //表头对应字段
+      codeList: ['xh', 'responseName', 'warnStartTime', 'warnEndTime', 'auditStatusName', 'auditMethod', 'operate'], //表头对应字段
       span: [1, 5, 5, 5, 2, 2, 4], //表头布局间隔
     },
     {
       titleList: ['时间', '事件明细', '地点', '状态', '责任单位', '督办'],
-      codeList: ['sj', 'mx', 'dd', 'zt', 'dw', 'duban'],
+      codeList: ['createTime', 'eventDetails', 'eventAddress', 'statusValue', 'dw', 'duban'],
       span: [5, 5, 5, 2, 4, 3],
     },
     {
       titleList: ['方式', '发起人', '接收人', '调度开始时间', '调度结束时间'],
-      codeList: ['type', 'initiator', 'recipient', 'startTime', 'endTime'],
+      codeList: ['typeDynamic', 'initiator', 'recipient', 'startTime', 'endTime'],
       span: [4, 5, 5, 5, 5],
     },
   ],
@@ -248,13 +264,103 @@
 const changeDT = index => {
   infoIndex.value = index;
   tableHeader.value = tableHeaderData.value[index];
-  tableBodyData.value = allData[index];
+  tableBodyData.value = [];
+  if (index == 0) {
+    getCenterDynamic();
+  } else if (index == 1) {
+    getNowDynamic();
+  } else if (index == 2) {
+    getCallDynamic();
+  }
 };
+// 调度动态
+const getCallDynamic = async () => {
+  // loading.value = true;
+  try {
+    const res = await callRecordsList();
+    tableBodyData.value = res.data.slice(0, 10).map(item => {
+      return {
+        typeDynamic: item.type == 1 ? '语音调度' : '视频调度',
+        ...item,
+      };
+    });
+    loading.value = false;
+    // console.log('🚀 ~ getCallDynamic ~ res:', res);
+  } catch (error) {
+    loading.value = false;
+    console.log('🚀 ~ getCallDynamic ~ error:', error);
+  }
+};
+
+// 中心调度
+const getCenterDynamic = async () => {
+  try {
+    const res = await warningReleaseDatailPage({
+      pageNum: 1,
+      pageSize: 20,
+    });
+    tableBodyData.value = res.data.map((item, index) => {
+      return {
+        xh: index,
+        auditStatusName: item.auditStatus == '0' ? '已审核' : item.auditStatus == '1' ? '发布' : '解除',
+        ...item,
+      };
+    });
+  } catch (error) {
+    console.log('🚀 ~ getCenterDynamic ~ error:', error);
+  }
+};
+// 现场动态
+const getNowDynamic = async () => {
+  try {
+    const res = await alarmWorkOrderList();
+    console.log('🚀 ~ getNowDynamic ~ res:', res);
+    tableBodyData.value = res.data.map((item, index) => {
+      return {
+        dw: '延安市燃气总公司',
+        // xh: index,
+        // auditStatusName: item.auditStatus == '0' ? '已审核' : item.auditStatus == '1' ? '发布' : '解除',
+        statusValue: item.status == '0' ? '未处理' : '已处理',
+        ...item,
+      };
+    });
+  } catch (error) {
+    console.log('🚀 ~ getCenterDynamic ~ error:', error);
+  }
+};
+
+// 发布
+function rowUpdate(data, num) {
+  // if (num == 1) {
+  //   let formData = new FormData();
+  //   formData.append('id', data.id);
+  //   formData.append('auditStatus', '1');
+  //   warningReleaseDatailEditfb(formData).then(res => {
+  //     proxy.$modal.msgSuccess('发布成功');
+  //     bus.emit('Rq_head', data);
+  //     bus.emit('publicDialog_Close');
+  //   });
+  // }
+  // if (num == 2) {
+  //   let formData = new FormData();
+  //   formData.append('id', data.id);
+  //   formData.append('auditStatus', '2');
+  //   warningReleaseDatailEditfb(formData).then(res => {
+  //     proxy.$modal.msgSuccess('解除成功');
+  //     bus.emit('Rq_head', false);
+  //     bus.emit('publicDialog_Close');
+  //   });
+  // }
+}
+
+// 下载
+function rowDown(data) {}
 
 onMounted(() => {
   // console.log(tableHeaderList.value);
   tableHeader.value = tableHeaderData.value[infoIndex.value];
-  tableBodyData.value = allData[infoIndex.value];
+  // tableBodyData.value = allData[infoIndex.value];
+  changeDT(infoIndex.value);
 });
 </script>
 
@@ -365,6 +471,9 @@
       // display: flex;
       // flex-direction: column;
       // flex-wrap: nowrap;
+      .el-loading-mask {
+        background-color: rgba(0, 43, 67, 0.8);
+      }
 
       .TopTableBody_list {
         // display: inline-block;
@@ -375,14 +484,15 @@
           background: linear-gradient(0deg, #008599 0%, #08596d 100%);
         }
         .bodySpan {
-          display: flex;
-          justify-content: center;
-          align-items: center;
+          // display: flex;
+          // justify-content: center;
+          // align-items: center;
           text-align: center;
           font-weight: 400;
           font-size: 14px;
           color: #ffffff;
           height: 34px;
+          width: 100%;
           line-height: 34px;
           box-sizing: border-box;
           cursor: default;
@@ -408,7 +518,6 @@
         }
       }
     }
-
   }
 
   .infoIcon {

diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js
index 32f2dc0..e263923 100644
--- a/src/api/RQWarning.js
+++ b/src/api/RQWarning.js
@@ -43,3 +43,39 @@
     data: data,
   });
 }
+
+
+// /commonWarning/list
+export function commonWarningList(query) {
+  return request({
+    url: "/business/commonWarning/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// /commonWarning/{id}
+export function commonWarningGet(id) {
+  return request({
+    url: `/business/commonWarning/${id}`,
+    method: "get",
+  });
+}
+
+// /alarmWorkOrder/add
+export function alarmWorkOrderAdd(data) {
+  return request({
+    url: "/business/alarmWorkOrder/add",
+    method: "POST",
+    data: data,
+  });
+}
+
+// /alarmWorkOrder/list
+export function alarmWorkOrderList(query) {
+  return request({
+    url: "/business/alarmWorkOrder/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/system/tanchuang.js b/src/api/system/tanchuang.js
new file mode 100644
index 0000000..7b6d12f
--- /dev/null
+++ b/src/api/system/tanchuang.js
@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+// /callRecords/list
+export function callRecordsList(query) {
+  return request({
+    url: "/business/callRecords/list",
+    method: "get",
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index b9fd757..5f48c79 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -1,23 +1,23 @@
 <template>
   <div id="GongDanPaiFa">
-    <el-form :model="AllData.form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
+    <el-form :model="form" label-width="auto" style="max-width: 100%; padding: 0 40px 0 0px" class="GongDanPaiForm">
       <el-form-item label="工单类型：" class="cell2">
-        <el-input v-model="AllData.form.GDType" />
+        <el-input v-model="form.moduleTypeName" />
       </el-form-item>
       <el-form-item label="警情时间：" class="cell2">
-        <el-input v-model="AllData.form.JQTimer" />
+        <el-input v-model="form.requestFeedbackTime" />
       </el-form-item>
       <el-form-item label="风险位置：" class="cell1">
-        <el-input v-model="AllData.form.FXWZ" />
+        <el-input v-model="form.eventAddress" />
       </el-form-item>
       <el-form-item label="辅助研判：" class="cell1">
-        <el-input v-model="AllData.form.FZYP" />
+        <el-input v-model="form.eventDetails" />
       </el-form-item>
       <el-form-item label="要求反馈时间：" class="cell2">
-        <el-input v-model="AllData.form.FKSJ" />
+        <el-input v-model="form.requestFeedbackHour" />
       </el-form-item>
       <el-form-item label="要求完成时间：" class="cell2">
-        <el-input v-model="AllData.form.WCSJ" />
+        <el-input v-model="form.requiredCompletionTime" />
       </el-form-item>
     </el-form>
     <el-button color="#03B6A0" style="width: 110px; height: 34px" @click="CloseDialog()">派发工单</el-button>
@@ -27,6 +27,10 @@
 <script setup name="GongDanPaiFa">
 import { ref, reactive, toRefs, onMounted } from 'vue';
 import bus from '@/bus';
+
+// 辅助决策
+import { commonWarningGet, alarmWorkOrderAdd, alarmWorkOrderList } from '@/api/RQWarning';
+
 const props = defineProps({
   // 数据id
   dataID: {
@@ -35,47 +39,117 @@
 });
 import { unitVoiceTemplateCall } from '@/api/OutgoingCall/templateList';
 const { proxy } = getCurrentInstance();
+const { module_type } = proxy.useDict('module_type');
+const { order_type } = proxy.useDict('order_type');
+console.log('🚀 ~ module_type,order_type:', module_type, order_type);
 const AllData = reactive({
   form: {
-    GDType: '预警工单',
-    JQTimer: '2024-09-26  17:26',
-    FXWZ: '宝塔区凤凰山街道二道街',
-    FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
-    FKSJ: '2小时内',
-    WCSJ: '2024-09-30',
+    // GDType: '预警工单',
+    // JQTimer: '2024-09-26 17:26:00',
+    // FXWZ: '宝塔区凤凰山街道二道街',
+    // FZYP: '压力检测超标，并且该地点管网发生过管道泄漏事件',
+    // FKSJ: '2小时内',
+    // WCSJ: '2024-09-30',
   },
 });
+const { form } = toRefs(AllData);
 // 关闭弹窗
 const CloseDialog = () => {
-  unitVoiceTemplateCall({
-    robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
-    phones: '13129919657,13638648812,13332926003',
-    templateDesc: {
-      title: '延安城市生命线通知',
-      notice: `在${AllData.form.FXWZ}出现了${AllData.form.FZYP},请于${AllData.form.FKSJ}进行确认与反馈`,
-    },
-  }).then(response => {
-    proxy.$modal.msgSuccess('派发成功');
-    bus.emit('publicDialog_Close');
-  });
+  alarmWorkOrderAdd(form.value)
+    .then(res => {
+      // console.log('🚀 ~ CloseDialog ~ res:', res);
+      unitVoiceTemplateCall({
+        robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+        phones: '13129919657,13638648812,13332926003',
+        templateDesc: {
+          title: '延安城市生命线通知',
+          // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+          notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+        },
+      }).then(response => {
+        proxy.$modal.msgSuccess('派发成功');
+        bus.emit('publicDialog_Close');
+      });
+    })
+    .catch(err => {
+      console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
+    });
+
+  // unitVoiceTemplateCall({
+  //   robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+  //   phones: '13129919657,13638648812,13332926003',
+  //   templateDesc: {
+  //     title: '延安城市生命线通知',
+  //     // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+  //     notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`,
+  //   },
+  // }).then(response => {
+  //   proxy.$modal.msgSuccess('派发成功');
+  //   bus.emit('publicDialog_Close');
+  // });
 };
+
+// 工单信息
+const getWarningData = async () => {
+  try {
+    const res = await commonWarningGet(props.dataID);
+
+    form.value.requestFeedbackTime = res.data.warnTime;
+    form.value.warnId = res.data.id;
+    form.value.eventAddress = res.data.wranLocation;
+    form.value.eventDetails = res.data.riskProfile + ',' + res.data.assessment;
+    form.value.orderType = 'early_warning';
+    form.value.moduleTypeName = module_type.value.find(item => item.value == res.data.moduleType)?.label;
+    form.value.moduleType = res.data.moduleType;
+    form.value.requestFeedbackHour = '2';
+    form.value.requiredCompletionTime = getCalculatedTime(form.value.warnTime, '2小时');
+    console.log('🚀 ~ getWarningData ~ res:', res);
+  } catch (error) {
+    console.log('🚀 ~ getWarningData ~ error:', error);
+  }
+};
+// 定义一个方法来计算新的时间
+const getCalculatedTime = (v1, v2) => {
+  const time = proxy.moment(v1);
+  const durationParts = v2.match(/(\d+)\s*(小时|分钟|秒)/);
+  // console.log("🚀 ~ getCalculatedTime ~ durationParts:", durationParts)
+  if (durationParts) {
+    const value = parseInt(durationParts[1], 10);
+    const unit = durationParts[2];
+    // console.log(value, unit);
+
+    switch (unit) {
+      case '小时':
+        return time.add(value, 'hours').format('YYYY-MM-DD HH:mm:ss');
+      case '分钟':
+        return time.add(value, 'minutes').format('YYYY-MM-DD HH:mm:ss');
+      case '秒':
+        return time.add(value, 'seconds').format('YYYY-MM-DD HH:mm:ss');
+      default:
+        return time.format('YYYY-MM-DD HH:mm:ss');
+    }
+  }
+  return time.format('YYYY-MM-DD HH:mm:ss');
+};
+
 onMounted(() => {
   console.log(123123123, props.dataID);
+  getWarningData();
   if (props.dataID == '001') {
-    AllData.form.FZYP = '压力监测异常波动,可能是设施故障';
+    form.value.FZYP = '压力监测异常波动,可能是设施故障';
   } else if (props.dataID == '002') {
-    AllData.form.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
+    form.value.FZYP = '燃气管道压力过大,会存在燃气爆管风险';
   } else if (props.dataID == '003') {
-    AllData.form.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
+    form.value.FZYP = '高峰期流量持续降低,会存在燃气泄漏风险';
   } else if (props.dataID == '004') {
-    AllData.form.FXWZ = '东大街管网';
-    AllData.form.FZYP = '高水位，水深250mm';
+    form.value.FXWZ = '东大街管网';
+    form.value.FZYP = '高水位，水深250mm';
   } else if (props.dataID == '005') {
-    AllData.form.FXWZ = '枣园南路与枣园五路管网';
-    AllData.form.FZYP = '满管，水深400mm';
+    form.value.FXWZ = '枣园南路与枣园五路管网';
+    form.value.FZYP = '满管，水深400mm';
   } else if (props.dataID == '006') {
-    AllData.form.FXWZ = '王家坪旧址门口';
-    AllData.form.FZYP = '积水，水深120mm';
+    form.value.FXWZ = '王家坪旧址门口';
+    form.value.FZYP = '积水，水深120mm';
   }
 });
 </script>
diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index 9847df8..4eb717f 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -1,51 +1,37 @@
 <template>
   <div id="WangJiaPIng" ref="threeDom">
-    <div
-      class="YuanDian"
-      v-for="(item, i) in labelData"
-      :key="item.id"
-      :id="item.id"
-      style="display: none"
-    >
+    <div class="YuanDian" v-for="(item, i) in labelData" :key="item.id" :id="item.id" style="display: none">
       <div class="iconBox" v-show="item.show">
         <img src="@/assets/images/ljx.png" alt="" class="iconImg" />
         <div class="ydBox">
           <div class="YuanDianText">{{ item.name }}</div>
           <div class="ydData" v-for="(val, k) in item.data" :key="k">
-            <div class="leftData">{{ val.name + ":" }}</div>
-            <div class="rightData">{{ val.value + " " + val.unit }}</div>
+            <div class="leftData">{{ val.name + ':' }}</div>
+            <div class="rightData">{{ val.value + ' ' + val.unit }}</div>
           </div>
         </div>
       </div>
-      <img
-        class="YuanDianIcon"
-        :src="item.icon"
-        @mouseenter="item.show = true"
-        @mouseleave="item.show = false"
-      />
+      <img class="YuanDianIcon" :src="item.icon" @mouseenter="item.show = true" @mouseleave="item.show = false" />
     </div>
   </div>
 </template>
 
 <script setup name="WangJiaPIng">
-import { ref, reactive, toRefs, onMounted } from "vue";
-import * as THREE from "three";
-import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js"; //控制器
-import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js"; // gltf加载器
-import { RGBELoader } from "three/examples/jsm/loaders/RGBELoader";
-import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader";
-import { Water } from "three/examples/jsm/objects/Water.js";
+import { ref, reactive, toRefs, onMounted } from 'vue';
+import * as THREE from 'three';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js'; //控制器
+import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js'; // gltf加载器
+import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
+import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
+import { Water } from 'three/examples/jsm/objects/Water.js';
 
-import {
-  CSS3DRenderer,
-  CSS3DObject,
-} from "three/examples/jsm/renderers/CSS3DRenderer.js";
-import gsap from "gsap";
-import { CSSRulePlugin } from "gsap/CSSRulePlugin";
-import bus from "@/bus";
+import { CSS3DRenderer, CSS3DObject } from 'three/examples/jsm/renderers/CSS3DRenderer.js';
+import gsap from 'gsap';
+import { CSSRulePlugin } from 'gsap/CSSRulePlugin';
+import bus from '@/bus';
 const AllData = reactive({});
 
-const show = ref("");
+const show = ref('');
 const width = ref(null);
 const height = ref(null);
 const Camera = ref(null);
@@ -57,139 +43,139 @@
 let Twater = null;
 const labelData = ref([
   {
-    name: "风速风向仪",
+    name: '风速风向仪',
     id: `YuanDian1`,
     position: {
       x: 0,
       y: 0,
       z: 2.5,
     },
-    icon: "/Three/icon/fsfx_icon.png",
+    icon: '/Three/icon/fsfx_icon.png',
     data: [
       {
-        name: "方向",
-        value: "东北风",
-        unit: "",
+        name: '方向',
+        value: '东北风',
+        unit: '',
       },
       {
-        name: "风速",
-        value: "1.3",
-        unit: "m/s",
+        name: '风速',
+        value: '1.3',
+        unit: 'm/s',
       },
     ],
     show: false,
   },
   {
-    name: "静力水准仪",
+    name: '静力水准仪',
     id: `YuanDian2`,
     position: {
       x: -46,
       y: 0,
       z: 2.5,
     },
-    icon: "/Three/icon/jlszy_icon.png",
+    icon: '/Three/icon/jlszy_icon.png',
     data: [
       {
-        name: "挠度变化值",
-        value: "-0.01",
-        unit: "mm",
+        name: '挠度变化值',
+        value: '-0.01',
+        unit: 'mm',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "静力水准仪",
+    name: '静力水准仪',
     id: `YuanDian3`,
     position: {
       x: -46,
       y: 0,
       z: -12.6,
     },
-    icon: "/Three/icon/jlszy_icon.png",
+    icon: '/Three/icon/jlszy_icon.png',
     data: [
       {
-        name: "挠度变化值",
-        value: "-0.01",
-        unit: "mm",
+        name: '挠度变化值',
+        value: '-0.01',
+        unit: 'mm',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "应变计",
+    name: '应变计',
     id: `YuanDian4`,
     position: {
       x: 0,
       y: 7.5,
       z: 0,
     },
-    icon: "/Three/icon/ybj_icon.png",
+    icon: '/Three/icon/ybj_icon.png',
     data: [
       {
-        name: "应变量",
-        value: "17",
-        unit: "με",
+        name: '应变量',
+        value: '17',
+        unit: 'με',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "应变计",
+    name: '应变计',
     id: `YuanDian5`,
     position: {
       x: 0,
       y: 7.5,
       z: -10,
     },
-    icon: "/Three/icon/ybj_icon.png",
+    icon: '/Three/icon/ybj_icon.png',
     data: [
       {
-        name: "应变量",
-        value: "17",
-        unit: "με",
+        name: '应变量',
+        value: '17',
+        unit: 'με',
       },
       {
-        name: "温度",
-        value: "16.3",
-        unit: "℃",
+        name: '温度',
+        value: '16.3',
+        unit: '℃',
       },
     ],
     show: false,
   },
   {
-    name: "加速度计",
+    name: '加速度计',
     id: `YuanDian6`,
     position: {
       x: 0,
       y: 0,
       z: -5,
     },
-    icon: "/Three/icon/jsdj_icon.png",
+    icon: '/Three/icon/jsdj_icon.png',
     data: [
       {
-        name: "加速度",
-        value: "1.42",
-        unit: "mm/s2",
+        name: '加速度',
+        value: '1.42',
+        unit: 'mm/s²',
       },
       {
-        name: "风速",
-        value: "1.3",
-        unit: "m/s",
+        name: '风速',
+        value: '1.3',
+        unit: 'm/s',
       },
     ],
     show: false,
@@ -284,11 +270,11 @@
   const Gltfloader = new GLTFLoader();
   var dracoLoader = new DRACOLoader();
   // dracoLoader.setDecoderPath("https://zhzz.hongshan.gov.cn:8865/file/hongshan/Three_Gltf/"); //设置解压库文件路径
-  dracoLoader.setDecoderPath("/draco/"); //设置解压库文件路径
+  dracoLoader.setDecoderPath('/draco/'); //设置解压库文件路径
   Gltfloader.setDRACOLoader(dracoLoader);
   Gltfloader.load(
     url,
-    (gltf) => {
+    gltf => {
       gltf.scene.name = name;
       gltf.scene.scale.set(1, 1, 1);
       // gltf.scene.position.x = -70;
@@ -326,7 +312,7 @@
     y: position.y,
     z: position.z,
     duration: time,
-    ease: "power4.out",
+    ease: 'power4.out',
   });
   // gsap.to(Camera.value.lookAt, {
   //   x: lookAt.x,
@@ -340,7 +326,7 @@
     y: lookAt.y,
     z: lookAt.z,
     duration: time,
-    ease: "power4.out",
+    ease: 'power4.out',
   });
 };
 
@@ -349,8 +335,8 @@
  * 该函数负责创建和配置Three.js的WebGL渲染器，包括设置视口大小、抗锯齿、阴影、像素比、色调映射等
  */
 const initRenderer = () => {
-  width.value = document.getElementById("WangJiaPIng").clientWidth;
-  height.value = document.getElementById("WangJiaPIng").clientHeight;
+  width.value = document.getElementById('WangJiaPIng').clientWidth;
+  height.value = document.getElementById('WangJiaPIng').clientHeight;
   Renderer.value = new THREE.WebGLRenderer({
     antialias: true,
     // alpha: true, //开启alpha
@@ -371,8 +357,8 @@
 const initLabelRenderer = () => {
   LabelRenderer.value = new CSS3DRenderer();
   LabelRenderer.value.setSize(width.value, height.value);
-  LabelRenderer.value.domElement.style.position = "absolute";
-  LabelRenderer.value.domElement.style.top = "0px";
+  LabelRenderer.value.domElement.style.position = 'absolute';
+  LabelRenderer.value.domElement.style.top = '0px';
   threeDom.value.appendChild(LabelRenderer.value.domElement);
   // LabelRenderer.value.domElement.addEventListener("click", meshOnClick);
 };
@@ -382,12 +368,7 @@
  * 创建一个透视摄像机，并设置其位置
  */
 const initCamera = () => {
-  Camera.value = new THREE.PerspectiveCamera(
-    45,
-    window.innerWidth / window.innerHeight,
-    1,
-    4000
-  );
+  Camera.value = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 4000);
   Camera.value.position.set(500, 500, 500);
 };
 
@@ -453,7 +434,7 @@
 const initSky = () => {
   var pmremGenerator = new THREE.PMREMGenerator(Renderer.value); // 使用hdr作为背景色
   pmremGenerator.compileEquirectangularShader();
-  new RGBELoader().load("/Gltf/Skey_1K.hdr", function (texture) {
+  new RGBELoader().load('/Gltf/Skey_1K.hdr', function (texture) {
     const envMap = pmremGenerator.fromEquirectangular(texture).texture;
     envMap.isPmremTexture = true;
     Scene.environment = envMap;
@@ -478,8 +459,8 @@
   LabelRenderer.value.render(Scene, Camera.value);
   const delta = clock.getDelta();
   // 如需调试请打开这个获取Camera,Controls 的值
-  // console.log(Camera.value);
-  // console.log(Controls.value);
+  console.log('Camera.value', Camera.value);
+  console.log('Controls.value', Controls.value);
 };
 
 // 创建气泡窗
@@ -488,7 +469,7 @@
     let labelCSS3D = Scene.getObjectByName(`YuanDian${index + 1}`);
     if (labelCSS3D === undefined) {
       let lableDiv = document.getElementById(`YuanDian${index + 1}`);
-      lableDiv.style.display = "block";
+      lableDiv.style.display = 'block';
       labelCSS3D = new CSS3DObject(lableDiv);
       labelCSS3D.position.set(item.position.x, item.position.y, item.position.z);
       labelCSS3D.scale.set(0.1, 0.1, 0.1);
@@ -515,16 +496,16 @@
     }
   });
 }
-const flyTo = (data) => {
+const flyTo = data => {
   // 静立水准仪
-  if (data.name[0] == "静力水准仪") {
+  if (data.name[0] == '静力水准仪') {
     // 摄像机位置
     gsap.to(Camera.value.position, {
       x: -69.16984920750228,
       y: 9.22906292776404,
       z: 14.97197297303164,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
     // 视角
     gsap.to(Controls.value.target, {
@@ -532,16 +513,16 @@
       y: -1.2146002003091534,
       z: -14.382184358955339,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
-  } else if (data.name[0] == "应变计") {
+  } else if (data.name[0] == '应变计') {
     // 摄像机位置
     gsap.to(Camera.value.position, {
       x: -18.741902596516276,
       y: 11.41010130909887,
       z: 8.418282711965766,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
     });
     // 视角
     gsap.to(Controls.value.target, {
@@ -549,12 +530,27 @@
       y: 7.3984913282701665,
       z: -5.438067100513153,
       duration: 3,
-      ease: "power4.out",
+      ease: 'power4.out',
+    });
+  } else if (data.name[0] == '加速度计') {
+    gsap.to(Camera.value.position, {
+      x: -17.287720948075602,
+      y: 8.016773260004873,
+      z: 11.57619028778769,
+      duration: 3,
+      ease: 'power4.out',
+    });
+    gsap.to(Controls.value.target, {
+      x: 4.538970140099083,
+      y: 2.881636781852132,
+      z: -8.354337289076433,
+      duration: 3,
+      ease: 'power4.out',
     });
   }
 
   // 打开弹窗
-  labelData.value.forEach((element) => {
+  labelData.value.forEach(element => {
     if (element.name == data.name[0]) {
       element.show = true;
     } else {
@@ -571,16 +567,16 @@
 onBeforeMount(() => {
   //   initGltfFloor();
   // initModal('ChangJing', '/Gltf/ChuWangCheng.gltf');
-  initModal("daqiao", "/Gltf/daqiao.gltf");
+  initModal('daqiao', '/Gltf/daqiao.gltf');
   // 共同弹窗触发事件
-  bus.on("WJP_BIM_flyTo", (params) => {
+  bus.on('WJP_BIM_flyTo', params => {
     // 打开弹窗
     flyTo(params);
   });
 });
 onMounted(() => {
   nextTick(() => {
-    if (document.readyState === "complete") {
+    if (document.readyState === 'complete') {
       createLable();
       // createWaterLevel();
     }
@@ -600,17 +596,17 @@
 });
 
 onBeforeUnmount(() => {
-  bus.off("WJP_BIM_flyTo");
+  bus.off('WJP_BIM_flyTo');
   // window.removeEventListener("click", BIMClick);
 
   // document.removeEventListener('click', meshOnClick);
   // window.removeEventListener("resize", onWindowResize, false);
 
-  Scene.traverse((e) => {
+  Scene.traverse(e => {
     if (e.BufferGeometry) e.BufferGeometry.dispose();
     if (e.material) {
       if (Array.isArray(e.material)) {
-        e.material.forEach((m) => {
+        e.material.forEach(m => {
           m.dispose();
         });
       } else {
@@ -664,11 +660,7 @@
       bottom: 8px;
       width: 45px;
       // height: 26px;
-      background: linear-gradient(
-        0deg,
-        rgba(12, 54, 92, 0.6) 0%,
-        rgba(12, 54, 92, 0.6) 100%
-      );
+      background: linear-gradient(0deg, rgba(12, 54, 92, 0.6) 0%, rgba(12, 54, 92, 0.6) 100%);
       border-radius: 2px;
       border: 1px solid #04d8ff;
       .ydData {
@@ -698,11 +690,7 @@
       pointer-events: none;
       font-size: 3px;
       text-align: center;
-      background: linear-gradient(
-        90deg,
-        rgba(4, 216, 255, 0.8) 0%,
-        rgba(4, 216, 255, 0.2) 100%
-      );
+      background: linear-gradient(90deg, rgba(4, 216, 255, 0.8) 0%, rgba(4, 216, 255, 0.2) 100%);
     }
 
     .YuanDianIcon {
diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue
index 4e0c0af..be22909 100644
--- a/src/views/oneMap/components/ZHRQ.vue
+++ b/src/views/oneMap/components/ZHRQ.vue
@@ -96,19 +96,19 @@
           <div class="JCListBox" v-for="item in AllData.JCData">
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">风险区域:</span>
-              <span class="JCListBox_List_value">{{ item.qy }}</span>
+              <span class="JCListBox_List_value">{{ item.wranLocation }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">风险特征:</span>
-              <span class="JCListBox_List_value">{{ item.tz }}</span>
+              <span class="JCListBox_List_value">{{ item.riskProfile }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">历史事件:</span>
-              <span class="JCListBox_List_value">{{ item.sj }}</span>
+              <span class="JCListBox_List_value">{{ item.warnFrequency }}</span>
             </div>
             <div class="JCListBox_List">
               <span class="JCListBox_List_label">问题研判:</span>
-              <span class="JCListBox_List_value color_red">{{ item.yp }}</span>
+              <span class="JCListBox_List_value color_red">{{ item.assessment }}</span>
             </div>
             <div class="JCListBox_List JCListBox_List_BTN">
               <el-button style="background: #03b6a0; color: white; border: none" size="small" @click="GongDanPaiFa(item)"
@@ -229,7 +229,14 @@
 import no_rq_QiTa from '@/assets/no_rq_QiTa.json';
 import yanAnRQoverindex from '@/assets/yanAnRQoverindex.json';
 import yanAnWarring from '@/assets/yanAnWarring.json';
+
+// 辅助决策
+import { commonWarningList } from '@/api/RQWarning';
+
 const { proxy } = getCurrentInstance();
+const { module_type } = proxy.useDict('module_type');
+console.log('🚀 ~ module_type:', module_type);
+
 const AllData = reactive({
   xunChaStatic: null,
   showTipsData: {},
@@ -404,6 +411,8 @@
   timer: null,
 });
 
+const { JCData } = toRefs(AllData);
+
 // 预警统计echarts实例
 const myChart = shallowRef(null);
 // 管道风险评估echarts实例
@@ -740,9 +749,9 @@
 const GongDanPaiFa = item => {
   console.log(item);
   let data = {
-    title: item.qy,
+    title: item.wranLocation,
     comIDs: ['gdpf'],
-    getSiteId: item.value,
+    getSiteId: item.id,
   };
   bus.emit('publicDialog', data);
 };
@@ -980,6 +989,18 @@
     zoom: 13,
   });
 };
+
+// 辅助决策
+const getCommonWarningList = async () => {
+  try {
+    const res = await commonWarningList({ moduleType: 'Gas' });
+    JCData.value = res.data;
+    // console.log('🚀 ~ getCommonWarningList ~ res:', res);
+  } catch (error) {
+    console.log('🚀 ~ getCommonWarningList ~ error:', error);
+  }
+};
+
 onMounted(() => {
   let initeRQTimer = setInterval(() => {
     if (!newfiberMapbox) return;
@@ -1015,6 +1036,7 @@
   }, 100);
   initEcharts(1);
   initEcharts2();
+  getCommonWarningList();
 });
 onBeforeUnmount(() => {
   bus.emit('setLayerVisible', { layername: 'rq_all', isCheck: false });
diff --git a/src/views/oneMap/components/dynamicInformation.vue b/src/views/oneMap/components/dynamicInformation.vue
index 5476bbf..10d85a7 100644
--- a/src/views/oneMap/components/dynamicInformation.vue
+++ b/src/views/oneMap/components/dynamicInformation.vue
@@ -27,15 +27,19 @@
         </el-col>
       </el-row>
       <!-- 表格内容 -->
-      <Vue3SeamlessScroll :list="tableBodyData" :singleHeight="34" :hover="true" class="TopTableBody">
+      <Vue3SeamlessScroll :list="tableBodyData" :singleHeight="34" :hover="true" class="TopTableBody" v-loading="loading">
         <el-row class="TopTableBody_list" v-for="(item, k) in tableBodyData" :key="k">
           <template v-for="(info, j) in tableHeader.codeList" :key="info">
             <!-- 中心动态 特殊展示 operate -->
             <el-col :span="tableHeader.span[j]" v-if="info == 'operate'">
               <div class="bodySpan">
-                <el-button class="bodyBtn" link>发布</el-button>
+                <!-- <el-button class="bodyBtn" link>发布</el-button>
                 <el-button class="bodyBtn" link>解除</el-button>
-                <el-button class="bodyBtn" link>下载</el-button>
+                <el-button class="bodyBtn" link>下载</el-button> -->
+                <el-button link type="primary" @click="rowUpdate(item, 1)" v-if="item.auditStatus == 0">发布</el-button>
+                <el-button link type="primary" @click="rowUpdate(item, 2)">解除</el-button>
+                <!-- <el-button link type="primary" @click="rowUpdate(scope.row, 3)" v-if="scope.row.releaseStatus == 3">回顾</el-button> -->
+                <el-button link type="primary" @click="rowDown(item)">下载</el-button>
               </div>
             </el-col>
             <!-- 现场动态 特殊展示-->
@@ -50,17 +54,19 @@
                 />
               </div>
             </el-col>
-            <el-col :span="tableHeader.span[j]" v-if="info == 'zt'">
-              <div class="bodySpan">
-                {{ item[info] == 0 ? '未处理' : '已处理' }}
-              </div>
-            </el-col>
-            <!-- 通用展示 -->
-            <el-col :span="tableHeader.span[j]" v-else>
+            <!-- eventDetails -->
+            <el-col :span="tableHeader.span[j]" v-if="info == 'eventDetails'">
               <el-tooltip effect="dark" :content="item[info]" placement="top">
                 <div class="bodySpan">{{ item[info] }}</div>
               </el-tooltip>
             </el-col>
+            <!-- 通用展示 -->
+            <el-col :span="tableHeader.span[j]" v-else>
+              <div class="bodySpan">{{ item[info] }}</div>
+              <!-- <el-tooltip effect="dark" :content="item[info]" placement="top">
+                <div class="bodySpan">{{ item[info] }}</div>
+              </el-tooltip> -->
+            </el-col>
           </template>
         </el-row>
       </Vue3SeamlessScroll>
@@ -80,10 +86,20 @@
 import dddt_icon from '@/assets/images/tanchuang/dddt_icon.png';
 import zxdt_icon from '@/assets/images/tanchuang/zxdt_icon.png';
 import xcdt_icon from '@/assets/images/tanchuang/xcdt_icon.png';
+import { callRecordsList } from '@/api/system/tanchuang';
+import {
+  warningLevelResposeList,
+  personnelPage,
+  warningReleaseDatailAdd,
+  warningReleaseDatailPage,
+  warningReleaseDatailEditfb,
+} from '@/api/RQWarning.js';
+import { alarmWorkOrderList } from '@/api/RQWarning';
 
 const infoIndex = ref(0);
 const showInfo = ref(false); // 改变 dynamicInformation 宽度
 const showPanel = ref(true); //面板展开收起  改变定位left
+const loading = ref(false);
 // 面板内容展开收起控制
 const props = defineProps({
   showPanel: {
@@ -188,7 +204,7 @@
   },
 ];
 
-const allData = [TopTableData, TopTableData1, TopTableData2];
+const allData = [[], TopTableData1, []];
 
 const AllData = reactive({
   // 当前动态 表头数据
@@ -197,17 +213,17 @@
   tableHeaderData: [
     {
       titleList: ['序号', '应急响应名称', '启动时间', '结束时间', '状态', '审核方式', '应急响应操作'], //表头
-      codeList: ['xh', 'name', 'startTime', 'endTime', 'zt', 'type', 'operate'], //表头对应字段
+      codeList: ['xh', 'responseName', 'warnStartTime', 'warnEndTime', 'auditStatusName', 'auditMethod', 'operate'], //表头对应字段
       span: [1, 5, 5, 5, 2, 2, 4], //表头布局间隔
     },
     {
       titleList: ['时间', '事件明细', '地点', '状态', '责任单位', '督办'],
-      codeList: ['sj', 'mx', 'dd', 'zt', 'dw', 'duban'],
+      codeList: ['createTime', 'eventDetails', 'eventAddress', 'statusValue', 'dw', 'duban'],
       span: [5, 5, 5, 2, 4, 3],
     },
     {
       titleList: ['方式', '发起人', '接收人', '调度开始时间', '调度结束时间'],
-      codeList: ['type', 'initiator', 'recipient', 'startTime', 'endTime'],
+      codeList: ['typeDynamic', 'initiator', 'recipient', 'startTime', 'endTime'],
       span: [4, 5, 5, 5, 5],
     },
   ],
@@ -248,13 +264,103 @@
 const changeDT = index => {
   infoIndex.value = index;
   tableHeader.value = tableHeaderData.value[index];
-  tableBodyData.value = allData[index];
+  tableBodyData.value = [];
+  if (index == 0) {
+    getCenterDynamic();
+  } else if (index == 1) {
+    getNowDynamic();
+  } else if (index == 2) {
+    getCallDynamic();
+  }
 };
+// 调度动态
+const getCallDynamic = async () => {
+  // loading.value = true;
+  try {
+    const res = await callRecordsList();
+    tableBodyData.value = res.data.slice(0, 10).map(item => {
+      return {
+        typeDynamic: item.type == 1 ? '语音调度' : '视频调度',
+        ...item,
+      };
+    });
+    loading.value = false;
+    // console.log('🚀 ~ getCallDynamic ~ res:', res);
+  } catch (error) {
+    loading.value = false;
+    console.log('🚀 ~ getCallDynamic ~ error:', error);
+  }
+};
+
+// 中心调度
+const getCenterDynamic = async () => {
+  try {
+    const res = await warningReleaseDatailPage({
+      pageNum: 1,
+      pageSize: 20,
+    });
+    tableBodyData.value = res.data.map((item, index) => {
+      return {
+        xh: index,
+        auditStatusName: item.auditStatus == '0' ? '已审核' : item.auditStatus == '1' ? '发布' : '解除',
+        ...item,
+      };
+    });
+  } catch (error) {
+    console.log('🚀 ~ getCenterDynamic ~ error:', error);
+  }
+};
+// 现场动态
+const getNowDynamic = async () => {
+  try {
+    const res = await alarmWorkOrderList();
+    console.log('🚀 ~ getNowDynamic ~ res:', res);
+    tableBodyData.value = res.data.map((item, index) => {
+      return {
+        dw: '延安市燃气总公司',
+        // xh: index,
+        // auditStatusName: item.auditStatus == '0' ? '已审核' : item.auditStatus == '1' ? '发布' : '解除',
+        statusValue: item.status == '0' ? '未处理' : '已处理',
+        ...item,
+      };
+    });
+  } catch (error) {
+    console.log('🚀 ~ getCenterDynamic ~ error:', error);
+  }
+};
+
+// 发布
+function rowUpdate(data, num) {
+  // if (num == 1) {
+  //   let formData = new FormData();
+  //   formData.append('id', data.id);
+  //   formData.append('auditStatus', '1');
+  //   warningReleaseDatailEditfb(formData).then(res => {
+  //     proxy.$modal.msgSuccess('发布成功');
+  //     bus.emit('Rq_head', data);
+  //     bus.emit('publicDialog_Close');
+  //   });
+  // }
+  // if (num == 2) {
+  //   let formData = new FormData();
+  //   formData.append('id', data.id);
+  //   formData.append('auditStatus', '2');
+  //   warningReleaseDatailEditfb(formData).then(res => {
+  //     proxy.$modal.msgSuccess('解除成功');
+  //     bus.emit('Rq_head', false);
+  //     bus.emit('publicDialog_Close');
+  //   });
+  // }
+}
+
+// 下载
+function rowDown(data) {}
 
 onMounted(() => {
   // console.log(tableHeaderList.value);
   tableHeader.value = tableHeaderData.value[infoIndex.value];
-  tableBodyData.value = allData[infoIndex.value];
+  // tableBodyData.value = allData[infoIndex.value];
+  changeDT(infoIndex.value);
 });
 </script>
 
@@ -365,6 +471,9 @@
       // display: flex;
       // flex-direction: column;
       // flex-wrap: nowrap;
+      .el-loading-mask {
+        background-color: rgba(0, 43, 67, 0.8);
+      }
 
       .TopTableBody_list {
         // display: inline-block;
@@ -375,14 +484,15 @@
           background: linear-gradient(0deg, #008599 0%, #08596d 100%);
         }
         .bodySpan {
-          display: flex;
-          justify-content: center;
-          align-items: center;
+          // display: flex;
+          // justify-content: center;
+          // align-items: center;
           text-align: center;
           font-weight: 400;
           font-size: 14px;
           color: #ffffff;
           height: 34px;
+          width: 100%;
           line-height: 34px;
           box-sizing: border-box;
           cursor: default;
@@ -408,7 +518,6 @@
         }
       }
     }
-
   }
 
   .infoIcon {
diff --git a/vite.config.js b/vite.config.js
index 56ed385..a32940f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,6 +7,7 @@
 const Timestamp = new Date().getTime(); //随机时间戳
 
 // const targetUrl = 'http://192.168.48.145:13000'; //张鸿志
+const zhz = 'http://192.168.20.5:13002'; //张鸿志
 // const targetUrl = 'http://192.168.16.105:13000'; //张亚辉
 const targetUrl = 'https://server2.wh-nf.cn:8088/prod-api'; //线上
 
@@ -73,6 +74,12 @@
           logLevel: 'debug',
           rewrite: p => p.replace(/^\/prod-api/, ''),
         },
+        // '/zhz': {
+        //   target: zhz, //测试服务
+        //   changeOrigin: true,
+        //   logLevel: 'debug',
+        //   rewrite: p => p.replace(/^\/zhz/, ''),
+        // },
         // 洪山服务
         '/hsApi': {
           target: 'http://42.193.13.68:8104', //测试服务