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

src/api/manage.js

@@ -7,9 +7,16 @@ import store from '../store'    //引用store.js
 
 // 创建 axios 实例
 var axios = Axios.create({
-    //baseURL: 'http://10.72.143.2:88', //准东后台默认地址
-    //baseURL: 'http://11.72.128.68:88', // 一厂默认地址k(11段)
-     baseURL: 'http://192.168.31.252:88', // 王森玉默认地址
+    // baseURL: 'http://101.200.219.190:88', // 后台默认地址
+    // baseURL: 'http://10.72.143.2:88', //准东后台默认地址
+    //baseURL: 'http://11.72.128.68:88', // 一厂默认地址k
+   // baseURL: 'http://10.184.33.224:88', // 中石油默认地址
+
+    // baseURL: 'http://10.72.143.2:88', // 数据公司后台默认地址
+    baseURL: 'http://192.168.31.252:88', // 线下默认地址
+    // baseURL: 'http://192.168.1.120:9005', // 许思睿默认地址
+    // baseURL: 'http://192.168.1.119:9000', // 郭笑天默认地址
+    //http://117.34.118.57:28888/job/microarch-fe-app/buildWithParameters?token=asdfwefasdfkljlkgff&tag_version=app2
     timeout: 12000, // 请求超时时间
 })
 axios.interceptors.request.use(function (config) {
@@ -76,7 +83,7 @@ axios.interceptors.response.use(
 
 function formatDate(date, fmt) {
     date = new Date(date);
-    if (typeof (fmt) === "undefined") {
+    if (typeof(fmt) === "undefined") {
         fmt = "yyyy-MM-dd HH:mm:ss";
     }
     if (/(y+)/.test(fmt)) {
@@ -99,7 +106,7 @@ function formatDate(date, fmt) {
 }
 
 //定义一个时间过滤器
-Vue.filter("FormatDate", function (date, fmt) {
+Vue.filter("FormatDate", function(date, fmt) {
     return formatDate(date, fmt);
 });
 
@@ -120,7 +127,6 @@ export function postAction(url, parameter) {
         data: parameter
     })
 }
-
 export function postExcelAction(url, parameter) {
 
     return axios({
@@ -229,7 +235,6 @@ export function uploadExcel(url, parameter) {
         },
     })
 }
-
 export function getExcelExampleAction(url) {
 
     return axios({
@@ -238,7 +243,6 @@ export function getExcelExampleAction(url) {
         responseType: 'blob',
     })
 }
-
 /**
  * 下载文件 用于excel导出
  * @param url

src/api/publicUrl.js

@@ -51,6 +51,7 @@ let publicUrl = {
 	getDefaultCvrresult:'/data-authorize/dgns/getDgnsResult/getDefaultCvrresult',//默认的三张功图
 	getDgnsCvrresult:'/dgns-diagnose/dgns/getDgnsResult/getDgnsCvrresult',//查询的三张功图
 	saveUserConfirm:'/dgns-diagnose/dgns/saveUserConfirm',//问题处置
+	setStandardGt:'/dgns-diagnose/dgns/setStandardGt',//set standardGt
 	// getProblemListItems:'/warning/warning/getProblemListItems',//问题列表
 	getProblemListItems:'/data-authorize/warning/getProblemListItems',//问题列表
 	getDgnsCvrresultById:'/dgns-diagnose/dgns/getDgnsResult/getDgnsCvrresultById',//问题列表最后一步画图

src/components/solution/solution.vue

@@ -245,6 +245,13 @@
       <div class="solutionTop">
         <p class="solutionTopTitle solutionTopTitle3">
           {{ pageData.processparam.JH }}工况诊断报告单
+          <el-tooltip class="item" effect="light" content="设为标准功图"  placement="top">
+            <el-icon class="el-icon-setting" style="cursor: pointer"
+                     @click.native.prevent="setStandardGtForm.visible=true;
+                     setStandardGtForm.rerunDiagnose=false;
+                     setStandardGtForm.resetResult=pageData.result2"></el-icon>
+          </el-tooltip>
+
         </p>
         <div class="solutionTopContentLeft_ZD solutionTopContent1">
           <p class="solutionTopTitle solutionTopTitle2">诊断功图
@@ -468,6 +475,7 @@
         >已处置
       </el-button>
       <div style="width: 100%;height: 1px;margin-top: 20px;"></div>
+
     </div>
     <!-- 生产曲线 -->
     <Modal
@@ -1007,7 +1015,34 @@
         </div>
       </div>
     </Modal>
+    <el-dialog
+               append-to-body
+               width="300px"
+               title="设置标准功图"
+               :visible.sync="setStandardGtForm.visible"
+    >
+      <el-form :model="setStandardGtForm" label-width="70px">
+        <el-form-item label="设置工况" >
+          <el-input v-model="setStandardGtForm.resetResult" :placeholder="pageData.result2" style="width: 60%;"></el-input>
+        </el-form-item>
+        <el-form-item label="重新诊断">
+          <el-checkbox v-model="setStandardGtForm.rerunDiagnose"></el-checkbox>
+        </el-form-item>
+      </el-form>
+
+<!--      <row >
+        <label>设置工况</label>
+        <el-input :model="setStandardGtForm.resetResult" style="width: 60%;height: "></el-input>
+      </row>
+      <row>
+        <label>重新诊断</label>
+        <el-checkbox :model="setStandardGtForm.rerunDiagnose"></el-checkbox></row>-->
+      <el-button @click="setStandardGt">确认</el-button>
+      <el-button @click="setStandardGtForm.visible=false">取消</el-button>
+    </el-dialog>
+
   </div>
+
 </template>
 
 <script>
@@ -1046,6 +1081,11 @@ export default {
       jhObj: "",
       treeStatus2: 0,
       activeName: "first",
+      setStandardGtForm:{
+        visible:false,
+        rerunDiagnose: false,
+        resetResult: ''
+      },
       leftform: {
         name: "",
         jibie: [],
@@ -1158,6 +1198,21 @@ export default {
     };
   },
   methods: {
+    setStandardGt(){
+      console.log(this.setStandardGtForm)
+      getAction(publicUrl.setStandardGt,{
+        wellId: this.pageData.wellId,
+        prodDate: this.pageData.prodDateTime,
+        rerunDiagnose: this.setStandardGtForm.rerunDiagnose,
+        resetResult: this.setStandardGtForm.resetResult
+      }).then(res=>{
+        this.$message({
+          message: res.data.data?'设置成功':'设置失败',
+          type: res.data.data?'success':'warning'
+        })
+      })
+      this.setStandardGtForm.visible = false
+    },
     appendDealContent(item) {
       this.questionForm.measure += item + ";";
     },