Merge branch 'master' of http://118.89.139.230:10101/r/admin-mw into master

whychdw

2021-05-25 05b0fb3716113d1cfb92eb293abf8600dfb541b7

Merge branch 'master' of http://118.89.139.230:10101/r/admin-mw into master

 src/pages/windingTest/js/apis.js

@@ -60,12 +60,12 @@
    });
  }
  /**
 * 获取测试人
 * 完成试验
 */
 export const complete = (data) => {
    return axios({
      method: "POST",
      url: "/windingExperiment/updateFlag",
      url: "/windingExperiment/finishRZExperiment",
      params: data
    });
  }

 src/pages/windingTest/windingTest.vue

@@ -105,7 +105,7 @@
</div>
</template>
<script>
import { getDataList,daleteData,getThisNumber,complete,seveData,updateRZStep } from "./js/apis"
import { getDataList,daleteData,saveRZStep,complete,seveData,updateRZStep } from "./js/apis"
export default {
    data(){
        return {
@@ -203,12 +203,9 @@
        // 查询当前试验编号
        getThisNumber:function(){
            let self = this;
            let data = {
                type : "rz"
            };
                getThisNumber(data).then(res=>{
                saveRZStep().then(res=>{
                    if(res.data.code == 1){
                        self.thisNumber = res.data.data;
                        self.thisNumber = res.data.data.id;
                    }
                })
                
@@ -304,7 +301,7 @@
                                    resistance:element.rz3,
                                    temperature:element.rz4,
                                    deviceId:'',
                                    experimentId:element.experimentId?element.experimentId:self.routeObj.experimentId,
                                    experimentId:element.experimentId?element.experimentId:self.thisNumber,
                                    realName:'',
                                    saveTime:'',
                                    status:'',
@@ -324,7 +321,7 @@
                                    resistance:self.rzObj.rz3,
                                    temperature:self.rzObj.rz4,
                                    deviceId:'',
                                    experimentId:self.rzObj.experimentId?self.rzObj.experimentId:self.routeObj.experimentId,
                                    experimentId:self.rzObj.experimentId?self.rzObj.experimentId:self.thisNumber,
                                    realName:'',
                                    saveTime:'',
                                    status:'',

 src/pages/windingTest/windingTestIndex.vue

@@ -160,8 +160,7 @@
                            callback:()=>{
                                if(res.data.data.type == "rz"){
                                    this.$router.push({
                                        path: '/index/windingTest',
                                        query:{experimentId:res.data.data.id}
                                        path: '/index/windingTest'
                                    })
                                }else{
                                    this.$router.push({
@@ -233,7 +232,7 @@
                    if(res.data.code == 1){
                        this.$router.push({
                            path: '/index/windingTest',
                            query:{gxrzljqk:self.fromObj02.gxrzljqk,experimentId:self.fromObj02.dqsybh}
                            query:{gxrzljqk:self.fromObj02.gxrzljqk}
                        })
                    }else{
                        self.$layer.msg("添加失败，请核对！");