From 8f72fa7fb760225accc92d89dc1c402584f5548b Mon Sep 17 00:00:00 2001
From: dengfuchuan <389068019@qq.com>
Date: Fri, 9 Jul 2021 16:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue                          | 204 +++++++++---------
 .../safe_insp/components/create/index.vue     |  13 +-
 .../safe_insp/components/edit_form/index.vue  |   7 +-
 .../safe_insp/components/insp_det/index.vue   |   1 +
 4 files changed, 117 insertions(+), 108 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 965bcd1b..70a9088e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,102 +1,102 @@
-<template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
-        <navbar />
-        <tags-view v-if="needTagsView" />
-      </div>
-      <app-main />
-      <right-panel v-if="showSettings">
-        <settings />
-      </right-panel>
-    </div>
-  </div>
-</template>
-
-<script>
-import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
-import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'Layout',
-  components: {
-    AppMain,
-    Navbar,
-    RightPanel,
-    Settings,
-    Sidebar,
-    TagsView
-  },
-  mixins: [ResizeMixin],
-  computed: {
-    ...mapState({
-      sidebar: state => state.app.sidebar,
-      device: state => state.app.device,
-      showSettings: state => state.settings.showSettings,
-      needTagsView: state => state.settings.tagsView,
-      fixedHeader: state => state.settings.fixedHeader
-    }),
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened,
-        withoutAnimation: this.sidebar.withoutAnimation,
-        mobile: this.device === 'mobile'
-      }
-    }
-  },
-  methods: {
-    handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  @import "~@/styles/mixin.scss";
-  @import "~@/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
-
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .fixed-header {
-    position: fixed;
-    top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
-  }
-
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
-
-  .mobile .fixed-header {
-    width: 100%;
-  }
-</style>
+<template>
+  <div :class="classObj" class="app-wrapper">
+    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+    <sidebar class="sidebar-container" />
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+      <div :class="{'fixed-header':fixedHeader}">
+        <navbar />
+        <tags-view v-if="needTagsView" />
+      </div>
+      <app-main />
+      <right-panel v-if="showSettings">
+        <settings />
+      </right-panel>
+    </div>
+  </div>
+</template>
+
+<script>
+import RightPanel from '@/components/RightPanel'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'Layout',
+  components: {
+    AppMain,
+    Navbar,
+    RightPanel,
+    Settings,
+    Sidebar,
+    TagsView
+  },
+  mixins: [ResizeMixin],
+  computed: {
+    ...mapState({
+      sidebar: state => state.app.sidebar,
+      device: state => state.app.device,
+      showSettings: state => state.settings.showSettings,
+      needTagsView: state => state.settings.tagsView,
+      fixedHeader: state => state.settings.fixedHeader
+    }),
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened,
+        withoutAnimation: this.sidebar.withoutAnimation,
+        mobile: this.device === 'mobile'
+      }
+    }
+  },
+  methods: {
+    handleClickOutside() {
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  @import "~@/styles/mixin.scss";
+  @import "~@/styles/variables.scss";
+
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
+
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
+  }
+
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
+
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
+
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
+
+  .mobile .fixed-header {
+    width: 100%;
+  }
+</style>
diff --git a/src/views/safe_insp/components/create/index.vue b/src/views/safe_insp/components/create/index.vue
index 7d805187..9669c654 100644
--- a/src/views/safe_insp/components/create/index.vue
+++ b/src/views/safe_insp/components/create/index.vue
@@ -2,7 +2,15 @@
   <div>
     <el-card>
       <div class="buttons">
-        <buttons funid="safe_insp" style="margin-bottom:20px" @save="save" />
+        <div class="buttons">
+          <el-button type="primary" @click="create">新增</el-button>
+          <el-button type="primary" @click="del">删除</el-button>
+          <el-button type="primary" @click="save">保存</el-button>
+          <el-button type="primary" @click="audit">提交</el-button>
+          <el-button type="primary" @click="unaudit">反提交</el-button>
+          <el-button type="primary" @click="upload">图文附件</el-button>
+          <el-button type="primary" @click="back">返回列表</el-button>
+        </div>
         <el-button type="primary" @click="back">返回列表</el-button>
       </div>
       <el-form ref="form" :model="form" label-width="80px" :rules="rules">
@@ -122,14 +130,12 @@
 <script>
 import api from '../../api'
 import publicApi from '@/api/public'
-import buttons from '@/components/formBtn'
 import InspDet from '../insp_det'
 import SelUser from '@/components/selUser'
 import InspName from '../inspName'
 export default {
   name: 'AuditForm',
   components: {
-    buttons,
     SelUser,
     InspDet,
     InspName
@@ -294,6 +300,7 @@ export default {
 }
 .buttons {
   display: flex;
+  margin-bottom:20px;
   .el-button--primary {
     margin-left: 10px;
     height: 26.8px;
diff --git a/src/views/safe_insp/components/edit_form/index.vue b/src/views/safe_insp/components/edit_form/index.vue
index 47b01af9..7bc4f19e 100644
--- a/src/views/safe_insp/components/edit_form/index.vue
+++ b/src/views/safe_insp/components/edit_form/index.vue
@@ -14,12 +14,12 @@
         <el-row>
           <el-col :span="7">
             <el-form-item label="巡检单编号">
-              <el-input v-model="form.safe_insp__insp_code" />
+              <el-input v-model="form.safe_insp__insp_code" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="巡检状态">
-              <el-select v-model="form.safe_insp__insp_state" placeholder="请选择">
+              <el-select v-model="form.safe_insp__insp_state" disabled placeholder="请选择">
                 <el-option
                   v-for="item in options"
                   :key="item.funall_control__value_data"
@@ -96,7 +96,8 @@
         </el-row>
       </el-form>
     </el-card>
-    <InspDet :id="id" />
+    <InspDet :id="id" @updateList="getList" />
+    <InspDet :id="id" @updateList="getList" />
     <el-dialog
       v-if="selUserVisible"
       title="选择人员"
diff --git a/src/views/safe_insp/components/insp_det/index.vue b/src/views/safe_insp/components/insp_det/index.vue
index 5ec41be8..08198a76 100644
--- a/src/views/safe_insp/components/insp_det/index.vue
+++ b/src/views/safe_insp/components/insp_det/index.vue
@@ -268,6 +268,7 @@ export default {
               this.dialogFormVisible = false
               this.$refs['form'].resetFields()
               this.$message.success('保存成功！')
+              this.$emit('updateList')
             } else {
               this.$message.error(data.message)
             }