liuyiliang
/
smart-om-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
weitingdong 1 year ago
parent 35319bc74f 362cc2d45d
commit 2bfc3b6e5d
4 changed files with 18 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/views/leger/toolinventoryrecordDetail.vue
  2. 3
      src/views/smart/operationticket.vue
  3. 16
      src/views/smart/operationticketDetail.vue
  4. 39
      src/views/wel/index.vue

5
src/views/leger/toolinventoryrecordDetail.vue
Unescape View File

@ -33,10 +33,8 @@
<span v-else-if="type.prop==='task'">
<div>
<avue-crud :data="task_data"
:table-loading="loading"
:option="optionTask"
:permission="permissionList"
:before-open="beforeOpen"
:header-cell-class-name="headerClass"
v-model="task_form"
ref="crud">
@ -139,6 +137,7 @@
:visible.sync="resultVisible">
<avue-crud :option="resultDia"
v-model="resultForm"
:header-cell-class-name="headerClass"
:data="result_data"
ref="diaForm">
</avue-crud>
@ -336,8 +335,10 @@ export default {
},
]
},
task_form: {},
task_data: [],
optionTask: {
addBtn: false,
delBtn: false,
editBtn: false,
align: 'center',

3
src/views/smart/operationticket.vue
Unescape View File

@ -93,6 +93,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
return {
form: {},
updateid:0,
search:{},
query: {},
loading: true,
closeTicketBox: false,
@ -700,7 +701,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
cancelButtonText: "取消",
type: "warning"
}).then(() => {
expUtil.excelExport(`/api/smart/operationticket/export?daf-auth=${getToken()}`, this.search);
expUtil.excelExportEasy(`/api/smart/operationticket/export?daf-auth=${getToken()}`, this.search);
});
},
}

16
src/views/smart/operationticketDetail.vue
Unescape View File

@ -50,16 +50,16 @@
</span>
<div class="container">
<span >
<el-button type="primary"
size="large"
@click="back"
v-if="addUpdateShowButton">
取消</el-button>
<el-button type="primary"
size="large"
@click="handleFormSubmit"
v-if="addUpdateShowButton">
确定</el-button>
<el-button type="text"
size="large"
@click="back"
v-if="addUpdateShowButton">
取消</el-button>
<el-button type="primary"
size="small"
@click="handleDetailcls"
@ -339,6 +339,8 @@ export default {
prop: "plannedStartTime",
rules: [{
required: true,
message: "请输入计划开始时间",
trigger: "blur"
}],
type: "datetime",
format: 'yyyy/MM/dd HH:mm:ss',
@ -351,6 +353,8 @@ export default {
prop: "plannedEndTime",
rules: [{
required: true,
message: "请输入计划结束时间",
trigger: "blur"
}],
type: "datetime",
format: 'yyyy/MM/dd HH:mm:ss',
@ -363,6 +367,8 @@ export default {
prop: "workIssuanceTime",
rules: [{
required: true,
message: "请输入计划工作签发时间",
trigger: "blur"
}],
type: "datetime",
format: 'yyyy/MM/dd HH:mm:ss',

39
src/views/wel/index.vue
Unescape View File

@ -32,43 +32,8 @@
<p class="notification-title"><i class="el-icon-document el-icon-home"></i> 今日任务</p>
<div class="overflowList">
<el-skeleton :rows="3" animated v-show="skeleton"/>
<div class="el-collapse">
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
</div>
<div class="el-collapse-item">
<div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
<div class="el-collapse-item" v-for="(item, index) in homePageData.inspectionTasksAudit" :key="index">
<div class="el-collapse-item__header" @click="skip('/inspection/inspectiontasksDetail', item.id)"><span class="el-collapse-span">☆巡检任务：{{item.taskName}}</span></div>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save