Browse Source

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

gxt 1 year ago
parent
commit
0044488791
3 changed files with 68 additions and 8 deletions
  1. 12 8
      src/api/manage.js
  2. 1 0
      src/api/publicUrl.js
  3. 55 0
      src/components/solution/solution.vue

+ 12 - 8
src/api/manage.js

@@ -7,9 +7,16 @@ import store from '../store'    //引用store.js
7 7
 
8 8
 // 创建 axios 实例
9 9
 var axios = Axios.create({
10
-    //baseURL: 'http://10.72.143.2:88', //准东后台默认地址
11
-    //baseURL: 'http://11.72.128.68:88', // 一厂默认地址k(11段)
12
-     baseURL: 'http://192.168.31.252:88', // 王森玉默认地址
10
+    // baseURL: 'http://101.200.219.190:88', // 后台默认地址
11
+    // baseURL: 'http://10.72.143.2:88', //准东后台默认地址
12
+    //baseURL: 'http://11.72.128.68:88', // 一厂默认地址k
13
+   // baseURL: 'http://10.184.33.224:88', // 中石油默认地址
14
+
15
+    // baseURL: 'http://10.72.143.2:88', // 数据公司后台默认地址
16
+    baseURL: 'http://192.168.31.252:88', // 线下默认地址
17
+    // baseURL: 'http://192.168.1.120:9005', // 许思睿默认地址
18
+    // baseURL: 'http://192.168.1.119:9000', // 郭笑天默认地址
19
+    //http://117.34.118.57:28888/job/microarch-fe-app/buildWithParameters?token=asdfwefasdfkljlkgff&tag_version=app2
13 20
     timeout: 12000, // 请求超时时间
14 21
 })
15 22
 axios.interceptors.request.use(function (config) {
@@ -76,7 +83,7 @@ axios.interceptors.response.use(
76 83
 
77 84
 function formatDate(date, fmt) {
78 85
     date = new Date(date);
79
-    if (typeof (fmt) === "undefined") {
86
+    if (typeof(fmt) === "undefined") {
80 87
         fmt = "yyyy-MM-dd HH:mm:ss";
81 88
     }
82 89
     if (/(y+)/.test(fmt)) {
@@ -99,7 +106,7 @@ function formatDate(date, fmt) {
99 106
 }
100 107
 
101 108
 //定义一个时间过滤器
102
-Vue.filter("FormatDate", function (date, fmt) {
109
+Vue.filter("FormatDate", function(date, fmt) {
103 110
     return formatDate(date, fmt);
104 111
 });
105 112
 
@@ -120,7 +127,6 @@ export function postAction(url, parameter) {
120 127
         data: parameter
121 128
     })
122 129
 }
123
-
124 130
 export function postExcelAction(url, parameter) {
125 131
 
126 132
     return axios({
@@ -229,7 +235,6 @@ export function uploadExcel(url, parameter) {
229 235
         },
230 236
     })
231 237
 }
232
-
233 238
 export function getExcelExampleAction(url) {
234 239
 
235 240
     return axios({
@@ -238,7 +243,6 @@ export function getExcelExampleAction(url) {
238 243
         responseType: 'blob',
239 244
     })
240 245
 }
241
-
242 246
 /**
243 247
  * 下载文件 用于excel导出
244 248
  * @param url

+ 1 - 0
src/api/publicUrl.js

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

+ 55 - 0
src/components/solution/solution.vue

@@ -245,6 +245,13 @@
245 245
       <div class="solutionTop">
246 246
         <p class="solutionTopTitle solutionTopTitle3">
247 247
           {{ pageData.processparam.JH }}工况诊断报告单
248
+          <el-tooltip class="item" effect="light" content="设为标准功图"  placement="top">
249
+            <el-icon class="el-icon-setting" style="cursor: pointer"
250
+                     @click.native.prevent="setStandardGtForm.visible=true;
251
+                     setStandardGtForm.rerunDiagnose=false;
252
+                     setStandardGtForm.resetResult=pageData.result2"></el-icon>
253
+          </el-tooltip>
254
+
248 255
         </p>
249 256
         <div class="solutionTopContentLeft_ZD solutionTopContent1">
250 257
           <p class="solutionTopTitle solutionTopTitle2">诊断功图
@@ -468,6 +475,7 @@
468 475
         >已处置
469 476
       </el-button>
470 477
       <div style="width: 100%;height: 1px;margin-top: 20px;"></div>
478
+
471 479
     </div>
472 480
     <!-- 生产曲线 -->
473 481
     <Modal
@@ -1007,7 +1015,34 @@
1007 1015
         </div>
1008 1016
       </div>
1009 1017
     </Modal>
1018
+    <el-dialog
1019
+               append-to-body
1020
+               width="300px"
1021
+               title="设置标准功图"
1022
+               :visible.sync="setStandardGtForm.visible"
1023
+    >
1024
+      <el-form :model="setStandardGtForm" label-width="70px">
1025
+        <el-form-item label="设置工况" >
1026
+          <el-input v-model="setStandardGtForm.resetResult" :placeholder="pageData.result2" style="width: 60%;"></el-input>
1027
+        </el-form-item>
1028
+        <el-form-item label="重新诊断">
1029
+          <el-checkbox v-model="setStandardGtForm.rerunDiagnose"></el-checkbox>
1030
+        </el-form-item>
1031
+      </el-form>
1032
+
1033
+<!--      <row >
1034
+        <label>设置工况</label>
1035
+        <el-input :model="setStandardGtForm.resetResult" style="width: 60%;height: "></el-input>
1036
+      </row>
1037
+      <row>
1038
+        <label>重新诊断</label>
1039
+        <el-checkbox :model="setStandardGtForm.rerunDiagnose"></el-checkbox></row>-->
1040
+      <el-button @click="setStandardGt">确认</el-button>
1041
+      <el-button @click="setStandardGtForm.visible=false">取消</el-button>
1042
+    </el-dialog>
1043
+
1010 1044
   </div>
1045
+
1011 1046
 </template>
1012 1047
 
1013 1048
 <script>
@@ -1046,6 +1081,11 @@ export default {
1046 1081
       jhObj: "",
1047 1082
       treeStatus2: 0,
1048 1083
       activeName: "first",
1084
+      setStandardGtForm:{
1085
+        visible:false,
1086
+        rerunDiagnose: false,
1087
+        resetResult: ''
1088
+      },
1049 1089
       leftform: {
1050 1090
         name: "",
1051 1091
         jibie: [],
@@ -1158,6 +1198,21 @@ export default {
1158 1198
     };
1159 1199
   },
1160 1200
   methods: {
1201
+    setStandardGt(){
1202
+      console.log(this.setStandardGtForm)
1203
+      getAction(publicUrl.setStandardGt,{
1204
+        wellId: this.pageData.wellId,
1205
+        prodDate: this.pageData.prodDateTime,
1206
+        rerunDiagnose: this.setStandardGtForm.rerunDiagnose,
1207
+        resetResult: this.setStandardGtForm.resetResult
1208
+      }).then(res=>{
1209
+        this.$message({
1210
+          message: res.data.data?'设置成功':'设置失败',
1211
+          type: res.data.data?'success':'warning'
1212
+        })
1213
+      })
1214
+      this.setStandardGtForm.visible = false
1215
+    },
1161 1216
     appendDealContent(item) {
1162 1217
       this.questionForm.measure += item + ";";
1163 1218
     },