Browse Source

园子沟无NFC瓦斯巡检

lxh 2 days ago
parent
commit
cef3dc7ca7

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

@@ -7,12 +7,12 @@ if (process.env.NODE_ENV == "development") {
   // BASE_URL = "http://10.248.135.10:9999"; // 大柳塔进
   // BASE_URL = "http://10.248.135.121:9999"; // 活鸡兔井
   // BASE_URL = "http://10.246.63.125:9999"; // 寸草塔二矿
-  BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
+  // 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://10.246.167.205:9999"; //上湾
-  // BASE_URL = "http://172.30.157.9:9999"; //元子沟
+  BASE_URL = "http://172.30.157.9:9999"; //元子沟
   // BASE_URL = "http://10.246.167.205:9999"; //上湾
 }
 let staticDomainURL = BASE_URL + "/sys/common/static";

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

@@ -191,7 +191,7 @@ export default {
   
     data() {
         return {
-            nfcShow: true,//是否使用NFC
+            nfcShow: false,//是否使用NFC
             isDisabled: false,
             isStatus: '',
             deviceId: '',

+ 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';
 export default {
     name: 'gasFill',
     props: {

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

@@ -33,7 +33,7 @@ export default {
         return {
             indexList: [
                 // { id: 1, label: '瓦斯巡检记录卡管理', },
-                { id: 1, label: '图片识别', },
+                // { id: 1, label: '图片识别', },
                 {
                     id: 2, label: '巡检任务面板', children: [
                         { label: '早班', },
@@ -41,7 +41,7 @@ export default {
                         { label: '夜班' },
                     ]
                 },
-                // { id: 3, label: '瓦斯巡检填报' },
+                { id: 3, label: '瓦斯巡检填报' },
             ],
         }
     },

+ 7 - 4
pages/gasreport/gasreport.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="gas-report" name="gasreport">
         <u-navbar :bgStatusImage="backPic0" :bgImage="backPic" :title="gasTitle" :safeAreaInsetTop="true"
-            leftIcon="" > </u-navbar>
+            leftIcon="list"   @leftClick="showPopup" > </u-navbar>
         <view class="gas-content">
             <component :is="loadComponent" :firstAddress="firstAddress" :secondAddress="secondAddress"
                 :firstTj="firstTj" :secondTj="secondTj"></component>
@@ -35,11 +35,11 @@ export default {
         return {
             backPic0: "url(/static/topnavbar0.png)",
             backPic: "url(../../static/topnavbar.png)",
-            gasTitle: '瓦斯日报1',//标题
+            gasTitle: '瓦斯日报',//标题
             showModel: false,//是否打开弹出层
-            // loadComponent: 'gasFill',//默认加载组件
+            loadComponent: 'gasFill',//默认加载组件
             // loadComponent: 'gasImgIdentify',//默认加载组件
-            loadComponent: 'taskBoard',//默认加载组件
+            // loadComponent: 'taskBoard',//默认加载组件
             taskTj: {},
             firstAddress: '',//一次线路
             secondAddress: '',//二次线路
@@ -54,6 +54,9 @@ export default {
         this.queryNowGasInfoByUser()
     },
     methods: {
+        showPopup(){
+            this.showModel=!this.showModel
+        },
         //导航栏点击
         handlerClick(data) {
             let that = this