From 1e6c74570ac2d85b4d567305b25b1b252a9d809a Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sun, 28 Apr 2024 14:27:42 +0800
Subject: [PATCH] 更新
---
pages/login/login-account.vue | 3
mixin/uploadMixin.js | 5
manifest.json | 498 ++++++++++++++++++++++++------------------------
mixin/uploadMixinPicCheck.js | 5
mixin/uploadMixinPlace.js | 5
pages/home/launch.html | 5
subPackage/school/troubleDetail.vue | 64 +++++-
common/setting.js | 5
8 files changed, 318 insertions(+), 272 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index 45fea46..0195f11 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -16,7 +16,10 @@
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl: "http://192.168.0.101:9528/",
// 线上环境接口Url
- prodUrl: 'https://srgdjczzxtpt.com:2080/api',
+ // prodUrl: 'https://srgdjczzxtpt.com:2080/api',
+ prodUrl: 'http://192.168.2.105:9528',
+ uploadUrl: 'https://srgdjczzxtpt.com:2080/api',
+
// 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
contentType: 'application/json;charset=UTF-8',
// 后端返回状态码
diff --git a/manifest.json b/manifest.json
index 40a17e3..7820fb9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,250 +1,250 @@
{
- "name": "饶城格格通",
- "appid": "__UNI__EE88272",
- "description": "",
- "versionName": "1.0.10",
- "versionCode": 104,
- "transformPx": false,
- /* 5+App特有相关 */
- "app-plus": {
- "compatible": {
- "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
- },
- "safearea": {
- "bottom": {
- "offset": "none"
- }
- },
- "usingComponents": true,
- "nvueCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": false,
- "waiting": false,
- "autoclose": false,
- "delay": 0
- },
- /* 模块配置 */
- "modules": {
- "VideoPlayer": {},
- "Camera": {},
- "Geolocation": {},
- "Push": {},
- "Maps": {}
- },
- /* 应用发布信息 */
- "distribute": {
- /* android打包配置 */
- "android": {
- "permissions": [
- "<uses-feature android:name=\"android.hardware.camera\"/>",
- "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
- "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
- "<uses-permission android:name=\"android.permission.INTERNET\"/>",
- "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
- "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
- "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
- "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
- "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
- "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
- "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
- "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ],
- "abiFilters": ["armeabi-v7a", "arm64-v8a"]
- },
- /* ios打包配置 */
- "ios": {
- "dSYMs": false,
- "UIBackgroundModes": "",
- "idfa": false
- },
- /* SDK配置 */
- "sdkConfigs": {
- "ad": {},
- "maps": {
- "amap": {
- "appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
- "appkey_android": "c21be9bc7343573c28112c4fe272cb41"
- }
- },
- "geolocation": {
- "amap": {
- "__platform__": ["ios", "android"],
- "appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
- "appkey_android": "c21be9bc7343573c28112c4fe272cb41"
- },
- "system": {
- "__platform__": ["ios", "android"]
- }
- },
- "push": {
- "unipush": {
- "offline": true
- }
- }
- },
- "icons": {
- "android": {
- "hdpi": "D:/Desktop/hbsl/app/应用图标/72.png",
- "xhdpi": "D:/Desktop/hbsl/app/应用图标/96.png",
- "xxhdpi": "D:/Desktop/hbsl/app/应用图标/144.png",
- "xxxhdpi": "D:/Desktop/hbsl/app/应用图标/192.png"
- },
- "ios": {
- "appstore": "D:/Desktop/icon/1024x1024bb.png",
- "iphone": {
- "app@2x": "D:/Desktop/icon/120.png",
- "app@3x": "D:/Desktop/icon/180.png",
- "spotlight@2x": "D:/Desktop/icon/80.png",
- "spotlight@3x": "D:/Desktop/icon/120.png",
- "settings@2x": "D:/Desktop/icon/58.png",
- "settings@3x": "D:/Desktop/icon/87.png",
- "notification@2x": "D:/Desktop/icon/40.png",
- "notification@3x": "D:/Desktop/icon/60.png"
- },
- "ipad": {
- "app": "",
- "app@2x": "",
- "proapp@2x": "",
- "spotlight": "",
- "spotlight@2x": "",
- "settings": "",
- "settings@2x": "",
- "notification": "",
- "notification@2x": ""
- }
- }
- },
- "splashscreen": {
- "useOriginalMsgbox": true
- }
- },
- "uniStatistics": {
- "enable": false
- },
- "nativePlugins": {}
- },
- /* 快应用特有相关 */
- "quickapp": {},
- /* 小程序特有相关 */
- "mp-weixin": {
- "appid": "wx41aa8a5d2e565a05",
- "setting": {
- "urlCheck": false,
- "minified": true,
- "postcss": true,
- "es6": true
- },
- "usingComponents": true,
- "plugins": {
- "ocr-plugin": {
- "version": "3.1.3",
- "provider": "wx4418e3e031e551be"
- }
- },
- "optimization": {
- "subPackages": true
- },
- "uniStatistics": {
- "enable": false
- },
- "requiredPrivateInfos": [
- "getLocation",
- "chooseLocation",
- "onLocationChange",
- "startLocationUpdateBackground"
- ],
- "requiredBackgroundModes": ["location"], //必填
- "permission": {
- "scope.userLocation": {
- "desc": "定位"
- }
- }
- },
- "mp-alipay": {
- "usingComponents": true,
- "uniStatistics": {
- "enable": false
- }
- },
- "mp-baidu": {
- "usingComponents": true,
- "uniStatistics": {
- "enable": false
- }
- },
- "mp-toutiao": {
- "usingComponents": true,
- "setting": {
- "es6": true,
- "minified": true,
- "postcss": true,
- "urlCheck": false
- },
- "uniStatistics": {
- "enable": false
- }
- },
- "h5": {
- "template": "template.h5.html",
- "router": {
- "mode": "hash",
- "base": "/app"
- },
- "optimization": {
- "treeShaking": {
- "enable": true
- }
- },
- "devServer": {
- "proxy": {
- "/api": {
- "target": "http://127.0.0.1",
- //"target" : "https://rider.bladex.vip/api",
- "pathRewrite": {
- "^/api": "/"
- }
- }
- },
- "port": "",
- "https": true
- },
- "uniStatistics": {
- "enable": false
- },
- "sdkConfigs": {
- "maps": {
- "amap": {
- "key": "7fa69abe1defd5888bb85bc736cda874",
- "securityJsCode": "8ac9e5f522c62ed6e3a5800a87b0d140",
- "serviceHost": ""
- }
- }
- },
- "unipush": {
- "enable": false
- }
- },
- "uniStatistics": {
- "enable": false
- },
- "mp-qq": {
- "uniStatistics": {
- "enable": false
- }
- }
-}
\ No newline at end of file
+ "name" : "饶城格格通",
+ "appid" : "__UNI__EE88272",
+ "description" : "",
+ "versionName" : "1.0.10",
+ "versionCode" : 104,
+ "transformPx" : false,
+ /* 5+App特有相关 */
+ "app-plus" : {
+ "compatible" : {
+ "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+ },
+ "safearea" : {
+ "bottom" : {
+ "offset" : "none"
+ }
+ },
+ "usingComponents" : true,
+ "nvueCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : false,
+ "waiting" : false,
+ "autoclose" : false,
+ "delay" : 0
+ },
+ /* 模块配置 */
+ "modules" : {
+ "VideoPlayer" : {},
+ "Camera" : {},
+ "Geolocation" : {},
+ "Push" : {},
+ "Maps" : {}
+ },
+ /* 应用发布信息 */
+ "distribute" : {
+ /* android打包配置 */
+ "android" : {
+ "permissions" : [
+ "<uses-feature android:name=\"android.hardware.camera\"/>",
+ "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+ "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+ "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+ "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+ "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+ "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+ "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+ "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+ },
+ /* ios打包配置 */
+ "ios" : {
+ "dSYMs" : false,
+ "UIBackgroundModes" : "",
+ "idfa" : false
+ },
+ /* SDK配置 */
+ "sdkConfigs" : {
+ "ad" : {},
+ "maps" : {
+ "amap" : {
+ "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
+ "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
+ }
+ },
+ "geolocation" : {
+ "amap" : {
+ "__platform__" : [ "ios", "android" ],
+ "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
+ "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
+ },
+ "system" : {
+ "__platform__" : [ "ios", "android" ]
+ }
+ },
+ "push" : {
+ "unipush" : {
+ "offline" : true
+ }
+ }
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "D:/Desktop/hbsl/app/应用图标/72.png",
+ "xhdpi" : "D:/Desktop/hbsl/app/应用图标/96.png",
+ "xxhdpi" : "D:/Desktop/hbsl/app/应用图标/144.png",
+ "xxxhdpi" : "D:/Desktop/hbsl/app/应用图标/192.png"
+ },
+ "ios" : {
+ "appstore" : "D:/Desktop/icon/1024x1024bb.png",
+ "iphone" : {
+ "app@2x" : "D:/Desktop/icon/120.png",
+ "app@3x" : "D:/Desktop/icon/180.png",
+ "spotlight@2x" : "D:/Desktop/icon/80.png",
+ "spotlight@3x" : "D:/Desktop/icon/120.png",
+ "settings@2x" : "D:/Desktop/icon/58.png",
+ "settings@3x" : "D:/Desktop/icon/87.png",
+ "notification@2x" : "D:/Desktop/icon/40.png",
+ "notification@3x" : "D:/Desktop/icon/60.png"
+ },
+ "ipad" : {
+ "app" : "",
+ "app@2x" : "",
+ "proapp@2x" : "",
+ "spotlight" : "",
+ "spotlight@2x" : "",
+ "settings" : "",
+ "settings@2x" : "",
+ "notification" : "",
+ "notification@2x" : ""
+ }
+ }
+ },
+ "splashscreen" : {
+ "useOriginalMsgbox" : true
+ }
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "nativePlugins" : {}
+ },
+ /* 快应用特有相关 */
+ "quickapp" : {},
+ /* 小程序特有相关 */
+ "mp-weixin" : {
+ "appid" : "wx41aa8a5d2e565a05",
+ "setting" : {
+ "urlCheck" : false,
+ "minified" : true,
+ "postcss" : true,
+ "es6" : true
+ },
+ "usingComponents" : true,
+ "plugins" : {
+ "ocr-plugin" : {
+ "version" : "3.1.3",
+ "provider" : "wx4418e3e031e551be"
+ }
+ },
+ "optimization" : {
+ "subPackages" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "requiredPrivateInfos" : [
+ "getLocation",
+ "chooseLocation",
+ "onLocationChange",
+ "startLocationUpdateBackground"
+ ],
+ "requiredBackgroundModes" : [ "location" ], //必填
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "定位"
+ }
+ }
+ },
+ "mp-alipay" : {
+ "usingComponents" : true,
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "mp-baidu" : {
+ "usingComponents" : true,
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "mp-toutiao" : {
+ "usingComponents" : true,
+ "setting" : {
+ "es6" : true,
+ "minified" : true,
+ "postcss" : true,
+ "urlCheck" : false
+ },
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "h5" : {
+ "template" : "template.h5.html",
+ "router" : {
+ "mode" : "hash",
+ "base" : "/app"
+ },
+ "optimization" : {
+ "treeShaking" : {
+ "enable" : true
+ }
+ },
+ "devServer" : {
+ "proxy" : {
+ "/api" : {
+ "target" : "http://127.0.0.1",
+ //"target" : "https://rider.bladex.vip/api",
+ "pathRewrite" : {
+ "^/api" : "/"
+ }
+ }
+ },
+ "port" : "",
+ "https" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "sdkConfigs" : {
+ "maps" : {
+ "amap" : {
+ "key" : "7fa69abe1defd5888bb85bc736cda874",
+ "securityJsCode" : "8ac9e5f522c62ed6e3a5800a87b0d140",
+ "serviceHost" : ""
+ }
+ }
+ },
+ "unipush" : {
+ "enable" : false
+ }
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "mp-qq" : {
+ "uniStatistics" : {
+ "enable" : false
+ }
+ }
+}
diff --git a/mixin/uploadMixin.js b/mixin/uploadMixin.js
index d031c93..fdc080d 100644
--- a/mixin/uploadMixin.js
+++ b/mixin/uploadMixin.js
@@ -1,7 +1,8 @@
import {
prodUrl,
clientId,
- clientSecret
+ clientSecret,
+ uploadUrl
} from '@/common/setting'
import {
@@ -22,7 +23,7 @@
maxCount: "5",
previewFullImage: true,
uploadText: "上传中",
- url: prodUrl + "/blade-resource/oss/endpoint/put-file",
+ url: uploadUrl + "/blade-resource/oss/endpoint/put-file",
header: {},
},
}
diff --git a/mixin/uploadMixinPicCheck.js b/mixin/uploadMixinPicCheck.js
index 9d89848..8fcb6c3 100644
--- a/mixin/uploadMixinPicCheck.js
+++ b/mixin/uploadMixinPicCheck.js
@@ -2,7 +2,8 @@
devUrl,
prodUrl,
clientId,
- clientSecret
+ clientSecret,
+ uploadUrl
} from '@/common/setting'
import {
@@ -23,7 +24,7 @@
maxCount: "5",
previewFullImage: true,
uploadText: "上传中",
- url: prodUrl + "/blade-resource/oss/endpoint/put-file-attach-by-prefix-path"
+ url: uploadUrl + "/blade-resource/oss/endpoint/put-file-attach-by-prefix-path"
},
}
},
diff --git a/mixin/uploadMixinPlace.js b/mixin/uploadMixinPlace.js
index 6a78b6a..5899b49 100644
--- a/mixin/uploadMixinPlace.js
+++ b/mixin/uploadMixinPlace.js
@@ -1,7 +1,8 @@
import {
prodUrl,
clientId,
- clientSecret
+ clientSecret,
+ uploadUrl
} from '@/common/setting'
import {
@@ -22,7 +23,7 @@
maxCount: "5",
previewFullImage: true,
uploadText: "上传中",
- url: prodUrl + "/blade-resource/oss/endpoint/put-file-attach-by-prefix-path"
+ url: uploadUrl + "/blade-resource/oss/endpoint/put-file-attach-by-prefix-path"
},
}
},
diff --git a/pages/home/launch.html b/pages/home/launch.html
index 630831e..19d05e2 100644
--- a/pages/home/launch.html
+++ b/pages/home/launch.html
@@ -9,8 +9,9 @@
<script type="text/javascript">
var config = {
id: "wx41aa8a5d2e565a05",
- path: "page/login/login",
- version: "develop",
+ // path: "pages/home/login-account",
+ path: "pages/login/login-account",
+ version: "trial", //trial ,release ,develop
query: {
type: 1
}
diff --git a/pages/login/login-account.vue b/pages/login/login-account.vue
index 40f1fc5..d18bdf2 100644
--- a/pages/login/login-account.vue
+++ b/pages/login/login-account.vue
@@ -43,7 +43,7 @@
<u-input placeholder="请输入用户名" prefixIcon="account"
prefixIconStyle="font-size: 28px;color: #017BFC"
placeholderStyle="font-size:28rpx;color:#ABABAB;"
- customStyle="background:#fff;width:634rpx;" type="number" v-model="form.phone"></u-input>
+ customStyle="background:#fff;width:634rpx;" v-model="form.phone"></u-input>
</u-form-item>
<u-form-item prop="password" :borderBottom="false" ref="password">
<u-input v-if="passwordProps.passwordType == 'password'" placeholder="请输入密码" prefixIcon="lock"
@@ -174,6 +174,7 @@
},
onLoad(option) {
+ console.log(option);
if (option.type) {
//type 1 安全隐患 2 矛盾纠纷 3 护学打卡
diff --git a/subPackage/school/troubleDetail.vue b/subPackage/school/troubleDetail.vue
index 6ee5041..6494962 100644
--- a/subPackage/school/troubleDetail.vue
+++ b/subPackage/school/troubleDetail.vue
@@ -32,6 +32,13 @@
<text>时间</text>
<text>{{info.createTime}}</text>
</view>
+
+
+ <view class="item-row flex j-c-s-b a-i-c" v-if="info.type == 1">
+ <text>隐患类型</text>
+ <text>{{troubleValue}}</text>
+ </view>
+
<view class="item-row flex j-c-s-b a-i-c" v-if="info.isProblem">
<text>是否隐患</text>
<text>{{info.isProblem == 1?"是":"否"}}</text>
@@ -67,10 +74,9 @@
<view class="mb-20">
工作照片
</view>
-
<view class="flex-wrap" v-if="info.confirmFlag == 2">
- <view class="mr-20" v-for="i in images">
- <u-image :src="i" width="140rpx" height="140rpx" @click="previewImage(images,i)"></u-image>
+ <view class="mr-20" v-for="i in workImage">
+ <u-image :src="i" width="140rpx" height="140rpx" @click="previewImage(workImage,i)"></u-image>
</view>
</view>
<u-upload v-else :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
@@ -86,7 +92,7 @@
- <view class="image-wrap bgc-ff" v-if="roleTypeName == 'xyzt' && info.confirmFlag != 2">
+ <view class="image-wrap bgc-ff" v-if="roleTypeName == 'xyzt' && info.confirmFlag == 4">
<u-form labelWidth="70" :model="form" ref="form">
<u-form-item label="是否隐患:" labelWidth="100" prop="isProblem">
<u-radio-group v-model="form.isProblem">
@@ -112,6 +118,9 @@
</u-form-item> -->
</u-form>
</view>
+
+ <view class="blank"></view>
+
<!-- <audit-action @handle="submit"
v-if="roleType == 2 && info.confirmFlag == 1 && roleTypeName == 'mj' "></audit-action> -->
<!-- <footer-btn v-if="roleType == 1 && info.confirmFlag == 3" text="编辑" @click="navToEdit" /> -->
@@ -129,6 +138,9 @@
getTroubleReportDetail,
auditTroubleReport
} from "@/api/school/school.js"
+ import {
+ bizDictionary
+ } from '@/api/system/dict.js'
export default {
components: {
auditAction
@@ -154,10 +166,10 @@
}
],
roleTypeName: "",
-
+ workImage: [],
+ troubleValue: ""
}
},
-
onLoad(option) {
let {
@@ -168,28 +180,50 @@
if (roleAlias == "mj" || roleAlias == "xyzt") {
this.roleType = 2;
}
-
if (roleAlias == "inhabitant" || roleAlias == "xyty") {
this.roleType == 1;
}
-
this.id = option.id;
},
-
onShow() {
this.getDetail(this.id)
},
-
methods: {
+ getDangerTypeList(callback) {
+ bizDictionary({
+ code: "hiddenDangerType"
+ }).then(res => {
+ if (res.code == 200) {
+ callback(res.data);
+ }
+ })
+ },
+
getDetail(id) {
getTroubleReportDetail({
id
}).then(res => {
this.info = res.data;
+ if (res.data.images) {
+ this.images = this.$setImageUrl(res.data.images);
+ }
+ if (Number(res.data.type) == 1) {
+ uni.setNavigationBarTitle({
+ title: "隐患排查详情"
+ })
+ this.getDangerTypeList(data => {
+ this.troubleValue = this.$getIndex(data, res.data.hiddenDangerType, "dictKey",
+ "dictValue").name
+ })
+ } else {
+ uni.setNavigationBarTitle({
+ title: "矛盾纠纷详情"
+ })
+ }
if (res.data.workImage) {
- this.images = this.$setImageUrl(res.data.workImage);
+ this.workImage = this.$setImageUrl(res.data.workImage);
}
if (res.data.type == 1) {
uni.setNavigationBarTitle({
@@ -269,7 +303,8 @@
this.form.images.forEach(e => {
urls.push(e.name)
})
- this.form.workImage = urls.join(",")
+ data.workImage = urls.join(",")
+
} else {
this.$showTips("请上传工作照片")
return;
@@ -339,7 +374,10 @@
.upload {
margin: 0 30rpx;
padding: 30rpx;
+ }
-
+ .blank {
+ width: 100%;
+ height: 200rpx;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3