diff --git a/src/views/order/component/createDispatch.vue b/src/views/order/component/createDispatch.vue
index 6c98d1d..a57438b 100644
--- a/src/views/order/component/createDispatch.vue
+++ b/src/views/order/component/createDispatch.vue
@@ -866,6 +866,7 @@ export default {
           content: "",
           level: 1,
           kaiqishuliang: 0,
+          diaolingleixing: "",
           leibie: this.ability,
           situations: i.id_equip_situation_relations_equipment_id_relation
         })) || [];
@@ -906,6 +907,11 @@ export default {
         if (!item.start_time || !item.end_time) {
           verify = false;
         }
+        if (this.diaolingleixing.find(i => i.value === item.diaolingleixing)?.key === "船只过闸调令") {
+          if (item.start_time) {
+            verify = true
+          }
+        }
       });
       if (!verify) {
         this.$message({
@@ -938,6 +944,7 @@ export default {
               content: i.content,
               level: i.level,
               kaiqishuliang: i.kaiqishuliang,
+              diaolingleixing: i.diaolingleixing,
             }))
           ),
         }).then((_) => {
@@ -994,6 +1001,11 @@ export default {
         if (!item.start_time || !item.end_time || !item.level) {
           verify = false;
         }
+        if (this.diaolingleixing.find(i => i.value === item.diaolingleixing)?.key === "船只过闸调令") {
+          if (item.start_time) {
+            verify = true
+          }
+        }
       });
       if (!verify) {
         this.$message({
diff --git a/src/views/order/component/weather.vue b/src/views/order/component/weather.vue
index eb81713..0508ebd 100644
--- a/src/views/order/component/weather.vue
+++ b/src/views/order/component/weather.vue
@@ -3,25 +3,199 @@
     <el-row :gutter="20">
       <el-col :span="12">
         <el-card>
-          <template #header>
-            实时水位（米）
+          <template>
+            <el-descriptions
+              title="实时水位（米）"
+              :column="4"
+              direction="vertical"
+              :colon="false"
+              size="small"
+            >
+              <el-descriptions-item label="太湖（西山）">
+                {{ info.daily_water[0].taihu }}
+              </el-descriptions-item>
+              <el-descriptions-item label="湘城"> {{ info.daily_water[0].xiangcheng }} </el-descriptions-item>
+              <el-descriptions-item label="枫桥"> {{ info.daily_water[0].fengqiao }} </el-descriptions-item>
+              <el-descriptions-item label="苏州（二）">
+                {{ info.daily_water[0].suzhouer }}
+              </el-descriptions-item>
+              <el-descriptions-item label="汽车北站">
+                {{ info.daily_water[0].qichebeizhan }}
+              </el-descriptions-item>
+              <el-descriptions-item label="觅渡桥"> {{ info.daily_water[0].miduqiao }} </el-descriptions-item>
+              <el-descriptions-item label="石湖"> {{ info.daily_water[0].shihu }} </el-descriptions-item>
+              <el-descriptions-item label="小鲇鱼口（太湖侧）">
+                {{ info.daily_water[0].xiaonianyukou }}
+              </el-descriptions-item>
+            </el-descriptions>
           </template>
         </el-card>
-        <el-card style="margin-top: 10px;">
-          <template #header>
-            当日累计雨量（毫米）
+        <el-card style="margin-top: 10px">
+          <template>
+            <el-descriptions
+              title="当日累计雨量（毫米）"
+              :column="4"
+              direction="vertical"
+              :colon="false"
+              size="small"
+            >
+              <el-descriptions-item label="上塘河枢纽">
+                {{ info.yuliang[0].shangtangheshuniu }}
+              </el-descriptions-item>
+              <el-descriptions-item label="十字洋闸">
+                {{ info.yuliang[0].shiziyangzha }}
+              </el-descriptions-item>
+              <el-descriptions-item label="娄江枢纽">
+                {{ info.yuliang[0].loujiangshuniu }}
+              </el-descriptions-item>
+              <el-descriptions-item label="西郭桥泵站">
+                {{ info.yuliang[0].xiguoqiaobengzhan }}
+              </el-descriptions-item>
+              <el-descriptions-item label="大龙港枢纽">
+                {{ info.yuliang[0].dalonggangshuniu }}
+              </el-descriptions-item>
+              <el-descriptions-item label="邱家村泵站">
+                {{ info.yuliang[0].qiujiacunbengzhan }}
+              </el-descriptions-item>
+              <el-descriptions-item label="元和塘枢纽">
+                {{ info.yuliang[0].yuanhetangshuniu }}
+              </el-descriptions-item>
+            </el-descriptions>
           </template>
         </el-card>
       </el-col>
       <el-col :span="12">
         <el-card>
-          <template #header>
-            闸门开度/堰闸顶高（米）
+          <template>
+            <el-descriptions
+              title="闸门开度/堰闸顶高（米）"
+              :column="4"
+              direction="vertical"
+              :colon="false"
+              size="small"
+            >
+              <el-descriptions-item label="阊门堰"> {{ info.kaidu[0].changmenyan }} </el-descriptions-item>
+              <el-descriptions-item label="娄门堰"> {{ info.kaidu[0].loumenyan }} </el-descriptions-item>
+              <el-descriptions-item label="外塘河(东闸)">
+                {{ info.kaidu2[0].regulatorOpen1 }}
+              </el-descriptions-item>
+              <el-descriptions-item label="外塘河(西闸)">
+                {{ info.kaidu2[0].regulatorOpen2 }}
+              </el-descriptions-item>
+            </el-descriptions>
           </template>
         </el-card>
-        <el-card style="margin-top: 10px;">
-          <template #header>
-            机组实时状态
+        <el-card style="margin-top: 10px">
+          <template>
+            <div class="el-descriptions__header">
+              <div class="el-descriptions__title">机组实时状态</div>
+            </div>
+            <el-row :gutter="12">
+              <el-col :span="12">
+                <el-table stripe size="mini" :data="Object.entries(info.yunxingzhuangtai[0]).slice(0,5).map(([key,state]) => ({name:key,state}))" style="width: 100%">
+                  <el-table-column prop="name" label="站点名称">
+                  </el-table-column>
+                  <el-table-column prop="state" label="机组状态">
+                    <template #default="{ row }">
+                      <div style="display:flex;align-items: center;">
+                        <template v-for="i in row.state">
+                          <template v-if="i.state">
+                            <svg class="icon__state-1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+                              <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                                <g transform="translate(-987, -473)" fill="#00BE69" fill-rule="nonzero">
+                                  <g transform="translate(72, 149)">
+                                    <g transform="translate(717, 210)">
+                                      <g transform="translate(174, 80)">
+                                        <g transform="translate(0, 34)">
+                                          <g transform="translate(24, 0)">
+                                            <path d="M8.00000184,15.9999921 C6.23498645,16.0024741 4.51911443,15.418749 3.12175786,14.340447 C2.9518161,14.2188346 2.86179857,14.0141626 2.88701451,13.8067131 C2.91223046,13.5992637 3.0486588,13.422118 3.24278573,13.3447611 C3.43691266,13.2674042 3.65778158,13.3021719 3.81875699,13.4354267 C5.01641733,14.3596667 6.48720215,14.8597894 8.00000184,14.8572086 C9.53484365,14.8598401 11.0257689,14.3450325 12.2319966,13.3959258 C12.4136489,13.2527615 12.6637204,13.23332 12.8653156,13.3466892 C13.0669108,13.4600584 13.1802076,13.6838438 13.1522455,13.9134374 C13.1341378,14.064071 13.0568792,14.2013228 12.9374957,14.294946 C11.5333802,15.3993305 9.79888021,15.9998163 8.01250182,15.9999921 L8.00000184,15.9999921 Z M12.5652462,11.9998945 C12.5652462,11.3675143 13.0778795,10.8548688 13.7102448,10.8548688 C14.3426101,10.8548688 14.8552434,11.3675143 14.8552434,11.9998945 C14.8552434,12.6322747 14.3426101,13.1449202 13.7102448,13.1449202 C13.0778795,13.1449202 12.5652462,12.6322747 12.5652462,11.9998945 Z M1.1450103,11.9998945 C1.14495962,11.5907824 1.36318403,11.2127256 1.71746864,11.0081549 C2.07175325,10.8035843 2.50826452,10.8035843 2.86254914,11.0081549 C3.21683375,11.2127256 3.43505816,11.5907824 3.43500748,11.9998945 C3.43492912,12.6322193 2.92231874,13.1447783 2.29000889,13.1447783 C1.65769903,13.1447783 1.14508865,12.6322193 1.1450103,11.9998945 Z M4.36700633,11.6341363 C3.40002571,10.6723876 2.85815456,9.36363741 2.86223504,7.99980477 C2.85849986,6.63648066 3.4003488,5.32832429 4.36700633,4.36697329 C5.32838599,3.4001867 6.63659829,2.85823621 8.00000184,2.86192068 C9.36328266,2.85823691 10.6713874,3.40009012 11.6327473,4.36672329 C12.5995111,5.3281257 13.1414487,6.63636896 13.1377647,7.99980477 C13.141487,9.36319894 12.5996457,10.6714268 11.6329973,11.6328862 C10.6716177,12.5996728 9.36340538,13.1416233 8.00000184,13.1379394 C6.63658727,13.1416791 5.32835433,12.5997201 4.36700633,11.6328862 L4.36700633,11.6341363 L4.36700633,11.6341363 Z M7.42475255,5.78400506 L6.34150389,8.65481945 C6.32835523,8.69000944 6.33322227,8.72940337 6.3545401,8.76033489 C6.37585794,8.79126641 6.41093904,8.80983599 6.44850375,8.81007293 L7.28250272,8.81007293 C7.32055394,8.80979909 7.35623299,8.82852926 7.37761777,8.86000478 C7.39900255,8.89148031 7.40327316,8.93155069 7.38900259,8.96682646 L6.66650349,10.7773671 C6.64525631,10.8296466 6.6654543,10.8896042 6.71400343,10.9183702 C6.76230111,10.9475918 6.82471101,10.9370659 6.86075324,10.8936197 L9.38825012,7.89555242 C9.41693198,7.86143451 9.42331667,7.81381518 9.40463519,7.77334661 C9.38595371,7.73287803 9.34557079,7.70684902 9.30100022,7.70654818 L8.45725126,7.70654818 C8.41421368,7.70621999 8.37506419,7.68157694 8.35615635,7.64291293 C8.33724851,7.60424892 8.34183555,7.55821639 8.36800138,7.52404409 L9.58149989,5.89375753 C9.60781387,5.85903884 9.61198846,5.81234059 9.59224986,5.77350483 C9.57293365,5.73475597 9.53329538,5.71033279 9.48999999,5.71049972 L7.53175242,5.71049972 C7.48455609,5.71012391 7.44205046,5.73899258 7.42500255,5.78300506 L7.42475255,5.78400506 L7.42475255,5.78400506 Z M14.8764933,10.8736192 C14.7325706,10.8262051 14.6133962,10.7235261 14.545217,10.5881961 C14.4770377,10.4528661 14.4654457,10.2959846 14.5129938,10.152103 C14.7416433,9.45836637 14.8577789,8.73250194 14.8569934,8.00205482 C14.8568699,5.03284668 12.946762,2.4006855 10.1239992,1.47990855 C9.82385583,1.38240116 9.65955685,1.06006311 9.75699967,0.7598924 C9.85482102,0.460042455 10.1770535,0.296125201 10.4769988,0.393634179 C13.7699564,1.4666779 15.9989084,4.5363521 15.999996,7.99980477 C16.0008491,8.85221964 15.8653023,9.69928029 15.5984925,10.508861 C15.4995254,10.8086556 15.1763107,10.9714978 14.8764933,10.8726192 L14.8764933,10.8736192 L14.8764933,10.8736192 Z M0.38576124,10.46286 C0.12916235,9.66706782 -0.00100333917,8.83594487 5.82308065e-06,7.99980477 C5.82308065e-06,4.52630253 2.24071052,1.449416 5.54650486,0.383383951 C5.74081245,0.320861063 5.95371484,0.366751851 6.10501375,0.503769697 C6.25631267,0.640787543 6.32302221,0.848116177 6.28001354,1.04765691 C6.23700487,1.24719763 6.09081202,1.40863547 5.89650443,1.47115835 C3.06321092,2.38528348 1.14296273,5.02263215 1.1430103,7.99980477 C1.14226139,8.71612127 1.25386751,9.42812272 1.47375989,10.1098521 C1.53015545,10.2837243 1.49994277,10.4740853 1.39248345,10.6219504 C1.28502412,10.7698156 1.11329616,10.8573694 0.930510563,10.8573694 C0.68226899,10.8577 0.462176505,10.6978034 0.38576124,10.46161 L0.38576124,10.46286 L0.38576124,10.46286 Z M6.85500307,1.14565105 C6.85465806,0.513270831 7.36701157,0.000345538485 7.99937683,1.7414218e-07 C8.63174209,-0.000344841565 9.14465524,0.512020787 9.14500043,1.14440101 C9.14500043,1.77678123 8.6323671,2.28942669 8.00000184,2.28942669 C7.36763658,2.28942669 6.85500307,1.77678123 6.85500307,1.14440101 L6.85500307,1.14565105 L6.85500307,1.14565105 Z" id="形状"/>
+                                          </g>
+                                        </g>
+                                      </g>
+                                    </g>
+                                  </g>
+                                </g>
+                              </g>
+                            </svg>
+                          </template>
+                          <template v-else>
+                            <svg class="icon__state-2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+                              <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                                <g transform="translate(-963, -473)" fill="#FF931D" fill-rule="nonzero">
+                                  <g transform="translate(72, 149)">
+                                    <g transform="translate(717, 210)">
+                                      <g transform="translate(174, 80)">
+                                        <g transform="translate(0, 34)">
+                                          <g transform="translate(0, 0)">
+                                            <path d="M12.8653156,13.3466892 C13.0669108,13.4600584 13.1802076,13.6838438 13.1522455,13.9134374 C13.1341378,14.064071 13.0568792,14.2013228 12.9374957,14.294946 C11.5333802,15.3993305 9.79888021,15.9998163 8.01250182,15.9999921 L8.00000184,15.9999921 C6.23498645,16.0024741 4.51911443,15.418749 3.12175786,14.340447 C2.9518161,14.2188346 2.86179857,14.0141626 2.88701451,13.8067131 C2.91223046,13.5992637 3.0486588,13.422118 3.24278573,13.3447611 C3.43691266,13.2674042 3.65778158,13.3021719 3.81875699,13.4354267 C5.01641733,14.3596667 6.48720215,14.8597894 8.00000184,14.8572086 C9.53484365,14.8598401 11.0257689,14.3450325 12.2319966,13.3959258 C12.4136489,13.2527615 12.6637204,13.23332 12.8653156,13.3466892 Z M13.7102448,10.8548688 C14.3426101,10.8548688 14.8552434,11.3675143 14.8552434,11.9998945 C14.8552434,12.6322747 14.3426101,13.1449202 13.7102448,13.1449202 C13.0778795,13.1449202 12.5652462,12.6322747 12.5652462,11.9998945 C12.5652462,11.3675143 13.0778795,10.8548688 13.7102448,10.8548688 Z M2.86254914,11.0081549 C3.21683375,11.2127256 3.43505816,11.5907824 3.43500748,11.9998945 C3.43492912,12.6322193 2.92231874,13.1447783 2.29000889,13.1447783 C1.65769903,13.1447783 1.14508865,12.6322193 1.1450103,11.9998945 C1.14495962,11.5907824 1.36318403,11.2127256 1.71746864,11.0081549 C2.07175325,10.8035843 2.50826452,10.8035843 2.86254914,11.0081549 Z M8.00064407,2.86222222 C10.8332812,2.86222222 13.1377778,5.16800691 13.1377778,7.99935593 C13.1377778,10.8332812 10.8332812,13.1377778 8.00064407,13.1377778 C5.16800691,13.1377778 2.86351037,10.8332812 2.86222222,7.99935593 C2.86222222,5.16671876 5.16800691,2.86222222 8.00064407,2.86222222 Z M10.4769988,0.393634179 C13.7699564,1.4666779 15.9989084,4.5363521 15.999996,7.99980477 C16.0008491,8.85221964 15.8653023,9.69928029 15.5984925,10.508861 C15.4995254,10.8086556 15.1763107,10.9714978 14.8764933,10.8726192 C14.7325706,10.8262051 14.6133962,10.7235261 14.545217,10.5881961 C14.4770377,10.4528661 14.4654457,10.2959846 14.5129938,10.152103 C14.7416433,9.45836637 14.8577789,8.73250194 14.8569934,8.00205482 C14.8568699,5.03284668 12.946762,2.4006855 10.1239992,1.47990855 C9.82385583,1.38240116 9.65955685,1.06006311 9.75699967,0.7598924 C9.85482102,0.460042455 10.1770535,0.296125201 10.4769988,0.393634179 Z M6.10501375,0.503769697 C6.25631267,0.640787543 6.32302221,0.848116177 6.28001354,1.04765691 C6.23700487,1.24719763 6.09081202,1.40863547 5.89650443,1.47115835 C3.06321092,2.38528348 1.14296273,5.02263215 1.1430103,7.99980477 C1.14226139,8.71612127 1.25386751,9.42812272 1.47375989,10.1098521 C1.53015545,10.2837243 1.49994277,10.4740853 1.39248345,10.6219504 C1.28502412,10.7698156 1.11329616,10.8573694 0.930510563,10.8573694 C0.68226899,10.8577 0.462176505,10.6978034 0.38576124,10.46161 C0.12916235,9.66706782 -0.00100333917,8.83594487 5.82308065e-06,7.99980477 C5.82308065e-06,4.52630253 2.24071052,1.449416 5.54650486,0.383383951 C5.74081245,0.320861063 5.95371484,0.366751851 6.10501375,0.503769697 Z M6.78463249,5.54543423 C6.36598443,5.54543423 6.02720154,5.88421712 6.02720154,6.30286518 L6.02720154,9.70872815 C6.02720154,10.1273762 6.36598443,10.4661591 6.78463249,10.4661591 C7.20328054,10.4661591 7.54206343,10.1273762 7.54206343,9.70872815 L7.54206343,6.30286518 C7.54206343,5.88421712 7.20328054,5.54543423 6.78463249,5.54543423 Z M9.21536751,5.54543423 C8.79671946,5.54543423 8.45793657,5.88421712 8.45793657,6.30286518 L8.45793657,9.70872815 C8.45793657,10.1273762 8.79671946,10.4661591 9.21536751,10.4661591 C9.63401557,10.4661591 9.97279846,10.1273762 9.97279846,9.70872815 L9.97279846,6.30286518 C9.97279846,5.88421712 9.63401557,5.54543423 9.21536751,5.54543423 Z M7.99937683,1.7414218e-07 C8.63174209,-0.000344841565 9.14465524,0.512020787 9.14500043,1.14440101 C9.14500043,1.77678123 8.6323671,2.28942669 8.00000184,2.28942669 C7.40979426,2.28942669 6.92388635,1.84285554 6.86172177,1.26916417 L6.85500307,1.14565105 C6.85465806,0.513270831 7.36701157,0.000345538485 7.99937683,1.7414218e-07 Z" id="形状结合"/>
+                                          </g>
+                                        </g>
+                                      </g>
+                                    </g>
+                                  </g>
+                                </g>
+                              </g>
+                            </svg>
+                          </template>
+                        </template>
+                      </div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-col>
+              <el-col :span="12">
+                <el-table stripe size="mini" :data="Object.entries(info.yunxingzhuangtai[0]).slice(5).map(([key,state]) => ({name:key,state}))" style="width: 100%">
+                  <el-table-column prop="name" label="站点名称">
+                  </el-table-column>
+                  <el-table-column prop="state" label="机组状态">
+                    <template #default="{ row }">
+                      <div style="display:flex;align-items: center;">
+                        <template v-for="i in row.state">
+                          <template v-if="i.state">
+                            <svg class="icon__state-1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+                              <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                                <g transform="translate(-987, -473)" fill="#00BE69" fill-rule="nonzero">
+                                  <g transform="translate(72, 149)">
+                                    <g transform="translate(717, 210)">
+                                      <g transform="translate(174, 80)">
+                                        <g transform="translate(0, 34)">
+                                          <g transform="translate(24, 0)">
+                                            <path d="M8.00000184,15.9999921 C6.23498645,16.0024741 4.51911443,15.418749 3.12175786,14.340447 C2.9518161,14.2188346 2.86179857,14.0141626 2.88701451,13.8067131 C2.91223046,13.5992637 3.0486588,13.422118 3.24278573,13.3447611 C3.43691266,13.2674042 3.65778158,13.3021719 3.81875699,13.4354267 C5.01641733,14.3596667 6.48720215,14.8597894 8.00000184,14.8572086 C9.53484365,14.8598401 11.0257689,14.3450325 12.2319966,13.3959258 C12.4136489,13.2527615 12.6637204,13.23332 12.8653156,13.3466892 C13.0669108,13.4600584 13.1802076,13.6838438 13.1522455,13.9134374 C13.1341378,14.064071 13.0568792,14.2013228 12.9374957,14.294946 C11.5333802,15.3993305 9.79888021,15.9998163 8.01250182,15.9999921 L8.00000184,15.9999921 Z M12.5652462,11.9998945 C12.5652462,11.3675143 13.0778795,10.8548688 13.7102448,10.8548688 C14.3426101,10.8548688 14.8552434,11.3675143 14.8552434,11.9998945 C14.8552434,12.6322747 14.3426101,13.1449202 13.7102448,13.1449202 C13.0778795,13.1449202 12.5652462,12.6322747 12.5652462,11.9998945 Z M1.1450103,11.9998945 C1.14495962,11.5907824 1.36318403,11.2127256 1.71746864,11.0081549 C2.07175325,10.8035843 2.50826452,10.8035843 2.86254914,11.0081549 C3.21683375,11.2127256 3.43505816,11.5907824 3.43500748,11.9998945 C3.43492912,12.6322193 2.92231874,13.1447783 2.29000889,13.1447783 C1.65769903,13.1447783 1.14508865,12.6322193 1.1450103,11.9998945 Z M4.36700633,11.6341363 C3.40002571,10.6723876 2.85815456,9.36363741 2.86223504,7.99980477 C2.85849986,6.63648066 3.4003488,5.32832429 4.36700633,4.36697329 C5.32838599,3.4001867 6.63659829,2.85823621 8.00000184,2.86192068 C9.36328266,2.85823691 10.6713874,3.40009012 11.6327473,4.36672329 C12.5995111,5.3281257 13.1414487,6.63636896 13.1377647,7.99980477 C13.141487,9.36319894 12.5996457,10.6714268 11.6329973,11.6328862 C10.6716177,12.5996728 9.36340538,13.1416233 8.00000184,13.1379394 C6.63658727,13.1416791 5.32835433,12.5997201 4.36700633,11.6328862 L4.36700633,11.6341363 L4.36700633,11.6341363 Z M7.42475255,5.78400506 L6.34150389,8.65481945 C6.32835523,8.69000944 6.33322227,8.72940337 6.3545401,8.76033489 C6.37585794,8.79126641 6.41093904,8.80983599 6.44850375,8.81007293 L7.28250272,8.81007293 C7.32055394,8.80979909 7.35623299,8.82852926 7.37761777,8.86000478 C7.39900255,8.89148031 7.40327316,8.93155069 7.38900259,8.96682646 L6.66650349,10.7773671 C6.64525631,10.8296466 6.6654543,10.8896042 6.71400343,10.9183702 C6.76230111,10.9475918 6.82471101,10.9370659 6.86075324,10.8936197 L9.38825012,7.89555242 C9.41693198,7.86143451 9.42331667,7.81381518 9.40463519,7.77334661 C9.38595371,7.73287803 9.34557079,7.70684902 9.30100022,7.70654818 L8.45725126,7.70654818 C8.41421368,7.70621999 8.37506419,7.68157694 8.35615635,7.64291293 C8.33724851,7.60424892 8.34183555,7.55821639 8.36800138,7.52404409 L9.58149989,5.89375753 C9.60781387,5.85903884 9.61198846,5.81234059 9.59224986,5.77350483 C9.57293365,5.73475597 9.53329538,5.71033279 9.48999999,5.71049972 L7.53175242,5.71049972 C7.48455609,5.71012391 7.44205046,5.73899258 7.42500255,5.78300506 L7.42475255,5.78400506 L7.42475255,5.78400506 Z M14.8764933,10.8736192 C14.7325706,10.8262051 14.6133962,10.7235261 14.545217,10.5881961 C14.4770377,10.4528661 14.4654457,10.2959846 14.5129938,10.152103 C14.7416433,9.45836637 14.8577789,8.73250194 14.8569934,8.00205482 C14.8568699,5.03284668 12.946762,2.4006855 10.1239992,1.47990855 C9.82385583,1.38240116 9.65955685,1.06006311 9.75699967,0.7598924 C9.85482102,0.460042455 10.1770535,0.296125201 10.4769988,0.393634179 C13.7699564,1.4666779 15.9989084,4.5363521 15.999996,7.99980477 C16.0008491,8.85221964 15.8653023,9.69928029 15.5984925,10.508861 C15.4995254,10.8086556 15.1763107,10.9714978 14.8764933,10.8726192 L14.8764933,10.8736192 L14.8764933,10.8736192 Z M0.38576124,10.46286 C0.12916235,9.66706782 -0.00100333917,8.83594487 5.82308065e-06,7.99980477 C5.82308065e-06,4.52630253 2.24071052,1.449416 5.54650486,0.383383951 C5.74081245,0.320861063 5.95371484,0.366751851 6.10501375,0.503769697 C6.25631267,0.640787543 6.32302221,0.848116177 6.28001354,1.04765691 C6.23700487,1.24719763 6.09081202,1.40863547 5.89650443,1.47115835 C3.06321092,2.38528348 1.14296273,5.02263215 1.1430103,7.99980477 C1.14226139,8.71612127 1.25386751,9.42812272 1.47375989,10.1098521 C1.53015545,10.2837243 1.49994277,10.4740853 1.39248345,10.6219504 C1.28502412,10.7698156 1.11329616,10.8573694 0.930510563,10.8573694 C0.68226899,10.8577 0.462176505,10.6978034 0.38576124,10.46161 L0.38576124,10.46286 L0.38576124,10.46286 Z M6.85500307,1.14565105 C6.85465806,0.513270831 7.36701157,0.000345538485 7.99937683,1.7414218e-07 C8.63174209,-0.000344841565 9.14465524,0.512020787 9.14500043,1.14440101 C9.14500043,1.77678123 8.6323671,2.28942669 8.00000184,2.28942669 C7.36763658,2.28942669 6.85500307,1.77678123 6.85500307,1.14440101 L6.85500307,1.14565105 L6.85500307,1.14565105 Z" id="形状"/>
+                                          </g>
+                                        </g>
+                                      </g>
+                                    </g>
+                                  </g>
+                                </g>
+                              </g>
+                            </svg>
+                          </template>
+                          <template v-else>
+                            <svg class="icon__state-2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+                              <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+                                <g transform="translate(-963, -473)" fill="#FF931D" fill-rule="nonzero">
+                                  <g transform="translate(72, 149)">
+                                    <g transform="translate(717, 210)">
+                                      <g transform="translate(174, 80)">
+                                        <g transform="translate(0, 34)">
+                                          <g transform="translate(0, 0)">
+                                            <path d="M12.8653156,13.3466892 C13.0669108,13.4600584 13.1802076,13.6838438 13.1522455,13.9134374 C13.1341378,14.064071 13.0568792,14.2013228 12.9374957,14.294946 C11.5333802,15.3993305 9.79888021,15.9998163 8.01250182,15.9999921 L8.00000184,15.9999921 C6.23498645,16.0024741 4.51911443,15.418749 3.12175786,14.340447 C2.9518161,14.2188346 2.86179857,14.0141626 2.88701451,13.8067131 C2.91223046,13.5992637 3.0486588,13.422118 3.24278573,13.3447611 C3.43691266,13.2674042 3.65778158,13.3021719 3.81875699,13.4354267 C5.01641733,14.3596667 6.48720215,14.8597894 8.00000184,14.8572086 C9.53484365,14.8598401 11.0257689,14.3450325 12.2319966,13.3959258 C12.4136489,13.2527615 12.6637204,13.23332 12.8653156,13.3466892 Z M13.7102448,10.8548688 C14.3426101,10.8548688 14.8552434,11.3675143 14.8552434,11.9998945 C14.8552434,12.6322747 14.3426101,13.1449202 13.7102448,13.1449202 C13.0778795,13.1449202 12.5652462,12.6322747 12.5652462,11.9998945 C12.5652462,11.3675143 13.0778795,10.8548688 13.7102448,10.8548688 Z M2.86254914,11.0081549 C3.21683375,11.2127256 3.43505816,11.5907824 3.43500748,11.9998945 C3.43492912,12.6322193 2.92231874,13.1447783 2.29000889,13.1447783 C1.65769903,13.1447783 1.14508865,12.6322193 1.1450103,11.9998945 C1.14495962,11.5907824 1.36318403,11.2127256 1.71746864,11.0081549 C2.07175325,10.8035843 2.50826452,10.8035843 2.86254914,11.0081549 Z M8.00064407,2.86222222 C10.8332812,2.86222222 13.1377778,5.16800691 13.1377778,7.99935593 C13.1377778,10.8332812 10.8332812,13.1377778 8.00064407,13.1377778 C5.16800691,13.1377778 2.86351037,10.8332812 2.86222222,7.99935593 C2.86222222,5.16671876 5.16800691,2.86222222 8.00064407,2.86222222 Z M10.4769988,0.393634179 C13.7699564,1.4666779 15.9989084,4.5363521 15.999996,7.99980477 C16.0008491,8.85221964 15.8653023,9.69928029 15.5984925,10.508861 C15.4995254,10.8086556 15.1763107,10.9714978 14.8764933,10.8726192 C14.7325706,10.8262051 14.6133962,10.7235261 14.545217,10.5881961 C14.4770377,10.4528661 14.4654457,10.2959846 14.5129938,10.152103 C14.7416433,9.45836637 14.8577789,8.73250194 14.8569934,8.00205482 C14.8568699,5.03284668 12.946762,2.4006855 10.1239992,1.47990855 C9.82385583,1.38240116 9.65955685,1.06006311 9.75699967,0.7598924 C9.85482102,0.460042455 10.1770535,0.296125201 10.4769988,0.393634179 Z M6.10501375,0.503769697 C6.25631267,0.640787543 6.32302221,0.848116177 6.28001354,1.04765691 C6.23700487,1.24719763 6.09081202,1.40863547 5.89650443,1.47115835 C3.06321092,2.38528348 1.14296273,5.02263215 1.1430103,7.99980477 C1.14226139,8.71612127 1.25386751,9.42812272 1.47375989,10.1098521 C1.53015545,10.2837243 1.49994277,10.4740853 1.39248345,10.6219504 C1.28502412,10.7698156 1.11329616,10.8573694 0.930510563,10.8573694 C0.68226899,10.8577 0.462176505,10.6978034 0.38576124,10.46161 C0.12916235,9.66706782 -0.00100333917,8.83594487 5.82308065e-06,7.99980477 C5.82308065e-06,4.52630253 2.24071052,1.449416 5.54650486,0.383383951 C5.74081245,0.320861063 5.95371484,0.366751851 6.10501375,0.503769697 Z M6.78463249,5.54543423 C6.36598443,5.54543423 6.02720154,5.88421712 6.02720154,6.30286518 L6.02720154,9.70872815 C6.02720154,10.1273762 6.36598443,10.4661591 6.78463249,10.4661591 C7.20328054,10.4661591 7.54206343,10.1273762 7.54206343,9.70872815 L7.54206343,6.30286518 C7.54206343,5.88421712 7.20328054,5.54543423 6.78463249,5.54543423 Z M9.21536751,5.54543423 C8.79671946,5.54543423 8.45793657,5.88421712 8.45793657,6.30286518 L8.45793657,9.70872815 C8.45793657,10.1273762 8.79671946,10.4661591 9.21536751,10.4661591 C9.63401557,10.4661591 9.97279846,10.1273762 9.97279846,9.70872815 L9.97279846,6.30286518 C9.97279846,5.88421712 9.63401557,5.54543423 9.21536751,5.54543423 Z M7.99937683,1.7414218e-07 C8.63174209,-0.000344841565 9.14465524,0.512020787 9.14500043,1.14440101 C9.14500043,1.77678123 8.6323671,2.28942669 8.00000184,2.28942669 C7.40979426,2.28942669 6.92388635,1.84285554 6.86172177,1.26916417 L6.85500307,1.14565105 C6.85465806,0.513270831 7.36701157,0.000345538485 7.99937683,1.7414218e-07 Z" id="形状结合"/>
+                                          </g>
+                                        </g>
+                                      </g>
+                                    </g>
+                                  </g>
+                                </g>
+                              </g>
+                            </svg>
+                          </template>
+                        </template>
+                      </div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-col>
+            </el-row>
           </template>
         </el-card>
       </el-col>
@@ -36,50 +210,100 @@ import { index, save } from "@/api/system/baseForm";
 export default {
   data() {
     return {
-      weather: {},
-    }
+      info: {
+        daily_water: [{}],
+        yuliang: [{}],
+        kaidu: [{}],
+        kaidu2: [{}],
+        yunxingzhuangtai: [
+          {
+            大龙港枢纽: [],
+            外塘河枢纽: [],
+            仙人大港枢纽: [],
+            胥江南支枢纽: [],
+            澹台湖枢纽: [],
+            娄江枢纽: [],
+            南庄枢纽: [],
+            青龙桥枢纽: [],
+            东风新枢纽: [],
+            元和塘枢纽: [],
+          },
+        ],
+      },
+    };
   },
   methods: {
-    async getWeatherInfo () {
+    async getWeatherInfo() {
       let infoObj = {
-        weather: '',
-        water: '',
-        rain: '',
-        prevent: '',
-        early_warning: ''
-      }
-      const weatherInfo = await weather()
-      infoObj.weather = `${weatherInfo.weather},${weatherInfo.wD}${weatherInfo.wS},${weatherInfo.sendibleTemp}-${weatherInfo.temp}°C`
-      const info = await infoStatics()
-      console.log(info)
+        weather: "",
+        water: "",
+        rain: "",
+        prevent: "",
+        early_warning: "",
+      };
+      const weatherInfo = await weather();
+      infoObj.weather = `${weatherInfo.weather},${weatherInfo.wD}${weatherInfo.wS},${weatherInfo.sendibleTemp}-${weatherInfo.temp}°C`;
+      const info = await infoStatics();
+      this.info = info;
     },
-
-    async getWeather () {
-      const res = (await index({
-        table_name: 'waters',
-        filter: [
-          {
-            key: 'date',
-            op: 'eq',
-            value: this.$moment().format('YYYY-MM-DD')
-          }
-        ]
-      },false)).data[0]
-
-      if (!res) {
-        await this.getWeatherInfo()
-      } else {
-        this.weather = res
-      }
-    }
   },
   computed: {},
   created() {
-    //this.getWeather()
-    this.getWeatherInfo()
-  }
-}
+    this.getWeatherInfo();
+  },
+};
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table {
+    border: none;
+    color: #023152;
+  }
+  ::v-deep .el-table .el-table__cell {
+    border-bottom: none;
+  }
+  ::v-deep .el-descriptions__header {
+    margin-bottom: 8px;
+    color: #023152;
+    font-weight: 600;
+  }
+  ::v-deep .el-descriptions__body .el-descriptions-row:nth-child(1) {
+    background: #d0e4f666;
+  }
+  ::v-deep .el-descriptions__body tr:nth-child(2) .el-descriptions-item__cell {
+    color: #006bef;
+    font-weight: 600;
+    line-height: 30px;
+  }
+  ::v-deep .el-descriptions--small:not(.is-bordered) .el-descriptions-item__cell {
+    color: #023152;
+    line-height: 35px;
+    font-weight: 600;
+    padding: 0 6px;
+    margin-bottom: 6px;
+  }
+  ::v-deep .el-table th.el-table__cell.is-leaf {
+    color: #023152;
+    border-bottom: none;
+  }
+  ::v-deep .el-table:before {
+    display: none;
+  }
+  ::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+    background: #d0e4f666;
+  }
+    .icon__state-1 {
+    animation: rotate 1.5s linear infinite;
+  }
+  @keyframes rotate {
+    from {
+      transform: rotate(0);
+    }
+    to {
+      transform: rotate(360deg);
+    }
+  }
+  [class^=icon__state] {
+    margin-right: 4px;
+  }
 </style>
diff --git a/src/views/order/handle.vue b/src/views/order/handle.vue
index 047db91..d0f047e 100644
--- a/src/views/order/handle.vue
+++ b/src/views/order/handle.vue
@@ -158,24 +158,18 @@
       </el-col>
     </el-row>
 
-    <dialoger
-      :table-name="customForm.tableName"
-      :form-info="form"
-      ref="dialog"
-      @refresh="$refs['xyTable'].getTableData()"
-    >
-    </dialoger>
-    <drawer
-      :table-name="customForm.tableName"
-      :form-info="form"
-      ref="drawer"
-    ></drawer>
-    <imports
-      :table-name="customForm.tableName"
-      :form-info="form"
-      ref="imports"
-      @refresh="$refs['xyTable'].getTableData()"
-    ></imports>
+<!--    <dialoger-->
+<!--      :table-name="customForm.tableName"-->
+<!--      :form-info="form"-->
+<!--      ref="dialog"-->
+<!--      @refresh="$refs['xyTable'].getTableData()"-->
+<!--    >-->
+<!--    </dialoger>-->
+<!--    <drawer-->
+<!--      :table-name="customForm.tableName"-->
+<!--      :form-info="form"-->
+<!--      ref="drawer"-->
+<!--    ></drawer>-->
 
     <callback ref="callback"></callback>
     <adjust :areas="areas" :abilities="abilities" ref="adjust" @refresh="$refs['xyTable'].getTableData()"></adjust>
@@ -743,6 +737,36 @@ export default {
         width: 46,
         reserveSelection: true
       })
+      this.table.unshift({
+        prop: "expand",
+        type: "expand",
+        width: 46,
+        expandFn:({ row }) => {
+          return (
+            <div style="max-width: 600px;padding: 10px;">
+              {
+                (row.id_transfers_to_transfer_id_relation || []).map((i,index) => (
+                  <div style="display: flex;">
+                    <div style="font-weight: 600;padding: 0 10px;">{index+1}.</div>
+                    <div>
+                      <span style="font-weight: 600;padding: 0 6px;">调整时间：</span>
+                      <span>{ this.$moment(this.created_at).format('YYYY-MM-DD HH:mm') }</span>
+                    </div>
+                    <div>
+                      <span style="font-weight: 600;padding: 0 6px;">调整类型：</span>
+                      <span>{ i.tiaozhengleixing }</span>
+                    </div>
+                    <div>
+                      <span style="font-weight: 600;padding: 0 6px;">调整内容：</span>
+                      <span>{ i.content }</span>
+                    </div>
+                  </div>
+                ))
+              }
+            </div>
+          )
+        }
+      })
     },
   },