本地登录页面 请假类型选择

This commit is contained in:
yangzhq68909 2024-09-26 12:06:47 +08:00
parent f9432900bd
commit 8809cc1975
12 changed files with 355 additions and 116 deletions

View File

@ -1,3 +1,3 @@
# 开发环境 # 开发环境
# 请求接口地址 # 请求接口地址
VITE_REQUEST_BASE_URL = https://36.112.48.190 VITE_REQUEST_BASE_URL = http://10.75.166.174:8080

View File

@ -60,7 +60,6 @@ export function queryMyDeptTreeListApi(config) { // 部门
} }
export function userListApi(config) { // 所有人员列表 export function userListApi(config) { // 所有人员列表
return https({ return https({
// url: '/appConnet/app/userList',
url: '/sys/user/userList', url: '/sys/user/userList',
method: 'get', method: 'get',
data: config data: config
@ -82,7 +81,7 @@ export function indexChartScdtDataApi(config) { // 首页
} }
export function bpmlistApi(config) { // 公文 export function bpmlistApi(config) { // 公文
return https({ return https({
url: '/appConnet/app/bpmlist', url: '/cxcoagwfb/cxcOaGwfb/bpmlist',
method: 'get', method: 'get',
data: config data: config
}) })

View File

@ -6,6 +6,13 @@ export function loginApi(config) { // 登录
data: config data: config
}) })
} }
export function localLoginApi(config) { // 本地登录
return https({
url: '/sys/login',
method: 'post',
data: config
})
}
export function queryRoleApi(config) { // 获取角色职位 export function queryRoleApi(config) { // 获取角色职位
return https({ return https({
url: '/appConnet/app/queryRoleByRoleIds', url: '/appConnet/app/queryRoleByRoleIds',

View File

@ -19,12 +19,11 @@
</view> </view>
<input v-model="phone" /> <input v-model="phone" />
</view> </view>
<view class="f-row aic jcb input_box"> <view class="f-row aic jcb input_box">
<view class="title"> <view class="title">
请假类型 请假类型
</view> </view>
<tree-select :dataSource="dataSource" v-model="type" /> <tree-select :dataSource="dataSource" v-model="type" dataValue="name" />
</view> </view>
<picker mode="date" fields="day" @change="chooseStart" :value="beginTime"> <picker mode="date" fields="day" @change="chooseStart" :value="beginTime">
@ -170,6 +169,8 @@
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
startMutilProcess(res.message) startMutilProcess(res.message)
} else {
proxy.$toast(res.message);
} }
}) })
} }
@ -191,18 +192,19 @@
}) })
} }
const loadData = () => { const loadData = () => {
getCategoryItemsApi('1838487445813645313').then((res) => { // getCategoryItemsApi('1838487445813645313').then((res) => { //
if (res.success) { if (res.success) {
dataSource.value = res.result dataSource.value = res.result
console.log('--',res.result)
} }
}) })
queryDepByCode(store.userinfo.orgCode).then((res) => { // queryDepByCode(store.userinfo.orgCode).then((res) => { //
if (res.success) { if (res.success) {
depart.value = res.result depart.value = res.result
} }
}) })
} }
</script> </script>

View File

@ -16,6 +16,7 @@
<image v-if="showpwd" src="@/static/login/eye.png" @click="showpwd = !showpwd"></image> <image v-if="showpwd" src="@/static/login/eye.png" @click="showpwd = !showpwd"></image>
<image v-else src="@/static/login/eye-off.png" @click="showpwd = !showpwd"></image> <image v-else src="@/static/login/eye-off.png" @click="showpwd = !showpwd"></image>
</view> </view>
</view> </view>
<view class="pwd f-row aic"> <view class="pwd f-row aic">
<view style="display: inline-block;" @click="check = !check"> <view style="display: inline-block;" @click="check = !check">
@ -41,7 +42,7 @@
watch watch
} from 'vue'; } from 'vue';
import { import {
loginApi, localLoginApi,
queryRoleApi queryRoleApi
} from '@/api/login.js'; } from '@/api/login.js';
import Base64 from 'base-64'; import Base64 from 'base-64';
@ -81,15 +82,13 @@
if (!username.value.trim()) return proxy.$toast('请输入账号') if (!username.value.trim()) return proxy.$toast('请输入账号')
if (!password.value.trim()) return proxy.$toast('请输入密码') if (!password.value.trim()) return proxy.$toast('请输入密码')
let un = Base64.encode(encodeURIComponent(username.value))
let pw = Base64.encode(encodeURIComponent(password.value))
uni.showLoading({ uni.showLoading({
title: '登录中...' title: '登录中...'
}); });
loginApi({ localLoginApi({
username: un, username: username.value,
password: pw, password: password.value,
ip: getDeviceIp() captcha: 'app'
}).then((loginres) => { }).then((loginres) => {
if (loginres.success) { if (loginres.success) {
uni.setStorageSync('token', loginres.result.token) uni.setStorageSync('token', loginres.result.token)
@ -131,39 +130,7 @@
username.value = obj.un ? obj.un : '' username.value = obj.un ? obj.un : ''
password.value = obj.pw ? obj.pw : '' password.value = obj.pw ? obj.pw : ''
} }
// localAccountArr = uni.getStorageSync('accountArr') ? JSON.parse(uni.getStorageSync('accountArr')) : []
// accountArr.value = localAccountArr
}) })
function getDeviceIp() {
// #ifdef APP-PLUS
let deviceIp
if (plus.os.name == "Android") {
let Context = plus.android.importClass('android.content.Context')
let main = plus.android.runtimeMainActivity()
let cm = main.getSystemService(Context.CONNECTIVITY_SERVICE)
plus.android.importClass(cm)
let linkProperties = cm.getLinkProperties(cm.getActiveNetwork())
let linkAddrs = plus.android.invoke(linkProperties, 'getLinkAddresses')
plus.android.importClass(linkAddrs)
for (var i = 0; i < linkAddrs.size(); i++) {
let inetAddr = plus.android.invoke(linkAddrs.get(i), 'getAddress')
deviceIp = plus.android.invoke(inetAddr, 'getHostAddress')
}
//wifi
if (deviceIp == '') {
var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
var wifiInfo = plus.android.invoke(wifiManager, "getConnectionInfo");
var ipAddress = plus.android.invoke(wifiInfo, "getIpAddress");
if (ipAddress != 0) {
deviceIp = ((ipAddress & 0xff) + "." + (ipAddress >> 8 & 0xff) + "." + (ipAddress >> 16 &
0xff) + "." + (ipAddress >> 24 & 0xff));
}
}
}
return deviceIp;
// #endif
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

280
pages/login/login22.vue Normal file
View File

@ -0,0 +1,280 @@
<template>
<view :class="{'gray':store.isgray==1}">
<view class="logo f-col aic">
<image src="@/static/login/logo.png"></image>
</view>
<view class="form f-col aic">
<view class="box f-row aic">
<image src="@/static/login/phone.png"></image>
<input v-model="username" type="text" placeholder="请输入统一身份认证"
placeholder-style="font-size: 28rpx;color: #999999;" />
</view>
<view class="box f-row aic">
<image src="@/static/login/pwd.png"></image>
<input v-model="password" :type="!showpwd?'password':'text'" placeholder="请输入密码"
placeholder-style="font-size: 28rpx;color: #999999;" />
<image v-if="showpwd" src="@/static/login/eye.png" @click="showpwd = !showpwd"></image>
<image v-else src="@/static/login/eye-off.png" @click="showpwd = !showpwd"></image>
</view>
</view>
<view class="pwd f-row aic">
<view style="display: inline-block;" @click="check = !check">
<view class="f-row aic">
<image v-if="!check" src="@/static/login/nocheck.png"></image>
<image v-else src="@/static/login/checked.png"></image>
<text>记住密码</text>
</view>
</view>
</view>
<view class="login f-col aic">
<view @click="login">
登录
</view>
</view>
</view>
</template>
<script setup>
import {
ref,
getCurrentInstance,
watch
} from 'vue';
import {
loginApi,
queryRoleApi
} from '@/api/login.js';
import Base64 from 'base-64';
import {
onLoad
} from '@dcloudio/uni-app'
import {
useStore
} from '@/store'
const store = useStore()
const {
proxy
} = getCurrentInstance()
/**是否明文显示密码*/
const showpwd = ref(false)
/**用于用户缓存账号和密码*/
let localObj = {}
/**记住账号和密码*/
const savePwd = () => {
let localObj = {
un: username.value
}
if (check.value) {
localObj.pw = password.value
}
uni.setStorageSync('accountObj', JSON.stringify(localObj))
}
/**是否选中记住密码*/
const check = ref(true);
/**账号*/
const username = ref('')
/**密码*/
const password = ref('')
const login = () => {
if (!username.value.trim()) return proxy.$toast('请输入账号')
if (!password.value.trim()) return proxy.$toast('请输入密码')
let un = Base64.encode(encodeURIComponent(username.value))
let pw = Base64.encode(encodeURIComponent(password.value))
uni.showLoading({
title: '登录中...'
});
loginApi({
username: un,
password: pw,
ip: getDeviceIp()
}).then((loginres) => {
if (loginres.success) {
uni.setStorageSync('token', loginres.result.token)
store.setToken(loginres.result.token)
savePwd()
queryRoleApi({
roles: loginres.result.userInfo.roles
}).then((roleres) => {
//
uni.setStorageSync('logintime', Date.now())
//
uni.setStorageSync('role', roleres)
store.setRole(roleres)
//
uni.setStorageSync('user', JSON.stringify(loginres.result
.userInfo))
store.setUserInfo(loginres.result.userInfo)
//
uni.switchTab({
url: '/pages/tab/index'
})
})
}
}).catch((err) => {
console.log(err);
})
}
let localAccountArr = []
const accountArr = ref([])
onLoad(() => {
if (uni.getStorageSync('accountObj')) {
let obj = JSON.parse(uni.getStorageSync('accountObj'))
username.value = obj.un ? obj.un : ''
password.value = obj.pw ? obj.pw : ''
}
// localAccountArr = uni.getStorageSync('accountArr') ? JSON.parse(uni.getStorageSync('accountArr')) : []
// accountArr.value = localAccountArr
})
function getDeviceIp() {
// #ifdef APP-PLUS
let deviceIp
if (plus.os.name == "Android") {
let Context = plus.android.importClass('android.content.Context')
let main = plus.android.runtimeMainActivity()
let cm = main.getSystemService(Context.CONNECTIVITY_SERVICE)
plus.android.importClass(cm)
let linkProperties = cm.getLinkProperties(cm.getActiveNetwork())
let linkAddrs = plus.android.invoke(linkProperties, 'getLinkAddresses')
plus.android.importClass(linkAddrs)
for (var i = 0; i < linkAddrs.size(); i++) {
let inetAddr = plus.android.invoke(linkAddrs.get(i), 'getAddress')
deviceIp = plus.android.invoke(inetAddr, 'getHostAddress')
}
//wifi
if (deviceIp == '') {
var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
var wifiInfo = plus.android.invoke(wifiManager, "getConnectionInfo");
var ipAddress = plus.android.invoke(wifiInfo, "getIpAddress");
if (ipAddress != 0) {
deviceIp = ((ipAddress & 0xff) + "." + (ipAddress >> 8 & 0xff) + "." + (ipAddress >> 16 &
0xff) + "." + (ipAddress >> 24 & 0xff));
}
}
}
return deviceIp;
// #endif
}
</script>
<style lang="scss" scoped>
:deep(.uni-select) {
border: none;
padding-left: 0;
height: 88rpx;
}
:deep(.uni-select__input-placeholder) {
font-size: 28rpx;
color: #999999;
}
:deep(.uni-icons) {
display: none;
}
.logo {
padding-top: 184rpx;
image {
width: 475rpx;
height: 199rpx;
}
}
.form {
margin-top: 60rpx;
.box {
width: 570rpx;
height: 88rpx;
background: #F8F8F8;
border-radius: 44rpx;
padding: 0 30rpx;
margin-top: 40rpx;
position: relative;
.account_box {
position: absolute;
top: 100rpx;
left: 90rpx;
width: 500rpx;
background-color: #fff;
box-shadow: 0px 0px 3px 1px #dfdfdf;
z-index: 99;
border-radius: 10rpx;
// &::after {
// position: absolute;
// content: ' ';
// border: 15rpx solid;
// border-color: transparent transparent #fff transparent;
// top: -30rpx;
// left: 30rpx;
// z-index: 999;
// }
.account {
max-height: 200rpx;
overflow-y: auto;
view {
padding: 10rpx;
}
}
}
image {
width: 40rpx;
height: 40rpx;
margin-right: 20rpx;
}
input {
height: 100%;
flex: 1;
}
}
}
.pwd {
image {
width: 34rpx;
height: 34rpx;
margin-right: 4rpx;
}
justify-content: flex-end;
margin-top: 20rpx;
margin-right: 60rpx;
font-size: 24rpx;
color: #01508B;
}
.login {
margin-top: 63rpx;
view {
width: 630rpx;
height: 88rpx;
background: #4e74fb;
border-radius: 44rpx;
font-size: 32rpx;
color: #FFFFFF;
text-align: center;
line-height: 88rpx;
}
}
</style>

View File

@ -268,6 +268,7 @@
pageNo, pageNo,
pageSize pageSize
}).then((res) => { }).then((res) => {
console.log('---',res)
if (res.success) { if (res.success) {
list.value = [...list.value, ...formatObj(res.result.records, 'fwbt', 'fwtime', null)] list.value = [...list.value, ...formatObj(res.result.records, 'fwbt', 'fwtime', null)]
} }

View File

@ -71,6 +71,7 @@
import { import {
useStore useStore
} from '@/store'; } from '@/store';
const baseUrl = import.meta.env.VITE_REQUEST_BASE_URL + '/jeecg-boot'
const store = useStore() const store = useStore()
const sexIndex = ref(null) const sexIndex = ref(null)
@ -100,7 +101,7 @@
success: (chooseImageRes) => { success: (chooseImageRes) => {
const tempFilePaths = chooseImageRes.tempFilePaths; const tempFilePaths = chooseImageRes.tempFilePaths;
uni.uploadFile({ uni.uploadFile({
url: 'https://36.112.48.190/jeecg-boot/sys/common/upload', // url: baseUrl + '/sys/common/upload', //
filePath: tempFilePaths[0], filePath: tempFilePaths[0],
name: 'file', name: 'file',
header: { header: {

View File

@ -12,6 +12,7 @@ import {
hasNewVersion, hasNewVersion,
onClickUpdate onClickUpdate
} from '@/utils/index.js'; } from '@/utils/index.js';
const baseUrl = import.meta.env.VITE_REQUEST_BASE_URL + '/jeecg-boot/sys/common/static/'
export const useUpdateApp = defineStore('updateApp', () => { export const useUpdateApp = defineStore('updateApp', () => {
const updateOptions = reactive({ const updateOptions = reactive({
@ -34,8 +35,8 @@ export const useUpdateApp = defineStore('updateApp', () => {
let { let {
result result
} = res } = res
result.apkUrl = 'https://36.112.48.190/jeecg-boot/sys/common/static/' + result.apkUrl; result.apkUrl = baseUrl + result.apkUrl;
result.wgtUrl = 'https://36.112.48.190/jeecg-boot/sys/common/static/' + result.wgtUrl result.wgtUrl = baseUrl + result.wgtUrl
console.log('更新', result); console.log('更新', result);
// res = { // res = {
// "update": "wgt", // "update": "wgt",

View File

@ -61,7 +61,7 @@ if (uni.restoreGlobal) {
const _imports_4 = "/static/login/eye-off.png"; const _imports_4 = "/static/login/eye-off.png";
const _imports_5 = "/static/login/nocheck.png"; const _imports_5 = "/static/login/nocheck.png";
const _imports_6 = "/static/login/checked.png"; const _imports_6 = "/static/login/checked.png";
let baseUrl = "https://36.112.48.190/jeecg-boot"; let baseUrl$1 = "http://10.75.166.174:8080/jeecg-boot";
let loading = false; let loading = false;
function https(config) { function https(config) {
if (loading) if (loading)
@ -76,7 +76,7 @@ if (uni.restoreGlobal) {
loading = false; loading = false;
return; return;
} }
config.url = baseUrl + config.url; config.url = baseUrl$1 + config.url;
let token = uni.getStorageSync("token") || ""; let token = uni.getStorageSync("token") || "";
config.header = { config.header = {
//返回数据类型 //返回数据类型
@ -130,9 +130,9 @@ if (uni.restoreGlobal) {
}); });
return promise; return promise;
} }
function loginApi(config) { function localLoginApi(config) {
return https({ return https({
url: "/sys/sinopecLogin", url: "/sys/login",
method: "post", method: "post",
data: config data: config
}); });
@ -256,8 +256,7 @@ if (uni.restoreGlobal) {
} }
})(commonjsGlobal); })(commonjsGlobal);
})(base64, base64.exports); })(base64, base64.exports);
var base64Exports = base64.exports; base64.exports;
const Base64 = /* @__PURE__ */ getDefaultExportFromCjs(base64Exports);
var isVue2 = false; var isVue2 = false;
function set(target, key, val) { function set(target, key, val) {
if (Array.isArray(target)) { if (Array.isArray(target)) {
@ -1779,15 +1778,13 @@ This will fail in production.`);
return proxy.$toast("请输入账号"); return proxy.$toast("请输入账号");
if (!password.value.trim()) if (!password.value.trim())
return proxy.$toast("请输入密码"); return proxy.$toast("请输入密码");
let un = Base64.encode(encodeURIComponent(username.value));
let pw = Base64.encode(encodeURIComponent(password.value));
uni.showLoading({ uni.showLoading({
title: "登录中..." title: "登录中..."
}); });
loginApi({ localLoginApi({
username: un, username: username.value,
password: pw, password: password.value,
ip: getDeviceIp() captcha: "app"
}).then((loginres) => { }).then((loginres) => {
if (loginres.success) { if (loginres.success) {
uni.setStorageSync("token", loginres.result.token); uni.setStorageSync("token", loginres.result.token);
@ -1807,7 +1804,7 @@ This will fail in production.`);
}); });
} }
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/login/login.vue:122", err); formatAppLog("log", "at pages/login/login.vue:121", err);
}); });
}; };
vue.ref([]); vue.ref([]);
@ -1818,31 +1815,6 @@ This will fail in production.`);
password.value = obj.pw ? obj.pw : ""; password.value = obj.pw ? obj.pw : "";
} }
}); });
function getDeviceIp() {
let deviceIp;
if (plus.os.name == "Android") {
let Context = plus.android.importClass("android.content.Context");
let main = plus.android.runtimeMainActivity();
let cm = main.getSystemService(Context.CONNECTIVITY_SERVICE);
plus.android.importClass(cm);
let linkProperties = cm.getLinkProperties(cm.getActiveNetwork());
let linkAddrs = plus.android.invoke(linkProperties, "getLinkAddresses");
plus.android.importClass(linkAddrs);
for (var i2 = 0; i2 < linkAddrs.size(); i2++) {
let inetAddr = plus.android.invoke(linkAddrs.get(i2), "getAddress");
deviceIp = plus.android.invoke(inetAddr, "getHostAddress");
}
if (deviceIp == "") {
var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
var wifiInfo = plus.android.invoke(wifiManager, "getConnectionInfo");
var ipAddress = plus.android.invoke(wifiInfo, "getIpAddress");
if (ipAddress != 0) {
deviceIp = (ipAddress & 255) + "." + (ipAddress >> 8 & 255) + "." + (ipAddress >> 16 & 255) + "." + (ipAddress >> 24 & 255);
}
}
}
return deviceIp;
}
return (_ctx, _cache) => { return (_ctx, _cache) => {
return vue.openBlock(), vue.createElementBlock( return vue.openBlock(), vue.createElementBlock(
"view", "view",
@ -6277,7 +6249,7 @@ This will fail in production.`);
} }
function bpmlistApi(config) { function bpmlistApi(config) {
return https({ return https({
url: "/appConnet/app/bpmlist", url: "/cxcoagwfb/cxcOaGwfb/bpmlist",
method: "get", method: "get",
data: config data: config
}); });
@ -6465,6 +6437,7 @@ This will fail in production.`);
} }
}; };
const customNav = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__scopeId", "data-v-420daeb5"], ["__file", "D:/projects/cxc-szcx-uniapp/bpm/customNav.vue"]]); const customNav = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__scopeId", "data-v-420daeb5"], ["__file", "D:/projects/cxc-szcx-uniapp/bpm/customNav.vue"]]);
const baseurl = "http://10.75.166.174:8080/jeecg-boot/sys/common/static";
const toast = (title, icon, duration) => { const toast = (title, icon, duration) => {
uni.showToast({ uni.showToast({
title, title,
@ -6488,7 +6461,7 @@ This will fail in production.`);
} }
} }
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at utils/index.js:34", "err@", err); formatAppLog("log", "at utils/index.js:35", "err@", err);
}); });
}; };
const handleAllowPage = (menu, arr = []) => { const handleAllowPage = (menu, arr = []) => {
@ -6518,14 +6491,14 @@ This will fail in production.`);
}); });
}; };
function downloadApp(url) { function downloadApp(url) {
formatAppLog("log", "at utils/index.js:77", "url", url); formatAppLog("log", "at utils/index.js:78", "url", url);
var dtask = plus.downloader.createDownload(url, { var dtask = plus.downloader.createDownload(url, {
filename: `_downloads/wgt-${Date.now()}.wgt` filename: `_downloads/wgt-${Date.now()}.wgt`
//利用保存路径,实现下载文件的重命名 //利用保存路径,实现下载文件的重命名
}, function(d2, status) { }, function(d2, status) {
if (status == 200) { if (status == 200) {
var fileSaveUrl = plus.io.convertLocalFileSystemURL(d2.filename); var fileSaveUrl = plus.io.convertLocalFileSystemURL(d2.filename);
formatAppLog("log", "at utils/index.js:85", "fileSaveUrl", fileSaveUrl); formatAppLog("log", "at utils/index.js:86", "fileSaveUrl", fileSaveUrl);
installApp(fileSaveUrl); installApp(fileSaveUrl);
} else { } else {
plus.downloader.clear(); plus.downloader.clear();
@ -6621,12 +6594,12 @@ This will fail in production.`);
store.setPosition(info); store.setPosition(info);
getWeather(position.latitude, position.longitude); getWeather(position.latitude, position.longitude);
} else { } else {
formatAppLog("log", "at utils/index.js:223", data.message); formatAppLog("log", "at utils/index.js:224", data.message);
} }
}, },
fail: function(err) { fail: function(err) {
toast("获取定位失败"); toast("获取定位失败");
formatAppLog("log", "at utils/index.js:228", "地址解析失败" + err); formatAppLog("log", "at utils/index.js:229", "地址解析失败" + err);
} }
}); });
} }
@ -6656,27 +6629,27 @@ This will fail in production.`);
}, },
fail: function(err) { fail: function(err) {
toast("天气获取失败"); toast("天气获取失败");
formatAppLog("log", "at utils/index.js:269", "天气获取失败" + err); formatAppLog("log", "at utils/index.js:270", "天气获取失败" + err);
} }
}); });
}; };
const opendocument = (url) => { const opendocument = (url) => {
uni.downloadFile({ uni.downloadFile({
url: "https://36.112.48.190/jeecg-boot/sys/common/static/" + url, url: baseurl + url,
success: function(res) { success: function(res) {
var filePath = res.tempFilePath; var filePath = res.tempFilePath;
uni.openDocument({ uni.openDocument({
filePath, filePath,
showMenu: true, showMenu: true,
success: function(res2) { success: function(res2) {
formatAppLog("log", "at utils/index.js:283", "打开文档成功"); formatAppLog("log", "at utils/index.js:284", "打开文档成功");
} }
}); });
} }
}); });
}; };
const imgUrl = (url) => { const imgUrl = (url) => {
return `https://36.112.48.190/jeecg-boot/sys/common/static/${url}`; return baseurl + `/${url}`;
}; };
const _sfc_main$F = { const _sfc_main$F = {
__name: "index", __name: "index",
@ -6684,7 +6657,7 @@ This will fail in production.`);
vue.useCssVars((_ctx) => ({ vue.useCssVars((_ctx) => ({
"ae0729d5-cusnavbarheight": cusnavbarheight "ae0729d5-cusnavbarheight": cusnavbarheight
})); }));
const baseurl = "https://36.112.48.190/jeecg-boot"; const baseurl2 = "http://10.75.166.174:8080/jeecg-boot";
const store = useStore(); const store = useStore();
onShow(() => { onShow(() => {
cxcDaping(); cxcDaping();
@ -6699,7 +6672,7 @@ This will fail in production.`);
if (res2.success) { if (res2.success) {
let arr = res2.result.records[0].wenjian.split(","); let arr = res2.result.records[0].wenjian.split(",");
banner.value = arr.map((item) => { banner.value = arr.map((item) => {
return baseurl + "/sys/common/static/" + item; return baseurl2 + "/sys/common/static/" + item;
}); });
} }
}); });
@ -6770,12 +6743,13 @@ This will fail in production.`);
pageNo, pageNo,
pageSize pageSize
}).then((res2) => { }).then((res2) => {
formatAppLog("log", "at pages/tab/index.vue:271", "---", res2);
if (res2.success) { if (res2.success) {
list.value = [...list.value, ...formatObj(res2.result.records, "fwbt", "fwtime", null)]; list.value = [...list.value, ...formatObj(res2.result.records, "fwbt", "fwtime", null)];
} }
loading2 = false; loading2 = false;
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/tab/index.vue:276", "err", err); formatAppLog("log", "at pages/tab/index.vue:277", "err", err);
}); });
}; };
const gonggaolist = () => { const gonggaolist = () => {
@ -6789,7 +6763,7 @@ This will fail in production.`);
} }
loading2 = false; loading2 = false;
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/tab/index.vue:291", "err", err); formatAppLog("log", "at pages/tab/index.vue:292", "err", err);
}); });
}; };
const zhibanArr = vue.ref([]); const zhibanArr = vue.ref([]);
@ -6799,7 +6773,7 @@ This will fail in production.`);
zhibanArr.value = res2.result.records.slice(0, 2); zhibanArr.value = res2.result.records.slice(0, 2);
} }
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/tab/index.vue:302", "err", err); formatAppLog("log", "at pages/tab/index.vue:303", "err", err);
}); });
}; };
const fagui = () => { const fagui = () => {
@ -6813,7 +6787,7 @@ This will fail in production.`);
} }
loading2 = false; loading2 = false;
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/tab/index.vue:318", "err", err); formatAppLog("log", "at pages/tab/index.vue:319", "err", err);
}); });
}; };
const zhidu = () => { const zhidu = () => {
@ -6829,7 +6803,7 @@ This will fail in production.`);
} }
loading2 = false; loading2 = false;
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/tab/index.vue:335", "err", err); formatAppLog("log", "at pages/tab/index.vue:336", "err", err);
}); });
}; };
const formatObj = (arr, title, time, depart) => { const formatObj = (arr, title, time, depart) => {
@ -12066,6 +12040,8 @@ This will fail in production.`);
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
startMutilProcess(res.message); startMutilProcess(res.message);
} else {
proxy.$toast(res.message);
} }
}); });
}; };
@ -12084,13 +12060,14 @@ This will fail in production.`);
}, 2e3); }, 2e3);
} }
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/leave/application.vue:190", err); formatAppLog("log", "at pages/leave/application.vue:191", err);
}); });
}; };
const loadData = () => { const loadData = () => {
getCategoryItemsApi("1838487445813645313").then((res) => { getCategoryItemsApi("1838487445813645313").then((res) => {
if (res.success) { if (res.success) {
dataSource.value = res.result; dataSource.value = res.result;
formatAppLog("log", "at pages/leave/application.vue:198", "--", res.result);
} }
}); });
queryDepByCode(store.userinfo.orgCode).then((res) => { queryDepByCode(store.userinfo.orgCode).then((res) => {
@ -12157,7 +12134,8 @@ This will fail in production.`);
vue.createVNode(treeSelect, { vue.createVNode(treeSelect, {
dataSource: dataSource.value, dataSource: dataSource.value,
modelValue: type.value, modelValue: type.value,
"onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => type.value = $event) "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => type.value = $event),
dataValue: "name"
}, null, 8, ["dataSource", "modelValue"]) }, null, 8, ["dataSource", "modelValue"])
]), ]),
vue.createElementVNode("picker", { vue.createElementVNode("picker", {
@ -12365,6 +12343,7 @@ This will fail in production.`);
const _sfc_main$j = { const _sfc_main$j = {
__name: "useredit", __name: "useredit",
setup(__props) { setup(__props) {
const baseUrl2 = "http://10.75.166.174:8080/jeecg-boot";
const store = useStore(); const store = useStore();
vue.ref(null); vue.ref(null);
const chooseAvatar = () => { const chooseAvatar = () => {
@ -12373,7 +12352,7 @@ This will fail in production.`);
success: (chooseImageRes) => { success: (chooseImageRes) => {
const tempFilePaths = chooseImageRes.tempFilePaths; const tempFilePaths = chooseImageRes.tempFilePaths;
uni.uploadFile({ uni.uploadFile({
url: "https://36.112.48.190/jeecg-boot/sys/common/upload", url: baseUrl2 + "/sys/common/upload",
//仅为示例,非真实的接口地址 //仅为示例,非真实的接口地址
filePath: tempFilePaths[0], filePath: tempFilePaths[0],
name: "file", name: "file",
@ -12393,11 +12372,11 @@ This will fail in production.`);
userProfile(); userProfile();
} }
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/useredit/useredit.vue:122", err); formatAppLog("log", "at pages/useredit/useredit.vue:123", err);
}); });
}, },
fail(err) { fail(err) {
formatAppLog("log", "at pages/useredit/useredit.vue:126", "图片上传出错", err); formatAppLog("log", "at pages/useredit/useredit.vue:127", "图片上传出错", err);
} }
}); });
} }
@ -12417,7 +12396,7 @@ This will fail in production.`);
store.setUserInfo(res.result.records[0]); store.setUserInfo(res.result.records[0]);
} }
}).catch((err) => { }).catch((err) => {
formatAppLog("log", "at pages/useredit/useredit.vue:160", err); formatAppLog("log", "at pages/useredit/useredit.vue:161", err);
}); });
}; };
const loginout = () => { const loginout = () => {
@ -18217,6 +18196,7 @@ ${i3}
__definePage("pages/safe/detail", PagesSafeDetail); __definePage("pages/safe/detail", PagesSafeDetail);
__definePage("pages/zhiban/index", PagesZhibanIndex); __definePage("pages/zhiban/index", PagesZhibanIndex);
__definePage("pages/task/self", PagesTaskSelf); __definePage("pages/task/self", PagesTaskSelf);
const baseUrl = "http://10.75.166.174:8080/jeecg-boot/sys/common/static/";
const useUpdateApp = defineStore("updateApp", () => { const useUpdateApp = defineStore("updateApp", () => {
const updateOptions = vue.reactive({ const updateOptions = vue.reactive({
force: false, force: false,
@ -18232,9 +18212,9 @@ ${i3}
let { let {
result result
} = res; } = res;
result.apkUrl = "https://36.112.48.190/jeecg-boot/sys/common/static/" + result.apkUrl; result.apkUrl = baseUrl + result.apkUrl;
result.wgtUrl = "https://36.112.48.190/jeecg-boot/sys/common/static/" + result.wgtUrl; result.wgtUrl = baseUrl + result.wgtUrl;
formatAppLog("log", "at store/update.js:39", "更新", result); formatAppLog("log", "at store/update.js:40", "更新", result);
updateOptions.wgtUrl = result.wgtUrl; updateOptions.wgtUrl = result.wgtUrl;
if (systemInfo.osName === "android") { if (systemInfo.osName === "android") {
updateOptions.apkUrl = result.apkUrl; updateOptions.apkUrl = result.apkUrl;

View File

@ -1,3 +1,4 @@
const baseurl = import.meta.env.VITE_REQUEST_BASE_URL + '/jeecg-boot/sys/common/static'
/**提示*/ /**提示*/
export const toast = (title, icon, duration) => { export const toast = (title, icon, duration) => {
uni.showToast({ uni.showToast({
@ -273,7 +274,7 @@ const weatherRequest = (params) => {
export const opendocument = (url) => { export const opendocument = (url) => {
uni.downloadFile({ uni.downloadFile({
url: 'https://36.112.48.190/jeecg-boot/sys/common/static/' + url, url: baseurl + url,
success: function(res) { success: function(res) {
var filePath = res.tempFilePath; var filePath = res.tempFilePath;
uni.openDocument({ uni.openDocument({
@ -306,5 +307,5 @@ export const preview = (current, urls) => {
}); });
} }
export const imgUrl = (url) => { export const imgUrl = (url) => {
return `https://36.112.48.190/jeecg-boot/sys/common/static/${url}` return baseurl + `/${url}`
} }