fix: bug#19771、20134、20211
* fix: bug#19771 * fix: bug#20134 * fix: bug#20211
This commit is contained in:
parent
0ff347fded
commit
345be95d1d
|
@ -64,7 +64,7 @@
|
|||
<p>
|
||||
{{ provider.description }}
|
||||
</p>
|
||||
<p>消息协议:{{ provider.id }}</p>
|
||||
<!-- <p>消息协议:{{ provider.id }}</p> -->
|
||||
<TitleComponent data="设备接入指引" />
|
||||
<p>1、配置{{ provider.name }}通道</p>
|
||||
<p>2、创建{{ provider.name }}设备接入网关</p>
|
||||
|
|
|
@ -99,7 +99,7 @@ const pickerTimeChange = () => {
|
|||
};
|
||||
|
||||
const echartsOptions = computed(() => {
|
||||
console.log(serverActive.value)
|
||||
console.log(serverActive.value,'---')
|
||||
const series = serverActive.value.length
|
||||
? serverActive.value.map((key) => setOptions(serverData.data, key))
|
||||
: typeDataLine
|
||||
|
@ -173,7 +173,7 @@ const getCPUEcharts = async (val: any) => {
|
|||
|
||||
const setOptions = (optionsData: any, key: string) => ({
|
||||
data: arrayReverse(optionsData[key]),
|
||||
name: key,
|
||||
name: key != 'undefined' ? key : '',
|
||||
type: 'line',
|
||||
smooth: true,
|
||||
symbol: 'none',
|
||||
|
|
|
@ -140,7 +140,7 @@ const getJVMEcharts = async (val: any) => {
|
|||
|
||||
const setOptions = (optionsData: any, key: string) => ({
|
||||
data: arrayReverse(optionsData[key]),
|
||||
name: key,
|
||||
// name: key!= 'undefined' ? key : '',
|
||||
type: 'line',
|
||||
smooth: true,
|
||||
symbol: 'none',
|
||||
|
|
|
@ -111,7 +111,7 @@
|
|||
<PermissionButton
|
||||
:hasPermission="`${rolePermission}:add`"
|
||||
@click="form.clickAddItem('roleIdList', 'Role')"
|
||||
v-if="!admin"
|
||||
v-if="form.data.username !== 'admin'"
|
||||
>
|
||||
<AIcon type="PlusOutlined" />
|
||||
</PermissionButton>
|
||||
|
@ -207,11 +207,6 @@ import { AxiosResponse } from 'axios';
|
|||
import { passwordRegEx } from '@/utils/validate';
|
||||
import { filterSelectNode, onlyMessage } from '@/utils/comm';
|
||||
import { uniqBy } from 'lodash-es';
|
||||
import { useUserInfo } from '@/store/userInfo';
|
||||
import { storeToRefs } from 'pinia';
|
||||
|
||||
const userInfoStore = useUserInfo()
|
||||
const { userInfos } = storeToRefs(userInfoStore)
|
||||
|
||||
const admin = computed(() => {
|
||||
return userInfos.value?.username === 'admin';
|
||||
|
|
|
@ -96,8 +96,8 @@ export default defineConfig(({ mode}) => {
|
|||
// target: 'http://192.168.32.244:8881',
|
||||
// target: 'http://192.168.32.163:8844', //张季本地
|
||||
// target: 'http://120.77.179.54:8844', // 120测试
|
||||
target: 'http://192.168.33.46:8844', // 本地开发环境
|
||||
// target: 'http://192.168.33.1:8845', // 社区版开发环境
|
||||
// target: 'http://192.168.33.46:8844', // 本地开发环境
|
||||
target: 'http://192.168.33.1:8845', // 社区版开发环境
|
||||
// target: 'http://192.168.32.5:8848', // 刘本地
|
||||
ws: 'ws://192.168.33.46:8844',
|
||||
changeOrigin: true,
|
||||
|
|
Loading…
Reference in New Issue