wfhou 9 月之前
父节点
当前提交
622ab9ef41
共有 6 个文件被更改,包括 76 次插入77 次删除
  1. 11 18
      config.js
  2. 4 2
      manifest.json
  3. 1 1
      pagesB/components/fireWork/index.vue
  4. 4 3
      pagesB/fire/fireWork/addWork/index.vue
  5. 2 2
      pagesB/fire/fireWork/index.vue
  6. 54 51
      project.config.json

+ 11 - 18
config.js

@@ -1,36 +1,29 @@
 // 应用全局配置
 module.exports = {
-	// baseUrl: 'http://api-security.byants.com',
-	// baseUrlImg:'http://security.byants.com/static/appimg',
-	// baseUrl: 'http://112.19.80.230',
-	// baseUrl:'https://byant.jujutong.cloud',
-	// baseUrlImg: 'https://byant.jujutong.cloud/static/appimg',
-	// baseUrl: 'https://ggfw.ybxfjy.com',
-	// baseUrlImg: 'https://ggfw.ybxfjy.com/static/appimg',
-	baseUrl: 'http://8.142.173.95:48081', 
-	baseUrlImg:'http://byant.jujutong.cloud/static/appimg',
-	// baseUrl:'http://api-security.byants.com/app-api/s9/task/self-page',
-	// baseUrl: 'http://127.0.0.1:4523/m1/2188954-0-default',
-	// baseUrl: 'https://mock.apifox.cn/m1/2188954-0-default',
-	// baseApi: '/admin-api',
+	baseUrlImg:'https://ggfw.ybxfjy.com/static/appimg',
+
+	//baseUrlImg: 'http://127.0.0.1/static/appimg',
+	baseUrl: 'https://ggfw.ybxfjy.com',
+	//baseUrl: 'http://127.0.0.1:48081',
 	baseApi: '',
+	// baseApi: '',
 	// 应用信息
 	appInfo: {
 		// 应用名称
-		name: "yudao-app",
+		name: "宜宾智慧消防公共服务平台移动端",
 		// 应用版本
 		version: "1.0.0",
 		// 应用logo
 		logo: "/static/logo.png",
 		// 官方网站
-		site_url: "https://iocoder.cn",
+		site_url: "https://www.ybxfjy.com",
 		// 政策协议
 		agreements: [{
 			title: "隐私政策",
-			url: "https://iocoder.cn"
+			url: "https://www.ybxfjy.com"
 		}, {
 			title: "用户服务协议",
-			url: "https://iocoder.cn"
+			url: "https://www.ybxfjy.com"
 		}]
 	}
-}
+}

+ 4 - 2
manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "消防安全公共平台",
-    "appid" : "__UNI__B25A099",
+    "appid" : "__UNI__B1C9DF0",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -114,6 +114,8 @@
                     "key" : "E66BZ-LLKCZ-76SXQ-ZMVUP-GGWT7-S4FGG"
                 }
             }
-        }
+        },
+        "title" : "宜宾智慧消防公共服务平台移动端",
+        "domain" : "ggfw.ybxfjy.com"
     }
 }

+ 1 - 1
pagesB/components/fireWork/index.vue

@@ -34,7 +34,7 @@
 							<text class="conts">{{ item.executor }}</text>
 						</view>
 						<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
-							<text class="name-align-drill">动火事由:</text>
+							<text class="name-align-drill">动火部位:</text>
 							<text class="conts">{{ item.workReason }}</text>
 						</view>
 						<view style="margin-top: 80rpx;">

+ 4 - 3
pagesB/fire/fireWork/addWork/index.vue

@@ -6,7 +6,7 @@
 					<u-form-item label="所属单位" prop="orgName" @click="showOrg = true; hideKeyboard()" :required="true">
 						<u-input v-model="formData.orgName" placeholder="请输入" :disabled="isview" />
 					</u-form-item>
-					<u-form-item label="动火事由" prop="workReason" :required="true">
+					<u-form-item label="动火部位" prop="workReason" :required="true">
 						<u-input v-model="formData.workReason" placeholder="请输入" :disabled="isview" />
 					</u-form-item>
 					<u-form-item label="动火作业执行人" prop="executor" :required="true"
@@ -120,14 +120,15 @@
 					workBegin: '',
 					workEnd: '',
 					att: '',
-					attId: []
+					attId: [],
+                    img1:''
 				},
 				loading: '',
 				rules: {
 					workReason: [{
 						type: 'string',
 						required: true,
-						message: '动火事由不能为空',
+						message: '动火部位不能为空',
 						trigger: ['blur', 'change']
 					}],
 					executor: [{

+ 2 - 2
pagesB/fire/fireWork/index.vue

@@ -34,7 +34,7 @@
 							<text class="conts">{{ item.executor }}</text>
 						</view>
 						<view style="display: flex;margin-bottom: 15rpx; color: #728f90;">
-							<text class="name-align-drill">动火事由:</text>
+							<text class="name-align-drill">动火部位:</text>
 							<text class="conts">{{ item.workReason }}</text>
 						</view>
 						<view style="margin-top: 80rpx;">
@@ -170,7 +170,7 @@
 			//审核通过
 			confirmShenHe() {
 				this.showShenHe = false
-				fireWorkShenHe({ids:this.ShenHeids
+				fireWorkShenHe({orgId:this.formData.orgId,ids:this.ShenHeids
 				}).then(response => {
 						this.tableData = []
 						this.getData()

+ 54 - 51
project.config.json

@@ -1,53 +1,56 @@
 {
-	"appid": "touristappid",
-	"compileType": "miniprogram",
-	"libVersion": "2.28.1",
-	"packOptions": {
-		"ignore": [],
-		"include": []
-	},
-	"setting": {
-		"urlCheck": true,
-		"scopeDataCheck": false,
-		"coverView": true,
-		"es6": true,
-		"postcss": true,
-		"compileHotReLoad": false,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"autoAudits": false,
-		"newFeature": false,
-		"uglifyFileName": false,
-		"uploadWithSourceMap": true,
-		"useIsolateContext": true,
-		"nodeModules": false,
-		"enhance": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false,
-		"showShadowRootInWxmlPanel": true,
-		"lazyloadPlaceholderEnable": false,
-		"useMultiFrameRuntime": true,
-		"packNpmManually": false,
-		"packNpmRelationList": [],
-		"minifyWXSS": true,
-		"useStaticServer": true,
-		"showES6CompileOption": false,
-		"checkInvalidKey": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"disableUseStrict": false,
-		"useCompilerPlugins": false
-	},
-	"editorSetting": {
-		"tabIndent": "insertSpaces",
-		"tabSize": 2
-	},
-	"description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-	"projectname": "yibin",
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {}
+    "appid": "wx521a1bc45a7cac4a",
+    "compileType": "miniprogram",
+    "libVersion": "2.28.1",
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "setting": {
+        "urlCheck": true,
+        "es6": true,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": false,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "useIsolateContext": true,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "minifyWXML": true,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "ignoreUploadUnusedFiles": true
+    },
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 2
+    },
+    "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "ybxf-security-uniapp",
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "condition": {}
 }