Skip to content

卡
卡车调度系统
Commit 3b5f6f50 authored by caicaicai's avatar caicaicai
Browse files
Options

修改

parent d8f3d1cc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 221 deletions
src/components/ezuikit/carsEZUIKitJs.vue
View file @ 3b5f6f50
This diff is collapsed.
src/views/regionalManagement/regionalInformation/index.vue
View file @ 3b5f6f50
......@@ -43,52 +43,52 @@
<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="800px">
<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
<el-form-item label="编码" prop="code">
<el-input v-model="form.item.code" style="width:160px;" placeholder="" :disabled="form.reqType == 'edit'"/>
<el-input v-model="form.item.code" style="width:160px;" placeholder="请输入编码" :disabled="form.reqType == 'edit'"/>
</el-form-item>
<el-form-item label="所属类别" prop="areaclass">
<el-select v-model="form.item.areaclass" placeholder="" size="small" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-select v-model="form.item.areaclass" placeholder="请选择所属类别" size="small" style="width:160px;">
<el-option v-for="(obj,index) in RegionalTypeData" :label="obj.classname" :value="obj.classname" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="区域名称" prop="name">
<el-input v-model="form.item.name" style="width:160px;" placeholder="" :disabled="form.reqType == 'edit'"/>
<el-input v-model="form.item.name" style="width:160px;" placeholder="请输入区域名称" :disabled="form.reqType == 'edit'"/>
</el-form-item>
<el-form-item label="是否需要遮罩层" prop="shadow">
<el-select v-model="form.item.shadow" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-select v-model="form.item.shadow" placeholder="请选择是否需要遮罩层" style="width:160px;">
<el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option>
</el-select>
</el-form-item>
<el-form-item label="最大承接车辆数" prop="max">
<el-input v-model="form.item.max" style="width:160px;" placeholder="" :disabled="form.reqType == 'edit'"/>
<el-input v-model="form.item.max" style="width:160px;" placeholder="请输入最大承接车辆数"/>
</el-form-item>
<!-- <el-form-item label="区域中心坐标点" prop="coordinate">
<el-input v-model="form.item.coordinate" style="width:160px;" placeholder="请输入区域中心坐标点"/>
</el-form-item> -->
<el-form-item label="区域标记">
<el-input v-model="picFileName" style="width:160px;" placeholder="" disabled />
<input type="file" name="image" @change="excelImport($event)" v-show="form.reqType == 'add'" />
<el-input v-model="picFileName" style="width:160px;" placeholder="请选择图片" disabled />
<input type="file" name="image" @change="excelImport($event)" />
</el-form-item>
<!-- <el-form-item label="区域范围或直径" prop="arearange">
<el-input v-model="form.item.arearange" style="width:160px;" placeholder="请输入区域范围或直径"/>
</el-form-item> -->
<el-form-item label="电铲名称" prop="areashovel">
<el-input v-model="form.item.areashovel" style="width:160px;" placeholder="" :disabled="form.reqType == 'edit'"/>
<el-input v-model="form.item.areashovel" style="width:160px;" placeholder="请输入电铲名称"/>
</el-form-item>
<el-form-item label="矿种" prop="arearesources">
<el-select v-model="form.item.arearesources" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-select v-model="form.item.arearesources" placeholder="请选择矿种" style="width:160px;">
<el-option label="废石" value="废石"></el-option>
<el-option label="矿石" value="矿石"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否配矿" prop="areaore">
<el-select v-model="form.item.areaore" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-select v-model="form.item.areaore" placeholder="请选择是否配矿" style="width:160px;">
<el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option>
</el-select>
</el-form-item>
<el-form-item label="优先级" prop="areapriority">
<el-input-number v-model="form.item.areapriority" :min="1" :max="10" label="" :disabled="form.reqType == 'edit'"></el-input-number>
<el-input-number v-model="form.item.areapriority" :min="1" :max="10" label=""></el-input-number>
</el-form-item>
<div id="centerDiv" class="mapcontainer" v-show="form.reqType == 'add'">
<mars3dViewerMap :url="configUrl" @onload="onMapload" ref="mars3dViewerMapMethod"/>
......@@ -99,17 +99,15 @@
<el-form-item label="启用时间段" v-show="form.item.areaclass == '电子围栏'">
<el-time-picker
v-model="form.item.startTime"
placeholder="开始时间"
:disabled="form.reqType == 'edit'">
placeholder="开始时间">
</el-time-picker>
<el-time-picker
v-model="form.item.endTime"
placeholder="结束时间"
:disabled="form.reqType == 'edit'">
placeholder="结束时间">
</el-time-picker>
</el-form-item>
<el-form-item label="限制类型" prop="limitclass" v-show="form.item.areaclass == '电子围栏'">
<el-select v-model="form.item.limitclass" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-select v-model="form.item.limitclass" placeholder="请选择限制类型" style="width:160px;">
<el-option label="限入" value="限入"></el-option>
<el-option label="限出" value="限出"></el-option>
</el-select>
......@@ -117,20 +115,20 @@
<br/>
<el-form-item label="选择车辆" prop="cars" v-show="form.item.areaclass == '电子围栏'">
<div class="checkboxViews">
<el-checkbox-group v-model="checkDataList" style="width:480px;" :disabled="form.reqType == 'edit'">
<el-checkbox-group v-model="checkDataList" style="width:480px;">
<el-checkbox v-for="(obj,index) in carInformationData" :label="obj.name + '/' + obj.number" :key="index">{{obj.name + '/' + obj.number}}</el-checkbox>
</el-checkbox-group>
</div>
</el-form-item>
<el-form-item label="启停状态" prop="status" v-show="form.item.areaclass == '电子围栏'">
<el-select v-model="form.item.status" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-select v-model="form.item.status" placeholder="请选择启停状态" style="width:160px;">
<el-option label="启用" value="启用"></el-option>
<el-option label="停用" value="停用"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" v-show="form.reqType == 'add'">
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancelForm">取消</el-button>
<el-button :loading="form.status.cu === 2" type="primary" @click="submitForm('form1', form.item)">确认</el-button>
</div>
......@@ -296,7 +294,7 @@ export default {
toEdit(item) {
// 请除表单验证
this.$refs['form1'] && this.$refs['form1'].clearValidate();
this.form.title = '查看区域信息';
this.form.title = '修改区域信息';
this.form.status.cu = 0;
this.form.visible = true;
this.form.item = {...item};
......
vue.config.js
View file @ 3b5f6f50
......@@ -24,8 +24,8 @@ module.exports = {
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,
devServer: {
host: 'localhost', // 也可以直接写IP地址这样方便真机测试
// host: '192.168.0.102', // 也可以直接写IP地址这样方便真机测试
// host: 'localhost', // 也可以直接写IP地址这样方便真机测试
host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试
port: port,
open: true,
overlay: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment