0017
/
smart-power-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交: 项目 图片地址拼接 去掉 /prod-api

This commit is contained in:
23688nl 2022-09-09 11:00:45 +08:00
parent aa26f98808
commit 996bd13179
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/hciot.js
View File

@ -164,8 +164,7 @@ export function getIotFileUrl(importUrl) {
if (importUrl.indexOf('http') === 0 || importUrl.indexOf('https') === 0) { if (importUrl.indexOf('http') === 0 || importUrl.indexOf('https') === 0) {
return importUrl; return importUrl;
} else if (importUrl.indexOf('/profile/upload/') === 0 || importUrl.indexOf('/profile/avatar/') === 0) { } else if (importUrl.indexOf('/profile/upload/') === 0 || importUrl.indexOf('/profile/avatar/') === 0) {
console.log('baseUrl:', baseHref + baseURL + importUrl); return baseHref + importUrl;
return baseHref + baseURL + importUrl;
} else if (importUrl.indexOf('data:image/') === 0 || importUrl.indexOf('/static/') === 0) { } else if (importUrl.indexOf('data:image/') === 0 || importUrl.indexOf('/static/') === 0) {
return importUrl; return importUrl;
} }

18
src/views/iot/video/site/index.vue
View File

@ -72,7 +72,7 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="站点名称" align="left" width="150" prop="siteName" /> <el-table-column label="站点名称" align="left" width="200" prop="siteName" />
<!-- <el-table-column <!-- <el-table-column
label="行政区划" label="行政区划"
align="left" align="left"
@ -80,7 +80,11 @@
prop="regionalismFullName" prop="regionalismFullName"
/> --> /> -->
<el-table-column label="项目名称" align="left" width="150" prop="projectName" /> <el-table-column label="项目名称" align="left" width="150" prop="projectName" />
<el-table-column label="站点地址" align="left" prop="siteAddress" /> <el-table-column label="站点地址" align="left" prop="siteAddress" >
<template slot-scope="scope">
<span :title="scope.row.siteAddress" class="lay-table-textarea">{{ scope.row.siteAddress || '--'}}</span>
</template>
</el-table-column>
<el-table-column label="站点状态" align="center" width="100" prop="siteStatus"> <el-table-column label="站点状态" align="center" width="100" prop="siteStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="list-row"> <div class="list-row">
@ -92,8 +96,8 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="接入协议" align="left" width="150" prop="videoProtocol" /> <el-table-column label="接入协议" align="left" width="100" prop="videoProtocol" />
<el-table-column label="设备ID" align="left" width="200" prop="devId" /> <el-table-column label="站点通道" align="left" width="200" prop="devId" />
<el-table-column label="设备编码" align="left" width="150" prop="devCode" /> <el-table-column label="设备编码" align="left" width="150" prop="devCode" />
<el-table-column label="创建时间" align="center" prop="createTime" width="160"> <el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
@ -310,11 +314,11 @@
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="设备ID" prop="devId" v-show="tempType !== 'distri'"> <el-form-item label="站点通道" prop="devId" v-show="tempType !== 'distri'">
<el-input <el-input
v-model="form.devId" v-model="form.devId"
:disabled="tempType === 'distri'" :disabled="tempType === 'distri'"
placeholder="请输入设备ID" placeholder="请输入站点通道"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备编码" prop="devCode" v-show="tempType !== 'distri'"> <el-form-item label="设备编码" prop="devCode" v-show="tempType !== 'distri'">
@ -500,7 +504,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
devId: [ devId: [
{ required: true, message: "设备ID不能为空", trigger: "blur" }, { required: true, message: "站点通道不能为空", trigger: "blur" },
{ {
pattern: /^[0-9]{20}$/, pattern: /^[0-9]{20}$/,
message: "格式不正确; 纯数字 组合20个字符", message: "格式不正确; 纯数字 组合20个字符",