调令修改

src/views/bigScreen1/component/callback.vue

@@ -136,7 +136,7 @@ export default {
     },
 
     submit() {
-      this.smsForm.content = `${ this.$refs['elEdit_feedback_department_id']?.selectedLabel ? this.$refs['elEdit_feedback_department_id'].selectedLabel + '-' : '' }${ this.$refs['elEdit_feedback_admin_id']?.selectedLabel ? this.$refs['elEdit_feedback_admin_id'].selectedLabel + '-' : '' }${ this.form.content }`
+      this.smsForm.content = `调令平台反馈：${ this.$moment().format('YYYY-MM-DD HH:mm') }，${ this.row.equipment_id_equipments_id_relation.name }，关于${ this.form.content }指令有误，申请${ this.$refs['elEdit_type']?.selectedLabel || '' }`
       if (this.type === "add") {
         this.form.transfer_id = this.transfer_id;
         if (this.form.hasOwnProperty("id")) {

src/views/bigScreen1/component/detailTransfer.vue

@@ -104,7 +104,7 @@
                         执行状态：{{ typeMap.get(data.status) }}
                       </p>
                       <p>
-                        开启数量：{{ data.kaiqishuliang }} / {{ data.equipment_id_equipments_id_relation.bengzhashuliang }}
+                        开启数量：{{ data.kaiqishuliang }} / {{ data.equipment_id_equipments_id_relation ? data.equipment_id_equipments_id_relation.bengzhashuliang : 0 }}
                       </p>
 
                       <div style="display:flex;">
@@ -363,8 +363,8 @@ export default {
         [1, "待下发"],
         [2, "已下发"],
         [3, "确认接收"],
-        [4, "已通知开机"],
-        [5, "确认开机"],
+        [4, "已通知开启"],
+        [5, "确认开启"],
         [6, "已通知关机"],
         [7, "确认关机"]
       ]),

src/views/bigScreen1/component/done.vue

@@ -79,12 +79,12 @@ export default {
         },
         {
           value: 3,
-          label: "通知开机",
+          label: "通知开启",
           auth: "noticeOpen"
         },
         {
           value: 4,
-          label: "开机",
+          label: "开启",
           auth: "open"
         },
         {

src/views/bigScreen1/component/toDo.vue

@@ -121,12 +121,12 @@ export default {
         },
         {
           value: 3,
-          label: "通知开机",
+          label: "通知开启",
           auth: "noticeOpen"
         },
         {
           value: 4,
-          label: "开机",
+          label: "开启",
           auth: "open"
         },
       ],

src/views/bigScreen1/component/tomorrow.vue

@@ -68,11 +68,11 @@ export default {
         },
         {
           value: 3,
-          label: "通知开机"
+          label: "通知开启"
         },
         {
           value: 4,
-          label: "开机"
+          label: "开启"
         }
       ],
       statusType: [

src/views/bigScreen1/index.vue

@@ -9,6 +9,7 @@
             $refs['callbackList'].show()
           }"
           @callback="e => {
+             $refs['callback'].setRow(e)
              $refs['callback'].setId(e.id)
              $refs['callback'].setType('add')
              $refs['callback'].show()
@@ -20,6 +21,7 @@
             $refs['callbackList'].show()
           }"
            @callback="e => {
+             $refs['callback'].setRow(e)
              $refs['callback'].setId(e.id)
              $refs['callback'].setType('add')
              $refs['callback'].show()

src/views/dashboard/components/weather.vue

@@ -14,7 +14,7 @@
             </template>
             <template>
               <template>
-                <div class="text" v-html="splitSpan(weather ? weather[key] : '')"></div>
+                <div class="text" v-html="key === 'weather' ? weather[key] : splitSpan(weather ? weather[key] : '')"></div>
               </template>
             </template>
           </Card>

src/views/order/component/adjust.vue

@@ -35,7 +35,7 @@
               style="width: 300px"
             >
               <el-option
-                v-for="item in tiaozhengleixings"
+                v-for="item in types"
                 :key="item.id"
                 :label="item.value"
                 :value="item.id"
@@ -219,6 +219,33 @@ export default {
       } else {
         return Number(this.detail?.equipment_id_equipments_id_relation?.bengzhashuliang) || 0
       }
+    },
+
+    types () {
+      let type = this.detail?.equipment_id_equipments_id_relation?.type;
+      if (type === 1) {
+        return [
+          {
+            id: 0,
+            value: "关闭"
+          },
+          {
+            id: 1,
+            value: "新开"
+          }
+        ]
+      } else {
+        return [
+          {
+            id: 0,
+            value: "关闭"
+          },
+          {
+            id: 1,
+            value: "调整开度"
+          }
+        ]
+      }
     }
   },
   watch: {

src/views/order/component/createDispatch.vue

@@ -245,6 +245,7 @@ export default {
       },
       areas: [],
       types: [],
+      diaolingleixing: [],
       abilities: [],
       select: {
         area: [],
@@ -613,6 +614,29 @@ export default {
               }
             },i.key))),
         },
+        {
+          title: "调令类型",
+          key: "diaolingleixing",
+          width: 160,
+          align: "center",
+          render: (h, { row, index }) =>
+            h("Select", {
+                props: {
+                  value: this.data[index].diaolingleixing,
+                  size: "small"
+                },
+                on: {
+                  ['on-change']:e => {
+                    this.data[index].diaolingleixing = e
+                  }
+                }
+              },
+              this.diaolingleixing.map(i => h("Option",{
+                props: {
+                  value: i.value
+                }
+              },i.key))),
+        },
         {
           title: "开启时间",
           width: 140,
@@ -1159,6 +1183,22 @@ export default {
       }
       this.$bus.$emit("yinpaishui", this.abilities);
     },
+    async getDiaolingleixing() {
+      const obj = (await show({ id: 85 }, false))?.select_item;
+      if (obj && typeof obj === "object") {
+        let keys = Object.keys(obj);
+        if (keys.length > 0) {
+          this.diaolingleixing = keys.map((key) => {
+            return {
+              key,
+              value: /^\d*$/.test(obj[key]) ? Number(obj[key]) : obj[key],
+            };
+          });
+        }
+      }
+      console.log(this.diaolingleixing)
+      this.$bus.$emit("diaolingleixing", this.abilities);
+    },
 
     pickDate() {
       this.$bus.$emit("pickDate", this.date);
@@ -1259,6 +1299,7 @@ export default {
     this.getType();
     this.getAbility();
     this.getEquipmentInfos();
+    this.getDiaolingleixing();
   },
   destroyed() {
     this.$bus.$off("getDispatches");
@@ -1273,7 +1314,10 @@ export default {
 ::v-deep .equip-number .ivu-checkbox ~ span {
   display: none;
 }
-.flex-center {
+::v-deep .ivu-checkbox-inner {
+  border-color: $primaryColor;
+}
+  .flex-center {
   display: flex;
   align-items: center;
   justify-content: center;

src/views/order/component/normalCreate.vue

@@ -22,7 +22,7 @@
             </template>
             <template>
               <template>
-                <div class="text" v-html="splitSpan(weather ? weather[key] : '')"></div>
+                <div class="text" v-html="key === 'weather' ? weather[key] : splitSpan(weather ? weather[key] : '')"></div>
               </template>
             </template>
           </Card>

src/views/order/handle.vue

@@ -25,9 +25,6 @@
                   <Select clearable v-model="select.filter[1].value" placeholder="请选择类别" style="width: 140px;margin-left: 6px;">
                     <Option v-for="item in abilities" :value="item.value">{{ item.key }}</Option>
                   </Select>
-                  <Select clearable v-model="selectArea" placeholder="请选择范围" style="width: 140px;margin-left: 6px;">
-                    <Option v-for="item in areas" :value="item.value">{{ item.key }}</Option>
-                  </Select>
                   <Input style="width: 140px;margin-left: 6px;" clearable v-model="select.filter[0].value" placeholder="搜索内容"/>
 <!--                  <Select-->
 <!--                    v-model="select.filter[0].key"-->
@@ -532,6 +529,11 @@ export default {
           return false
         }
       }
+      if ([7].find(i => i.status)) {
+        if (item === 'adjust') {
+          return false
+        }
+      }
       return true
     },