隐藏多余导航,巡检任务-巡检组回显变更

main
zhangqun 2 years ago
parent 06a6710c1b
commit 78eb7de549
  1. 8
      src/page/index/index.vue
  2. 8
      src/page/index/top/index.vue
  3. 2
      src/store/modules/common.js
  4. 14
      src/views/inspection/insTask.vue

@ -94,10 +94,10 @@ export default {
clearInterval(this.timer); clearInterval(this.timer);
return; return;
} }
if (this.itemList.length === 0) { // if (this.itemList.length === 0) {
this.notifyList = []; // this.notifyList = [];
this.notice(); // this.notice();
} // }
}, 20000); }, 20000);
}, },
// //

@ -40,7 +40,7 @@
<top-color></top-color> <top-color></top-color>
</div> </div>
</el-tooltip> --> </el-tooltip> -->
<span style="color:#E6A23C;margin-right:20px;font-weight:600;cursor: pointer;" v-if="total>0" @click="oneClickRead">一键已读 {{total}}</span> <!-- <span style="color:#E6A23C;margin-right:20px;font-weight:600;cursor: pointer;" v-if="total>0" @click="oneClickRead">一键已读 {{total}}</span>
<el-tooltip <el-tooltip
effect="dark" effect="dark"
content="切换输入框颜色" content="切换输入框颜色"
@ -55,7 +55,7 @@
<div class="iconfont iconicon_scan code" @click="codeHandle"> <div class="iconfont iconicon_scan code" @click="codeHandle">
</div> </div>
</el-tooltip> </el-tooltip> -->
<el-tooltip <el-tooltip
v-if="showLock" v-if="showLock"
effect="dark" effect="dark"
@ -76,7 +76,7 @@
<top-theme></top-theme> <top-theme></top-theme>
</div> </div>
</el-tooltip> </el-tooltip>
<el-tooltip <!-- <el-tooltip
effect="dark" effect="dark"
:content="$t('navbar.notice')" :content="$t('navbar.notice')"
placement="bottom" placement="bottom"
@ -93,7 +93,7 @@
<div class="top-bar__item top-bar__item--show"> <div class="top-bar__item top-bar__item--show">
<top-lang></top-lang> <top-lang></top-lang>
</div> </div>
</el-tooltip> </el-tooltip> -->
<el-tooltip <el-tooltip
v-if="showFullScren" v-if="showFullScren"
effect="dark" effect="dark"

@ -18,7 +18,7 @@ const common = {
showTag: true, showTag: true,
showDebug: true, showDebug: true,
showCollapse: true, showCollapse: true,
showSearch: true, showSearch: false,
showLock: true, showLock: true,
showFullScren: true, showFullScren: true,
showTheme: true, showTheme: true,

@ -176,7 +176,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" style="width: 31%; margin-left: 1%"> <el-col :span="6" style="width: 31%; margin-left: 1%">
<el-form-item label="巡检班组" prop="groupId"> <el-form-item label="巡检班组" prop="groupName">
<el-input
style="width: 98%"
v-model="addForm.groupName"
placeholder="巡检班组"
disabled
></el-input>
</el-form-item>
<!-- <el-form-item label="巡检班组" prop="groupId">
<el-select <el-select
v-model="addForm.groupId" v-model="addForm.groupId"
placeholder="请选择巡检班组" placeholder="请选择巡检班组"
@ -184,7 +192,7 @@
> >
<el-option v-for="item in groupList" :key="item.id" :label="item.fullName" :value="item.id"></el-option> <el-option v-for="item in groupList" :key="item.id" :label="item.fullName" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
@ -470,7 +478,7 @@
<el-descriptions-item span="1" label="巡检名称">{{taskForm.planName}}</el-descriptions-item> <el-descriptions-item span="1" label="巡检名称">{{taskForm.planName}}</el-descriptions-item>
<el-descriptions-item span="1" label="计划单据">{{taskForm.taskCode}}</el-descriptions-item> <el-descriptions-item span="1" label="计划单据">{{taskForm.taskCode}}</el-descriptions-item>
<el-descriptions-item span="1" label="巡检班组"> <el-descriptions-item span="1" label="巡检班组">
{{taskForm.groupId | groupName}} {{taskForm.groupName}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="1" label="实际开始">{{taskForm.actStartTime}}</el-descriptions-item> <el-descriptions-item span="1" label="实际开始">{{taskForm.actStartTime}}</el-descriptions-item>
<el-descriptions-item span="1" label="实际完成">{{taskForm.actFinishTime}}</el-descriptions-item> <el-descriptions-item span="1" label="实际完成">{{taskForm.actFinishTime}}</el-descriptions-item>

Loading…
Cancel
Save