lxh 4 days ago
parent
commit
cd3a207e65

+ 1 - 1
common/service/config.service.js

@@ -10,7 +10,7 @@ if (process.env.NODE_ENV == "development") {
   // BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
   // BASE_URL = "http://10.120.120.164:9999"; // 察哈素
   // BASE_URL = "http://182.92.126.35:9999"; // 生产环境
-  BASE_URL = "http://172.16.53.16:9999"; //大海则
+  // BASE_URL = "http://172.16.53.16:9999"; //大海则
   // BASE_URL = "http://10.246.167.205:9999"; //上湾
   // BASE_URL = "http://172.30.157.9:9999"; //元子沟
   // BASE_URL = "http://10.246.167.205:9999"; //上湾

+ 1 - 1
pages/gasreport/components/gasImgIdentify.vue

@@ -126,7 +126,7 @@
 import api from "@/api/api";
 import moment from 'moment'
 import configService from '@/common/service/config.service.js'
-// import { RHFselcet } from '@/uni_modules/fz-media-selcet';
+import { RHFselcet } from '@/uni_modules/fz-media-selcet';
 import helangCompress from '@/components/helang-compress/helang-compress';
 export default {
     name: 'gasFill',

+ 16 - 24
pages/ipConfig/ipConfig.vue

@@ -1,27 +1,15 @@
   <template>
-  <view class="zai-box">
-    <scroll-view scroll-y class="page">
-      <view class="IPSet">
-        <span class="text-style"
-          ><u-button
-            :plain="true"
-            color="#18a5ff"
-            size="small"
-            :text="IPSet ? IPSet : '选择IP地址'"
-            @tap="changeIP()"
-          ></u-button
-        ></span>
-        <u-picker
-          :show="ipShow"
-          :columns="IpConfig"
-          @cancel="ipShow = false"
-          @confirm="selectIpAddr"
-          keyName="label"
-        ></u-picker>
-      </view>
-    </scroll-view>
-  </view>
-</template>
+    <view class="zai-box">
+      <scroll-view scroll-y class="page">
+        <view class="IPSet">
+          <span class="text-style"><u-button :plain="true" color="#18a5ff" size="small" :text="IPSet ? IPSet : '选择IP地址'"
+              @tap="changeIP()"></u-button></span>
+          <u-picker :show="ipShow" :columns="IpConfig" @cancel="ipShow = false" @confirm="selectIpAddr"
+            keyName="label"></u-picker>
+        </view>
+      </scroll-view>
+    </view>
+  </template>
 
 <script>
 import configService from "@/common/service/config.service.js";
@@ -33,6 +21,7 @@ export default {
       IPSet: "",
       IpConfig: [
         [
+          { label: "大海泽煤矿", value: "http://172.16.53.16:9999" },
           { label: "大柳塔井", value: "http://10.248.135.10:9999" },
           { label: "活鸡兔井", value: "http://10.248.135.121:9999" },
           { label: "寸草塔二矿", value: "http://10.246.63.5:9999" },
@@ -83,7 +72,7 @@ export default {
       this.ipShow = true;
     },
   },
-  beforeDestroy() {},
+  beforeDestroy() { },
 };
 </script>
 
@@ -91,6 +80,7 @@ export default {
 .login-paddingtop {
   padding-top: 300upx;
 }
+
 .zai-box {
   height: 100vh;
   background-image: url(/static/desk-img/loginBg.png);
@@ -133,10 +123,12 @@ export default {
 .zai-btn.button-hover {
   transform: translate(1upx, 1upx);
 }
+
 .IPSet {
   display: flex;
   flex-direction: column;
 }
+
 .text-style {
   margin: 20px;
 }

+ 13 - 21
pages/login/login.vue

@@ -4,7 +4,7 @@
       <scroll-view scroll-y class="page" v-if="!ipShow">
         <view class="text-center" :style="[{ animation: 'show ' + 0.4 + 's 1' }]">
           <!-- <image src="/static/desk-img/logo.png" mode='aspectFit' class="zai-logo "></image> -->
-              <image src="/static/dhz-logo.png" mode='aspectFit' class="zai-logo "></image>
+          <image src="/static/dhz-logo.png" mode='aspectFit' class="zai-logo "></image>
         </view>
         <view class="text-center" :style="[{ animation: 'show ' + 0.4 + 's 1' }]">
           <!-- <u-link  class="zai-title2 text-shadow " href="http://localhost:8080?ticket=234" >切换单点登录</u-link> -->
@@ -45,7 +45,7 @@
         <image src="/static/desk-img/144.png" mode="aspectFit" class="round"></image>
         <view class="gray-text">登录中...</view>
       </view>
-      <scroll-view scroll-y  class="page" v-if="ipShow">
+      <scroll-view scroll-y class="page" v-if="ipShow">
         <!-- <view class="IPSet">
             <span class="text-style">IP地址:  <u--input
               placeholder="请输入IP地址"
@@ -60,25 +60,13 @@
             <span class="text-style"><u-button :plain="true" color="#18a5ff" size="small" @tap="saveIP()">保存</u-button></span>
         </view> -->
         <!-- <scroll-view scroll-y class="page"> -->
-      <view class="IPSet">
-        <span class="text-style"
-          ><u-button
-            :plain="true"
-            color="#18a5ff"
-            size="small"
-            :text="IPSet ? IPSet : '选择IP地址'"
-            @tap="changeIP()"
-          ></u-button
-        ></span>
-        <u-picker
-          :show="ipShow1"
-          :columns="IpConfig"
-          @cancel="ipShow = false"
-          @confirm="selectIpAddr"
-          keyName="label"
-        ></u-picker>
-      </view>
-    <!-- </scroll-view> -->
+        <view class="IPSet">
+          <span class="text-style"><u-button :plain="true" color="#18a5ff" size="small" :text="IPSet ? IPSet : '选择IP地址'"
+              @tap="changeIP()"></u-button></span>
+          <u-picker :show="ipShow1" :columns="IpConfig" @cancel="ipShow = false" @confirm="selectIpAddr"
+            keyName="label"></u-picker>
+        </view>
+        <!-- </scroll-view> -->
       </scroll-view>
     </view>
 
@@ -118,6 +106,7 @@ export default {
       IPSet: "",
       IpConfig: [
         [
+          { label: "大海泽煤矿", value: "http://172.16.53.16:9999" },
           { label: "大柳塔井", value: "http://10.248.135.10:9999" },
           { label: "活鸡兔井", value: "http://10.248.135.121:9999" },
           { label: "寸草塔二矿", value: "http://10.246.63.5:9999" },
@@ -473,6 +462,7 @@ export default {
 .login-paddingtop {
   padding-top: 300upx;
 }
+
 .zai-box {
   height: 100vh;
   background-image: url(/static/desk-img/loginBg.png);
@@ -515,10 +505,12 @@ export default {
 .zai-btn.button-hover {
   transform: translate(1upx, 1upx);
 }
+
 .IPSet {
   display: flex;
   flex-direction: column;
 }
+
 .text-style {
   margin: 20px;
 }