Browse Source

6.14

master
fengdong777 2 years ago
parent
commit
3d10767f11
  1. 6
      warehousing-system/project_web/src/components/Home.vue
  2. 20
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureAdd.vue
  3. 144
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue
  4. 12
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplateAdd.vue
  5. 18
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandardsAdds.vue
  6. 4
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue
  7. 167
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue
  8. 56
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue
  9. 20
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue
  10. 4
      yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue

6
warehousing-system/project_web/src/components/Home.vue

@ -131,10 +131,8 @@ export default {
}, },
methods: { methods: {
logout () { logout () {
// 1.session window.opener = null
window.sessionStorage.clear() window.open('about:blank', '_top').close()
// 2.
this.$router.push('/login')
}, },
async getMenuList () { async getMenuList () {
// 1. // 1.

20
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureAdd.vue

@ -334,17 +334,17 @@
}) })
}, },
doCommoditylDel(index) { doCommoditylDel(index) {
const tip = '请确认是否删除所选记录?' const tip = '请确认是否删除所选记录?'
this.$confirm(tip, '提示', { this.$confirm(tip, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.formobj.commodityList.splice(index, 1); this.formobj.commodityList.splice(index, 1);
}) })
}, },
// //
indexMethod(index) { indexMethod(index) {

144
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplate.vue

@ -7,8 +7,8 @@
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button> <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="queryParams" :model="queryParams.params" :inline="true" class="tab-header"> <el-form ref="queryParams" :model="queryParams.params" :inline="true" class="tab-header">
<el-form-item label="模板id"><el-input v-model="queryParams.params.templateid" placeholder="请输入模板id" clearable /></el-form-item> <el-form-item label="模板名称"><el-input v-model="queryParams.params.templateid" placeholder="请输入模板名称" clearable /></el-form-item>
<el-form-item label="任务项标准库id"><el-input v-model="queryParams.params.taskid" placeholder="请输入任务项标准库id" clearable /></el-form-item> <el-form-item label="任务类型"><el-input v-model="queryParams.params.taskid" placeholder="请输入任务类型" clearable /></el-form-item>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@ -25,16 +25,19 @@
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div> <div>
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange"> <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" >
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="templateid" label="模板id" align="center" /> <el-table-column prop="templateid" label="模板名称" align="center" />
<el-table-column prop="taskid" label="任务项标准库id" align="center" /> <el-table-column prop="taskid" label="任务类型" align="center" />
<el-table-column fixed="right" label="操作" align="center"> <el-table-column fixed="right" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top-end"> <el-tooltip class="item" effect="dark" content="维护" placement="top-end">
<i class="el-icon-coin" @click="toMaintain(scope.row)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<i class="el-icon-edit-outline" @click="toEdit(scope.row)"></i> <i class="el-icon-edit-outline" @click="toEdit(scope.row)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<i class="el-icon-delete" @click="doDel(scope.row)"></i> <i class="el-icon-delete" @click="doDel(scope.row)"></i>
</el-tooltip> </el-tooltip>
</template> </template>
@ -55,8 +58,62 @@
/> />
</div> </div>
</div> </div>
</div>
<!-- 弹出关联项 -->
<el-dialog
title="关联任务项"
:visible.sync="dialogVisible"
width="70%"
>
<div class="main-content">
<div class="searchcon">
<div class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="任务项名称"><el-input v-model="queryParams2.params.taskname" placeholder="请输入任务项名称" clearable /></el-form-item>
<el-form-item label="任务项分类"><el-input v-model="queryParams2.params.tasktype" placeholder="请输入任务项分类" clearable /></el-form-item>
<div class="btn" style="margin-left: 400px;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearchs">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuerys">重置</el-button>
</div>
</el-form>
</div>
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">数据列表</div>
<pageye v-show="arrList.length > 0" :total="queryParams2.total" :page.sync="queryParams2.current" :limit.sync="queryParams2.size" class="pagination" @pagination="loadLists" />
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div>
<el-table v-loading="tableLoading" :data="arrList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center" />
<el-table-column prop="taskname" label="任务项名称" align="center" />
<el-table-column prop="tasktype" label="任务项分类" align="center" />
<el-table-column prop="taskdesc" label="任务描述" align="center" />
<el-table-column prop="taskreturn" :formatter="formatPrivilegeType" label="反馈形式" align="center" />
</el-table>
<div style="margin-top: 20px; margin-left: 800px;">
<el-button size="small" @click="dialogVisible = false"> </el-button>
<el-button size="small" type="primary" @click="confirm"> </el-button>
</div>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination
v-show="arrList.length > 0"
:total="queryParams2.total"
:page.sync="queryParams2.current"
:limit.sync="queryParams2.size"
class="pagination"
@pagination="loadLists"
/>
</div>
</div> </div>
<!-- End 查询和其列表部分 --> </el-dialog>
<!-- 新增修改部分组件 --> <!-- 新增修改部分组件 -->
<div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> <div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
@ -68,6 +125,7 @@
<script> <script>
import req from '@/api/yxtdispatchcenter/dispatchmodletemplate' import req from '@/api/yxtdispatchcenter/dispatchmodletemplate'
import req2 from '@/api/yxtdispatchcenter/dispatchstandards'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import pageye from '@/components/pagination/pageye'
@ -89,7 +147,9 @@ export default {
viewState: 1, // 1 2 3 4 viewState: 1, // 1 2 3 4
isSearchShow: false, isSearchShow: false,
tableLoading: false, tableLoading: false,
dialogVisible: false,
dataList: [], dataList: [],
arrList: [],
queryParams: { queryParams: {
current: 1, current: 1,
size: 10, size: 10,
@ -102,7 +162,7 @@ export default {
}, },
multipleSelection: [], multipleSelection: [],
btnList: [ btnList: [
{ {
type: 'primary', type: 'primary',
size: 'small', size: 'small',
icon: 'plus', icon: 'plus',
@ -116,7 +176,21 @@ export default {
btnKey: 'doClose', btnKey: 'doClose',
btnLabel: '关闭' btnLabel: '关闭'
} }
] ],
queryParams2: {
current: 1,
size: 10,
total: 0,
params: {
sids: [], // SID
taskname: '', //
tasktype: '', //
taskdesc: '', //
taskreturn: '', // 1 2 3
tasktypeparent: '' // +
}
},
multipleSelection:[]
} }
}, },
mounted() { mounted() {
@ -195,12 +269,22 @@ export default {
this.queryParams.current = 1 this.queryParams.current = 1
this.loadList() this.loadList()
}, },
dosearchs() {
this.queryParams2.current = 1
this.loadLists()
},
resetQuery() { resetQuery() {
this.queryParams.params = {} this.queryParams.params = {}
this.queryParams.params.sid = '' // sid this.queryParams.params.sid = '' // sid
this.queryParams.params.name = '' // this.queryParams.params.name = '' //
this.dosearch() this.dosearch()
}, },
resetQuerys() {
this.queryParams2.params = {}
this.queryParams2.params.sid = '' // sid
this.queryParams2.params.name = '' //
this.dosearchs()
},
loadList() { loadList() {
const _this = this const _this = this
this.tableLoading = true this.tableLoading = true
@ -220,6 +304,25 @@ export default {
_this.tableLoading = false _this.tableLoading = false
}) })
}, },
loadLists() {
const _this = this
this.tableLoading = true
req2
.listPage(this.queryParams2)
.then(resp => {
_this.tableLoading = false
if (resp.success) {
const data = resp.data
_this.queryParams2.total = data.total
_this.arrList = data.records
} else {
// resp.code
}
})
.catch(() => {
_this.tableLoading = false
})
},
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val this.multipleSelection = val
}, },
@ -237,6 +340,27 @@ export default {
this.$store.dispatch('tagsView/delView', this.$route) this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1) this.$router.go(-1)
}, },
toMaintain(row){
this.loadLists()
this.dialogVisible=true
},
formatPrivilegeType: function( row, column) {
if(row.taskreturn === '1'){
return '文字'
} else if(row.taskreturn === '2') {
return '图片'
} else if (row.taskreturn === '3') {
return '选项'
} else {
return ''
}
},
confirm(){
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
return
}
}
} }
} }
</script> </script>

12
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchmodletemplateAdd.vue

@ -22,18 +22,18 @@
</div> </div>
<el-row> <el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span><span class="icon">*</span>模板id</span> <span><span class="icon">*</span>模板名称</span>
</el-col> </el-col>
<el-col :span="8" class="trightb"> <el-col :span="8" class="trightb">
<el-form-item prop="templateid"><el-input v-model="formobj.templateid" placeholder="模板id" class="addinputw" clearable /></el-form-item> <el-form-item prop="templateid"><el-input v-model="formobj.templateid" placeholder="模板名称" class="addinputw" clearable /></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span><span class="icon">*</span>任务项标准库id</span> <span><span class="icon">*</span>任务类型</span>
</el-col> </el-col>
<el-col :span="8" class="trightb"> <el-col :span="8" class="trightb">
<el-form-item prop="taskid"><el-input v-model="formobj.taskid" placeholder="任务项标准库id" class="addinputw" clearable /></el-form-item> <el-form-item prop="taskid"><el-input v-model="formobj.taskid" placeholder="任务类型" class="addinputw" clearable /></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -59,8 +59,8 @@ export default {
taskid: '' // id taskid: '' // id
}, },
rules: { rules: {
templateid: [{ required: true, message: '模板id不能为空', trigger: 'blur' }], // id templateid: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }], // id
taskid: [{ required: true, message: '任务项标准库id不能为空', trigger: 'blur' }] // id taskid: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }] // id
} }
} }
}, },

18
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchmodletemplate/dispatchstandardsAdds.vue

@ -24,8 +24,19 @@
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">任务项分类</span> <span class="item_text">任务项分类</span>
<el-input v-model="formobj.tasktype" class="item_input" <el-select
placeholder="任务项分类" /> v-model="formobj.tasktype"
class="item_input"
placeholder="请选择任务项"
size="small"
>
<el-option
v-for="(item, i) in arr"
:key="i"
:label="item.type"
:value="item.type"
/>
</el-select>
</div> </div>
<div class="item"> <div class="item">
@ -75,7 +86,8 @@ export default {
taskdesc: [{ required: true, message: '任务描述不能为空', trigger: 'blur' }], // taskdesc: [{ required: true, message: '任务描述不能为空', trigger: 'blur' }], //
taskreturn: [{ required: true, message: '反馈形式(1选项 2图片 3文字)不能为空', trigger: 'blur' }], // 1 2 3 taskreturn: [{ required: true, message: '反馈形式(1选项 2图片 3文字)不能为空', trigger: 'blur' }], // 1 2 3
tasktypeparent: [{ required: true, message: '任务项父级分类+不能为空', trigger: 'blur' }] // + tasktypeparent: [{ required: true, message: '任务项父级分类+不能为空', trigger: 'blur' }] // +
} },
arr:[{value:1,type:'电力电缆检查'},{value:2,type:'变压器外观'},{value:3,type:'集污器、冷却风扇'},{value:4,type:'通讯柜'}],
} }
}, },
created() {}, created() {},

4
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfo.vue

@ -33,7 +33,7 @@
</div> </div>
<!-- Start 项目列表头部 --> <!-- Start 项目列表头部 -->
<div class="listtop"> <div class="listtop">
<div class="tit">汇总工单数据列表</div> <div class="tit">巡视工单列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" /> <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
@ -45,7 +45,7 @@
<el-table-column prop="orderno" label="工单编号" align="center" /> <el-table-column prop="orderno" label="工单编号" align="center" />
<el-table-column prop="ordername" label="工单名称" align="center" /> <el-table-column prop="ordername" label="工单名称" align="center" />
<el-table-column prop="custname" label="客户名称" align="center" /> <el-table-column prop="custname" label="客户名称" align="center" />
<el-table-column prop="orderdegree" :formatter="formatorderdegree" label="等级" align="center" /> <el-table-column prop="orderdegree" label="等级" align="center" />
<el-table-column prop="ordercontent" label="工单内容" align="center" /> <el-table-column prop="ordercontent" label="工单内容" align="center" />
<el-table-column prop="receiveperson" label="现场联系人" align="center" /> <el-table-column prop="receiveperson" label="现场联系人" align="center" />
<el-table-column prop="receivetel" label="现场联系人电话" align="center" /> <el-table-column prop="receivetel" label="现场联系人电话" align="center" />

167
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchorderinfoAdd.vue

@ -37,7 +37,7 @@
<el-col :span="2" class="tleftb"> <el-col :span="2" class="tleftb">
<span><span class="icon">*</span>工单名称</span> <span><span class="icon">*</span>工单名称</span>
</el-col> </el-col>
<el-col :span="3" class="trightb"> <el-col :span="2" class="trightb">
<el-form-item prop="ordername"><el-input size="small" v-model="formobj.ordername" placeholder="工单名称" class="addinputw" clearable /></el-form-item> <el-form-item prop="ordername"><el-input size="small" v-model="formobj.ordername" placeholder="工单名称" class="addinputw" clearable /></el-form-item>
</el-col> </el-col>
<el-col :span="2" class="tleftb"> <el-col :span="2" class="tleftb">
@ -46,6 +46,24 @@
<el-col :span="3" class="trightb"> <el-col :span="3" class="trightb">
<el-form-item prop="ordercontent"><el-input size="small" v-model="formobj.ordercontent" placeholder="工单内容" class="addinputw" clearable /></el-form-item> <el-form-item prop="ordercontent"><el-input size="small" v-model="formobj.ordercontent" placeholder="工单内容" class="addinputw" clearable /></el-form-item>
</el-col> </el-col>
<el-col :span="2" class="tleftb">
<span><span class="icon">*</span>模板</span>
</el-col>
<el-col :span="3" class="trightb">
<el-select
v-model="formobj.templatesid"
class="addinputw"
placeholder="模板"
size="small"
>
<el-option
v-for="(item, i) in dataList"
:key="i"
:label="item.templateid"
:value="item.taskid"
/>
</el-select>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="2" class="tleftb"> <el-col :span="2" class="tleftb">
@ -92,7 +110,7 @@
v-for="(item, i) in arrList" v-for="(item, i) in arrList"
:key="i" :key="i"
:label="item.type" :label="item.type"
:value="item.value" :value="item.type"
/> />
</el-select> </el-select>
</el-col> </el-col>
@ -101,17 +119,40 @@
</div> </div>
<div class="listtop"> <div class="listtop">
<div class="tit">巡视人员</div> <div class="tit">巡视人员</div>
<el-button class="span" type="primary" @click.stop="add()">新增</el-button>
</div> </div>
<div> <div>
<el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%" <el-table ref="table" tooltip-effect="dark" :data="TabList" border style="width: 100%"
@selection-change="handleSelectionChange" @select="handleSelection" stripe> @selection-change="handleSelectionChange" @select="handleSelection" stripe >
> >
<el-table-column type="selection" width="55"/> <el-table-column type="selection" width="55"/>
<el-table-column fixed width="100" type="index" label="序号" align="center" /> <el-table-column fixed width="100" type="index" label="序号" align="center" />
<el-table-column prop="principalname" label="巡视人名称" align="center" /> <el-table-column label="操作" wid align="center" width="150">
<el-table-column prop="principalcontact" label="联系方式" align="center" /> <template slot-scope="scope">
<el-table-column prop="workteam" label="班组组织" align="center" /> <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
<el-table-column prop="executorname" label="是否负责人" width="150px" align="center" /> </template>
</el-table-column>
<el-table-column prop="principalname" label="巡视人名称" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.principalname" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="principalcontact" label="联系方式" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.principalcontact" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="workteam" label="班组组织" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.workteam" placeholder="" clearable></el-input>
</template>
</el-table-column>
<el-table-column prop="executorname" label="是否负责人" width="150px" align="center" >
<template slot-scope="scope">
<el-radio v-model="scope.row.executorname" label="是"></el-radio>
<el-radio v-model="scope.row.executorname" label="否"></el-radio>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="listtop"> <div class="listtop">
@ -120,8 +161,8 @@
<div> <div>
<el-table :data="list" border style="width: 100%;text-align: center;"> <el-table :data="list" border style="width: 100%;text-align: center;">
<el-table-column fixed width="100" type="index" label="序号" align="center" /> <el-table-column fixed width="100" type="index" label="序号" align="center" />
<el-table-column prop="a" width="200" label="设备类别" align="center" /> <el-table-column prop="taskid" width="200" label="设备类别" align="center" />
<el-table-column prop="b" label="任务模板名称" width="200" align="center" /> <el-table-column prop="templateid" label="任务模板名称" width="200" align="center" />
<el-table-column prop="c" label="巡视内容" align="center" /> <el-table-column prop="c" label="巡视内容" align="center" />
</el-table> </el-table>
</div> </div>
@ -131,6 +172,7 @@
<script> <script>
import req from '@/api/yxtdispatchcenter/dispatchorderinfo' import req from '@/api/yxtdispatchcenter/dispatchorderinfo'
import req2 from '@/api/yxtdispatchcenter/dispatchmodletemplate'
export default { export default {
name: 'DispatchOrderinfoAdd', name: 'DispatchOrderinfoAdd',
data() { data() {
@ -147,6 +189,7 @@ export default {
supervisesid: '', // id supervisesid: '', // id
orderno: '', // orderno: '', //
ordername: '', // ordername: '', //
templatesid: '', // sid
orderdegree: '', // 1-2- 3-4- orderdegree: '', // 1-2- 3-4-
ordertype: '', // 1- ordertype: '', // 1-
ordercontent: '', // ordercontent: '', //
@ -156,35 +199,9 @@ export default {
}, },
arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}], arr:[{value:1,type:'计划巡视'},{value:2,type:'专项巡视'},{value:3,type:'告警巡视'}],
arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}], arrList:[{value:1,type:'一般'},{value:2,type:'重要'},{value:3,type:'紧急'},{value:4,type:'督办'}],
TabList:[{ TabList:[],
principalname:'1',// dataList:[],
principalsid:'1',//sid list:[],
principalcontact:'1',//
executorname:'1',//
executornamekey:'1',//key
workteam:'1',//
workteamid:'110',//id
},{
principalname:'1',//
principalsid:'1',//sid
principalcontact:'1',//
executorname:'1',//
executornamekey:'1',//key
workteam:'1',//
workteamid:'110',//id
}],
list:[
{
a:'变压器',
b:'变压器巡视',
c:'设备类型占位符_巡视标准占位符占位符占位符占位符占位符占位符占位符',
},
{
a:'感应器',
b:'感应器巡视',
c:'设备类型占位符_巡视标准占位符',
},
],
rules: { rules: {
custid: [{ required: true, message: '客户ID不能为空', trigger: 'blur' }], // ID custid: [{ required: true, message: '客户ID不能为空', trigger: 'blur' }], // ID
custname: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }], // custname: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }], //
@ -199,29 +216,48 @@ export default {
operationcontent: [{ required: true, message: '处理情况不能为空', trigger: 'blur' }], // operationcontent: [{ required: true, message: '处理情况不能为空', trigger: 'blur' }], //
receiveperson: [{ required: true, message: '现场联系人不能为空', trigger: 'blur' }], // receiveperson: [{ required: true, message: '现场联系人不能为空', trigger: 'blur' }], //
receivetel: [{ required: true, message: '现场联系人电话不能为空', trigger: 'blur' }] // receivetel: [{ required: true, message: '现场联系人电话不能为空', trigger: 'blur' }] //
} },
queryParams: {
current: 1,
size: 100,
total: 0,
params: {
sids: [],
templateid: '',
taskid: ''
}
},
} }
}, },
mounted(){
req2.listPage(this.queryParams).then(resp => {
if (resp.success) {
const data = resp.data
this.dataList = data.records
this.list = data.records
}
})
},
created() {}, created() {},
methods: { methods: {
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
this.formobj.id = '' this.formobj.id = ''
this.formobj.sid = '' // SID this.formobj.sid = '' // SID
this.formobj.custid = '' // ID
this.custid = '' // ID this.formobj.custname = '' //
this.custname = '' // this.formobj.supervisesid = '' // id
this.supervisesid = '' // id this.formobj.orderno = '' //
this.orderno = '' // this.formobj.ordername = '' //
this.ordername = '' // this.formobj.orderdegree = '' // 1-2- 3-4-
this.orderdegree = '' // 1-2- 3-4- this.formobj.ordertype = '' // 1-
this.ordertype = '' // 1- this.formobj.templatesid = '' //
this.ordercontent = '' // this.formobj.ordercontent = '' //
this.arrivetime = '' // this.formobj.arrivetime = '' //
this.planfinishtime = '' // this.formobj.planfinishtime = '' //
this.operationcontent = '' // this.formobj.operationcontent = '' //
this.receiveperson = '' // this.formobj.receiveperson = '' //
this.receivetel = '' // this.formobj.receivetel = '' //
this.$refs['form_obj'].resetFields() this.$refs['form_obj'].resetFields()
this.$emit('doback') this.$emit('doback')
@ -276,6 +312,10 @@ export default {
}) })
}, },
saveOrUpdate() { saveOrUpdate() {
if (this.formobj.workers.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择一条巡视人员进行添加' })
return
}
const _this = this const _this = this
this.$refs['form_obj'].validate(valid => { this.$refs['form_obj'].validate(valid => {
if (valid) { if (valid) {
@ -307,9 +347,24 @@ export default {
let del_row = selection.shift(); let del_row = selection.shift();
this.$refs.table.toggleRowSelection(del_row, false) this.$refs.table.toggleRowSelection(del_row, false)
} }
} },
} add() {
} this.TabList.push({
})
},
doCommoditylDel(index) {
const tip = '请确认是否删除所选记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.TabList.splice(index, 1);
})
},
}
}
</script> </script>
<style scoped></style> <style scoped></style>

56
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchorderinfo/dispatchpatrolplanAdds.vue

@ -44,7 +44,19 @@
<span><span class="icon">*</span>巡视模板</span> <span><span class="icon">*</span>巡视模板</span>
</el-col> </el-col>
<el-col :span="2" class="trightb"> <el-col :span="2" class="trightb">
<el-form-item prop="templateid"><el-input size="small" v-model="formobj.templateid" placeholder="巡视模板" class="addinputw" clearable /></el-form-item> <el-select
v-model="formobj.templateid"
class="addinputw"
placeholder="巡视模板"
size="small"
>
<el-option
v-for="(item, i) in dataList"
:key="i"
:label="item.templateid"
:value="item.taskid"
/>
</el-select>
</el-col> </el-col>
<el-col :span="2" class="tleftb"> <el-col :span="2" class="tleftb">
<span><span class="icon">*</span>用户联系人</span> <span><span class="icon">*</span>用户联系人</span>
@ -65,7 +77,19 @@
<span><span class="icon">*</span>周期类型</span> <span><span class="icon">*</span>周期类型</span>
</el-col> </el-col>
<el-col :span="2" class="trightb"> <el-col :span="2" class="trightb">
<el-form-item prop="cycletype"><el-input size="small" v-model="formobj.cycletype" placeholder="周期类型" class="addinputw" clearable /></el-form-item> <el-select
v-model="formobj.cycletype"
class="addinputw"
placeholder="周期类型"
size="small"
>
<el-option
v-for="(item, i) in period"
:key="i"
:label="item.type"
:value="item.type"
/>
</el-select>
</el-col> </el-col>
<el-col :span="2" class="tleftb"> <el-col :span="2" class="tleftb">
<span><span class="icon">*</span>巡检周期</span> <span><span class="icon">*</span>巡检周期</span>
@ -137,6 +161,7 @@
<script> <script>
import req from '@/api/yxtdispatchcenter/dispatchpatrolplan' import req from '@/api/yxtdispatchcenter/dispatchpatrolplan'
import req2 from '@/api/yxtdispatchcenter/dispatchmodletemplate'
export default { export default {
name: 'DispatchPatrolPlanAdd', name: 'DispatchPatrolPlanAdd',
data() { data() {
@ -164,6 +189,7 @@ export default {
cyclevalue: '', // cyclevalue: '', //
workers:[], workers:[],
}, },
dataList:[],
TabList:[{ TabList:[{
principalname:'1',// principalname:'1',//
principalsid:'1',//sid principalsid:'1',//sid
@ -207,9 +233,28 @@ export default {
cycletype: [{ required: true, message: '周期类型(固定间隔周期)不能为空', trigger: 'blur' }], // () cycletype: [{ required: true, message: '周期类型(固定间隔周期)不能为空', trigger: 'blur' }], // ()
cycle: [{ required: true, message: '巡检周期不能为空', trigger: 'blur' }], // cycle: [{ required: true, message: '巡检周期不能为空', trigger: 'blur' }], //
cyclevalue: [{ required: true, message: '周期值不能为空', trigger: 'blur' }] // cyclevalue: [{ required: true, message: '周期值不能为空', trigger: 'blur' }] //
} },
period:[{value:1,type:'日'},{value:2,type:'月'}],
queryParams: {
current: 1,
size: 100,
total: 0,
params: {
sids: [],
templateid: '',
taskid: ''
}
},
} }
}, },
mounted(){
req2.listPage(this.queryParams).then(resp => {
if (resp.success) {
const data = resp.data
this.dataList = data.records
}
})
},
created() {}, created() {},
methods: { methods: {
handleReturn(isreload) { handleReturn(isreload) {
@ -286,6 +331,10 @@ export default {
}) })
}, },
saveOrUpdate() { saveOrUpdate() {
if (this.formobj.workers.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择一条巡视人员进行添加' })
return
}
const _this = this const _this = this
this.$refs['form_obj'].validate(valid => { this.$refs['form_obj'].validate(valid => {
if (valid) { if (valid) {
@ -311,7 +360,6 @@ export default {
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.formobj.workers = val; this.formobj.workers = val;
console.log(this.formobj);
}, },
handleSelection(selection){ handleSelection(selection){
if (selection.length > 1){ if (selection.length > 1){

20
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchtemplate.vue

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="历史" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="历史" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button> <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
@ -33,7 +33,7 @@
</div> </div>
<!-- Start 项目列表头部 --> <!-- Start 项目列表头部 -->
<div class="listtop"> <div class="listtop">
<div class="tit">汇总工单数据列表</div> <div class="tit">历史告警列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" /> <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
@ -49,6 +49,13 @@
<el-table-column prop="orderdegree" :formatter="formatorderdegree" label="等级" align="center" /> <el-table-column prop="orderdegree" :formatter="formatorderdegree" label="等级" align="center" />
<el-table-column prop="receiveperson" label="现场联系人" align="center" /> <el-table-column prop="receiveperson" label="现场联系人" align="center" />
<el-table-column prop="receivetel" label="现场联系人电话" align="center" /> <el-table-column prop="receivetel" label="现场联系人电话" align="center" />
<el-table-column fixed="right" label="操作" align="center">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<i class="el-icon-notebook-2" @click="purchase(scope.row)"></i>
</el-tooltip>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
@ -65,6 +72,15 @@
/> />
</div> </div>
</div> </div>
<!-- End 查询和其列表部分 -->
<el-drawer
title="历史告警详情"
:visible.sync="drawer"
size="56%">
<div class="main-content">
666
</div>
</el-drawer>
</div> </div>
<!-- End 查询和其列表部分 --> <!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 --> <!-- 新增修改部分组件 -->

4
yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchworker/dispatchworker.vue

@ -33,7 +33,7 @@
</div> </div>
<!-- Start 项目列表头部 --> <!-- Start 项目列表头部 -->
<div class="listtop"> <div class="listtop">
<div class="tit">汇总工单数据列表</div> <div class="tit">实时报警列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" /> <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
@ -76,7 +76,7 @@
</div> </div>
<!-- End 查询和其列表部分 --> <!-- End 查询和其列表部分 -->
<el-drawer <el-drawer
title="汇总工单数据详情" title="实时报警详情"
:visible.sync="drawer" :visible.sync="drawer"
size="56%"> size="56%">
<div class="main-content"> <div class="main-content">

Loading…
Cancel
Save