Преглед изворни кода

Merge branch 'master' of http://39.97.59.228:8013/msx/Vent-App

lxh пре 1 дан
родитељ
комит
9fe1c7180b
3 измењених фајлова са 168 додато и 59 уклоњено
  1. 6 1
      common/service/config.service.js
  2. 61 34
      pages/ipConfig/ipConfig.vue
  3. 101 24
      pages/login/login.vue

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

@@ -7,7 +7,11 @@ if (process.env.NODE_ENV == "development") {
   // BASE_URL = "http://10.35.116.82:9999";//棋盘井东区
   // BASE_URL = "http://192.168.126.12:9999";//王洼二矿
   // BASE_URL = "http://172.17.3.15:9999"; //黑龙煤矿
-  // BASE_URL = "http://182.92.126.35:9999";
+  BASE_URL = "http://172.19.7.101:9999"; //准东二矿
+  // BASE_URL = "http://172.16.53.16:9999"; //大海则煤矿
+  //BASE_URL = "http://10.7.0.19:9999"; //特拉布拉
+  //BASE_URL = "http://10.35.116.82:9999"; //棋盘井东区
+  //BASE_URL = "http://182.92.126.35:9999"; //测试环境
 }
 let staticDomainURL = BASE_URL + "/sys/common/static";
 const configService = {
@@ -15,6 +19,7 @@ const configService = {
   apiUrlP: "http://182.92.126.35",
   // apiUrlP: 'http://182.92.126.35:6006',
   staticDomainURL: staticDomainURL,
+  hasBaseUrl: !!BASE_URL,
 };
 
 export default configService;

+ 61 - 34
pages/ipConfig/ipConfig.vue

@@ -1,15 +1,27 @@
   <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";
@@ -21,25 +33,40 @@ export default {
       IPSet: "",
       IpConfig: [
         [
-          { label: "棋盘井", value: "http://10.35.116.82:9999", code: 'qpj' },
-          { label: "准东二矿", value: "http://172.19.7.101:9999", code: 'zdrk' },
-          { label: "大海则煤矿", value: "http://172.16.53.16:9999", code: 'dhz' },
-          { label: "大柳塔井", value: "http://10.248.135.10:9999", code: 'dlt' },
-          { label: "活鸡兔井", value: "http://10.248.135.121:9999", code: 'hjt' },
-          { label: "寸草塔二矿", value: "http://10.246.63.5:9999", code: 'cctr' },
-          { label: "乌兰木伦", value: "http://10.246.183.35:9999", code: 'wlml' },
-          { label: "哈拉沟煤矿", value: "http://10.248.223.12:9999", code: 'hlg' },
-          { label: "布尔台", value: "http://10.246.95.4:9999", code: 'brt' },
-          { label: "上湾", value: "http://10.246.167.205:9999", code: 'sw' },
-          { label: "锦界", value: "http://10.248.151.42:9999", code: 'jj' },
-          { label: "补连塔", value: "http://10.246.175.16:9999", code: 'blt' },
-          { label: "寸草塔", value: "http://10.246.23.171:9999", code: 'cct' },
-          { label: "柳塔", value: "http://10.246.87.121:9999", code: 'lt' },
-          { label: "石圪台", value: "http://10.246.191.13:9999", code: 'sgt' },
-          { label: "榆家梁", value: "http://10.248.143.211:9999", code: 'yjl' },
-          { label: "开发", value: "http://182.92.126.35:9999", code: 'kf' },
-          { label: "测试", value: "http://182.92.126.35:9998", code: 'cs' },
-          { label: "特拉布拉", value: "http://10.7.0.19:9999", code: 'lblt' },
+          {
+            label: "大柳塔井",
+            value: "http://10.248.135.10:9999",
+            code: "dlt",
+          },
+          {
+            label: "活鸡兔井",
+            value: "http://10.248.135.121:9999",
+            code: "hjt",
+          },
+          {
+            label: "寸草塔二矿",
+            value: "http://10.246.63.5:9999",
+            code: "cctr",
+          },
+          {
+            label: "乌兰木伦",
+            value: "http://10.246.183.35:9999",
+            code: "wlml",
+          },
+          {
+            label: "哈拉沟煤矿",
+            value: "http://10.248.223.12:9999",
+            code: "hlg",
+          },
+          { label: "布尔台", value: "http://10.246.95.4:9999", code: "brt" },
+          { label: "上湾", value: "http://10.246.167.205:9999", code: "sw" },
+          { label: "锦界", value: "http://10.248.151.42:9999", code: "jj" },
+          { label: "补连塔", value: "http://10.246.175.16:9999", code: "blt" },
+          { label: "寸草塔", value: "http://10.246.23.171:9999", code: "cct" },
+          { label: "柳塔", value: "http://10.246.87.121:9999", code: "lt" },
+          { label: "石圪台", value: "http://10.246.191.13:9999", code: "sgt" },
+          { label: "榆家梁", value: "http://10.248.143.211:9999", code: "yjl" },
+          { label: "保德", value: "http://10.248.210.152:9999", code: "bd" },
         ],
       ],
       fromSetting: false, // 是否来自设置页
@@ -56,9 +83,9 @@ export default {
       this.ipShow = false;
       this.ip = e.value[0].value;
       const fullURL = e.value[0].value;
-      console.log(fullURL, 'fullURL')
-      const apicode = e.value[0].code
-      console.log(apicode, '9900')
+      console.log(fullURL, "fullURL");
+      const apicode = e.value[0].code;
+      console.log(apicode, "9900");
       this.IPSet = e.value[0].label;
       configService.apiUrl = fullURL;
       uni.setStorageSync("selectedIP", true);
@@ -78,7 +105,7 @@ export default {
       this.ipShow = true;
     },
   },
-  beforeDestroy() { },
+  beforeDestroy() {},
 };
 </script>
 

+ 101 - 24
pages/login/login.vue

@@ -9,9 +9,68 @@
           <image class="logo" src="/static/desk-img/1-1.png" mode="aspectFit"></image>
           <u-icon name="setting-fill" color="#2979ff" size="22" @click="setIp"></u-icon>
         </view>
-        <view class="welcome-text">您好,欢迎使用</view>
-        <view class="platform-name">“一通三防”智能管控平台</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> -->
+          <view class="zai-title2 text-shadow " v-if="!hasBaseUrl" @click="changeloginType">切换单点登录</view>
+        </view>
+        <view class="box padding-lr-xl login-paddingtop" :style="[{ animation: 'show ' + 0.6 + 's 1' }]">
+          <block>
+            <view class="cu-form-group margin-top  shadow-warp" :class="[shape == 'round' ? 'round' : '']">
+              <view class="title"><text class="cuIcon-people margin-right-xs"></text>账号:</view>
+              <input placeholder="请输入账号" name="input" v-model="userName"></input>
+            </view>
+            <view class="cu-form-group margin-top shadow-warp" :class="[shape == 'round' ? 'round' : '']">
+              <view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
+              <input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" />
+              <view class="action text-lg">
+                <text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']"
+                  @click="changePassword"></text>
+              </view>
+            </view>
+            <view class="padding text-center margin-top">
+              <button class="cu-btn bg-blue lg margin-right shadow" :loading="loading"
+                :class="[shape == 'round' ? 'round' : '']" @tap="onLogin"><text space="emsp">{{ loading ? "登录中..." :
+                  "登录" }}</text>
+              </button>
+            </view>
+          </block>
+          <!-- #ifdef APP-PLUS -->
+          <view class="padding flex flex-direction  text-center">
+            当前版本:{{ version }}
+          </view>
+          <!-- #endif -->
+
+        </view>
+      </scroll-view>
+      <!-- 登录加载弹窗 -->
+      <view class="cu-load load-modal" v-if="loading">
+        <!-- <view class="cuIcon-emojifill text-orange"></view> -->
+        <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="!hasBaseUrl">
+        <!-- <view class="IPSet">
+            <span class="text-style">IP地址:  <u--input
+              placeholder="请输入IP地址"
+              border="surround"
+              v-model="IPValue"
+            ></u--input></span>
+            <span class="text-style">端口号:  <u--input
+              placeholder="请输入端口号"
+              border="surround"
+              v-model="PortValue"
+            ></u--input></span>
+            <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> -->
+      </scroll-view>
     </view>
 
     <!-- 登录表单 -->
@@ -125,25 +184,40 @@ export default {
       IPSet: "",
       IpConfig: [
         [
-          { label: "棋盘井", value: "http://10.35.116.82:9999", code: 'qpj' },
-          { label: "准东二矿", value: "http://172.19.7.101:9999", code: 'zdrk' },
-          { label: "大海则煤矿", value: "http://172.16.53.16:9999", code: 'dhz' },
-          { label: "大柳塔井", value: "http://10.248.135.10:9999", code: 'dlt' },
-          { label: "活鸡兔井", value: "http://10.248.135.121:9999", code: 'hjt' },
-          { label: "寸草塔二矿", value: "http://10.246.63.5:9999", code: 'cctr' },
-          { label: "乌兰木伦", value: "http://10.246.183.35:9999", code: 'wlml' },
-          { label: "哈拉沟煤矿", value: "http://10.248.223.12:9999", code: 'hlg' },
-          { label: "布尔台", value: "http://10.246.95.4:9999", code: 'brt' },
-          { label: "上湾", value: "http://10.246.167.205:9999", code: 'sw' },
-          { label: "锦界", value: "http://10.248.151.42:9999", code: 'jj' },
-          { label: "补连塔", value: "http://10.246.175.16:9999", code: 'blt' },
-          { label: "寸草塔", value: "http://10.246.23.171:9999", code: 'cct' },
-          { label: "柳塔", value: "http://10.246.87.121:9999", code: 'lt' },
-          { label: "石圪台", value: "http://10.246.191.13:9999", code: 'sgt' },
-          { label: "榆家梁", value: "http://10.248.143.211:9999", code: 'yjl' },
-          { label: "开发", value: "http://182.92.126.35:9999", code: 'kf' },
-          { label: "测试", value: "http://182.92.126.35:9998", code: 'cs' },
-          { label: "特拉布拉", value: "http://10.7.0.19:9999", code: 'lblt' },
+          {
+            label: "大柳塔井",
+            value: "http://10.248.135.10:9999",
+            code: "dlt",
+          },
+          {
+            label: "活鸡兔井",
+            value: "http://10.248.135.121:9999",
+            code: "hjt",
+          },
+          {
+            label: "寸草塔二矿",
+            value: "http://10.246.63.5:9999",
+            code: "cctr",
+          },
+          {
+            label: "乌兰木伦",
+            value: "http://10.246.183.35:9999",
+            code: "wlml",
+          },
+          {
+            label: "哈拉沟煤矿",
+            value: "http://10.248.223.12:9999",
+            code: "hlg",
+          },
+          { label: "布尔台", value: "http://10.246.95.4:9999", code: "brt" },
+          { label: "上湾", value: "http://10.246.167.205:9999", code: "sw" },
+          { label: "锦界", value: "http://10.248.151.42:9999", code: "jj" },
+          { label: "补连塔", value: "http://10.246.175.16:9999", code: "blt" },
+          { label: "寸草塔", value: "http://10.246.23.171:9999", code: "cct" },
+          { label: "柳塔", value: "http://10.246.87.121:9999", code: "lt" },
+          { label: "石圪台", value: "http://10.246.191.13:9999", code: "sgt" },
+          { label: "榆家梁", value: "http://10.248.143.211:9999", code: "yjl" },
+          { label: "保德", value: "http://10.248.210.152:9999", code: "bd" },
         ],
       ],
     };
@@ -159,6 +233,9 @@ export default {
     // #endif
   },
   computed: {
+    hasBaseUrl() {
+      return configService.hasBaseUrl;
+    },
     isSendSMSEnable() {
       return this.smsCountDown <= 0 && this.phoneNo.length > 4;
     },
@@ -196,7 +273,7 @@ export default {
       let loginParams = {
         username: this.userName,
         password: this.password,
-        clientId: uni.getStorageSync('push_cid')
+        clientId: uni.getStorageSync("push_cid"),
       };
       // 加密
       const loginCipher = getLoginCipher();
@@ -434,7 +511,7 @@ export default {
       this.ipShow1 = false;
       const fullURL = e.value[0].value;
       this.IPSet = e.value[0].label;
-      const apiCode = e.value[0].code
+      const apiCode = e.value[0].code;
       configService.apiUrl = fullURL;
       uni.setStorageSync("apiUrl", configService.apiUrl);
       uni.setStorageSync("apiCode", apiCode);
@@ -622,4 +699,4 @@ export default {
 .text-style {
   margin: 20px;
 }
-</style>
+</style>