joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

调整系统关于vue报错误

Browse Source
This commit is contained in:
zyy 2020-04-24 14:17:15 +08:00
parent 7536022d33
commit 2210965709
11 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/baseUrl.js
View File

@ -2,9 +2,9 @@ export function getBaseUrl() {
let BASE_API; let BASE_API;
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
// BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud'; BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.41:9000'; // 张赛

6
src/views/iscs/iscsSystem/config/bas/controlBAS.vue
View File

@ -76,7 +76,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog title="" :visible.sync="dialogVisible" width="600px" :before-close="handleClose" class="dialog-div"> <el-dialog title="" :visible.sync="dialogVisible" width="600px" class="dialog-div">
<div> <div>
<div class="dialog-box"> <div class="dialog-box">
<div class="title">模式类别</div> <div class="title">模式类别</div>
@ -104,8 +104,8 @@ export default {
data() { data() {
return { return {
dialogVisible: false, dialogVisible: false,
tableTitleStyle: 'text-align: center; height: 28px; padding: 0;background: #45607B;', tableTitleStyle: {'text-align': 'center', 'height': '28px', 'padding': '0', 'background': '#45607B'},
rowStyle: 'text-align: center;height: 28px; padding: 0; background: #45607B;', rowStyle: {'text-align': 'center', 'height': '28px', 'padding': '0', 'background': '#45607B' },
tableData: [{ tableData: [{
code: '101', code: '101',
faf1: '打开', faf1: '打开',

3
src/views/iscs/iscsSystem/config/cctv/controlCCTV.vue
View File

@ -129,7 +129,8 @@ export default {
return { return {
selectedCCTV: '41', selectedCCTV: '41',
descriptionList: [], descriptionList: [],
textarea: '' textarea: '',
value: ''
}; };
}, },
mounted() { mounted() {

4
src/views/iscs/iscsSystem/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="iscs-system-box"> <div class="iscs-system-box">
<top-nav v-if="!$route.query.group" @selectMode="selectMode" /> <top-nav v-if="!$route.query.group" />
<group-nav v-if="$route.query.group" @selectMode="selectMode" /> <group-nav v-if="$route.query.group" />
<div class="content-box iscs_content_box" :class="{'displayIscs': $route.query.group}"> <div class="content-box iscs_content_box" :class="{'displayIscs': $route.query.group}">
<router-view /> <router-view />
</div> </div>

12
src/views/orderauthor/order/detail.vue
View File

@ -8,17 +8,17 @@
:data="orderList" :data="orderList"
size="medium" size="medium"
> >
<el-table-column :key="goodsName" :label="this.$t('orderAuthor.commodityName')" prop="goodsName" /> <el-table-column :label="this.$t('orderAuthor.commodityName')" prop="goodsName" />
<el-table-column :key="forever" :label="this.$t('orderAuthor.permanenceOrNot')" prop="forever"> <el-table-column :label="this.$t('orderAuthor.permanenceOrNot')" prop="forever">
<template slot-scope="scope"> <template slot-scope="scope">
{{ $ConstSelect.translate(scope.row.forever, 'Whether') }} {{ $ConstSelect.translate(scope.row.forever, 'Whether') }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :key="goodsName" :label="this.$t('orderAuthor.goodsAmount')" prop="goodsAmount" /> <el-table-column :label="this.$t('orderAuthor.goodsAmount')" prop="goodsAmount" />
<el-table-column :key="goodsName" :label="this.$t('orderAuthor.itemPricing')" prop="price" /> <el-table-column :label="this.$t('orderAuthor.itemPricing')" prop="price" />
<el-table-column :key="goodsName" :label="this.$t('orderAuthor.startDate')" prop="startTime" /> <el-table-column :label="this.$t('orderAuthor.startDate')" prop="startTime" />
<el-table-column :key="goodsName" :label="this.$t('orderAuthor.purchaseMonths')" prop="monthAmount"> <el-table-column :label="this.$t('orderAuthor.purchaseMonths')" prop="monthAmount">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.forever?'/':scope.row.monthAmount }} {{ scope.row.forever?'/':scope.row.monthAmount }}
</template> </template>

4
src/views/orderauthor/rules/index.vue
View File

@ -227,11 +227,11 @@ export default {
handleOriginalForm() { handleOriginalForm() {
if (this.$route.query.distributeId) { if (this.$route.query.distributeId) {
const form = localStore.get(this.$route.path); const form = localStore.get(this.$route.path);
form.distributeId = this.$route.query.distributeId; form['distributeId'] = this.$route.query.distributeId;
localStore.set(this.$route.path, form); localStore.set(this.$route.path, form);
} else { } else {
const form = localStore.get(this.$route.path); const form = localStore.get(this.$route.path);
form.distributeId = ''; form['distributeId'] = '';
localStore.set(this.$route.path, form); localStore.set(this.$route.path, form);
} }
}, },

12
src/views/publish/publishMap/index.vue
View File

@ -110,12 +110,6 @@ export default {
type: 'warning', type: 'warning',
showControl: (row) => { return row.status == 1; } showControl: (row) => { return row.status == 1; }
}, },
{
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger',
showControl: () => { return this.isShow != -1; }
},
{ {
name: this.$t('global.exportMap'), name: this.$t('global.exportMap'),
handleClick: this.handleExportMap, handleClick: this.handleExportMap,
@ -138,6 +132,12 @@ export default {
name: this.$t('publish.simulationDataCheck'), name: this.$t('publish.simulationDataCheck'),
handleClick: this.handleSimulationCheck, handleClick: this.handleSimulationCheck,
showControl: (row) => { return row.drawWay; } showControl: (row) => { return row.drawWay; }
},
{
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger',
showControl: () => { return this.isShow != -1; }
} }
] ]
} }

10
src/views/publish/runPlanEveryDay/index.vue
View File

@ -68,15 +68,15 @@ export default {
width: '250', width: '250',
hide: (row) => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; }, hide: (row) => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
buttons: [ buttons: [
{
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
},
{ {
name: this.$t('global.preview'), name: this.$t('global.preview'),
handleClick: this.handleView, handleClick: this.handleView,
type: '' type: ''
},
{
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
} }
] ]
} }

10
src/views/publish/runPlanTemplate/index.vue
View File

@ -68,11 +68,6 @@ export default {
width: '450', width: '450',
hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; }, hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
buttons: [ buttons: [
{
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
},
{ {
name: this.$t('publish.generateRunPlan'), name: this.$t('publish.generateRunPlan'),
handleClick: this.handleMapSelect, handleClick: this.handleMapSelect,
@ -87,6 +82,11 @@ export default {
name: this.$t('global.preview'), name: this.$t('global.preview'),
handleClick: this.handleView, handleClick: this.handleView,
type: '' type: ''
},
{
name: this.$t('global.delete'),
handleClick: this.handleDelete,
type: 'danger'
} }
] ]
} }

8
src/views/system/deviceManage/add.vue
View File

@ -13,10 +13,10 @@ import { createDevice, deviceIsExist} from '@/api/project';
export default { export default {
name: 'DeviceAdd', name: 'DeviceAdd',
props: { props: {
type: { // type: {
type: String, // type: String,
required: true // required: true
} // }
}, },
data() { data() {
return { return {

8
src/views/system/deviceManage/editConfig.vue
View File

@ -36,10 +36,10 @@ import { getDeviceDetail, setPsdConfig, setSignalConfig, setSwitchConfig } from
export default { export default {
name: 'EditConfig', name: 'EditConfig',
props: { props: {
type: { // type: {
type: String, // type: String,
required: true // required: true
} // }
}, },
data() { data() {
return { return {