Commit 1d289a35 authored by tao's avatar tao

天津教育标准模板修复bug

parent c38def5e
File added
...@@ -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> -->
......
...@@ -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不能为空"){
......
...@@ -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
......
...@@ -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">
......
...@@ -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>
......
...@@ -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) {
......
...@@ -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">
......
This diff is collapsed.
...@@ -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;
......
...@@ -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,13 +625,15 @@ export default { ...@@ -625,13 +625,15 @@ 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',
url: '/api/Main/Main_GetMenuKey?argUserID=' + this.userid, url: '/api/Main/Main_GetMenuKey?argUserID=' + this.userid,
argUserID: this.userid argUserID: this.userid
}).then(res => { }).then(res => {
console.log('路由res===>',res)
//游客信息 //游客信息
this.$axios({ this.$axios({
......
...@@ -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>
......
...@@ -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
......
...@@ -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
......
...@@ -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">
......
This diff is collapsed.
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