lxh 2 天之前
父节点
当前提交
1ecf968aab

+ 4 - 2
common/service/config.service.js

@@ -3,7 +3,7 @@ let BASE_URL = "";
 if (process.env.NODE_ENV == "development") {
   BASE_URL = "http://182.92.126.35:9999"; // 开发环境
 } else {
-  BASE_URL = "http://182.92.126.35:9999"; // 开发环境
+  // BASE_URL = "http://182.92.126.35:9999"; // 开发环境
   // BASE_URL = "http://10.246.95.4:9999"; // 布尔台
   // BASE_URL = "http://10.248.135.10:9999"; // 大柳塔进
   // BASE_URL = "http://10.248.135.121:9999"; // 活鸡兔井
@@ -11,7 +11,9 @@ 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"; //上湾
+
 }
 let staticDomainURL = BASE_URL + "/sys/common/static";
 

+ 0 - 34
pages/gasreport/components/gasImgIdentify.vue

@@ -207,7 +207,6 @@
 <script>
 import api from "@/api/api";
 import moment from 'moment'
-// import testNfc from "@/common/util/hexiii-nfc.js"
 import { mapGetters } from "vuex";
 import configService from '@/common/service/config.service.js'
 export default {
@@ -272,17 +271,6 @@ export default {
         username: function () {
             return uni.getStorageSync('login_user_info')['realname']
         },
-        cardIds: function () {
-            return this.$store.getters.nfcreadtxt
-        }
-    },
-    watch: {
-        cardIds: {
-            handler(newV, oldV) {
-                this.getCardLists(newV)
-            },
-            immediate: true
-        }
     },
     mounted() {
         console.log(uni.getStorageSync('login_user_info'), 'ceshi00-----------')
@@ -1587,33 +1575,11 @@ export default {
                 this.isRule14 = false
             }
         },
-        //根据NFC读取数据获取监测地点信息
-        getCardLists(ids) {
-            let that = this
-            new Promise((resolve, reject) => {
-                api
-                    .getCardList({ id: ids })
-                    .then((response) => {
-                        if (response.data.code == 200) {
-                            let data = response.data.result
-                            that.formState.jcdd = data.id
-                            that.deviceId = data.id
-                        }
-                    })
-            });
-        },
         //瓦斯新增
         getAdd() {
             let that = this
             that.isStatus = 'add'
             that.isShowAdd = true
-            // that.formState.jcy = this.username
-            // if (that.nfcShow) {
-            //     testNfc.listenNFCStatus()
-            //     testNfc.readData();
-            //     // //根据NFC读取数据获取监测地点信息
-            //     // that.getCardLists(ids)
-            // }
             that.formState = {
                 id: '',
                 bc: that.indexParam['班次'],

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

@@ -41,7 +41,7 @@ export default {
                         { label: '夜班' },
                     ]
                 },
-                { id: 3, label: '瓦斯巡检填报' },
+                // { id: 3, label: '瓦斯巡检填报' },
             ],
         }
     },