低压测试功能流程添加

src/components/NewWorkPage/DvhCardTimePicker.vue

@@ -8,7 +8,7 @@ import {getAction} from "@/api/manage";
 
 export default {
   name: "DvhCardTimePicker",
-  props: ["wellId", "time"],
+  props: ["wellId", "time", "defaultDate"],
   emits: ['update:time', 'change'],
   data() {
     return {
@@ -32,7 +32,6 @@ export default {
         }, {
           text: '昨天',
           onClick(picker) {
-            console.log(picker)
             picker.$emit('pick', Util.nowDateMinusDays(1));
           }
         }, {
@@ -892,6 +891,11 @@ export default {
   },
   mounted() {
     // console.log(this.timePicker);
+    if (this.defaultDate) {
+      let t = new Date(this.defaultDate + " 00:00:00")
+      this.timePicker.min = Util.dateMinus(t, 7, 'd').getTime()
+      this.timePicker.current = t.getTime()
+    }
     this.queryCard()
   },
   watch: {
@@ -914,6 +918,21 @@ export default {
     },
     wellId: {
       handler(val) {
+        if (this.defaultDate) {
+          let t = new Date(this.defaultDate + " 00:00:00")
+          this.timePicker.min = Util.dateMinus(t, 7, 'd').getTime()
+          this.timePicker.current = t.getTime()
+        }
+        this.queryCard()
+      }
+    },
+    defaultDate:{
+      handler(val){
+        if (this.defaultDate) {
+          let t = new Date(this.defaultDate + " 00:00:00")
+          this.timePicker.min = Util.dateMinus(t, 7, 'd').getTime()
+          this.timePicker.current = t.getTime()
+        }
         this.queryCard()
       }
     }
@@ -994,7 +1013,6 @@ export default {
         wellId: this.wellId,
         limitSize: this.timePicker.pageMaxSize
       }
-      console.log(param);
       let _this = this
       getAction(publicUrl.cardTimePicker, param).then(res => {
         if (res.data.status !== 1) {
@@ -1260,7 +1278,7 @@ export default {
 
 
     </div>
-    <el-input v-model="timePicker.selected" slot="reference"
+    <el-input v-model="timePicker.selected" slot="reference" placeholder="选择一个功图"
               :readonly="true"
     ></el-input>
   </el-popover>

src/components/NewWorkPage/DvhCompareDialog.vue

@@ -10,7 +10,13 @@ import WellSelector from "@/components/NewWorkPage/WellSelector.vue";
 export default {
   name: "DvhCompareDialog",
   components: {WellSelector, DvhCardTimePicker},
-  props: ["visible", "dvhCardId", "wellId"],
+  props: [
+    //是否显示
+    "visible",
+    "dvhCardId",
+    "wellId",
+    //默认开始日期
+    "time"],
   emits: ["update:visible"],
   data() {
     return {
@@ -21,6 +27,7 @@ export default {
         cardId: '',
         wellId: '',
         cardTime: '',
+        defaultSearchTime: '',
         leftChartOption: {
           title: {
             text: '',
@@ -246,15 +253,18 @@ export default {
     }
   },
   mounted() {
-    this.dvhCardCheck.visible = this.visible
-    this.dvhCardCheck.cardId = this.dvhCardId
-    this.dvhCardCheck.wellId = this.wellId
-    this.initView()
+    // this.initView()
   },
   watch: {
     visible: {
       handler(val) {
         this.dvhCardCheck.visible = val
+        if (val) this.initView()
+      }
+    },
+    wellId: {
+      handler(val) {
+        this.initView()
       }
     }
   },
@@ -263,11 +273,31 @@ export default {
       this.$emit("update:visible", false);
     },
     initView() {
+
+      this.dvhCardCheck.visible = this.visible
+      this.dvhCardCheck.cardId = ''
+      this.dvhCardCheck.wellId = ''
+      this.dvhCardCheck.defaultSearchTime = ''
+
+      this.dvhCardCheck.visible = this.visible
+      this.dvhCardCheck.cardId = this.dvhCardId
+      this.dvhCardCheck.wellId = this.wellId
+      this.dvhCardCheck.defaultSearchTime = this.time
       this.setLeftCard()
     },
     //根据数据id查询对应功图显示
     setLeftCard() {
       let params = {}
+      this.setLeftCardData({
+        sgt: [],
+        wellId: '',
+        prodDate: '',
+        minL: 65,
+        maxL: 95,
+        s: 8,
+        n: 7,
+        zhc: 26
+      })
       if (this.dvhCardCheck.cardId) params = {
         wellId: this.dvhCardCheck.cardId.split(' ')[0],
         prodDate: this.dvhCardCheck.cardId.split(' ')[1] + ' ' + this.dvhCardCheck.cardId.split(' ')[2]
@@ -285,6 +315,7 @@ export default {
       })
     },
     setLeftCardData(baseData) {
+      this.dvhCardCheck.leftChartOption.title.text = baseData.wellId + '\n' + baseData.prodDate.replace('T', ' ')
       this.dvhCardCheck.leftChartOption.series[0].data = baseData.sgt
       this.dvhCardCheck.leftChartOption.series[1].data = [[0, baseData.minL], [baseData.s, baseData.minL]]
       this.dvhCardCheck.leftChartOption.series[2].data = [[0, baseData.maxL], [baseData.s, baseData.maxL]]
@@ -383,13 +414,17 @@ export default {
 </script>
 
 <template>
-  <el-dialog title="功图校核" :visible.sync="dvhCardCheck.visible" v-on:close="closeDialog" width="1200px">
+  <el-dialog title="功图校核"
+             :modal="false"
+
+             :visible.sync="dvhCardCheck.visible" v-on:close="closeDialog" width="1200px">
     <div class="flex-row min200">
       <div class="col-in-row flex-col dvh-original">
         <div class="f-height-30">
           <well-selector :selected.sync="dvhCardCheck.wellId"></well-selector>
           <dvh-card-time-picker :well-id="dvhCardCheck.wellId"
                                 :time.sync="dvhCardCheck.cardTime"
+                                :default-date="dvhCardCheck.defaultSearchTime"
                                 v-on:change="setLeftCard"></dvh-card-time-picker>
         </div>
         <div class="row-in-col">

src/components/NewWorkPage/WellSelector.vue

@@ -18,7 +18,6 @@ export default {
   },
   methods: {
     changeSelected(node) {
-      console.log(node);
       this.$emit("update:selected", node[node.length - 1]);
     },
     transSelectorOptions(d, node) {
@@ -74,7 +73,8 @@ export default {
   },
   async mounted() {
     await this.getWellsTree()
-    this.manualSelectWell('WELLTL100000864')
+    if (this.selected)
+      this.manualSelectWell(this.selected)
   },
   watch: {
     selected: {
@@ -82,7 +82,7 @@ export default {
         let cur = ''
         if (this.wellSelector.selected.length > 0) cur = this.wellSelector.selected[this.wellSelector.selected.length - 1]
         if (newVal !== cur)
-          this.wellSelector.selected = this.searchCheckNode(newVal, this.wellSelector.options, [])
+          this.manualSelectWell(newVal)
       }
     }
   }