mt01

control/components/prodnum-MT01/modules/division.vue

@@ -2,7 +2,11 @@
   <view class="control">
     <view class="control-title"> 分时控制 </view>
 
-    <view class="item-box" v-for="(item, index) in list" :key="item.w_functionid">
+    <view
+      class="item-box"
+      v-for="(item, index) in list"
+      :key="item.w_functionid"
+    >
       <view
         class="TR-state"
         hover-class="navigator-hover"
@@ -42,10 +46,11 @@
 
     <My_input ref="MyInput" @customMethod="customMethod">
       <view class="change-item" v-if="changeItem.funcname">
+        <!-- :end="endTime"  -->
+        <!-- :start="changeItem.showValue.begin" -->
         <picker
           mode="time"
           :value="changeItem.showValue.begin"
-          :end="endTime"
           data-name="begin"
           @change="timeChange"
         >
@@ -58,7 +63,6 @@
         </picker>
         <picker
           mode="time"
-          :start="changeItem.showValue.begin"
           :value="changeItem.showValue.end"
           data-name="end"
           @change="timeChange"
@@ -157,29 +161,25 @@ export default {
           index: i,
           inputType: "slot",
           paramValue: {
-            begin: newVal.paramcmdvalues[keyList[2]]
-              ? newVal.paramcmdvalues[keyList[2]] +
-                ":" +
-                newVal.paramcmdvalues[keyList[0]]
-              : "",
-            end: newVal.paramcmdvalues[keyList[3]]
-              ? newVal.paramcmdvalues[keyList[3]] +
-                ":" +
-                newVal.paramcmdvalues[keyList[1]]
-              : "",
+            begin:
+              newVal.paramcmdvalues[keyList[0]] +
+              ":" +
+              newVal.paramcmdvalues[keyList[2]],
+            end:
+              newVal.paramcmdvalues[keyList[1]] +
+              ":" +
+              newVal.paramcmdvalues[keyList[3]],
             value: newVal.paramcmdvalues[keyList[4]],
           },
           showValue: {
-            begin: newVal.paramvalues[keyList[2]]
-              ? newVal.paramvalues[keyList[2]] +
-                ":" +
-                newVal.paramvalues[keyList[0]]
-              : "",
-            end: newVal.paramvalues[keyList[3]]
-              ? newVal.paramvalues[keyList[3]] +
-                ":" +
-                newVal.paramvalues[keyList[1]]
-              : "",
+            begin:
+              newVal.paramvalues[keyList[0]] +
+              ":" +
+              newVal.paramvalues[keyList[2]],
+            end:
+              newVal.paramvalues[keyList[1]] +
+              ":" +
+              newVal.paramvalues[keyList[3]],
             value: newVal.paramvalues[keyList[4]],
           },
           params: {},
@@ -195,12 +195,10 @@ export default {
             : false;
         list.push(Object.assign(obj, item));
       }
-      console.log("TRList", TRList);
       this.TRList = TRList;
       this.list = list;
     },
     onClick(item) {
-      console.log(item);
       this.changeItem = JSON.parse(JSON.stringify(item));
       this.endTime =
         this.changeItem.showValue.end == "0:0"
@@ -237,10 +235,10 @@ export default {
         params[item.keyList[4]].num_scale
       );
       let obj = {
-        [item.keyList[0]]: showValue.begin.split(":")[1],
-        [item.keyList[1]]: showValue.begin.split(":")[0],
-        [item.keyList[2]]: showValue.end.split(":")[1],
-        [item.keyList[3]]: showValue.end.split(":")[0],
+        [item.keyList[0]]: showValue.begin.split(":")[0],
+        [item.keyList[1]]: showValue.end.split(":")[0],
+        [item.keyList[2]]: showValue.begin.split(":")[1],
+        [item.keyList[3]]: showValue.end.split(":")[1],
         [item.keyList[4]]: showValue.value,
       };
       console.log("发送请求", obj);

control/components/prodnum-MT01/prodnum-MT01.vue

@@ -54,6 +54,10 @@ export default {
               name: "失压报警",
               value: getBoole("A004"),
             },
+            {
+              name: "电量低报警",
+              value: getBoole("A002"),
+            },
           ];
           function getBoole(name, expect = 1) {
             try {
@@ -83,6 +87,9 @@ export default {
                 this.__proto__.getControlItem(["手动压力设置"], newVal)[0],
               ];
               break;
+            default:
+              this.$refs.阀门工作状态.list = [];
+              break;
           }
           console.log(
             "this.$refs.阀门工作状态.list",

control/components/prodnum-MT02/modules/division.vue

@@ -52,10 +52,10 @@
     </view>
     <My_input ref="MyInput" @customMethod="customMethod">
       <view class="change-item" v-if="changeItem.funcname">
+        <!-- :end="endTime" -->
         <picker
           mode="time"
           :value="changeItem.showValue.begin"
-          :end="endTime"
           data-name="begin"
           @change="timeChange"
         >
@@ -66,9 +66,9 @@
             </view>
           </view>
         </picker>
+        <!--  :start="changeItem.showValue.begin" -->
         <picker
           mode="time"
-          :start="changeItem.showValue.begin"
           :value="changeItem.showValue.end"
           data-name="end"
           @change="timeChange"

control/components/prodnum-MT03/modules/division.vue

@@ -1,271 +1,309 @@
 <template>
-    <view class="control">
-        <view class="control-title">
-            分时控制
+  <view class="control">
+    <view class="control-title"> 分时控制 </view>
+    <view
+      class="item"
+      hover-class="navigator-hover"
+      v-for="item in list"
+      :key="item.index"
+      @click="onClick(item)"
+    >
+      <view class="title">
+        {{ item.funcname }}
+      </view>
+      <view class="row">
+        <view class="box">
+          <view class=""> 开始时间 </view>
+          <view class="content">
+            <view class="value">{{ item.showValue.begin || "--" }}</view>
+          </view>
         </view>
-        <view class="item" hover-class="navigator-hover" v-for="item in list" :key="item.index" @click="onClick(item)">
-            <view class="title">
-                {{ item.funcname }}
-            </view>
-            <view class="row">
-                <view class="box">
-                    <view class="">
-                        开始时间
-                    </view>
-                    <view class="content">
-                        <view class="value">{{ item.showValue.begin || '--' }}</view>
-                    </view>
-                </view>
-                <view class="box">
-                    <view class="">
-                        结束时间
-                    </view>
-                    <view class="content">
-                        <view class="value">{{ item.showValue.end || '--' }}</view>
-                    </view>
-                </view>
-                <view class="box">
-                    <view class="">
-                        流量设定
-                    </view>
-                    <view class="content">
-                        <view class="value">{{ item.showValue.value || '--' }}</view>
-                        <view class="unit">{{ item.params[item.funcname + "流量设定"].unit || '' }}</view>
-                    </view>
-                </view>
-            </view>
-            <view v-if="item.isfeedback" class="dot" />
+        <view class="box">
+          <view class=""> 结束时间 </view>
+          <view class="content">
+            <view class="value">{{ item.showValue.end || "--" }}</view>
+          </view>
         </view>
-        <My_input ref="MyInput" @customMethod="customMethod">
-            <view class="change-item" v-if="changeItem.funcname">
-                <picker mode="time" :value="changeItem.showValue.begin" :end="endTime" data-name="begin"
-                    @change="timeChange">
-                    <view class="row">
-                        <view class="label">
-                            开始时间：
-                        </view>
-                        <view class="value day-parting-row">{{ changeItem.showValue.begin || ' --' }}
-                        </view>
-                    </view>
-                </picker>
-                <picker mode="time" :start="changeItem.showValue.begin" :value="changeItem.showValue.end" data-name="end"
-                    @change="timeChange">
-                    <view class="row">
-                        <view class="label">
-                            结束时间：
-                        </view>
-                        <view class="value day-parting-row">{{ changeItem.showValue.end || ' --' }}</view>
-                    </view>
-                </picker>
-                <view class="row">
-                    <view class="label">
-                        流量设定：
-                    </view>
-                    <view class="value">
-                        <u-input :placeholder="changeItem.showValue.value || '流量设定'" v-model="changeItem.showValue.value"
-                            :type="changeItem.params[changeItem.funcname1 + '流量设定'].num_scale == 0 ? 'number' : 'digit'">
-                            <template slot="suffix">
-                                {{ changeItem.params[changeItem.funcname1 + '流量设定'].unit || '' }}
-                            </template>
-                        </u-input>
-                    </view>
-                </view>
-            </view>
-        </My_input>
+        <view class="box">
+          <view class=""> 流量设定 </view>
+          <view class="content">
+            <view class="value">{{ item.showValue.value || "--" }}</view>
+            <view class="unit">{{
+              item.params[item.funcname + "流量设定"].unit || ""
+            }}</view>
+          </view>
+        </view>
+      </view>
+      <view v-if="item.isfeedback" class="dot" />
     </view>
+    <My_input ref="MyInput" @customMethod="customMethod">
+      <view class="change-item" v-if="changeItem.funcname">
+        <!--  :end="endTime" data-name="begin" -->
+        <picker
+          mode="time"
+          :value="changeItem.showValue.begin"
+          @change="timeChange"
+        >
+          <view class="row">
+            <view class="label"> 开始时间： </view>
+            <view class="value day-parting-row"
+              >{{ changeItem.showValue.begin || " --" }}
+            </view>
+          </view>
+        </picker>
+        <!-- :start="changeItem.showValue.begin" -->
+        <picker
+          mode="time"
+          :value="changeItem.showValue.end"
+          data-name="end"
+          @change="timeChange"
+        >
+          <view class="row">
+            <view class="label"> 结束时间： </view>
+            <view class="value day-parting-row">{{
+              changeItem.showValue.end || " --"
+            }}</view>
+          </view>
+        </picker>
+        <view class="row">
+          <view class="label"> 流量设定： </view>
+          <view class="value">
+            <u-input
+              :placeholder="changeItem.showValue.value || '流量设定'"
+              v-model="changeItem.showValue.value"
+              :type="
+                changeItem.params[changeItem.funcname1 + '流量设定']
+                  .num_scale == 0
+                  ? 'number'
+                  : 'digit'
+              "
+            >
+              <template slot="suffix">
+                {{
+                  changeItem.params[changeItem.funcname1 + "流量设定"].unit ||
+                  ""
+                }}
+              </template>
+            </u-input>
+          </view>
+        </view>
+      </view>
+    </My_input>
+  </view>
 </template>
 
 <script>
 export default {
-    name: "division",
-    data() {
-        return {
-            list: [],
-            changeItem: {},
-            endTime: ""
-        }
+  name: "division",
+  data() {
+    return {
+      list: [],
+      changeItem: {},
+      endTime: "",
+    };
+  },
+  methods: {
+    loadData(newVal, Chinese = false) {
+      let reg = /^时段\d{1,5}$/,
+        count = 0,
+        list = [];
+      for (const key in newVal.function) {
+        if (reg.test(key)) count++;
+      }
+      let Nzh = require("nzh");
+      let nzhcn = require("nzh/cn"); //直接使用简体中文
+      for (let i = 1; i <= count; i++) {
+        let name = Chinese ? nzhcn.encodeS(i) : i;
+        let obj = newVal.function[`时段${i}`],
+          keyList = [
+            `时段${name}分钟开始`, //0
+            `时段${name}分钟结束`, //1
+            `时段${name}小时开始`, //2
+            `时段${name}小时结束`, //3
+            `时段${name}流量设定`, //4
+            `时间段${name}置位`, //5
+          ],
+          item = {
+            keyList,
+            index: i,
+            inputType: "slot",
+            paramValue: {
+              begin: newVal.paramcmdvalues[keyList[2]]
+                ? newVal.paramcmdvalues[keyList[2]] +
+                  ":" +
+                  newVal.paramcmdvalues[keyList[0]]
+                : "",
+              end: newVal.paramcmdvalues[keyList[3]]
+                ? newVal.paramcmdvalues[keyList[3]] +
+                  ":" +
+                  newVal.paramcmdvalues[keyList[1]]
+                : "",
+              value: newVal.paramcmdvalues[keyList[4]],
+            },
+            showValue: {
+              begin: newVal.paramvalues[keyList[2]]
+                ? newVal.paramvalues[keyList[2]] +
+                  ":" +
+                  newVal.paramvalues[keyList[0]]
+                : "",
+              end: newVal.paramvalues[keyList[3]]
+                ? newVal.paramvalues[keyList[3]] +
+                  ":" +
+                  newVal.paramvalues[keyList[1]]
+                : "",
+              value: newVal.paramvalues[keyList[4]],
+            },
+            params: {},
+          };
+        keyList.forEach((key) => {
+          item.params[key] = newVal.params[key];
+        });
+        obj.funcname1 = "时段" + nzhcn.encodeS(i);
+        item.isfeedback =
+          newVal.isfeedback &&
+          (obj.paramValue.begin || obj.paramValue.end || obj.paramValue.value)
+            ? true
+            : false;
+        list.push(Object.assign(obj, item));
+      }
+      this.list = list;
     },
-    methods: {
-        loadData(newVal, Chinese = false) {
-            let reg = /^时段\d{1,5}$/,
-                count = 0,
-                list = [];
-            for (const key in newVal.function) {
-                if (reg.test(key)) count++
-            }
-            let Nzh = require("nzh");
-            let nzhcn = require("nzh/cn"); //直接使用简体中文
-            for (let i = 1; i <= count; i++) {
-                let name = Chinese ? nzhcn.encodeS(i) : i;
-                let obj = newVal.function[`时段${i}`],
-                    keyList = [
-                        `时段${name}分钟开始`,//0
-                        `时段${name}分钟结束`,//1
-                        `时段${name}小时开始`,//2
-                        `时段${name}小时结束`,//3
-                        `时段${name}流量设定`,//4
-                        `时间段${name}置位`,//5
-                    ],
-                    item = {
-                        keyList,
-                        index: i,
-                        inputType: "slot",
-                        paramValue: {
-                            begin: newVal.paramcmdvalues[keyList[2]] ? newVal.paramcmdvalues[keyList[2]] + ":" + newVal.paramcmdvalues[keyList[0]] : "",
-                            end: newVal.paramcmdvalues[keyList[3]] ? newVal.paramcmdvalues[keyList[3]] + ":" + newVal.paramcmdvalues[keyList[1]] : "",
-                            value: newVal.paramcmdvalues[keyList[4]]
-                        },
-                        showValue: {
-                            begin: newVal.paramvalues[keyList[2]] ? newVal.paramvalues[keyList[2]] + ":" + newVal.paramvalues[keyList[0]] : "",
-                            end: newVal.paramvalues[keyList[3]] ? newVal.paramvalues[keyList[3]] + ":" + newVal.paramvalues[keyList[1]] : "",
-                            value: newVal.paramvalues[keyList[4]]
-                        },
-                        params: {}
-                    };
-                keyList.forEach(key => {
-                    item.params[key] = newVal.params[key];
-                });
-                obj.funcname1 = "时段" + nzhcn.encodeS(i);
-                item.isfeedback = (newVal.isfeedback && (obj.paramValue.begin || obj.paramValue.end || obj.paramValue.value)) ? true : false;
-                list.push(Object.assign(obj, item))
-            }
-            this.list = list;
-        },
-        onClick(item) {
-            this.changeItem = JSON.parse(JSON.stringify(item));
-            this.endTime = this.changeItem.showValue.end == '0:0' ? "" : this.changeItem.showValue.end;
-            let toBeUpdated = [];
-            if (item.paramValue.begin) toBeUpdated.push(`开始时间：${item.paramValue.begin}`);
-            if (item.paramValue.end) toBeUpdated.push(`结束时间：${item.paramValue.begin}`);
-            if (item.paramValue.value) toBeUpdated.push(`流量设定：${item.paramValue.value}`);
-            if (toBeUpdated.length) {
-                model.toBeUpdated = '待更新记录：' + toBeUpdated.join(",")
-            }
-            this.$refs.MyInput.openInput(item, item.inputType != "switch")
-            console.log("时段设置", item)
-        },
-        timeChange(e) {
-            const name = e.currentTarget.dataset.name;
-            this.changeItem.showValue[name] = e.detail.value;
-        },
-        customMethod() {
-            const {
-                showValue,
-                w_functionid,
-                params,
-                index,
-            } = this.changeItem,
-                MyInput = this.$refs.MyInput;
-            if (!showValue.begin) return MyInput.submitBreak("还未填写开始时间")
-            if (!showValue.end) return MyInput.submitBreak("还未填写结束时间")
-            if ((showValue.value + '').length == 0) return MyInput.submitBreak("还未设定流量")
-            let Nzh = require("nzh");
-            let nzhcn = require("nzh/cn"); //直接使用简体中文
-            let funcname = '时段' + nzhcn.encodeS(index)
-            console.log('输入值:', showValue.value)
-            showValue.value = (showValue.value - 0).toFixed(params[funcname + '流量设定'].num_scale)
-            console.log('流量设定:', params[funcname + '流量设定'])
-            console.log('发送值:', showValue.value)
-            let obj = {
-                [funcname + "分钟开始"]: showValue.begin.split(":")[1],
-                [funcname + "小时开始"]: showValue.begin.split(":")[0],
-                [funcname + "分钟结束"]: showValue.end.split(":")[1],
-                [funcname + "小时结束"]: showValue.end.split(":")[0],
-                [funcname + "流量设定"]: showValue.value,
-                [`时间段${nzhcn.encodeS(index)}置位`]: params[`时间段${nzhcn.encodeS(index)}置位`].lastvalue
-            }
-            console.log("发送请求", obj)
-            MyInput.submit(w_functionid, obj)
-        }
-    }
-}
+    onClick(item) {
+      this.changeItem = JSON.parse(JSON.stringify(item));
+      this.endTime =
+        this.changeItem.showValue.end == "0:0"
+          ? ""
+          : this.changeItem.showValue.end;
+      let toBeUpdated = [];
+      if (item.paramValue.begin)
+        toBeUpdated.push(`开始时间：${item.paramValue.begin}`);
+      if (item.paramValue.end)
+        toBeUpdated.push(`结束时间：${item.paramValue.begin}`);
+      if (item.paramValue.value)
+        toBeUpdated.push(`流量设定：${item.paramValue.value}`);
+      if (toBeUpdated.length) {
+        model.toBeUpdated = "待更新记录：" + toBeUpdated.join(",");
+      }
+      this.$refs.MyInput.openInput(item, item.inputType != "switch");
+      console.log("时段设置", item);
+    },
+    timeChange(e) {
+      const name = e.currentTarget.dataset.name;
+      this.changeItem.showValue[name] = e.detail.value;
+    },
+    customMethod() {
+      const { showValue, w_functionid, params, index } = this.changeItem,
+        MyInput = this.$refs.MyInput;
+      if (!showValue.begin) return MyInput.submitBreak("还未填写开始时间");
+      if (!showValue.end) return MyInput.submitBreak("还未填写结束时间");
+      if ((showValue.value + "").length == 0)
+        return MyInput.submitBreak("还未设定流量");
+      let Nzh = require("nzh");
+      let nzhcn = require("nzh/cn"); //直接使用简体中文
+      let funcname = "时段" + nzhcn.encodeS(index);
+      console.log("输入值:", showValue.value);
+      showValue.value = (showValue.value - 0).toFixed(
+        params[funcname + "流量设定"].num_scale
+      );
+      console.log("流量设定:", params[funcname + "流量设定"]);
+      console.log("发送值:", showValue.value);
+      let obj = {
+        [funcname + "分钟开始"]: showValue.begin.split(":")[1],
+        [funcname + "小时开始"]: showValue.begin.split(":")[0],
+        [funcname + "分钟结束"]: showValue.end.split(":")[1],
+        [funcname + "小时结束"]: showValue.end.split(":")[0],
+        [funcname + "流量设定"]: showValue.value,
+        [`时间段${nzhcn.encodeS(index)}置位`]:
+          params[`时间段${nzhcn.encodeS(index)}置位`].lastvalue,
+      };
+      console.log("发送请求", obj);
+      MyInput.submit(w_functionid, obj);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 /* 边框 */
 .day-parting-row {
-    display: flex;
-    align-items: center;
-    flex: 1;
-    width: 0;
-    border: 1px solid #dadbde;
-    border-radius: 4px;
-    padding: 6px 9px;
-    height: 35px;
-    font-size: 14px;
-    box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  flex: 1;
+  width: 0;
+  border: 1px solid #dadbde;
+  border-radius: 4px;
+  padding: 6px 9px;
+  height: 35px;
+  font-size: 14px;
+  box-sizing: border-box;
 }
 
 .item {
-    position: relative;
-    padding: 4px 6px 6px;
-    box-sizing: border-box;
-    background: #fff;
-    border-radius: 4px;
-    margin-bottom: 5px;
+  position: relative;
+  padding: 4px 6px 6px;
+  box-sizing: border-box;
+  background: #fff;
+  border-radius: 4px;
+  margin-bottom: 5px;
 
-    .title {
-        margin-bottom: 6px;
-        font-weight: bold;
-    }
-
-    .row {
-        display: flex;
+  .title {
+    margin-bottom: 6px;
+    font-weight: bold;
+  }
 
-        .box {
-            width: 33.33%;
+  .row {
+    display: flex;
 
-            .content {
-                display: flex;
-                margin-top: 6px;
-                align-items: flex-end;
+    .box {
+      width: 33.33%;
 
-                .value {
-                    width: 0;
-                    flex: 1;
-                    color: #333;
-                    font-size: 16px;
-                    flex-shrink: 0;
-                    font-weight: bold;
-                }
+      .content {
+        display: flex;
+        margin-top: 6px;
+        align-items: flex-end;
 
-                .unit {
-                    font-size: 10px;
-                    color: #666;
-                    flex-shrink: 0;
-                    max-width: 50px;
-                }
-            }
+        .value {
+          width: 0;
+          flex: 1;
+          color: #333;
+          font-size: 16px;
+          flex-shrink: 0;
+          font-weight: bold;
         }
 
-
+        .unit {
+          font-size: 10px;
+          color: #666;
+          flex-shrink: 0;
+          max-width: 50px;
+        }
+      }
     }
+  }
 
-    .dot {
-        position: absolute;
-        right: 2px;
-        top: 2px;
-        width: 10px;
-        height: 10px;
-        background: #D9001B;
-        border-radius: 50%;
-    }
+  .dot {
+    position: absolute;
+    right: 2px;
+    top: 2px;
+    width: 10px;
+    height: 10px;
+    background: #d9001b;
+    border-radius: 50%;
+  }
 }
 
 .change-item {
+  .row {
+    display: flex;
+    align-items: center;
+    line-height: 35px;
+    width: 100%;
+    margin-top: 4px;
 
-    .row {
-        display: flex;
-        align-items: center;
-        line-height: 35px;
-        width: 100%;
-        margin-top: 4px;
-
-        .label {
-            width: 80px;
-            flex-shrink: 0;
-        }
+    .label {
+      width: 80px;
+      flex-shrink: 0;
     }
-
+  }
 }
 </style>

control/modules/My_input.vue

@@ -343,8 +343,10 @@ export default {
           precision: num_scale,
         }).format()
       ).value;
-      if (this.value < num_minvalue) this.value = num_minvalue - 0;
-      if (this.value > num_maxvalue) this.value = num_maxvalue - 0;
+      if (num_minvalue != "" && this.value < num_minvalue)
+        this.value = num_minvalue - 0;
+      if (num_maxvalue != "" && this.value > num_maxvalue)
+        this.value = num_maxvalue - 0;
       this.stepIsCalculate = false;
       if (this.stagingMethod) this.confirm();
     },
@@ -431,7 +433,12 @@ export default {
         this.checkBeforeSending(w_functionid, params);
         return;
       }
-      if (this.stepIsCalculate) return (this.stagingMethod = true);
+      if (this.stepIsCalculate) {
+        this.stagingMethod = true;
+        return;
+      } else {
+        this.stagingMethod = false;
+      }
       this.loading = true;
       let res = await this.$Http.setControlItem(w_functionid, params);
       this.loading = false;