Merge remote-tracking branch 'origin/yichang' into yichang

src/components/workSolution/workSolution.vue

@@ -101,6 +101,10 @@
         </el-dropdown>
       </div>
       <div style="width: 40%;float:left">
+        <div style="width: 100%;">
+          <el-button type="success"  size="mini"  @click="toPrev()" style="margin-left: 65%">上一个</el-button>
+          <el-button type="success"  size="mini" @click="toNext()">下一个</el-button>
+        </div>
         <p class="solutionTopTitle solutionTopTitle2_1">
           {{ jing }} {{ jingtime }}
         </p>
@@ -511,6 +515,8 @@ export default {
       jing: '',
       jingtime: '',
       workDiagramFullscreen:false,
+      dataIndex:0,
+      dataList:[]
     }
   },
   methods: {
@@ -610,6 +616,38 @@ export default {
         }
       })
     },
+    toPrev(){
+      if (this.dataIndex -1 <0){
+        this.dataIndex = 0
+        this.$message.success("前面已经没有了")
+        return
+      }
+      else this.dataIndex = this.dataIndex-1
+      this.form.name6 ={
+        name:this.dataList[this.dataIndex].wellCommonName,//井号,
+        id:this.dataList[this.dataIndex].wellId//井号
+      }
+      this.form.name4 = this.dataList[this.dataIndex].prodDate//单日期
+
+      this.getData()
+    },
+    toNext(){
+      if (this.dataIndex +1 >this.dataList.length) {
+        this.dataIndex = this.dataList.length
+        this.$message.success("前面已经没有了")
+        return
+      }
+      else this.dataIndex = this.dataIndex+1
+      this.form.name6 ={
+        name:this.dataList[this.dataIndex].wellCommonName,//井号,
+        id:this.dataList[this.dataIndex].wellId//井号
+      }
+      this.form.name4 = this.dataList[this.dataIndex].prodDate//单日期
+      console.log(this.form)
+
+      this.getData()
+    },
+
     changeWorkDiagramFullscreen(num) {
       //改变油井功图全屏状态
       let publicModal = document
@@ -1721,21 +1759,24 @@ export default {
       // this.getDate()
       // this.getPage()
       getAction(publicUrl.getDefaultData).then((res) => {
+        this.dataIndex = 0
+        this.dataList = res.data.data
+        let data = res.data.data[0]
         _this.form.name6 ={
-          name:res.data.data.wellCommonName,//井号,
-          id:res.data.data.wellId//井号
+          name:data.wellCommonName,//井号,
+          id:data.wellId//井号
         }
          //_this.form.name3 = res.data.data.wellId//井号
 
-        _this.form.name4 = res.data.data.prodDate//单日期
+        _this.form.name4 = data.prodDate//单日期
 
         _this.getData()
-        _this.zuoyequChange(res.data.data.zyq)
-        _this.form.name = res.data.data.zyq//单日期
-        _this.jingquChange(res.data.data.jq)
-        _this.form.name1 = res.data.data.jq//单日期
-        _this.zhandianChange(res.data.data.zd)
-        _this.form.name2 = res.data.data.zd//单日期
+        _this.zuoyequChange(data.zyq)
+        _this.form.name = data.zyq//单日期
+        _this.jingquChange(data.jq)
+        _this.form.name1 = data.jq//单日期
+        _this.zhandianChange(data.zd)
+        _this.form.name2 = data.zd//单日期
       })
     }
   },

src/router/index.js

@@ -261,7 +261,8 @@ const routes = [
 			{
 				path: '/manualMeter',
 				name: '人工计量录入',
-				component: manualMeter
+				component: manualMeter,
+				meta:{keepAlive: true}
 			},
 			{
 				path: '/runningJob',