Skip to content

王刘锁 / jianlin-tms-view

Go to a project
Commit 090f0c88 by 郑艺斌
Options

Merge branch 'master' of http://git.xmmakeit.com/wangls/jianlin-tms-view

parents 12035a0c c13a86b6
Inline Side-by-side
Showing with 47 additions and 48 deletions
src/views/modules/siteAdmin/factoryAdmin/index.vue
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="MIR调度IP：" prop="mirIp"> <el-form-item label="MIR调度IP：" prop="mirIp">
<el-input size="small" v-model="searchForm.mirIp" placeholder="请输入厂区ID" clearable></el-input> <el-input size="small" v-model="searchForm.mirIp" placeholder="请输入MIR调度IP" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="蓝芯调度IP：" prop="lxIp"> <el-form-item label="蓝芯调度IP：" prop="lxIp">
<el-input size="small" v-model="searchForm.lxIp" placeholder="请输入厂区ID" clearable></el-input> <el-input size="small" v-model="searchForm.lxIp" placeholder="请输入蓝芯调度IP" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getFactoryPage()" size="small" icon="el-icon-search">搜索</el-button> <el-button type="primary" @click="getFactoryPage()" size="small" icon="el-icon-search">搜索</el-button>
......
src/views/modules/siteAdmin/positionAdmin/index.vue
...@@ -281,7 +281,7 @@ export default { ...@@ -281,7 +281,7 @@ export default {
const formBody = new FormData() const formBody = new FormData()
formBody.append('file', file) formBody.append('file', file)
this.PositionAdmin.importExcel(formBody).then(result => { this.PositionAdmin.importExcel(formBody).then(result => {
this.$message.success(result) this.$message.success(result.data)
}) })
}, },
}, },
......
src/views/modules/siteAdmin/siteConfig/index.vue
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="厂区：" prop="factoryId"> <el-form-item label="厂区：" prop="factoryId">
<el-select v-model="searchForm.factoryId" placeholder="请选择模板状态" clearable> <el-select v-model="searchForm.factoryId" placeholder="请选择厂区" clearable>
<el-option v-for="item in factoryOptions" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in factoryOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="站点类型：" prop="siteType"> <el-form-item label="站点类型：" prop="siteType">
<el-select v-model="searchForm.siteType" placeholder="请选择模板状态" clearable> <el-select v-model="searchForm.siteType" placeholder="请选择站点类型" clearable>
<el-option v-for="item in $dictUtils.getDictList('tms_site_type')" :key="item.value" :label="item.label" <el-option v-for="item in $dictUtils.getDictList('tms_site_type')" :key="item.value" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<el-input v-model="searchForm.command" placeholder="请输入指令标识"></el-input> <el-input v-model="searchForm.command" placeholder="请输入指令标识"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="站点配置模板：" prop="tempId"> <el-form-item label="站点配置模板：" prop="tempId">
<el-select v-model="searchForm.tempId" placeholder="请选择站点状态" clearable> <el-select v-model="searchForm.tempId" placeholder="请选择站点配置模板" clearable>
<el-option v-for="item in configTempList" :key="item.id" :label="item.tempName" :value="item.id"> <el-option v-for="item in configTempList" :key="item.id" :label="item.tempName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -79,15 +79,15 @@ ...@@ -79,15 +79,15 @@
<vxe-column type="checkbox" width="40px" align="center"></vxe-column> <vxe-column type="checkbox" width="40px" align="center"></vxe-column>
<vxe-column field="company_dictText" title="公司" align="center" width="130px"></vxe-column> <vxe-column field="company_dictText" title="公司" align="center" width="130px"></vxe-column>
<vxe-column field="factoryId_dictText" title="厂区" align="center" width="130px"></vxe-column> <vxe-column field="factoryId_dictText" title="厂区" align="center" width="130px"></vxe-column>
<vxe-column field="floorNum" title="楼层" align="center" width="130px"></vxe-column> <vxe-column sortable field="floorNum" title="楼层" align="center" width="130px"></vxe-column>
<vxe-column field="siteType_dictText" title="站点类型" align="center" width="130px"></vxe-column> <vxe-column field="siteType_dictText" title="站点类型" align="center" width="130px"></vxe-column>
<vxe-column field="name" title="站点名称" align="center" width="130px"></vxe-column> <vxe-column sortable field="name" title="站点名称" align="center" width="130px"></vxe-column>
<vxe-column field="command" title="指令标识" align="center" width="130px"></vxe-column> <vxe-column sortable field="command" title="指令标识" align="center" width="130px"></vxe-column>
<vxe-column field="tempId_dictText" title="站点配置模板" align="center" width="130px"></vxe-column> <vxe-column sortable field="tempId_dictText" title="站点配置模板" align="center" width="130px"></vxe-column>
<vxe-column field="pointName" title="关联点位" align="center" width="130px"></vxe-column> <vxe-column sortable field="pointName" title="关联点位" align="center" width="130px"></vxe-column>
<vxe-column field="pointAlias" title="点位别名" align="center" width="130px"></vxe-column> <vxe-column sortable field="pointAlias" title="点位别名" align="center" width="130px"></vxe-column>
<vxe-column field="pointTypeName" title="任务类型" align="center" width="130px"></vxe-column> <vxe-column sortable field="pointTypeName" title="任务类型" align="center" width="130px"></vxe-column>
<vxe-column field="pointStatus" title="空闲状态" align="center" width="130px"> <vxe-column sortable field="pointStatus" title="空闲状态" align="center" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.pointStatus === '1'" style="color: #249601">占用<i class="pointStatus el-icon-refresh" <span v-if="scope.row.pointStatus === '1'" style="color: #249601">占用<i class="pointStatus el-icon-refresh"
@click="changePointStatus(scope.row)"></i> @click="changePointStatus(scope.row)"></i>
...@@ -98,15 +98,15 @@ ...@@ -98,15 +98,15 @@
</vxe-column> </vxe-column>
<!-- <vxe-column field="equipmentGroup" title="设备分组" align="center" width="130px"></vxe-column> --> <!-- <vxe-column field="equipmentGroup" title="设备分组" align="center" width="130px"></vxe-column> -->
<vxe-column field="remark" title="备注" align="center" width="130px"></vxe-column> <vxe-column field="remark" title="备注" align="center" width="130px"></vxe-column>
<vxe-column field="status" title="状态" align="center" width="130px"> <vxe-column sortable field="status" title="状态" align="center" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status === '1'" style="color: #249601;font-weight: bold;">启用</span> <span v-if="scope.row.status === '1'" style="color: #249601;font-weight: bold;">启用</span>
<span v-else-if="scope.row.status === '0'" style="color: #FF0000;font-weight: bold;">禁用</span> <span v-else-if="scope.row.status === '0'" style="color: #FF0000;font-weight: bold;">禁用</span>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="sort" title="排序" align="center" width="130px"></vxe-column> <vxe-column sortable field="sort" title="排序" align="center" width="130px"></vxe-column>
<vxe-column field="createDate" title="创建时间" align="center" width="180px"></vxe-column> <vxe-column sortable field="createDate" title="创建时间" align="center" width="180px"></vxe-column>
<vxe-column field="updateDate" title="更新时间" align="center" width="180px"></vxe-column> <vxe-column sortable field="updateDate" title="更新时间" align="center" width="180px"></vxe-column>
<vxe-column title="操作" width="180" align="center" fixed="right"> <vxe-column title="操作" width="180" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="hasPermission('siteConfig:view')" type="text" size="mini" <el-button v-if="hasPermission('siteConfig:view')" type="text" size="mini"
...@@ -332,8 +332,8 @@ export default { ...@@ -332,8 +332,8 @@ export default {
changePointStatus (row) { changePointStatus (row) {
console.log(row); console.log(row);
const can = { const can = {
id: row.id, id: row.configPointId,
status: row.status status: row.pointStatus
} }
this.SiteConfig.updateStatus(can).then((res) => { this.SiteConfig.updateStatus(can).then((res) => {
console.log(res); console.log(res);
......
src/views/modules/sys/login/login.vue
...@@ -37,18 +37,18 @@ ...@@ -37,18 +37,18 @@
<i slot="prefix" class="el-input__icon el-icon-female"></i> <i slot="prefix" class="el-input__icon el-icon-female"></i>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item> <!-- <el-form-item>-->
<el-row :gutter="10"> <!-- <el-row :gutter="10">-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-image @click="getCaptcha" :src="captchaImg" style="height:34px"></el-image> <!-- <el-image @click="getCaptcha" :src="captchaImg" style="height:34px"></el-image>-->
</el-col> <!-- </el-col>-->
<el-col :span="16"> <!-- <el-col :span="16">-->
<el-form-item prop="code"> <!-- <el-form-item prop="code">-->
<el-input placeholder="请输入验证码" v-model="inputForm.code"></el-input> <!-- <el-input placeholder="请输入验证码" v-model="inputForm.code"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type="primary" :loading="loading" class="login-submit" @click="login">登录</el-button> <el-button type="primary" :loading="loading" class="login-submit" @click="login">登录</el-button>
</el-form-item> </el-form-item>
...@@ -102,9 +102,9 @@ export default { ...@@ -102,9 +102,9 @@ export default {
password: [ password: [
{ required: true, message: '密码不能为空', trigger: 'blur' } { required: true, message: '密码不能为空', trigger: 'blur' }
], ],
code: [ // code: [
{ required: true, message: '验证码不能为空', trigger: 'blur' } // { required: true, message: '验证码不能为空', trigger: 'blur' }
] // ]
}, },
captchaPath: '' captchaPath: ''
} }
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
this.configService.getConfig().then(({ data }) => { this.configService.getConfig().then(({ data }) => {
this.productName = data.productName this.productName = data.productName
}) })
this.getCaptcha() // this.getCaptcha()
}, },
methods: { methods: {
// 提交表单 // 提交表单
...@@ -152,21 +152,20 @@ export default { ...@@ -152,21 +152,20 @@ export default {
}) })
}).catch(e => { }).catch(e => {
this.loading = false this.loading = false
this.getCaptcha()
}) })
} }
}) })
}, },
getTime () { getTime () {
this.time = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss') this.time = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
},
// 获取验证码
getCaptcha () {
this.loginService.getCode().then(({ data }) => {
this.captchaImg = 'data:image/gif;base64,' + data.codeImg
this.inputForm.uuid = data.uuid
})
} }
// 获取验证码
// getCaptcha () {
// this.loginService.getCode().then(({ data }) => {
// this.captchaImg = 'data:image/gif;base64,' + data.codeImg
// this.inputForm.uuid = data.uuid
// })
// }
} }
} }
</script> </script>
......
src/views/modules/taskPlan/taskChainList/index.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-input size="small" v-model="searchForm.taskId" clearable placeholder="请选输入任务编号"></el-input> <el-input size="small" v-model="searchForm.taskId" clearable placeholder="请选输入任务编号"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="task_name" label="任务名称："> <el-form-item prop="task_name" label="任务名称：">
<el-input size="small" v-model="searchForm.task_name" clearable placeholder="请选输入任务编号"></el-input> <el-input size="small" v-model="searchForm.task_name" clearable placeholder="请选输入任务名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="beginAt" label="执行开始时间："> <el-form-item prop="beginAt" label="执行开始时间：">
<el-date-picker v-model="searchForm.beginAt" type="datetime" placeholder="选择执行开始时间" <el-date-picker v-model="searchForm.beginAt" type="datetime" placeholder="选择执行开始时间"
......
src/views/modules/taskPlan/taskPlanTemplate/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="page"> <div class="page">
<el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm"> <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm">
<el-form-item prop="createdByName" label="设备类型："> <el-form-item prop="createdByName" label="设备类型：">
<el-select v-model="searchForm.createdByName" placeholder="请选择任务状态" clearable> <el-select v-model="searchForm.createdByName" placeholder="请选择设备类型" clearable>
<el-option v-for="item in $dictUtils.getDictList('tms_task_equipment_type')" :key="item.value" <el-option v-for="item in $dictUtils.getDictList('tms_task_equipment_type')" :key="item.value"
:label="item.label" :value="item.value"> :label="item.label" :value="item.value">
</el-option> </el-option>
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
<el-input size="small" v-model="searchForm.taskId" clearable placeholder="请选输入任务编号"></el-input> <el-input size="small" v-model="searchForm.taskId" clearable placeholder="请选输入任务编号"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="takeName" label="任务名称："> <el-form-item prop="takeName" label="任务名称：">
<el-input size="small" v-model="searchForm.takeName" clearable placeholder="请选输入任务编号"></el-input> <el-input size="small" v-model="searchForm.takeName" clearable placeholder="请选输入任务名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="variate" label="包含变量："> <el-form-item prop="variate" label="包含变量：">
<el-select v-model="searchForm.variate" placeholder="请选择任务状态" clearable> <el-select v-model="searchForm.variate" placeholder="请选择是否包含变量" clearable>
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
......
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 sign in to comment