Skip to content

Commit

Permalink
feat(cloudOperations): fix(equipmentCloud): 产品默认位置
Browse files Browse the repository at this point in the history
  • Loading branch information
@dawnwinterLiu
dawnwinterLiu committed Oct 21, 2022
1 parent 0c95658 commit 28a8297
Show file tree
Hide file tree
Showing 8 changed files with 259 additions and 168 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.EN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

### Bug Fixes

* **equipmentCloud:** 产品默认位置 ([0c95658](https://github.com/dgiot/dgiot-dashboard/commit/0c95658e11747babaf7b8ceab921fab368cdfac1))
* **equipmentCloud:** config ([a7575d2](https://github.com/dgiot/dgiot-dashboard/commit/a7575d2f6f2aaa8fe60b542d28451833436a5dc0))


Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.ZH.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

### Bug Fixes

* **equipmentCloud:** 产品默认位置 ([0c95658](https://github.com/dgiot/dgiot-dashboard/commit/0c95658e11747babaf7b8ceab921fab368cdfac1))
* **equipmentCloud:** config ([a7575d2](https://github.com/dgiot/dgiot-dashboard/commit/a7575d2f6f2aaa8fe60b542d28451833436a5dc0))


Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

### Bug Fixes

* **equipmentCloud:** 产品默认位置 ([0c95658](https://github.com/dgiot/dgiot-dashboard/commit/0c95658e11747babaf7b8ceab921fab368cdfac1))
* **equipmentCloud:** config ([a7575d2](https://github.com/dgiot/dgiot-dashboard/commit/a7575d2f6f2aaa8fe60b542d28451833436a5dc0))


Expand Down
9 changes: 8 additions & 1 deletion src/api/View/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ import {
query_object,
update_object,
} from '@/api/Parse'

import request from '@/utils/request/request'
//获取地图轨迹
export async function getTrack(id) {
return request({
url: `/gps/track/${id}`,
method: 'get',
})
}
export async function queryView(params) {
return query_object('View', params)
}
Expand Down
5 changes: 4 additions & 1 deletion src/i18n/zh.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1118,16 +1118,19 @@ export default {
principal: '负责人',
selectprincipal: '选择负责人',
selectexecutor: '选择执行人',
executor: '执行人',
maintenance_personnel: '设备运维人员',
selectmaintenance_personnel: '选择设备运维人员',
istimeout: '是否超时',
completiondata: '要求完成日期',
advance: '结束前几天提醒',
projects: '项目',
'Ticket type': '工单类型',
'Ticket status': '工单状态',
'Ticket description': '工单描述',
project: '所属项目',
'Equipment name': '设备名称',
Initiator: '创建人',
publisher: '发布人',
operating: '操作',
receive: '接收',
'To be assigned': '待接收',
Expand Down
151 changes: 80 additions & 71 deletions src/views/CloudOT/maintenance/ChangeStep.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,44 +96,53 @@
</el-col>
<el-col :lg="12" :md="12" :sm="24" :xl="12" :xs="24">
<el-form-item
:label="$translateTitle('Maintenance.principal') + ': '"
:label="$translateTitle('Maintenance.advance') + ': '"
>
<el-select
v-if="step == 4 && objectid == form.info.created"
v-model="form.info.principal"
:placeholder="$translateTitle('Maintenance.selectprincipal')"
style="width: 60%"
@change="principalChange"
>
<el-option
v-for="item in user"
:key="item.objectId"
:label="item.nick"
:value="item.objectId"
/>
</el-select>
<span v-else>{{ form.info.principalname }}</span>
<span>{{ form.info.advance }}</span>
</el-form-item>
</el-col>
<!-- <el-col :lg="12" :md="12" :sm="24" :xl="12" :xs="24">-->
<!-- <el-form-item-->
<!-- :label="$translateTitle('Maintenance.principal') + ': '"-->
<!-- >-->
<!-- <el-select-->
<!-- v-if="step == 4 && objectid == form.info.created"-->
<!-- v-model="form.info.principal"-->
<!-- :placeholder="$translateTitle('Maintenance.selectprincipal')"-->
<!-- style="width: 60%"-->
<!-- @change="principalChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in user"-->
<!-- :key="item.objectId"-->
<!-- :label="item.nick"-->
<!-- :value="item.objectId"-->
<!-- />-->
<!-- </el-select>-->
<!-- <span v-else>{{ form.info.principalname }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :lg="12" :md="12" :sm="24" :xl="12" :xs="24">
<el-form-item
:label="$translateTitle('Maintenance.executor') + ': '"
:label="
$translateTitle('Maintenance.maintenance_personnel') + ': '
"
>
<el-select
v-if="step == 4 && objectid == form.info.created"
v-model="form.info.executor"
:placeholder="$translateTitle('Maintenance.selectexecutor')"
style="width: 60%"
@change="executorChange"
>
<el-option
v-for="item in user"
:key="item.objectId"
:label="item.nick"
:value="item.objectId"
/>
</el-select>
<span v-else>{{ form.info.executorname }}</span>
<!-- <el-select-->
<!-- v-if="step == 4 && objectid == form.info.created"-->
<!-- v-model="form.info.executor"-->
<!-- :placeholder="$translateTitle('Maintenance.selectexecutor')"-->
<!-- style="width: 60%"-->
<!-- @change="executorChange"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in user"-->
<!-- :key="item.objectId"-->
<!-- :label="item.nick"-->
<!-- :value="item.objectId"-->
<!-- />-->
<!-- </el-select>-->
<span>{{ form.info.executorname }}</span>
</el-form-item>
</el-col>
<el-col :lg="24" :md="24" :sm="24" :xl="24" :xs="24">
Expand All @@ -145,7 +154,7 @@
>
<el-input
v-if="
(form.status != 2 && objectid == form.info.executor) ||
(form.status != 2 && objectid == form.info.executorid) ||
(form.status == 3 && objectid == form.info.created)
"
v-model="form.info.description"
Expand All @@ -156,51 +165,51 @@
</span>
</el-form-item>
</el-col>
<el-col :lg="24" :md="24" :sm="24" :xl="24" :xs="24">
<el-form-item
:label="$translateTitle('Maintenance.photo') + ': '"
style="margin-top: 10px"
>
<el-upload
v-if="
(form.status != 2 && objectid == form.info.executor) ||
(form.status == 3 && objectid == form.info.created)
"
action="#"
:auto-upload="true"
:http-request="myUpload"
list-type="picture-card"
>
<i slot="default" class="el-icon-plus"></i>
</el-upload>
<el-carousel
v-if="form.info.photo"
height="200px"
:interval="2000"
type="card"
>
<el-carousel-item
v-for="(item, index) in form.info.photo"
:key="index"
>
<img
:alt="item"
:src="item"
style="width: 100%; height: 100%"
:title="item"
/>
</el-carousel-item>
</el-carousel>
</el-form-item>
</el-col>
<!-- <el-col :lg="24" :md="24" :sm="24" :xl="24" :xs="24">-->
<!-- <el-form-item-->
<!-- :label="$translateTitle('Maintenance.photo') + ': '"-->
<!-- style="margin-top: 10px"-->
<!-- >-->
<!-- <el-upload-->
<!-- v-if="-->
<!-- (form.status != 2 && objectid == form.info.executor) ||-->
<!-- (form.status == 3 && objectid == form.info.created)-->
<!-- "-->
<!-- action="#"-->
<!-- :auto-upload="true"-->
<!-- :http-request="myUpload"-->
<!-- list-type="picture-card"-->
<!-- >-->
<!-- <i slot="default" class="el-icon-plus"></i>-->
<!-- </el-upload>-->
<!-- <el-carousel-->
<!-- v-if="form.info.photo"-->
<!-- height="200px"-->
<!-- :interval="2000"-->
<!-- type="card"-->
<!-- >-->
<!-- <el-carousel-item-->
<!-- v-for="(item, index) in form.info.photo"-->
<!-- :key="index"-->
<!-- >-->
<!-- <img-->
<!-- :alt="item"-->
<!-- :src="item"-->
<!-- style="width: 100%; height: 100%"-->
<!-- :title="item"-->
<!-- />-->
<!-- </el-carousel-item>-->
<!-- </el-carousel>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :lg="24" :md="24" :sm="24" :xl="24" :xs="24">
<el-form-item
:label="$translateTitle('Maintenance.Remarks') + ': '"
style="margin-top: 10px"
>
<el-input
v-if="
(form.status != 2 && objectid == form.info.executor) ||
(form.status != 2 && objectid == form.info.executorid) ||
(form.status == 3 && objectid == form.info.created)
"
v-model="form.info.Remarks"
Expand Down
Loading

1 comment on commit 28a8297

@vercel
Copy link

@vercel vercel bot commented on 28a8297 Oct 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

dgiot-dashboard – ./

dgiot-dashboard-dgiot.vercel.app
dgiot-dashboard-git-master-dgiot.vercel.app
dgiot-dashboard.vercel.app

Please sign in to comment.