Skip to content

T
tianjin
Commit 1d289a35 authored by tao's avatar tao
Browse files
Options

天津教育标准模板修复bug

parent c38def5e
Show whitespace changes
Inline Side-by-side
Showing with 271 additions and 310 deletions
dist.rar 0 → 100644
View file @ 1d289a35
File added
src/components/File/Agency.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 18:14:29 * @LastEditTime: 2021-01-28 19:12:26
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<div class="lookcontent" @click="selectword3 = false"> <div class="lookcontent" @click="selectword3 = false">
<div class="lookselect"> <div class="lookselect">
<div class="search"> <div class="search">
<span>设备类型：</span> <!-- <span>设备类型：</span>
<div class="selectClass"> <div class="selectClass">
<el-select v-model="Meter" placeholder="请选择"> <el-select v-model="Meter" placeholder="请选择">
<el-option <el-option
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<!-- <select name id v-model="oneselect" @click.stop="selectword2"> <!-- <select name id v-model="oneselect" @click.stop="selectword2">
<option :value="oneselect">{{oneselect}}</option> <option :value="oneselect">{{oneselect}}</option>
</select> --> </select> -->
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
<div class="pre" @click="pre1">确定</div> <div class="pre" @click="pre1">确定</div>
</div> </div>
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span>
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
......
src/components/File/plan.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 18:16:40 * @LastEditTime: 2021-01-28 19:12:49
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -24,18 +24,18 @@ ...@@ -24,18 +24,18 @@
<div class="lookcontent"> <div class="lookcontent">
<div class="lookselect"> <div class="lookselect">
<div class="search"> <div class="search">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id v-model="oneselect" @click.stop="selectword2"> <!-- <select name id v-model="oneselect" @click.stop="selectword2">
<option :value="oneselect">{{oneselect}}</option> <option :value="oneselect">{{oneselect}}</option>
</select> --> </select> -->
<div class="selectClass"> <!-- <div class="selectClass">
<el-select v-model="Meter" placeholder="请选择"> <el-select v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<div class="selectword selectword2" v-if="selectword3"> <div class="selectword selectword2" v-if="selectword3">
<el-tree <el-tree
...@@ -81,16 +81,16 @@ ...@@ -81,16 +81,16 @@
<div class="pre" @click="pre1">确定</div> <div class="pre" @click="pre1">确定</div>
</div> </div>
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<div class="selectword" v-if="changeselect"> <div class="selectword" v-if="changeselect">
<el-tree <el-tree
...@@ -863,10 +863,7 @@ export default { ...@@ -863,10 +863,7 @@ export default {
sessionStorage.getItem('userInfo1') sessionStorage.getItem('userInfo1')
).SCMSUserName; ).SCMSUserName;
} }
console.log(this.meaddtable);
console.log(this.sestion);
console.log(this.filesize)
console.log(this.file)
if (this.sestion == 1) { if (this.sestion == 1) {
if (this.filesize < 20971520) { if (this.filesize < 20971520) {
...@@ -900,8 +897,8 @@ export default { ...@@ -900,8 +897,8 @@ export default {
this.tipchange = true; this.tipchange = true;
this.pyyd1 = true; this.pyyd1 = true;
console.log(res1); console.log('设备资料',res1);
if (res1.data.code == 1){ if (res1.data.code == -1){
if(res1.data.msg == "AID不能为空"){ if(res1.data.msg == "AID不能为空"){
......
src/components/Repair/Agency.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 15:14:13 * @LastEditTime: 2021-01-28 19:02:51
--> -->
<template> <template>
<div class="public-table" @click=" changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click=" changeselect = false" v-loading="this.$store.state.isShow"
...@@ -33,19 +33,19 @@ ...@@ -33,19 +33,19 @@
<div class="lookcontent"> <div class="lookcontent">
<div class="lookselect"> <div class="lookselect">
<div class="search"> <div class="search">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id v-model="oneselect" @click.stop="selectword2"> <!-- <select name id v-model="oneselect" @click.stop="selectword2">
<option :value="oneselect">{{oneselect}}</option> <option :value="oneselect">{{oneselect}}</option>
</select> --> </select> -->
<div class="selectClass"> <!-- <div class="selectClass">
<el-select v-model="oneselect" placeholder="请选择"> <el-select v-model="oneselect" placeholder="请选择">
<el-option <el-option
:label="oneselect" :label="oneselect"
:value="oneselect"> :value="oneselect">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<div class="selectword selectword2" v-if="selectword3"> <div class="selectword selectword2" v-if="selectword3">
<el-tree <el-tree
...@@ -92,16 +92,16 @@ ...@@ -92,16 +92,16 @@
</div> </div>
<div class="search-container"> <div class="search-container">
<div> <div>
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<span class="sp1">任务状态：</span> <span class="sp1">任务状态：</span>
<select v-model="Meter1"> <select v-model="Meter1">
...@@ -171,11 +171,7 @@ ...@@ -171,11 +171,7 @@
<el-table-column label="序号" width="100" prop="Number" :show-overflow-tooltip="true" fixed> <el-table-column label="序号" width="100" prop="Number" :show-overflow-tooltip="true" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item"> <div class="item">
<span <span :style="'color:'+scope.row.Foreground">{{scope.row.Number}}</span>
class="sad"
v-if="scope.row.TaskType == '故障维修' || scope.row.Status=='已延迟'"
>{{scope.row.Number}}</span>
<span v-else>{{scope.row.Number}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -201,77 +197,49 @@ ...@@ -201,77 +197,49 @@
<el-table-column prop="TaskName" label="任务名称" width="200" :show-overflow-tooltip="true"> <el-table-column prop="TaskName" label="任务名称" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item"> <div class="item">
<span <span :style="'color:'+scope.row.Foreground">{{scope.row.TaskName}}</span>
class="sad"
v-if="scope.row.TaskType == '故障维修' || scope.row.Status=='已延迟'"
>{{scope.row.TaskName}}</span>
<span v-else>{{scope.row.TaskName}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="TaskType" label="任务类型" width="200" :show-overflow-tooltip="true"> <el-table-column prop="TaskType" label="任务类型" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item"> <div class="item">
<span <span :style="'color:'+scope.row.Foreground">{{scope.row.TaskType}}</span>
class="sad"
v-if="scope.row.TaskType == '故障维修' || scope.row.Status=='已延迟'"
>{{scope.row.TaskType}}</span>
<span v-else>{{scope.row.TaskType}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="StartTime" label="任务开始时间" width="200" :show-overflow-tooltip="true"> <el-table-column prop="StartTime" label="任务开始时间" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item"> <div class="item">
<span <span :style="'color:'+scope.row.Foreground">{{scope.row.StartTime}}</span>
class="sad"
v-if="scope.row.TaskType == '故障维修' || scope.row.Status=='已延迟'"
>{{scope.row.StartTime}}</span>
<span v-else>{{scope.row.StartTime}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="EndTime" label="任务结束时间" width="200" :show-overflow-tooltip="true"> <el-table-column prop="EndTime" label="任务结束时间" width="200" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item"> <div class="item">
<span <span :style="'color:'+scope.row.Foreground">{{scope.row.EndTime}}</span>
class="sad"
v-if="scope.row.TaskType == '故障维修' || scope.row.Status=='已延迟'"
>{{scope.row.EndTime}}</span>
<span v-else>{{scope.row.EndTime}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Status" label="任务状态" width="300" :show-overflow-tooltip="true"> <el-table-column prop="Status" label="任务状态" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item"> <div class="item">
<span <span :style="'color:'+scope.row.Foreground">{{scope.row.Status}}</span>
class="sad"
v-if="scope.row.TaskType == '故障维修' || scope.row.Status=='已延迟'"
>{{scope.row.Status}}</span>
<span v-else>{{scope.row.Status}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="RepairPerson" label="维修人员" width="300" :show-overflow-tooltip="true"> <el-table-column prop="RepairPerson" label="维修人员" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item"> <div class="item">
<span <span :style="'color:'+scope.row.Foreground">{{scope.row.RepairPerson}}</span>
class="sad"
v-if="scope.row.TaskType == '故障维修' || scope.row.Status=='已延迟'"
>{{scope.row.RepairPerson}}</span>
<span v-else>{{scope.row.RepairPerson}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="DeviceName" label="设备名称" width="300" :show-overflow-tooltip="true"> <el-table-column prop="DeviceName" label="设备名称" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item"> <div class="item">
<span <span :style="'color:'+scope.row.Foreground">{{scope.row.DeviceName}}</span>
class="sad"
v-if="scope.row.TaskType == '故障维修' || scope.row.Status=='已延迟'"
>{{scope.row.DeviceName}}</span>
<span v-else>{{scope.row.DeviceName}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -314,12 +282,12 @@ ...@@ -314,12 +282,12 @@
>添加故障维修任务</span> >添加故障维修任务</span>
<span <span
class="head" class="head"
v-else-if="sestion == 2 && mesad3" v-else-if="!mesad3"
:class="{fcolor:$store.state.color=='grey'}" :class="{fcolor:$store.state.color=='grey'}"
>查看故障维修任务</span> >查看故障维修任务</span>
<span <span
class="head" class="head"
v-else-if="sestion == 2 && !mesad3" v-else-if="mesad3"
:class="{fcolor:$store.state.color=='grey'}" :class="{fcolor:$store.state.color=='grey'}"
>查看维修任务内容</span> >查看维修任务内容</span>
<span <span
...@@ -850,7 +818,7 @@ ...@@ -850,7 +818,7 @@
@mouseup="mouseUpHandleelse12($event)" @mouseup="mouseUpHandleelse12($event)"
> >
<div class="tiphead" :class="{colordiv:$store.state.color=='grey'}"> <div class="tiphead" :class="{colordiv:$store.state.color=='grey'}">
<span :class="{fcolor:$store.state.color=='grey'}">关闭代办点巡检任务</span> <span :class="{fcolor:$store.state.color=='grey'}">关闭待办维修任务</span>
<img <img
:src="no2" :src="no2"
alt alt
......
src/components/Repair/Record.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 15:20:22 * @LastEditTime: 2021-01-28 19:03:27
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -11,16 +11,16 @@ ...@@ -11,16 +11,16 @@
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.4)"> element-loading-background="rgba(0, 0, 0, 0.4)">
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<span class="sp1">任务状态：</span> <span class="sp1">任务状态：</span>
<select v-model="Meter1"> <select v-model="Meter1">
......
src/components/Repair/plan.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 18:22:52 * @LastEditTime: 2021-01-28 19:03:02
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -24,18 +24,18 @@ ...@@ -24,18 +24,18 @@
<div class="lookcontent"> <div class="lookcontent">
<div class="lookselect"> <div class="lookselect">
<div class="search"> <div class="search">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id v-model="oneselect" @click.stop="selectword2"> <!-- <select name id v-model="oneselect" @click.stop="selectword2">
<option :value="oneselect">{{oneselect}}</option> <option :value="oneselect">{{oneselect}}</option>
</select> --> </select> -->
<div class="selectClass"> <!-- <div class="selectClass">
<el-select v-model="Meter" placeholder="请选择"> <el-select v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<div class="selectword selectword2" v-if="selectword3"> <div class="selectword selectword2" v-if="selectword3">
<el-tree <el-tree
...@@ -81,16 +81,16 @@ ...@@ -81,16 +81,16 @@
<div class="pre" @click="pre1">确定</div> <div class="pre" @click="pre1">确定</div>
</div> </div>
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<div class="selectword" v-if="changeselect"> <div class="selectword" v-if="changeselect">
<el-tree <el-tree
...@@ -233,8 +233,8 @@ ...@@ -233,8 +233,8 @@
@mouseup="mouseUpHandleelse1($event)" @mouseup="mouseUpHandleelse1($event)"
></div> ></div>
<span class="head" v-if="sestion == 1" :class="{fcolor:$store.state.color=='grey'}">添加维修计划</span> <span class="head" v-if="sestion == 1" :class="{fcolor:$store.state.color=='grey'}">添加维修计划</span>
<span class="head" v-else-if="sestion == 2" :class="{fcolor:$store.state.color=='grey'}">查看故障维修任务</span> <span class="head" v-else-if="sestion == 2" :class="{fcolor:$store.state.color=='grey'}">查看维修计划</span>
<span class="head" v-else-if="sestion == 3" :class="{fcolor:$store.state.color=='grey'}">编辑故障维修任务</span> <span class="head" v-else-if="sestion == 3" :class="{fcolor:$store.state.color=='grey'}">编辑维修计划</span>
<img :src="no2" alt class="no" @click.stop="cancel" v-if="$store.state.color=='grey'"/> <img :src="no2" alt class="no" @click.stop="cancel" v-if="$store.state.color=='grey'"/>
<img :src="no" alt class="no" @click.stop="cancel" v-else/> <img :src="no" alt class="no" @click.stop="cancel" v-else/>
</div> </div>
......
src/components/Spotinspection/Agency.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 18:23:26 * @LastEditTime: 2021-01-28 19:04:39
--> -->
<template> <template>
<div class="public-table public-table1" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table public-table1" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -40,16 +40,16 @@ ...@@ -40,16 +40,16 @@
</div> </div>
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<span class="sp1">任务状态：</span> <span class="sp1">任务状态：</span>
...@@ -108,7 +108,9 @@ ...@@ -108,7 +108,9 @@
:header-cell-style="[{background:(($store.state.color=='grey')?'#D9DBDE':'#5a6c98')},{color:(($store.state.color=='grey')?'#000':'#fff')}, {'border-left':'1px solid #cccccc',height:'50px',padding:'0'}]" :header-cell-style="[{background:(($store.state.color=='grey')?'#D9DBDE':'#5a6c98')},{color:(($store.state.color=='grey')?'#000':'#fff')}, {'border-left':'1px solid #cccccc',height:'50px',padding:'0'}]"
> >
<el-table-column label="序号" width="100" prop="Number" :show-overflow-tooltip="true" fixed> <el-table-column label="序号" width="100" prop="Number" :show-overflow-tooltip="true" fixed>
<template slot-scope="scope">{{ scope.row.Number }}</template> <template slot-scope="scope">
<span :style="'color:'+scope.row.Foreground">{{scope.row.Number}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="操作" width="300" :show-overflow-tooltip="true" fixed> <el-table-column prop="name" label="操作" width="300" :show-overflow-tooltip="true" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -121,13 +123,36 @@ ...@@ -121,13 +123,36 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="TaskName" label="维修记录名称" width="300" :show-overflow-tooltip="true" fixed></el-table-column> <el-table-column prop="Name" label="计划名称" :show-overflow-tooltip="true">
<el-table-column prop="Name" label="计划名称" :show-overflow-tooltip="true"></el-table-column> <template slot-scope="scope">
<el-table-column prop="StartTime" label="计划开始时间" :show-overflow-tooltip="true"></el-table-column> <span :style="'color:'+scope.row.Foreground">{{scope.row.Name}}</span>
<el-table-column prop="EndTime" label="计划结束时间" :show-overflow-tooltip="true"></el-table-column> </template>
<el-table-column prop="Status" label="任务状态" :show-overflow-tooltip="true"></el-table-column> </el-table-column>
<el-table-column prop="Executor" label="巡检人" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="StartTime" label="计划开始时间" :show-overflow-tooltip="true">
<el-table-column prop="DevicesStr" label="设备名称" :show-overflow-tooltip="true"></el-table-column> <template slot-scope="scope">
<span :style="'color:'+scope.row.Foreground">{{scope.row.StartTime}}</span>
</template>
</el-table-column>
<el-table-column prop="EndTime" label="计划结束时间" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span :style="'color:'+scope.row.Foreground">{{scope.row.EndTime}}</span>
</template>
</el-table-column>
<el-table-column prop="Status" label="任务状态" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span :style="'color:'+scope.row.Foreground">{{scope.row.Status}}</span>
</template>
</el-table-column>
<el-table-column prop="Executor" label="巡检人" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span :style="'color:'+scope.row.Foreground">{{scope.row.Executor}}</span>
</template>
</el-table-column>
<el-table-column prop="DevicesStr" label="设备名称" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span :style="'color:'+scope.row.Foreground">{{scope.row.DevicesStr}}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="pages-container"> <div class="pages-container">
...@@ -469,7 +494,7 @@ export default { ...@@ -469,7 +494,7 @@ export default {
gbword: '', gbword: '',
oldName: '', oldName: '',
antable:[], antable:[],
ztarr: ['不限', '已关闭', '已完成', '超时完成', '已过期'], ztarr: ['不限', '未开始','进行中','已延误'],
leixinarr: ['不限', '计划维修', '故障维修'], leixinarr: ['不限', '计划维修', '故障维修'],
setionchange: false, setionchange: false,
nowIndex: 1, nowIndex: 1,
...@@ -746,6 +771,7 @@ export default { ...@@ -746,6 +771,7 @@ export default {
console.log(res) console.log(res)
if (res.data.code == 0) { if (res.data.code == 0) {
this.tableData1 = res.data.data.DataList; this.tableData1 = res.data.data.DataList;
this.PageData = res.data.data.ParameterList; this.PageData = res.data.data.ParameterList;
let i = 0; let i = 0;
for (i in this.tableData1) { for (i in this.tableData1) {
......
src/components/Spotinspection/Record.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 16:19:05 * @LastEditTime: 2021-01-28 19:04:59
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -11,16 +11,16 @@ ...@@ -11,16 +11,16 @@
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.4)"> element-loading-background="rgba(0, 0, 0, 0.4)">
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<span class="sp1">任务状态：</span> <span class="sp1">任务状态：</span>
<select v-model="Meter1"> <select v-model="Meter1">
......
src/components/Spotinspection/plan.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 18:34:51 * @LastEditTime: 2021-01-29 09:48:37
--> -->
<template> <template>
<div class="public-table ysj" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table ysj" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -11,19 +11,19 @@ ...@@ -11,19 +11,19 @@
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.4)"> element-loading-background="rgba(0, 0, 0, 0.4)">
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <div class="seleword" @click.stop="selectword1"> <!-- <div class="seleword" @click.stop="selectword1">
<div class="seleword1"> <div class="seleword1">
{{Meter}} {{Meter}}
<img :src="xiala" alt /> <img :src="xiala" alt />
</div> </div>
</div> --> </div> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<div class="selectword" v-if="changeselect"> <div class="selectword" v-if="changeselect">
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
</el-select> </el-select>
</div> </div>
<div class="table_name"> <div class="table_name">
<span class="name_text">任务开始时间</span> <span class="name_text">开始时间</span>
<el-date-picker <el-date-picker
@change="starFun" @change="starFun"
v-model="startime" v-model="startime"
...@@ -247,38 +247,30 @@ ...@@ -247,38 +247,30 @@
placeholder="选择日期时间" placeholder="选择日期时间"
></el-date-picker> ></el-date-picker>
<span class="time_text">任务执行工期</span> <span class="time_text">结束时间</span>
<!-- <div class="is1"> -->
<div class="is1"> <!-- <input type="text" @input="endValue()" v-if="sestion == 1" v-model="sesstion.rwtime" disabled/>
<input type="text" @input="endValue()" v-if="sestion == 1" v-model="sesstion.rwtime" disabled/>
<input type="text" @input="endValue()" v-if="sestion == 2" v-model="sesstion.rwtime"/> <input type="text" @input="endValue()" v-if="sestion == 2" v-model="sesstion.rwtime"/>
<input type="text" @input="endValue()" v-if="sestion == 3" v-model="rwtime" /> <input type="text" @input="endValue()" v-if="sestion == 3" v-model="rwtime" />
<el-select <el-select
class="sl1" class="sl1"
v-model="sesstion.rwselect" v-model="sesstion.rwselect"
placeholder="请选择" placeholder="请选择"
v-if="sestion == 1" v-if="sestion == 1"
disabled disabled>
>
<el-option <el-option
v-for="item in TimeOptions1" v-for="item in TimeOptions1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
></el-option> </el-option>
</el-select> </el-select>
<el-select <el-select
class="sl1" class="sl1"
v-model="sesstion.rwselect" v-model="sesstion.rwselect"
placeholder="请选择" placeholder="请选择"
v-if="sestion == 2" v-if="sestion == 2">
>
<el-option <el-option
v-for="item in TimeOptions1" v-for="item in TimeOptions1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
...@@ -287,19 +279,17 @@ ...@@ -287,19 +279,17 @@
</el-select> </el-select>
<el-select <el-select
class="sl1" class="sl1"
v-model="rwselect" v-model="rwselect"
placeholder="请选择" placeholder="请选择"
v-if="sestion == 3" v-if="sestion == 3">
>
<el-option <el-option
v-for="item in TimeOptions1" v-for="item in TimeOptions1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select> -->
<!-- <select name id @change="endValue()" v-model="sesstion.endTimeUnit" v-if="sestion == 1"> <!-- <select name id @change="endValue()" v-model="sesstion.endTimeUnit" v-if="sestion == 1">
<option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option> <option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option>
</select> </select>
...@@ -309,8 +299,8 @@ ...@@ -309,8 +299,8 @@
<select name id @change="endValue()" v-model="sesstion.endTimeUnit" v-if="sestion == 3"> <select name id @change="endValue()" v-model="sesstion.endTimeUnit" v-if="sestion == 3">
<option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option> <option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option>
</select> --> </select> -->
</div> <!-- </div> -->
<!-- <el-date-picker <el-date-picker
@change="endFun" @change="endFun"
v-model="endtime" v-model="endtime"
type="datetime" type="datetime"
...@@ -331,16 +321,16 @@ ...@@ -331,16 +321,16 @@
type="datetime" type="datetime"
v-if="sestion == 2" v-if="sestion == 2"
placeholder="选择日期时间" placeholder="选择日期时间"
></el-date-picker> --> ></el-date-picker>
</div> </div>
<el-tooltip effect="dark" content="设置当前计划，首个任务的开始时间，计划进行即实际任务的执行" placement="bottom"> <!-- <el-tooltip effect="dark" content="设置当前计划，首个任务的开始时间，计划进行即实际任务的执行" placement="bottom">
<div class="showtext1"> <div class="showtext1">
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</div> </div>
</el-tooltip> </el-tooltip> -->
<div class="table_inspection"> <div class="table_inspection">
<div class="inspection_left"> <div class="inspection_left">
<span class="name_text">重复任务周期</span> <span class="name_text">巡检周期</span>
<input <input
class="name_ipt" class="name_ipt"
v-model="inspecionNum" v-model="inspecionNum"
...@@ -409,7 +399,7 @@ ...@@ -409,7 +399,7 @@
</div> </div>
<div class="inspection_right"> <div class="inspection_right">
<span class="time_text">计划到期时间</span> <span class="time_text">到期时间</span>
<el-date-picker <el-date-picker
@change="expireFun" @change="expireFun"
v-if="sestion == 3" v-if="sestion == 3"
...@@ -434,14 +424,14 @@ ...@@ -434,14 +424,14 @@
></el-date-picker> ></el-date-picker>
</div> </div>
</div> </div>
<el-tooltip effect="dark" content="一个任务结束后，根据任务开始时间和周期时间，自动生成下一个任务" placement="bottom"> <!-- <el-tooltip effect="dark" content="一个任务结束后，根据任务开始时间和周期时间，自动生成下一个任务" placement="bottom">
<div class="showtext"> <div class="showtext">
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</div> </div>
</el-tooltip> </el-tooltip> -->
<div class="table_inspection"> <div class="table_inspection">
<div class="inspection_left"> <div class="inspection_left">
<span class="name_text">任务提前提醒</span> <span class="name_text">提前提醒</span>
<input <input
class="name_ipt" class="name_ipt"
v-model="inspectionNum2" v-model="inspectionNum2"
...@@ -506,7 +496,7 @@ ...@@ -506,7 +496,7 @@
</el-select> </el-select>
</div> </div>
<div class="inspection_right"> <div class="inspection_right">
<span class="name-text">计划执行状态</span> <span class="name-text">是否启用</span>
<el-select v-model="hsavalue" placeholder="请选择" v-if="sestion == 3"> <el-select v-model="hsavalue" placeholder="请选择" v-if="sestion == 3">
<el-option <el-option
v-for="item in hasoptions" v-for="item in hasoptions"
...@@ -544,7 +534,7 @@ ...@@ -544,7 +534,7 @@
</div> </div>
<div class="inspection_ipt"> <div class="inspection_ipt">
<div class="inspection_left"> <div class="inspection_left">
<span class="name_text">任务执行内容</span> <span class="name_text">计划内容</span>
</div> </div>
<div class="inspection_right"> <div class="inspection_right">
<input <input
...@@ -734,7 +724,7 @@ ...@@ -734,7 +724,7 @@
</div> </div>
<div class="conter"> <div class="conter">
<div class="conter_title"> <div class="conter_title">
<span class="name_text">设备类型</span> <!-- <span class="name_text">设备类型</span>
<div class="selectClass"> <div class="selectClass">
<el-select v-model="Meter" placeholder="请选择"> <el-select v-model="Meter" placeholder="请选择">
<el-option <el-option
...@@ -742,7 +732,7 @@ ...@@ -742,7 +732,7 @@
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<!-- <div class="seleword2" @click.stop="treechange"> <!-- <div class="seleword2" @click.stop="treechange">
<div class="seleword1"> <div class="seleword1">
{{Meter3}} {{Meter3}}
...@@ -926,12 +916,12 @@ export default { ...@@ -926,12 +916,12 @@ export default {
// //
hasoptions: [ hasoptions: [
{ {
value: '启用', value: '是',
label: '启用' label: '是'
}, },
{ {
value: '停止', value: '否',
label: '停止' label: '否'
} }
], ],
TimeOptions1: [ TimeOptions1: [
...@@ -991,7 +981,7 @@ export default { ...@@ -991,7 +981,7 @@ export default {
} }
], ],
// xiala:require('../../assets/images/ziyuan4.png'), // xiala:require('../../assets/images/ziyuan4.png'),
hsavalue: '启用', hsavalue: '是',
addShow: false, //弹窗是否显示 addShow: false, //弹窗是否显示
equipmentShow: false, equipmentShow: false,
timeValue: '小时', timeValue: '小时',
...@@ -1007,8 +997,8 @@ export default { ...@@ -1007,8 +997,8 @@ export default {
treetrue: false, treetrue: false,
planName: '', planName: '',
rwselect:'小时', rwselect:'小时',
inspecionNum: 2, inspecionNum: '',
inspectionNum2: 1, inspectionNum2: '',
reduceTime: '', reduceTime: '',
EquipmentTypeAll: [], EquipmentTypeAll: [],
EquipmentTypeAll2:[], EquipmentTypeAll2:[],
...@@ -1041,7 +1031,6 @@ export default { ...@@ -1041,7 +1031,6 @@ export default {
created() { created() {
this.jurisdiction = this.$store.state.btnPowerData this.jurisdiction = this.$store.state.btnPowerData
this.buttonarr = this.findPathByLeafId(this.GetUrlParam('id'),this.jurisdiction)[0].Children this.buttonarr = this.findPathByLeafId(this.GetUrlParam('id'),this.jurisdiction)[0].Children
console.log("dsad",this.buttonarr)
this.buttonarr.forEach((item)=>{ this.buttonarr.forEach((item)=>{
if(item.RightName == "点巡检计划-查询按钮"){ if(item.RightName == "点巡检计划-查询按钮"){
this.cxid = item.RightID this.cxid = item.RightID
...@@ -1174,7 +1163,6 @@ export default { ...@@ -1174,7 +1163,6 @@ export default {
this.nowcheck = i.Number; this.nowcheck = i.Number;
this.yidata = i; this.yidata = i;
this.yinum = b; this.yinum = b;
console.log('eee',this.nowcheck,this.yinum)
}, },
swapArray(arr, index1, index2) { swapArray(arr, index1, index2) {
arr[index1] = arr.splice(index2, 1, arr[index1])[0]; arr[index1] = arr.splice(index2, 1, arr[index1])[0];
...@@ -1231,7 +1219,6 @@ export default { ...@@ -1231,7 +1219,6 @@ export default {
'/api/PointInspectionManage/PointInspectionManage_DeletePlan', '/api/PointInspectionManage/PointInspectionManage_DeletePlan',
data: a data: a
}).then(res => { }).then(res => {
console.log(res);
this.list = []; this.list = [];
this.deltrue = true; this.deltrue = true;
this.tipword = res.data.data; this.tipword = res.data.data;
...@@ -1285,18 +1272,18 @@ export default { ...@@ -1285,18 +1272,18 @@ export default {
this.checkArr = []; this.checkArr = [];
this.checkDeleArr1 = []; this.checkDeleArr1 = [];
this.planName = ''; this.planName = '';
this.inspecionNum = 2; this.inspecionNum = '';
this.inspectionNum2 = 1; this.inspectionNum2 = '';
this.timeValue = '小时'; this.timeValue = '小时';
this.timeValuee = '小时'; this.timeValuee = '小时';
this.hsavalue = '启用'; this.hsavalue = '是';
this.RemarksText = ''; this.RemarksText = '';
this.rwselect = '小时'; this.rwselect = '小时';
this.addShow = true; this.addShow = true;
this.userValue = 'SuperAdmin' this.userValue = 'SuperAdmin'
this.pdyd3 = true; this.pdyd3 = true;
this.rwtime = 1 this.rwtime = 1
this.Expiretime = moment(this.startime).add(Number(6),"days").format("YYYY-MM-DD HH:mm:ss") this.Expiretime = moment(this.startime).add(Number(0),"days").format("YYYY-MM-DD HH:mm:ss")
}, },
//关闭添加弹窗 //关闭添加弹窗
...@@ -1414,7 +1401,6 @@ export default { ...@@ -1414,7 +1401,6 @@ export default {
argKeyWord: '' argKeyWord: ''
}) })
.then(res => { .then(res => {
console.log("巡检人",res)
var data = res.data.data.DataList; var data = res.data.data.DataList;
this.useroptions = []; this.useroptions = [];
this.userValue = data[0].UserAccount; this.userValue = data[0].UserAccount;
...@@ -1439,7 +1425,7 @@ export default { ...@@ -1439,7 +1425,7 @@ export default {
var mothe = month > 9 ? month : '0' + month; //获取当前日 var mothe = month > 9 ? month : '0' + month; //获取当前日
var date = myDate.getDate(); var date = myDate.getDate();
var da = date > 9 ? date : '0' + date; var da = date > 9 ? date : '0' + date;
var h = myDate.getHours()+1; //获取当前小时数(0-23) var h = myDate.getHours(); //获取当前小时数(0-23)
var he = h > 9 ? h : '0' + h; var he = h > 9 ? h : '0' + h;
var m = myDate.getMinutes(); //获取当前分钟数(0-59) var m = myDate.getMinutes(); //获取当前分钟数(0-59)
var me = m > 9 ? m : '0' + m; var me = m > 9 ? m : '0' + m;
...@@ -1518,22 +1504,22 @@ export default { ...@@ -1518,22 +1504,22 @@ export default {
}, },
//添加弹窗确定按钮 //添加弹窗确定按钮
addQuerFun() { addQuerFun() {
console.log('确定了',this.sestion)
if (this.sestion == 3) {
if(this.rwselect == '小时'){ if (this.sestion == 3) {
this.endtime = // if(this.rwselect == '小时'){
moment(this.startime).add(Number(this.rwtime),"hours").format("YYYY-MM-DD HH:mm:ss") // this.endtime =
}else if(this.rwselect == '天'){ // moment(this.startime).add(Number(this.rwtime),"hours").format("YYYY-MM-DD HH:mm:ss")
this.endtime = // }else if(this.rwselect == '天'){
moment(this.startime).add(Number(this.rwtime),"days").format("YYYY-MM-DD HH:mm:ss") // this.endtime =
}else if(this.rwselect == '周'){ // moment(this.startime).add(Number(this.rwtime),"days").format("YYYY-MM-DD HH:mm:ss")
this.endtime = // }else if(this.rwselect == '周'){
moment(this.startime).add(Number(this.rwtime),"weeks").format("YYYY-MM-DD HH:mm:ss") // this.endtime =
}else if(this.rwselect == '月'){ // moment(this.startime).add(Number(this.rwtime),"weeks").format("YYYY-MM-DD HH:mm:ss")
this.endtime = // }else if(this.rwselect == '月'){
moment(this.startime).add(Number(this.rwtime),"months").format("YYYY-MM-DD HH:mm:ss") // this.endtime =
} // moment(this.startime).add(Number(this.rwtime),"months").format("YYYY-MM-DD HH:mm:ss")
// }
this.endtime = moment(this.endtime).add(Number(0),"months").format("YYYY-MM-DD HH:mm:ss")
if (this.planName == '') { if (this.planName == '') {
this.tipchange = true; this.tipchange = true;
this.pdyd1 = true; this.pdyd1 = true;
...@@ -1541,13 +1527,14 @@ export default { ...@@ -1541,13 +1527,14 @@ export default {
return; return;
} }
var newDate = new Date().getTime(); var newDate = new Date().getTime();
if (newDate > this.startime) {
if (newDate > this.startimeS) {
this.tipchange = true; this.tipchange = true;
this.pdyd1 = true; this.pdyd1 = true;
this.tipword = '开始时间必须大于当前时间'; this.tipword = '开始时间必须大于当前时间';
return; return;
} }
if (this.endtime <= this.startime) { if (this.endtimeS <= this.startimeS) {
this.tipchange = true; this.tipchange = true;
this.pdyd1 = true; this.pdyd1 = true;
this.tipword = '结束时间必须大于开始时间'; this.tipword = '结束时间必须大于开始时间';
...@@ -1643,7 +1630,6 @@ export default { ...@@ -1643,7 +1630,6 @@ export default {
} }
} }
} }
console.log('eee')
//注意 //注意
if (this.checkArr.length == 0) { if (this.checkArr.length == 0) {
this.tipchange = true; this.tipchange = true;
...@@ -1716,7 +1702,7 @@ export default { ...@@ -1716,7 +1702,7 @@ export default {
PeriodUnit: this.PeriodUnit, PeriodUnit: this.PeriodUnit,
ReminderTimeValue: Number(this.inspectionNum2), ReminderTimeValue: Number(this.inspectionNum2),
ReminderTimeUnit: this.ReminderTimeUnit, ReminderTimeUnit: this.ReminderTimeUnit,
IsEnabled: this.hsavalue == '启用' ? true : false, IsEnabled: this.hsavalue == '是' ? true : false,
Remarks: this.RemarksText, Remarks: this.RemarksText,
DeviceAndStandardGroup: [] DeviceAndStandardGroup: []
}; };
...@@ -1740,7 +1726,6 @@ export default { ...@@ -1740,7 +1726,6 @@ export default {
this.dataValue.DeviceAndStandardGroup.push(value1); this.dataValue.DeviceAndStandardGroup.push(value1);
} }
} }
this.$axios({ this.$axios({
method: 'post', method: 'post',
url: url:
...@@ -1765,6 +1750,7 @@ export default { ...@@ -1765,6 +1750,7 @@ export default {
console.log('errss', error); console.log('errss', error);
}); });
} else { } else {
console.log('eeeee',this.endtime)
if (this.sesstion.PeriodUnit == '小时') { if (this.sesstion.PeriodUnit == '小时') {
this.sesstion.PeriodUnit = 1; this.sesstion.PeriodUnit = 1;
} else if (this.sesstion.PeriodUnit == '天') { } else if (this.sesstion.PeriodUnit == '天') {
...@@ -1783,9 +1769,9 @@ export default { ...@@ -1783,9 +1769,9 @@ export default {
} else if (this.sesstion.ReminderTimeUnit == '月') { } else if (this.sesstion.ReminderTimeUnit == '月') {
this.sesstion.ReminderTimeUnit = 4; this.sesstion.ReminderTimeUnit = 4;
} }
if (this.sesstion.IsEnabled == '启用') { if (this.sesstion.IsEnabled == '是') {
this.sesstion.IsEnabled = true; this.sesstion.IsEnabled = true;
} else if (this.sesstion.IsEnabled == '停止') { } else if (this.sesstion.IsEnabled == '否') {
this.sesstion.IsEnabled = false; this.sesstion.IsEnabled = false;
} }
let a = [ let a = [
...@@ -1802,19 +1788,19 @@ export default { ...@@ -1802,19 +1788,19 @@ export default {
b.StandardID = this.checkArr[i].SID; b.StandardID = this.checkArr[i].SID;
a.push(b); a.push(b);
} }
if(this.sesstion.rwselect == '小时'){ // if(this.sesstion.rwselect == '小时'){
this.sesstion.CurrentEndTime = // this.sesstion.CurrentEndTime =
moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"hours").format("YYYY-MM-DD HH:mm:ss") // moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"hours").format("YYYY-MM-DD HH:mm:ss")
}else if(this.sesstion.rwselect == '天'){ // }else if(this.sesstion.rwselect == '天'){
this.sesstion.CurrentEndTime = // this.sesstion.CurrentEndTime =
moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"days").format("YYYY-MM-DD HH:mm:ss") // moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"days").format("YYYY-MM-DD HH:mm:ss")
}else if(this.sesstion.rwselect == '周'){ // }else if(this.sesstion.rwselect == '周'){
this.sesstion.CurrentEndTime = // this.sesstion.CurrentEndTime =
moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"weeks").format("YYYY-MM-DD HH:mm:ss") // moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"weeks").format("YYYY-MM-DD HH:mm:ss")
}else if(this.sesstion.rwselect == '月'){ // }else if(this.sesstion.rwselect == '月'){
this.sesstion.CurrentEndTime= // this.sesstion.CurrentEndTime=
moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"months").format("YYYY-MM-DD HH:mm:ss") // moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"months").format("YYYY-MM-DD HH:mm:ss")
} // }
//判断是否存在相同设备或未选择的巡检项目 //判断是否存在相同设备或未选择的巡检项目
console.log('aaaaaaaa',a) console.log('aaaaaaaa',a)
if(a.length){ if(a.length){
...@@ -1903,10 +1889,10 @@ export default { ...@@ -1903,10 +1889,10 @@ export default {
this.sesstion.ReminderTimeUnit = '月'; this.sesstion.ReminderTimeUnit = '月';
} }
if (this.sesstion.IsEnabled == true) { if (this.sesstion.IsEnabled == true || this.sesstion.IsEnabled == '是') {
this.sesstion.IsEnabled = '启用'; this.sesstion.IsEnabled = '是';
} else if (this.sesstion.IsEnabled == false) { } else if (this.sesstion.IsEnabled == false) {
this.sesstion.IsEnabled = '停止'; this.sesstion.IsEnabled = '否';
} }
} }
}); });
...@@ -2244,10 +2230,11 @@ export default { ...@@ -2244,10 +2230,11 @@ export default {
} else if (b.ReminderTimeUnit == 4) { } else if (b.ReminderTimeUnit == 4) {
b.ReminderTimeUnit = '月'; b.ReminderTimeUnit = '月';
} }
if (b.IsEnabled == false) {
b.IsEnabled = '停止'; if (b.IsEnabled == false || b.IsEnabled == '否') {
b.IsEnabled = '否';
} else { } else {
b.IsEnabled = '启用'; b.IsEnabled = '是';
} }
let aaa = b.MaturityTime.indexOf('/'); let aaa = b.MaturityTime.indexOf('/');
if (aaa == 0) { if (aaa == 0) {
...@@ -2338,10 +2325,11 @@ export default { ...@@ -2338,10 +2325,11 @@ export default {
} else if (b.ReminderTimeUnit == 4) { } else if (b.ReminderTimeUnit == 4) {
b.ReminderTimeUnit = '月'; b.ReminderTimeUnit = '月';
} }
if (b.IsEnabled == false) {
b.IsEnabled = '停止'; if (b.IsEnabled == false || b.IsEnabled == '否') {
b.IsEnabled = '否';
} else { } else {
b.IsEnabled = '启用'; b.IsEnabled = '是';
} }
let aaa = b.MaturityTime.indexOf('/'); let aaa = b.MaturityTime.indexOf('/');
if (aaa == 0) { if (aaa == 0) {
...@@ -2611,13 +2599,13 @@ export default { ...@@ -2611,13 +2599,13 @@ export default {
this.tableData1[i].ReminderTimeValue = this.tableData1[i].ReminderTimeValue =
this.tableData1[i].ReminderTimeValue + '年'; this.tableData1[i].ReminderTimeValue + '年';
} }
if(this.tableData1[i].IsEnabled){ if(this.tableData1[i].IsEnabled || this.tableData1[i].IsEnabled == '是'){
this.tableData1[i].IsEnabled = '启用' this.tableData1[i].IsEnabled = '是'
}else{ }else{
this.tableData1[i].IsEnabled = '停止' this.tableData1[i].IsEnabled = '否'
} }
} }
console.log('this.tableData1',this.tableData1)
} else { } else {
this.tipchange = true; this.tipchange = true;
this.pdyd1 = true; this.pdyd1 = true;
...@@ -2844,7 +2832,6 @@ export default { ...@@ -2844,7 +2832,6 @@ export default {
}, },
mounted() { mounted() {
this.$axios.post(`/api/UserManage/UserManage_GstUserWithNoPage`).then(res => { this.$axios.post(`/api/UserManage/UserManage_GstUserWithNoPage`).then(res => {
console.log("ss",res)
this.useroptions = res.data.data; this.useroptions = res.data.data;
}) })
...@@ -3556,7 +3543,7 @@ select { ...@@ -3556,7 +3543,7 @@ select {
} }
.name-text { .name-text {
margin-right: 15px; margin-right: 15px;
margin-left: 17px; margin-left: 48px;
} }
} }
} }
...@@ -4328,10 +4315,10 @@ img{ ...@@ -4328,10 +4315,10 @@ img{
// align-content: bottom; // align-content: bottom;
} }
.tinput{ .tinput{
margin-left: 15% !important; // margin-left: 15% !important;
} }
.tinput1{ .tinput1{
margin-left: 23% !important; // margin-left: 23% !important;
} }
.seleword2{ .seleword2{
display: inline-block; display: inline-block;
......
src/components/Spotinspection/standard.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 17:25:35 * @LastEditTime: 2021-01-28 19:07:00
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -11,19 +11,19 @@ ...@@ -11,19 +11,19 @@
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.4)"> element-loading-background="rgba(0, 0, 0, 0.4)">
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <div class="seleword" @click.stop="selectword1"> <!-- <div class="seleword" @click.stop="selectword1">
<div class="seleword1"> <div class="seleword1">
{{Meter}} {{Meter}}
<img :src="xiala" alt /> <img :src="xiala" alt />
</div> </div>
</div> --> </div> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<div class="selectword" v-if="changeselect"> <div class="selectword" v-if="changeselect">
<el-tree <el-tree
...@@ -458,20 +458,20 @@ ...@@ -458,20 +458,20 @@
</div> </div>
<div class="conter"> <div class="conter">
<div class="conter_title"> <div class="conter_title">
<span class="name_text">设备类型</span> <!-- <span class="name_text">设备类型</span> -->
<!-- <div class="seleword2" @click.stop="treechange"> --> <!-- <div class="seleword2" @click.stop="treechange"> -->
<!-- <div class="seleword1"> <!-- <div class="seleword1">
{{Meter3}} {{Meter3}}
<img :src="xiala" alt /> <img :src="xiala" alt />
</div> --> </div> -->
<div class="selectClass"> <!-- <div class="selectClass">
<el-select v-model="Meter" placeholder="请选择"> <el-select v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<!-- </div> --> <!-- </div> -->
<div class="selectword selectword2" v-if="treetrue"> <div class="selectword selectword2" v-if="treetrue">
...@@ -3644,10 +3644,10 @@ img{ ...@@ -3644,10 +3644,10 @@ img{
// align-content: bottom; // align-content: bottom;
} }
.tinput{ .tinput{
margin-left: 15% !important; // margin-left: 15% !important;
} }
.tinput1{ .tinput1{
margin-left: 23% !important; // margin-left: 23% !important;
} }
.seleword2{ .seleword2{
display: inline-block; display: inline-block;
......
src/components/VToolBar/VToolBar.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @since: 2019-11-07 20:40:08 * @since: 2019-11-07 20:40:08
* @Author: jawnwa22 * @Author: jawnwa22
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2020-08-06 13:30:38 * @LastEditTime: 2021-01-28 17:11:35
--> -->
<template> <template>
...@@ -625,7 +625,7 @@ export default { ...@@ -625,7 +625,7 @@ export default {
this.userid = userinfo.SCMSUserID; this.userid = userinfo.SCMSUserID;
} }
console.log('userid',this.userid) console.log('路由res===>',this.userid)
//请求权限的 //请求权限的
this.$axios({ this.$axios({
method: 'post', method: 'post',
...@@ -633,6 +633,8 @@ export default { ...@@ -633,6 +633,8 @@ export default {
argUserID: this.userid argUserID: this.userid
}).then(res => { }).then(res => {
console.log('路由res===>',res)
//游客信息 //游客信息
this.$axios({ this.$axios({
method: 'post', method: 'post',
......
src/components/Vulnerableparts/Agency.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 15:27:45 * @LastEditTime: 2021-01-28 19:11:24
--> -->
<template> <template>
<div class="public-table" @click=" changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click=" changeselect = false" v-loading="this.$store.state.isShow"
...@@ -187,18 +187,18 @@ ...@@ -187,18 +187,18 @@
<div class="lookcontent"> <div class="lookcontent">
<div class="lookselect"> <div class="lookselect">
<div class="search"> <div class="search">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id v-model="oneselect" @click.stop="selectword2"> <!-- <select name id v-model="oneselect" @click.stop="selectword2">
<option :value="oneselect">{{oneselect}}</option> <option :value="oneselect">{{oneselect}}</option>
</select> --> </select> -->
<div class="selectClass"> <!-- <div class="selectClass">
<el-select v-model="oneselect" placeholder="请选择"> <el-select v-model="oneselect" placeholder="请选择">
<el-option <el-option
:label="oneselect" :label="oneselect"
:value="oneselect"> :value="oneselect">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<div class="selectword selectword2" v-if="selectword3"> <div class="selectword selectword2" v-if="selectword3">
...@@ -246,16 +246,16 @@ ...@@ -246,16 +246,16 @@
</div> </div>
<div class="search-container"> <div class="search-container">
<div> <div>
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<span class="spge">更换时间范围：</span> <span class="spge">更换时间范围：</span>
......
src/components/Vulnerableparts/plan.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 15:31:01 * @LastEditTime: 2021-01-28 19:11:32
--> -->
<template> <template>
<div class="public-table" @click=" changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click=" changeselect = false" v-loading="this.$store.state.isShow"
...@@ -11,16 +11,16 @@ ...@@ -11,16 +11,16 @@
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.4)"> element-loading-background="rgba(0, 0, 0, 0.4)">
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<div class="selectword" v-if="changeselect"> <div class="selectword" v-if="changeselect">
<el-tree <el-tree
......
src/components/maintain/Agency.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 14:54:40 * @LastEditTime: 2021-01-28 19:01:14
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div class="lookcontent"> <div class="lookcontent">
<div class="lookselect"> <div class="lookselect">
<div class="search"> <div class="search">
<span>设备类型：</span> <!-- <span>设备类型：</span>
<div class="selectClass"> <div class="selectClass">
<el-select v-model="oneselect" placeholder="请选择"> <el-select v-model="oneselect" placeholder="请选择">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
:value="oneselect"> :value="oneselect">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<!-- <select name id v-model="oneselect" @click="selectword2"> <!-- <select name id v-model="oneselect" @click="selectword2">
<option :value="oneselect">{{oneselect}}</option> <option :value="oneselect">{{oneselect}}</option>
...@@ -79,16 +79,16 @@ ...@@ -79,16 +79,16 @@
<div class="pre" @click="pre1">确定</div> <div class="pre" @click="pre1">确定</div>
</div> </div>
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<span class="sp1">任务状态：</span> <span class="sp1">任务状态：</span>
<select v-model="Meter1"> <select v-model="Meter1">
...@@ -711,7 +711,7 @@ ...@@ -711,7 +711,7 @@
@mouseup="mouseUpHandleelse12($event)" @mouseup="mouseUpHandleelse12($event)"
></div> ></div>
<div class="tiphead" :class="[{colordiv:$store.state.color=='grey'},{fcolor:$store.state.color=='grey'}]"> <div class="tiphead" :class="[{colordiv:$store.state.color=='grey'},{fcolor:$store.state.color=='grey'}]">
<span :class="{fcolor:$store.state.color=='grey'}">关闭代办点巡检任务</span> <span :class="{fcolor:$store.state.color=='grey'}">关闭待办保养任务</span>
<img <img
:src="no2" :src="no2"
alt alt
......
src/components/maintain/Record.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 14:59:46 * @LastEditTime: 2021-01-28 19:02:16
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.4)"> element-loading-background="rgba(0, 0, 0, 0.4)">
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<span class="sp1">任务状态：</span> <span class="sp1">任务状态：</span>
<select v-model="Meter1"> <select v-model="Meter1">
......
src/components/maintain/plan.vue
View file @ 1d289a35
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2019-11-25 19:07:09 * @Date: 2019-11-25 19:07:09
* @Author: 随风 * @Author: 随风
* @LastEditors: Tao * @LastEditors: Tao
* @LastEditTime: 2021-01-27 18:20:56 * @LastEditTime: 2021-01-29 09:31:08
--> -->
<template> <template>
<div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow" <div class="public-table" @click="changeselect = false" v-loading="this.$store.state.isShow"
...@@ -30,18 +30,18 @@ ...@@ -30,18 +30,18 @@
<div class="lookcontent" @click="selectword3 = false"> <div class="lookcontent" @click="selectword3 = false">
<div class="lookselect"> <div class="lookselect">
<div class="search"> <div class="search">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id v-model="oneselect" @click.stop="selectword2"> <!-- <select name id v-model="oneselect" @click.stop="selectword2">
<option :value="oneselect">{{oneselect}}</option> <option :value="oneselect">{{oneselect}}</option>
</select> --> </select> -->
<div class="selectClass"> <!-- <div class="selectClass">
<el-select v-model="oneselect" placeholder="请选择"> <el-select v-model="oneselect" placeholder="请选择">
<el-option <el-option
:label="oneselect" :label="oneselect"
:value="oneselect"> :value="oneselect">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<div class="selectword selectword2" v-if="selectword3"> <div class="selectword selectword2" v-if="selectword3">
<el-tree <el-tree
...@@ -88,16 +88,16 @@ ...@@ -88,16 +88,16 @@
<div class="pre" @click="pre1">确定</div> <div class="pre" @click="pre1">确定</div>
</div> </div>
<div class="search-container"> <div class="search-container">
<span>设备类型：</span> <!-- <span>设备类型：</span> -->
<!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect"> <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
<option :value="Meter">{{Meter}}</option> <option :value="Meter">{{Meter}}</option>
</select> --> </select> -->
<el-select class="firstselect" v-model="Meter" placeholder="请选择"> <!-- <el-select class="firstselect" v-model="Meter" placeholder="请选择">
<el-option <el-option
:label="Meter" :label="Meter"
:value="Meter"> :value="Meter">
</el-option> </el-option>
</el-select> </el-select> -->
<div class="selectword" v-if="changeselect"> <div class="selectword" v-if="changeselect">
<el-tree <el-tree
...@@ -105,8 +105,7 @@ ...@@ -105,8 +105,7 @@
@node-click="handleNodeClic6" @node-click="handleNodeClic6"
node-key="node.id" node-key="node.id"
default-expand-all default-expand-all
icon-class="el-icon-arrow-up" icon-class="el-icon-arrow-up">
>
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<span> <span>
<img v-show="data.file" :src="data.file" alt class="img11" /> <img v-show="data.file" :src="data.file" alt class="img11" />
...@@ -293,7 +292,7 @@ ...@@ -293,7 +292,7 @@
</div> </div>
</div> </div>
<div class="margin"> <div class="margin">
<span>任务开始时间</span> <span style="margin-right:45px">开始时间</span>
<template> <template>
<div class="block" v-if="sestion == 1"> <div class="block" v-if="sestion == 1">
<el-date-picker <el-date-picker
...@@ -322,16 +321,16 @@ ...@@ -322,16 +321,16 @@
</div> </div>
</template> </template>
<el-tooltip effect="dark" content="设置当前计划，首个任务的开始时间，计划进行即实际任务的执行" placement="bottom"> <!-- <el-tooltip effect="dark" content="设置当前计划，首个任务的开始时间，计划进行即实际任务的执行" placement="bottom">
<div class="showtext"> <div class="showtext">
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</div> </div>
</el-tooltip> </el-tooltip> -->
</div> </div>
<div class="margin"> <div class="margin">
<!-- <span class="sp6">保养周期</span> --> <span style="margin-right:45px" class="sp6">保养周期</span>
<span class="sp6">重复任务周期</span> <!-- <span class="sp6">重复任务周期</span> -->
<div class="is"> <div class="is">
<input type="text" v-if="sestion == 1" v-model="meaddtable.PeriodValue" /> <input type="text" v-if="sestion == 1" v-model="meaddtable.PeriodValue" />
<input type="text" v-if="sestion == 2" v-model="meaddtable.PeriodValue" disabled/> <input type="text" v-if="sestion == 2" v-model="meaddtable.PeriodValue" disabled/>
...@@ -347,38 +346,20 @@ ...@@ -347,38 +346,20 @@
</select> </select>
</div> </div>
<el-tooltip effect="dark" content="一个任务结束后，根据任务开始时间和周期时间，自动生成下一个任务" placement="bottom"> <!-- <el-tooltip effect="dark" content="一个任务结束后，根据任务开始时间和周期时间，自动生成下一个任务" placement="bottom">
<div class="showtext"> <div class="showtext">
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</div> </div>
</el-tooltip> </el-tooltip> -->
</div> </div>
<div class="margin"> <div class="margin">
<span class="sp6">任务提前提醒</span> <span style="margin-right:45px;" class="sp6">提前提醒</span>
<div class="is"> <div class="is">
<input <input type="text" v-if="sestion == 1" v-model="meaddtable.ReminderTimeValue"/>
type="text" <input type="text" v-if="sestion == 2" v-model="meaddtable.ReminderTimeValue" disabled/>
v-if="sestion == 1" <input type="text" v-if="sestion == 3" v-model="meaddtable.ReminderTimeValue"/>
v-model="meaddtable.ReminderTimeValue" <select name id v-model="meaddtable.ReminderTimeUnit" v-if="sestion == 1">
/>
<input
type="text"
v-if="sestion == 2"
v-model="meaddtable.ReminderTimeValue"
disabled
/>
<input
type="text"
v-if="sestion == 3"
v-model="meaddtable.ReminderTimeValue"
/>
<select
name
id
v-model="meaddtable.ReminderTimeUnit"
v-if="sestion == 1"
>
<option <option
v-for="(item,index) in sametimearr" v-for="(item,index) in sametimearr"
:key="index" :key="index"
...@@ -415,7 +396,7 @@ ...@@ -415,7 +396,7 @@
</div> </div>
<div class="zr"> <div class="zr">
<div> <div>
<span style="margin-right:45px;" class="me">保养人</span> <span style="margin-right:10px;margin-left:15px;" class="me">保养人</span>
<select <select
name name
id id
...@@ -458,9 +439,9 @@ ...@@ -458,9 +439,9 @@
<div class="margin"> <div class="margin">
<!-- <span>结束时间</span> --> <!-- <span>结束时间</span> -->
<span style="vertical-align:top;margin-top:10px;display:inline-block">任务执行工期</span> <span style="vertical-align:top;margin-top:10px;margin-left:15px;display:inline-block">结束时间</span>
<div class="is"> <!-- <div class="is">
<input type="text" @input="endValue()" v-if="sestion == 1" v-model="meaddtable.EndTimeValue" /> <input type="text" @input="endValue()" v-if="sestion == 1" v-model="meaddtable.EndTimeValue" />
<input type="text" @input="endValue()" v-if="sestion == 2" v-model="meaddtable.EndTimeValue" disabled/> <input type="text" @input="endValue()" v-if="sestion == 2" v-model="meaddtable.EndTimeValue" disabled/>
<input type="text" @input="endValue()" v-if="sestion == 3" v-model="meaddtable.EndTimeValue" /> <input type="text" @input="endValue()" v-if="sestion == 3" v-model="meaddtable.EndTimeValue" />
...@@ -473,8 +454,8 @@ ...@@ -473,8 +454,8 @@
<select name id @change="endValue()" v-model="meaddtable.endTimeUnit" v-if="sestion == 3"> <select name id @change="endValue()" v-model="meaddtable.endTimeUnit" v-if="sestion == 3">
<option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option> <option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option>
</select> </select>
</div> </div> -->
<!-- <template> <template>
<div class="block" v-if="sestion == 1"> <div class="block" v-if="sestion == 1">
<el-date-picker <el-date-picker
v-model="meaddtable.CurrentEndTime " v-model="meaddtable.CurrentEndTime "
...@@ -501,10 +482,10 @@ ...@@ -501,10 +482,10 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker> ></el-date-picker>
</div> </div>
</template> --> </template>
</div> </div>
<div class="margin"> <div class="margin">
<span>计划到期时间</span> <span style="margin-left:15px">到期时间</span>
<template> <template>
<div class="block" v-if="sestion == 1"> <div class="block" v-if="sestion == 1">
<el-date-picker <el-date-picker
...@@ -534,7 +515,7 @@ ...@@ -534,7 +515,7 @@
</template> </template>
</div> </div>
<div class="margin"> <div class="margin">
<span>计划执行状态</span> <span style="margin-left:15px">是否启用</span>
<select v-model="meaddtable.IsEnabled" v-if="sestion == 1"> <select v-model="meaddtable.IsEnabled" v-if="sestion == 1">
<option <option
v-for="(item,index) in person1" v-for="(item,index) in person1"
...@@ -709,7 +690,7 @@ export default { ...@@ -709,7 +690,7 @@ export default {
}, },
person: ['SuperAdmin', 'Guest'], person: ['SuperAdmin', 'Guest'],
select1: 1, select1: 1,
person1: ['启动', '停止'], person1: ['是', '否'],
warry: '保内', warry: '保内',
device: '在用', device: '在用',
searchData: { searchData: {
...@@ -773,14 +754,14 @@ export default { ...@@ -773,14 +754,14 @@ export default {
OldPlanName: '', OldPlanName: '',
PlanName: '', PlanName: '',
AID: '', AID: '',
PeriodValue: '2', PeriodValue: '',
PeriodUnit: '小时', PeriodUnit: '小时',
PeriodTotalMinute: '', PeriodTotalMinute: '',
MaturityTime: '', MaturityTime: '',
ReminderTimeValue: '1', ReminderTimeValue: '',
ReminderTimeUnit: '小时', ReminderTimeUnit: '小时',
ReminderTimeTotalMinute: '', ReminderTimeTotalMinute: '',
IsEnabled: '启动', IsEnabled: '是',
MaintenancePerson: 'SuperAdmin', MaintenancePerson: 'SuperAdmin',
PlanContent: '', PlanContent: '',
CurrentStartTime: '', CurrentStartTime: '',
...@@ -1018,7 +999,7 @@ export default { ...@@ -1018,7 +999,7 @@ export default {
this.projectlistdata = []; this.projectlistdata = [];
for (a in i) { for (a in i) {
if (!this.projectkeyword) { if (!this.projectkeyword) {
if (this.oneselectid == '11111111-1111-1111-1111-111111111111' || this.oneselect == '') { if (this.oneselectid == '11111111-1111-1111-1111-111111111111' || this.oneselect == '' || this.oneselect == '全部') {
this.projectlistdata = i; this.projectlistdata = i;
} else if (this.oneselect == i[a].DeviceType) { } else if (this.oneselect == i[a].DeviceType) {
this.projectlistdata.push(i[a]); this.projectlistdata.push(i[a]);
...@@ -1026,7 +1007,7 @@ export default { ...@@ -1026,7 +1007,7 @@ export default {
} else { } else {
console.log(this.oneselect); console.log(this.oneselect);
console.log(a); console.log(a);
if (this.oneselectid == '11111111-1111-1111-1111-111111111111' || this.oneselect == '') { if (this.oneselectid == '11111111-1111-1111-1111-111111111111' || this.oneselect == '' || this.oneselect == '全部') {
if ( if (
reg.test(i[a].DeviceName) || reg.test(i[a].DeviceName) ||
reg.test(i[a].DeviceNo) || reg.test(i[a].DeviceNo) ||
...@@ -1157,12 +1138,12 @@ export default { ...@@ -1157,12 +1138,12 @@ export default {
} else if (this.meaddtable.ReminderTimeUnit == '月') { } else if (this.meaddtable.ReminderTimeUnit == '月') {
this.meaddtable.ReminderTimeUnit = 4; this.meaddtable.ReminderTimeUnit = 4;
} }
if (this.meaddtable.IsEnabled == '启动') { if (this.meaddtable.IsEnabled == '是') {
this.meaddtable.IsEnabled = true; this.meaddtable.IsEnabled = true;
} else if (this.meaddtable.IsEnabled == '停止') { } else if (this.meaddtable.IsEnabled == '否') {
this.meaddtable.IsEnabled = false; this.meaddtable.IsEnabled = false;
} }
this.endValue() // this.endValue()
console.log('ee==>',this.meaddtable) console.log('ee==>',this.meaddtable)
this.$axios({ this.$axios({
method: 'post', method: 'post',
...@@ -1198,9 +1179,9 @@ export default { ...@@ -1198,9 +1179,9 @@ export default {
this.meaddtable.ReminderTimeUnit = '月'; this.meaddtable.ReminderTimeUnit = '月';
} }
if (this.meaddtable.IsEnabled == true) { if (this.meaddtable.IsEnabled == true) {
this.meaddtable.IsEnabled = '启动'; this.meaddtable.IsEnabled = '是';
} else if (this.meaddtable.IsEnabled == false) { } else if (this.meaddtable.IsEnabled == false) {
this.meaddtable.IsEnabled = '停止'; this.meaddtable.IsEnabled = '否';
} }
} else { } else {
if (this.meaddtable.PeriodUnit == 1) { if (this.meaddtable.PeriodUnit == 1) {
...@@ -1222,9 +1203,9 @@ export default { ...@@ -1222,9 +1203,9 @@ export default {
this.meaddtable.ReminderTimeUnit = '月'; this.meaddtable.ReminderTimeUnit = '月';
} }
if (this.meaddtable.IsEnabled == true) { if (this.meaddtable.IsEnabled == true) {
this.meaddtable.IsEnabled = '启动'; this.meaddtable.IsEnabled = '是';
} else if (this.meaddtable.IsEnabled == false) { } else if (this.meaddtable.IsEnabled == false) {
this.meaddtable.IsEnabled = '停止'; this.meaddtable.IsEnabled = '否';
} }
this.tipword = res.data.msg; this.tipword = res.data.msg;
} }
...@@ -1248,9 +1229,9 @@ export default { ...@@ -1248,9 +1229,9 @@ export default {
} else if (this.meaddtable.ReminderTimeUnit == '月') { } else if (this.meaddtable.ReminderTimeUnit == '月') {
this.meaddtable.ReminderTimeUnit = 4; this.meaddtable.ReminderTimeUnit = 4;
} }
if (this.meaddtable.IsEnabled == '启动') { if (this.meaddtable.IsEnabled == '是') {
this.meaddtable.IsEnabled = true; this.meaddtable.IsEnabled = true;
} else if (this.meaddtable.IsEnabled == '停止') { } else if (this.meaddtable.IsEnabled == '否') {
this.meaddtable.IsEnabled = false; this.meaddtable.IsEnabled = false;
} }
this.meaddtable.Operate = 2; this.meaddtable.Operate = 2;
...@@ -1289,9 +1270,9 @@ export default { ...@@ -1289,9 +1270,9 @@ export default {
this.meaddtable.ReminderTimeUnit = '月'; this.meaddtable.ReminderTimeUnit = '月';
} }
if (this.meaddtable.IsEnabled == true) { if (this.meaddtable.IsEnabled == true) {
this.meaddtable.IsEnabled = '启动'; this.meaddtable.IsEnabled = '是';
} else if (this.meaddtable.IsEnabled == false) { } else if (this.meaddtable.IsEnabled == false) {
this.meaddtable.IsEnabled = '停止'; this.meaddtable.IsEnabled = '否';
} }
this.tipword = res.data.msg; this.tipword = res.data.msg;
} }
...@@ -1538,14 +1519,14 @@ export default { ...@@ -1538,14 +1519,14 @@ export default {
OldPlanName: '', OldPlanName: '',
PlanName: '', PlanName: '',
AID: '', AID: '',
PeriodValue: '2', PeriodValue: '',
PeriodUnit: '小时', PeriodUnit: '小时',
PeriodTotalMinute: '', PeriodTotalMinute: '',
MaturityTime: '', MaturityTime: '',
ReminderTimeValue: '1', ReminderTimeValue: '',
ReminderTimeUnit: '小时', ReminderTimeUnit: '小时',
ReminderTimeTotalMinute: '', ReminderTimeTotalMinute: '',
IsEnabled: '启动', IsEnabled: '是',
MaintenancePerson: 'SuperAdmin', MaintenancePerson: 'SuperAdmin',
PlanContent: '', PlanContent: '',
CurrentStartTime: '', CurrentStartTime: '',
...@@ -1555,10 +1536,10 @@ export default { ...@@ -1555,10 +1536,10 @@ export default {
endTimeUnit: '小时', endTimeUnit: '小时',
}; };
this.meaddtable.CurrentStartTime = this.gettimenowtime(); this.meaddtable.CurrentStartTime = this.gettimenowtime();
this.meaddtable.CurrentStartTime = moment(this.meaddtable.CurrentStartTime).add(1,'hours').format("YYYY-MM-DD HH:mm:ss") this.meaddtable.CurrentStartTime = moment(this.meaddtable.CurrentStartTime).add(0,'hours').format("YYYY-MM-DD HH:mm:ss")
this.meaddtable.CurrentEndTime = this.gettimenowtime(); this.meaddtable.CurrentEndTime = this.gettimenowtime();
this.meaddtable.MaturityTime = this.gettimenowtime(); this.meaddtable.MaturityTime = this.gettimenowtime();
this.meaddtable.MaturityTime = moment(this.meaddtable.MaturityTime).add(1,'weeks').format("YYYY-MM-DD HH:mm:ss") this.meaddtable.MaturityTime = moment(this.meaddtable.MaturityTime).add(0,'weeks').format("YYYY-MM-DD HH:mm:ss")
this.changetrue = true; this.changetrue = true;
this.pdyd2 = true; this.pdyd2 = true;
this.sestion = 1; this.sestion = 1;
...@@ -1642,9 +1623,9 @@ export default { ...@@ -1642,9 +1623,9 @@ export default {
this.tableData1[i].MaturityTime this.tableData1[i].MaturityTime
); );
if (this.tableData1[i].IsEnabled == true) { if (this.tableData1[i].IsEnabled == true) {
this.tableData1[i].IsEnabled = '启动'; this.tableData1[i].IsEnabled = '是';
} else if (this.tableData1[i].IsEnabled == false) { } else if (this.tableData1[i].IsEnabled == false) {
this.tableData1[i].IsEnabled = '停止'; this.tableData1[i].IsEnabled = '否';
} }
if (this.tableData1[i].PeriodUnit == 1) { if (this.tableData1[i].PeriodUnit == 1) {
this.tableData1[i].PeriodValue = this.tableData1[i].PeriodValue =
...@@ -2855,7 +2836,7 @@ textarea { ...@@ -2855,7 +2836,7 @@ textarea {
span { span {
color: #363636; color: #363636;
font-size: 14px; font-size: 14px;
margin-right: 20px; margin-right: 10px;
} }
} }
......
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