diff --git a/src/views/emergen_cyrescue/duty_management/duty_log/components/list.vue b/src/views/emergen_cyrescue/duty_management/duty_log/components/list.vue
index 4808482..dcd7800 100644
--- a/src/views/emergen_cyrescue/duty_management/duty_log/components/list.vue
+++ b/src/views/emergen_cyrescue/duty_management/duty_log/components/list.vue
@@ -6,7 +6,7 @@
           <el-input v-model="UNIT" placeholder="单位" class="filter-item" style="width: 200px;" />
         </el-form-item>
         <el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索？</el-button>
           <el-button class="filter-item" type="info" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -25,7 +25,7 @@
       <el-table-column :show-overflow-tooltip="true" prop="OPERATETIME" label="修改时间" />
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="{ row }">
-          <el-button type="text" icon="el-icon-download" size="mini" @click="confirmExport(row.ID)">数据导出</el-button>
+          <el-button v-if="false" type="text" icon="el-icon-download" size="mini" @click="confirmExport(row.ID)">数据导出</el-button>
           <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
           <el-button type="text" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.UNIT)">删除</el-button>
         </template>
diff --git a/src/views/emergen_cyrescue/duty_management/duty_log/index.vue b/src/views/emergen_cyrescue/duty_management/duty_log/index.vue
index ac13f74..765f84b 100644
--- a/src/views/emergen_cyrescue/duty_management/duty_log/index.vue
+++ b/src/views/emergen_cyrescue/duty_management/duty_log/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <list v-show="activeName=='list'" ref="list" />
-    <detail v-if="activeName=='detail'"/>
+    <list v-show="activeName==='list'" ref="list" />
+    <detail v-if="activeName==='detail'"/>
   </div>
 </template>
 <script>
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/addfrom.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/addfrom.vue
index 906d438..c7601ee 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/addfrom.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/addfrom.vue
@@ -126,10 +126,6 @@
     <div class="ui-height" />
     <div class="ui-foot">
       <el-button type="primary" @click="goback">返回</el-button>
-
-      <el-button type="primary" @click="shiyibu(0)">上一步</el-button>
-      <el-button type="primary" @click="xiayibu(1)" >下一步</el-button>
-
     </div>
 
     <!-- 坐标选择 -->
@@ -144,16 +140,12 @@
         <bm-view style="width: 100%; height:100%; flex: 1" />
         <bm-control ref="control" :offset="{width: 10, height: 10}" anchor="BMAP_ANCHOR_TOP_LEFT">
           <div class="map-flex">
-
             <div class="map-lable">关键词：</div>
             <div style="flex:1;">
               <el-autocomplete v-model="TYPEKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细设备类型" style="width:100%" @select="handleSelect" />
             </div>
-            <!--            <el-input v-model="TYPEKeyword" style="width: 200px" placeholder="请输入内容" />-->
-            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
           </div>
         </bm-control>
-        <!--        <bm-local-search :keyword="TYPEKeyword" :auto-viewport="true"/>-->
       </baidu-map>
       <div slot="footer" class="dialog-footer">
         <span>经度：</span>
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue
index 11e81ab..dd53879 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue
@@ -30,19 +30,13 @@
     </div>
 
     <el-dialog :visible.sync="dialogFormCheck" title="审核" width="400px" class="dy-dialog">
-      <div style="height:150px">
-        <div style="height: 20px"/>
-        <el-row :gutter="20" type="flex" class="row-bg" justify="center">
-          <el-col :span="18">  <Treeselect
-            :options="FILESTATUSThree"
-            v-model="AUDIT_STATUS"
-            placeholder="请选择预案类型"
-            no-options-text="暂无数据"
-            no-children-text="暂无数据"
-          /></el-col>
-
-        </el-row>
-      </div>
+      <Treeselect
+        :options="FILESTATUSThree"
+        v-model="AUDIT_STATUS"
+        placeholder="请选择预案类型"
+        no-options-text="暂无数据"
+        no-children-text="暂无数据"
+      />
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormCheck = false">取 消</el-button>
         <el-button type="primary" @click="setCheck">确 定</el-button>
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue
index 0ae4fbe..9ce58c4 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziling.vue
@@ -1,47 +1,72 @@
 
 <template>
   <div>
+    <el-row :gutter="20">
+      <el-col :span="13" class="bianxian">
+        <el-form ref="form" :model="yvanzhilingfrom" :rules="rules" label-width="110px" >
 
-    <!--      <el-col :span="13" class="bianxian">
-        <el-form ref="form" :model="yvanzhilingfrom" label-width="110px" >
-
-          <el-row :gutter="20">
-            <el-col :span="19"> <el-form-item label="相关资源" /></el-col>
-
-            <el-col :span="2">
-              <div class="filter-container"/>
-            </el-col>
+          <el-row :gutter="15">
+            <el-form-item label="响应级别" prop="HIERARCHICALRESPONSE_ID">
+              <el-checkbox-group v-model="checkList">
+                <el-checkbox v-for="jibei in xiangyingjibeiList" :label="jibei.HIERARCHICALRESPONSE_ID" :key="jibei.HIERARCHICALRESPONSE_ID" disabled>{{ jibei.HIERARCHICALNAME }}</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
           </el-row>
 
+          <el-form-item label="指令内容" prop="DIRECTIVECONTENT">
+            <el-input
+              v-model="yvanzhilingfrom.DIRECTIVECONTENT"
+              :rows="2"
+              disabled
+              type="textarea"
+              placeholder="指令内容"/>
+          </el-form-item>
+
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="执行机构" prop="EXECUTIVEBODY">
+                <Treeselect
+                  :options="treeData"
+                  v-model="yvanzhilingfrom.EXECUTIVEBODY"
+                  disabled
+                  placeholder="请选择机构"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="14"/>
+          </el-row>
         </el-form>
 
         <el-table ref="multipleTable" :data="yjzhilinglinshiList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
-
           <el-table-column prop="RESOURCETYPE" label="类型" width="180" />
           <el-table-column prop="RESOURCENAME" label="资源名称" />
           <el-table-column prop="LINKMPHONE" label="联系电话" />
           <el-table-column prop="URGENTLINKPHONE" label="紧急联系电话" />
-
         </el-table>
-        <div style="height: 20px"/>
-
-      </el-col>-->
-
-    <div class="filter-container"/>
-    <el-table ref="multipleTable" :data="yjzjvarList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
-
-      <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="HIERARCHICALRESPONSE_NAME" label="响应级别" />
-      <el-table-column prop="DIRECTIVECONTENT" width="1000" label="指令内容" />
-
-    </el-table>
-    <div class="page-btn-group">
-      <div/>
-      <pagination :total="yjzhuangjiatotal" :page.sync="listQueryzj.page" :limit.sync="listQueryzj.limit" @pagination="getDataList" />
-    </div>
+      </el-col>
+      <el-col :span="10" >
+        <el-table ref="multipleTable" :data="yjzjvarList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column type="index" label="序号" width="50" align="center" />
+          <el-table-column prop="HIERARCHICALRESPONSE_NAME" label="响应级别" />
+          <el-table-column prop="DIRECTIVECONTENT" label="指令内容" />
+          <el-table-column label="操作" align="center" width="300">
+            <template slot-scope="{row}">
+              <el-button type="primary" icon="el-icon-setting" size="mini" @click="updatezhiling(row)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page-btn-group">
+          <div/>
+          <pagination :total="yjzhuangjiatotal" :page.sync="listQueryzj.page" :limit.sync="listQueryzj.limit" @pagination="getDataList" />
+        </div>
+      </el-col>
+    </el-row>
 
     <el-dialog :visible.sync="dialogyjzlzyShow" title="相关资源" width="600px" >
-      <el-form ref="form" :model="zlxianghuanziyuanform" label-width="110px" style="width: 500px;">
+      <el-form ref="form2" :rules="rules2" :model="zlxianghuanziyuanform" label-width="110px" style="width: 500px;">
 
         <el-form-item label="资源名称" prop="RESOURCENAME">
           <el-input v-model="zlxianghuanziyuanform.RESOURCENAME" placeholder="资源名称..." />
@@ -83,6 +108,26 @@ export default {
   },
   data() {
     return {
+      rules: {
+        HIERARCHICALRESPONSE_ID: [
+          { required: true, message: '响应级别不能为空', trigger: 'blur' }],
+        DIRECTIVECONTENT: [
+          { required: true, message: '指令内容不能为空', trigger: 'blur' }],
+        EXECUTIVEBODY: [
+          { required: true, message: '执行机构不能为空', trigger: 'blur' }]
+
+      },
+      rules2: {
+        RESOURCENAME: [
+          { required: true, message: '资源名称不能为空', trigger: 'blur' }],
+        RESOURCETYPE: [
+          { required: true, message: '类型不能为空', trigger: 'blur' }],
+        LINKMPHONE: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }],
+        URGENTLINKPHONE: [
+          { required: true, message: '紧急联系电话不能为空', trigger: 'blur' }]
+
+      },
       checkList: [],
 
       zhuangjiatotal: 0,
@@ -167,6 +212,7 @@ export default {
           this.loading = false
           this.$refs.multipleTable.clearSelection()
           this.getDataList()
+          this.doreset()
         }).catch((e) => {
           this.loading = false
         })
@@ -184,6 +230,7 @@ export default {
         })
         this.loading = false
         this.getDataList()
+        this.doreset()
       }).catch((e) => {
         this.loading = false
       })
@@ -216,46 +263,26 @@ export default {
       this.yvanzhilingfrom.FIRERESERVEPLAN_ID = this.planid
       this.yvanzhilingfrom.HIERARCHICALRESPONSE_ID = this.checkList.join(',')
 
-      this.yvanzhilingfrom.listResources2 = this.yjzhilinglinshiList
-      this.loading = true
-
-      if (this.yvanzhilingfrom.HIERARCHICALRESPONSE_ID === '') {
-        this.$message({
-          message: '表单内容不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (this.yvanzhilingfrom.EXECUTIVEBODY) {
-        console.log('通过')
-      } else {
-        this.$message({
-          message: '表单内容不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      if (this.yvanzhilingfrom.DIRECTIVECONTENT) {
-        console.log('通过')
-      } else {
-        this.$message({
-          message: '表单内容不能为空',
-          type: 'warning'
-        })
-        return
-      }
-      requestFN(
-        '/plan/planningdirectives/save', this.yvanzhilingfrom
-      ).then((data) => {
-        this.$message({
-          message: '添加成功',
-          type: 'success'
-        })
-        this.loading = false
-        this.doreset()
-        this.getDataList()
-      }).catch((e) => {
-        this.loading = false
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.yvanzhilingfrom.listResources2 = this.yjzhilinglinshiList
+          this.loading = true
+          requestFN(
+            '/plan/planningdirectives/save', this.yvanzhilingfrom
+          ).then((data) => {
+            this.$message({
+              message: '添加成功',
+              type: 'success'
+            })
+            this.loading = false
+            this.doreset()
+            this.getDataList()
+          }).catch((e) => {
+            this.loading = false
+          })
+        } else {
+          return false
+        }
       })
     },
     //* ************添加应急指令相关资源************
@@ -273,15 +300,21 @@ export default {
       this.dialogyjzlzyShow = true
     },
     confirmsave() {
-      const form = {
-        RESOURCENAME: this.zlxianghuanziyuanform.RESOURCENAME,
-        RESOURCETYPE: this.zlxianghuanziyuanform.RESOURCETYPE,
-        LINKMPHONE: this.zlxianghuanziyuanform.LINKMPHONE,
-        URGENTLINKPHONE: this.zlxianghuanziyuanform.URGENTLINKPHONE,
-        id: this.yjzhilinglinshiList.length + 1
-      }
-      this.yjzhilinglinshiList.push(form)
-      this.dialogyjzlzyShow = false
+      this.$refs.form2.validate(valid => {
+        if (valid) {
+          const form = {
+            RESOURCENAME: this.zlxianghuanziyuanform.RESOURCENAME,
+            RESOURCETYPE: this.zlxianghuanziyuanform.RESOURCETYPE,
+            LINKMPHONE: this.zlxianghuanziyuanform.LINKMPHONE,
+            URGENTLINKPHONE: this.zlxianghuanziyuanform.URGENTLINKPHONE,
+            id: this.yjzhilinglinshiList.length + 1
+          }
+          this.yjzhilinglinshiList.push(form)
+          this.dialogyjzlzyShow = false
+        } else {
+          return false
+        }
+      })
     },
     //* *********获取应急机构树形列表********
     getTreeList() {
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue
index 75c9409..e9d311c 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanziyuan.vue
@@ -1,16 +1,18 @@
 
 <template>
   <div>
-    <div class="filter-container"/>
     <el-table ref="multipleTable" :data="yjzjvarList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
-
       <el-table-column prop="RESOURCETYPES" label="资源类型" width="180" />
       <el-table-column prop="RESOURCENAME" label="资源名称" />
       <el-table-column prop="RESOURCEADDRESS" label="资源地址" />
       <el-table-column prop="RESOURCESNUMBER" label="资源数量" />
       <el-table-column prop="LINKMAN" label="联系人" />
       <el-table-column prop="LINKPHONE" label="电话" />
-
+      <el-table-column label="操作" width="100px">
+        <template slot-scope="{row}">
+          <el-button type="text" size="mini" @click="getInfo(row)">查看</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <div class="page-btn-group">
       <div/>
@@ -18,99 +20,44 @@
     </div>
 
     <el-dialog :visible.sync="dialogzhuangjiaShow" title="预案资源" width="600px" @close="closeDialog('ruleForm')">
-      <el-form ref="form" :model="zhuangjiafrom" label-width="110px" style="width: 500px;">
-
+      <el-form ref="form" :rules="rules" :model="zhuangjiafrom" label-width="110px" style="width: 500px;">
         <el-form-item label="资源类型" prop="RESOURCETYPES">
-          <el-input v-model="zhuangjiafrom.RESOURCETYPES" placeholder="资源类型..." />
+          <el-input v-model="zhuangjiafrom.RESOURCETYPES" disabled placeholder="资源类型..." />
         </el-form-item>
         <el-form-item label="资源名称" prop="RESOURCENAME">
-          <el-input v-model="zhuangjiafrom.RESOURCENAME" placeholder="资源名称..." />
-
+          <el-input v-model="zhuangjiafrom.RESOURCENAME" disabled placeholder="资源名称..." />
         </el-form-item>
         <el-form-item label="资源地址" prop="RESOURCEADDRESS">
-          <el-input v-model="zhuangjiafrom.RESOURCEADDRESS" placeholder="资源地址..." />
+          <el-input v-model="zhuangjiafrom.RESOURCEADDRESS" disabled placeholder="资源地址..." />
         </el-form-item>
-
         <el-form-item label="资源数量" prop="RESOURCESNUMBER">
-          <el-input v-model="zhuangjiafrom.RESOURCESNUMBER" placeholder="资源数量..." />
+          <el-input v-model="zhuangjiafrom.RESOURCESNUMBER" disabled placeholder="资源数量..." />
         </el-form-item>
-
         <el-form-item label="联系人" prop="LINKMAN">
-          <el-input v-model="zhuangjiafrom.LINKMAN" placeholder="联系人..." />
+          <el-input v-model="zhuangjiafrom.LINKMAN" disabled placeholder="联系人..." />
         </el-form-item>
-
         <el-form-item label="联系电话" prop="LINKPHONE">
-          <el-input v-model="zhuangjiafrom.LINKPHONE" placeholder="联系电话..." />
+          <el-input v-model="zhuangjiafrom.LINKPHONE" disabled placeholder="联系电话..." />
         </el-form-item>
-
         <el-form-item label="资源描述" prop="RESOURCEDES">
-          <el-input v-model="zhuangjiafrom.RESOURCEDES" placeholder="资源描述..." />
+          <el-input v-model="zhuangjiafrom.RESOURCEDES" disabled placeholder="资源描述..." />
         </el-form-item>
-
         <el-form-item label="备注" prop="BZ">
-          <el-input v-model="zhuangjiafrom.BZ" placeholder="备注..." />
+          <el-input v-model="zhuangjiafrom.BZ" disabled placeholder="备注..." />
+        </el-form-item>
+        <el-form-item :key="zhuangjiafrom.LON" label="经度" prop="LON">
+          <el-input v-model="zhuangjiafrom.LON" placeholder="请输入内容" disabled />
+        </el-form-item>
+        <el-form-item :key="zhuangjiafrom.LAT" label="纬度" prop="LAT">
+          <el-input v-model="zhuangjiafrom.LAT" placeholder="请输入内容" disabled style="width: 100%"/>
         </el-form-item>
-        <el-row :gutter="32">
-          <el-col :span="16">
-            <el-form-item :key="zhuangjiafrom.LON" label="经度" prop="LON">
-              <el-input v-model="zhuangjiafrom.LON" placeholder="请输入内容" disabled @focus="handleMap" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item :key="zhuangjiafrom.LAT" label="纬度" prop="LAT">
-              <div style="display: flex">
-                <el-input v-model="zhuangjiafrom.LAT" placeholder="请输入内容" disabled style="width: 100%" @focus="handleMap"/>
-                <el-button style="margin-left:10px" @click="handleMap">
-                  <span class="svg-container">
-                    <svg-icon icon-class="international" />
-                  </span>
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogzhuangjiaShow = false">取 消</el-button>
         <el-button type="primary" @click="confirm">确 定</el-button>
       </div>
     </el-dialog>
-
-    <!-- 坐标选择 -->
-    <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
-      <baidu-map
-        v-ISLOADing="ISLOADingMap"
-        :zoom="zoom"
-        :scroll-wheel-zoom="true"
-        :style="{height: clientHeight+'px'}"
-        @click="getClickInfo"
-        @ready="handler">
-        <bm-view style="width: 100%; height:100%; flex: 1" />
-        <bm-control ref="control" :offset="{width: 10, height: 10}" anchor="BMAP_ANCHOR_TOP_LEFT">
-          <div class="map-flex">
-
-            <div class="map-lable">关键词：</div>
-            <div style="flex:1;">
-              <el-autocomplete v-model="TYPEKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细设备类型" style="width:100%" @select="handleSelect" />
-            </div>
-            <!--            <el-input v-model="TYPEKeyword" style="width: 200px" placeholder="请输入内容" />-->
-            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
-          </div>
-        </bm-control>
-        <!--        <bm-local-search :keyword="TYPEKeyword" :auto-viewport="true"/>-->
-      </baidu-map>
-      <div slot="footer" class="dialog-footer">
-        <span>经度：</span>
-        <el-input v-model="LON" style="width: 200px" placeholder="请输入内容" disabled />
-        <span>纬度：</span>
-        <el-input v-model="LAT" style="width: 200px" placeholder="请输入内容" disabled />
-        <el-button @click="dialogFormMap = false">取 消</el-button>
-        <el-button type="primary" @click="setPosition">确 定</el-button>
-      </div>
-    </el-dialog>
-
   </div>
-
 </template>
 <script>
 import { requestFN } from '@/utils/request'
@@ -127,6 +74,23 @@ export default {
   },
   data() {
     return {
+      rules: {
+        RESOURCETYPES: [
+          { required: true, message: '资源类型不能为空', trigger: 'blur' }],
+        RESOURCENAME: [
+          { required: true, message: '资源名称不能为空', trigger: 'blur' }],
+        RESOURCEADDRESS: [
+          { required: true, message: '资源地址不能为空', trigger: 'blur' }],
+        RESOURCESNUMBER: [
+          { required: true, message: '资源数量不能为空', trigger: 'blur' }],
+        LINKMAN: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }],
+        LINKPHONE: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }],
+        RESOURCEDES: [
+          { required: true, message: '资源描述不能为空', trigger: 'blur' }]
+
+      },
       // 地图相关
       CORPINFO_ID: this.$parent.CORPINFO_ID,
       clientHeight: 600,
@@ -305,21 +269,27 @@ export default {
       })
     },
     confirm() {
-      this.zhuangjiafrom.FIRERESERVEPLAN_ID = this.planid
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.zhuangjiafrom.FIRERESERVEPLAN_ID = this.planid
 
-      this.listISLOADing = true
-      requestFN(
-        '/plan/planningresources/save', this.zhuangjiafrom
-      ).then((data) => {
-        this.$message({
-          message: '添加成功',
-          type: 'success'
-        })
-        this.dialogzhuangjiaShow = false
-        this.listISLOADing = false
-        this.getDataList()
-      }).catch((e) => {
-        this.listISLOADing = false
+          this.listISLOADing = true
+          requestFN(
+            '/plan/planningresources/save', this.zhuangjiafrom
+          ).then((data) => {
+            this.$message({
+              message: '添加成功',
+              type: 'success'
+            })
+            this.dialogzhuangjiaShow = false
+            this.listISLOADing = false
+            this.getDataList()
+          }).catch((e) => {
+            this.listISLOADing = false
+          })
+        } else {
+          return false
+        }
       })
     },
     yjzjadd() {
@@ -361,12 +331,26 @@ export default {
         this.listISLOADing = false
         this.yjzjvarList = data.varList
         this.yjzhuangjiatotal = data.page.totalResult
+      }).catch((e) => {
+        this.listISLOADing = false
       })
-        .catch((e) => {
-          this.listISLOADing = false
-        })
+    },
+    getInfo(row) {
+      this.dialogzhuangjiaShow = true
+      this.zhuangjiafrom = {
+        PLANNINGRESOURCES_ID: row.PLANNINGRESOURCES_ID,
+        RESOURCETYPES: row.RESOURCETYPES,
+        RESOURCENAME: row.RESOURCENAME,
+        RESOURCEADDRESS: row.RESOURCEADDRESS,
+        RESOURCESNUMBER: row.RESOURCESNUMBER,
+        LINKMAN: row.LINKMAN,
+        LINKPHONE: row.LINKPHONE,
+        RESOURCEDES: row.RESOURCEDES,
+        BZ: row.BZ,
+        LAT: row.LAT,
+        LON: row.LON
+      }
     }
-
   }
 }
 </script>
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/check-yvanziyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/check-yvanziyuan.vue
index 4a4d27e..e9d311c 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/check-yvanziyuan.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/check-yvanziyuan.vue
@@ -8,6 +8,11 @@
       <el-table-column prop="RESOURCESNUMBER" label="资源数量" />
       <el-table-column prop="LINKMAN" label="联系人" />
       <el-table-column prop="LINKPHONE" label="电话" />
+      <el-table-column label="操作" width="100px">
+        <template slot-scope="{row}">
+          <el-button type="text" size="mini" @click="getInfo(row)">查看</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <div class="page-btn-group">
       <div/>
@@ -16,98 +21,43 @@
 
     <el-dialog :visible.sync="dialogzhuangjiaShow" title="预案资源" width="600px" @close="closeDialog('ruleForm')">
       <el-form ref="form" :rules="rules" :model="zhuangjiafrom" label-width="110px" style="width: 500px;">
-
         <el-form-item label="资源类型" prop="RESOURCETYPES">
-          <el-input v-model="zhuangjiafrom.RESOURCETYPES" placeholder="资源类型..." />
+          <el-input v-model="zhuangjiafrom.RESOURCETYPES" disabled placeholder="资源类型..." />
         </el-form-item>
         <el-form-item label="资源名称" prop="RESOURCENAME">
-          <el-input v-model="zhuangjiafrom.RESOURCENAME" placeholder="资源名称..." />
-
+          <el-input v-model="zhuangjiafrom.RESOURCENAME" disabled placeholder="资源名称..." />
         </el-form-item>
         <el-form-item label="资源地址" prop="RESOURCEADDRESS">
-          <el-input v-model="zhuangjiafrom.RESOURCEADDRESS" placeholder="资源地址..." />
+          <el-input v-model="zhuangjiafrom.RESOURCEADDRESS" disabled placeholder="资源地址..." />
         </el-form-item>
-
         <el-form-item label="资源数量" prop="RESOURCESNUMBER">
-          <el-input v-model="zhuangjiafrom.RESOURCESNUMBER" placeholder="资源数量..." />
+          <el-input v-model="zhuangjiafrom.RESOURCESNUMBER" disabled placeholder="资源数量..." />
         </el-form-item>
-
         <el-form-item label="联系人" prop="LINKMAN">
-          <el-input v-model="zhuangjiafrom.LINKMAN" placeholder="联系人..." />
+          <el-input v-model="zhuangjiafrom.LINKMAN" disabled placeholder="联系人..." />
         </el-form-item>
-
         <el-form-item label="联系电话" prop="LINKPHONE">
-          <el-input v-model="zhuangjiafrom.LINKPHONE" placeholder="联系电话..." />
+          <el-input v-model="zhuangjiafrom.LINKPHONE" disabled placeholder="联系电话..." />
         </el-form-item>
-
         <el-form-item label="资源描述" prop="RESOURCEDES">
-          <el-input v-model="zhuangjiafrom.RESOURCEDES" placeholder="资源描述..." />
+          <el-input v-model="zhuangjiafrom.RESOURCEDES" disabled placeholder="资源描述..." />
         </el-form-item>
-
         <el-form-item label="备注" prop="BZ">
-          <el-input v-model="zhuangjiafrom.BZ" placeholder="备注..." />
+          <el-input v-model="zhuangjiafrom.BZ" disabled placeholder="备注..." />
+        </el-form-item>
+        <el-form-item :key="zhuangjiafrom.LON" label="经度" prop="LON">
+          <el-input v-model="zhuangjiafrom.LON" placeholder="请输入内容" disabled />
+        </el-form-item>
+        <el-form-item :key="zhuangjiafrom.LAT" label="纬度" prop="LAT">
+          <el-input v-model="zhuangjiafrom.LAT" placeholder="请输入内容" disabled style="width: 100%"/>
         </el-form-item>
-        <el-row :gutter="32">
-          <el-col :span="16">
-            <el-form-item :key="zhuangjiafrom.LON" label="经度" prop="LON">
-              <el-input v-model="zhuangjiafrom.LON" placeholder="请输入内容" disabled @focus="handleMap" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item :key="zhuangjiafrom.LAT" label="纬度" prop="LAT">
-              <div style="display: flex">
-                <el-input v-model="zhuangjiafrom.LAT" placeholder="请输入内容" disabled style="width: 100%" @focus="handleMap"/>
-                <el-button style="margin-left:10px" @click="handleMap">
-                  <span class="svg-container">
-                    <svg-icon icon-class="international" />
-                  </span>
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogzhuangjiaShow = false">取 消</el-button>
         <el-button type="primary" @click="confirm">确 定</el-button>
       </div>
     </el-dialog>
-
-    <!-- 坐标选择 -->
-    <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
-      <baidu-map
-        v-ISLOADing="ISLOADingMap"
-        :zoom="zoom"
-        :scroll-wheel-zoom="true"
-        :style="{height: clientHeight+'px'}"
-        @click="getClickInfo"
-        @ready="handler">
-        <bm-view style="width: 100%; height:100%; flex: 1" />
-        <bm-control ref="control" :offset="{width: 10, height: 10}" anchor="BMAP_ANCHOR_TOP_LEFT">
-          <div class="map-flex">
-
-            <div class="map-lable">关键词：</div>
-            <div style="flex:1;">
-              <el-autocomplete v-model="TYPEKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细设备类型" style="width:100%" @select="handleSelect" />
-            </div>
-            <!--            <el-input v-model="TYPEKeyword" style="width: 200px" placeholder="请输入内容" />-->
-            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
-          </div>
-        </bm-control>
-        <!--        <bm-local-search :keyword="TYPEKeyword" :auto-viewport="true"/>-->
-      </baidu-map>
-      <div slot="footer" class="dialog-footer">
-        <span>经度：</span>
-        <el-input v-model="LON" style="width: 200px" placeholder="请输入内容" disabled />
-        <span>纬度：</span>
-        <el-input v-model="LAT" style="width: 200px" placeholder="请输入内容" disabled />
-        <el-button @click="dialogFormMap = false">取 消</el-button>
-        <el-button type="primary" @click="setPosition">确 定</el-button>
-      </div>
-    </el-dialog>
-
   </div>
-
 </template>
 <script>
 import { requestFN } from '@/utils/request'
@@ -381,12 +331,26 @@ export default {
         this.listISLOADing = false
         this.yjzjvarList = data.varList
         this.yjzhuangjiatotal = data.page.totalResult
+      }).catch((e) => {
+        this.listISLOADing = false
       })
-        .catch((e) => {
-          this.listISLOADing = false
-        })
+    },
+    getInfo(row) {
+      this.dialogzhuangjiaShow = true
+      this.zhuangjiafrom = {
+        PLANNINGRESOURCES_ID: row.PLANNINGRESOURCES_ID,
+        RESOURCETYPES: row.RESOURCETYPES,
+        RESOURCENAME: row.RESOURCENAME,
+        RESOURCEADDRESS: row.RESOURCEADDRESS,
+        RESOURCESNUMBER: row.RESOURCESNUMBER,
+        LINKMAN: row.LINKMAN,
+        LINKPHONE: row.LINKPHONE,
+        RESOURCEDES: row.RESOURCEDES,
+        BZ: row.BZ,
+        LAT: row.LAT,
+        LON: row.LON
+      }
     }
-
   }
 }
 </script>
diff --git a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziyuan.vue b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziyuan.vue
index 1077493..048380f 100644
--- a/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziyuan.vue
+++ b/src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanziyuan.vue
@@ -59,25 +59,19 @@
         <el-form-item label="备注" prop="BZ">
           <el-input v-model="zhuangjiafrom.BZ" placeholder="备注..." />
         </el-form-item>
-        <el-row :gutter="32">
-          <el-col :span="16">
-            <el-form-item :key="zhuangjiafrom.LON" label="经度" prop="LON">
-              <el-input v-model="zhuangjiafrom.LON" placeholder="请输入内容" disabled @focus="handleMap" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item :key="zhuangjiafrom.LAT" label="纬度" prop="LAT">
-              <div style="display: flex">
-                <el-input v-model="zhuangjiafrom.LAT" placeholder="请输入内容" disabled style="width: 100%" @focus="handleMap"/>
-                <el-button style="margin-left:10px" @click="handleMap">
-                  <span class="svg-container">
-                    <svg-icon icon-class="international" />
-                  </span>
-                </el-button>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item :key="zhuangjiafrom.LON" label="经度" prop="LON">
+          <el-input v-model="zhuangjiafrom.LON" placeholder="请输入内容" disabled @focus="handleMap" />
+        </el-form-item>
+        <el-form-item :key="zhuangjiafrom.LAT" label="纬度" prop="LAT">
+          <div style="display: flex">
+            <el-input v-model="zhuangjiafrom.LAT" placeholder="请输入内容" disabled style="width: 100%" @focus="handleMap"/>
+            <el-button style="margin-left:10px" @click="handleMap">
+              <span class="svg-container">
+                <svg-icon icon-class="international" />
+              </span>
+            </el-button>
+          </div>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogzhuangjiaShow = false">取 消</el-button>
diff --git a/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue b/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue
index f991f7f..ca2c676 100644
--- a/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue
@@ -22,11 +22,11 @@
       <el-table-column :show-overflow-tooltip="true" prop="DUTY_RECORD" label="值班记录" />
       <el-table-column :show-overflow-tooltip="true" prop="HANDLING_SITUATION" label="处理情况" />
       <el-table-column :show-overflow-tooltip="true" prop="HANDOVER_ITEMS" label="交接事项" />
-      <el-table-column label="操作" align="center" width="220">
+      <el-table-column label="操作" align="center" width="150">
         <template slot-scope="{ row }">
-          <el-button type="text" icon="el-icon-download" size="mini" @click="confirmExport(row.ID)">数据导出</el-button>
+          <el-button v-if="false" type="text" icon="el-icon-download" size="mini" @click="confirmExport(row.ID)">数据导出</el-button>
           <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
-          <el-button type="text" style="color:red;" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.UNIT)">删除</el-button>
+          <el-button v-if="false" type="text" style="color:red;" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.UNIT)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue b/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
index ccb84b7..f212af4 100644
--- a/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/list.vue
@@ -2,24 +2,11 @@
   <div class="app-container">
     <div class="filter-container">
       <el-form inline>
-
-        <el-form-item prop="ORGAN_ID" style="width: 250px;">
-          <Treeselect
-            :options="DepartmentData"
-            v-model="ORGAN_ID"
-
-            placeholder="请选择单位"
-            no-options-text="暂无数据"
-            no-children-text="暂无数据"
-            @input="handleDepartmentChange"
-          />
-        </el-form-item>
-
         <el-form-item label="月份：" prop="monthvalue">
           <el-date-picker
             v-model="monthvalue"
             type="month"
-            format="yyyy-MM"
+            value-format="yyyy-MM"
             placeholder="选择月"/>
         </el-form-item>
         <el-form-item>
@@ -277,7 +264,7 @@
     </el-dialog>
 
     <el-dialog :visible.sync="exceltempFormAdd" title="模版导入" width="300px">
-      <spa>{{ '注意：导入本月数据后会覆盖之前的手动编排的数据，请注意!' }}</spa>
+      <spa>{{ '注意：导入本月数据后会覆盖之前的手动编排的数据，请注意!，导入成功后请重新搜索' }}</spa>
       <el-form ref="formPeople" label-width="100px" >
         <el-form-item label="请选择模版">
           <el-upload
@@ -288,9 +275,7 @@
             :limit="1"
             action="#" >
             <el-button size="small" type="primary">点击上传</el-button>
-
           </el-upload>
-
         </el-form-item>
       </el-form>
 
@@ -569,13 +554,17 @@ export default {
           })
           this.exceltempFormAdd = false
           this.$refs.upload.clearFiles()
-          this.getList()
         })
       }
     },
     upload(fun) {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       const formData = new FormData()
-
       for (let i = 0; i < this.FFILE.length; i++) {
         if (this.FFILE[i].raw) {
           formData.append('FFILE', this.FFILE[i].raw)
@@ -587,8 +576,11 @@ export default {
         '/workingSchedule/upload',
         formData
       ).then((data) => {
+        loading.close()
         fun()
       }).catch((e) => {
+        console.log(e)
+        loading.close()
       })
     },
     //* ****************Excel功能********************
@@ -762,14 +754,12 @@ export default {
         }
       ).then((data) => {
         this.varList = data.varList
+      }).catch((e) => {
+        console.log(e)
       })
-        .catch((e) => {
-
-        })
     },
 
     getQuery() {
-      // this.$refs.multipleTable.clearSelection()
       this.getList()
     }
   }
diff --git a/src/views/emergency/drill/basic/components/list.vue b/src/views/emergency/drill/basic/components/list.vue
index 6e59453..d128585 100644
--- a/src/views/emergency/drill/basic/components/list.vue
+++ b/src/views/emergency/drill/basic/components/list.vue
@@ -4,11 +4,11 @@
       <el-row>
         <el-col :span="4">
           <el-form-item label="应急预案名称">
-            <el-input v-model="KEYWORDS" placeholder="搜索应急预案名称" clearable @clear="getQuery" />
+            <el-input v-model="KEYWORDS" placeholder="请输入" clearable @clear="getQuery" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="应急预案名称">
+          <el-form-item label="演练时间">
             <el-date-picker
               v-model="dates"
               :picker-options="pickerOptions"
@@ -67,26 +67,20 @@
     </el-table>
     <div class="page-btn-group">
       <div>
-        <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
-        <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+        <el-button type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
 
-    <!--    <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='edit'?'修改':'新增'" width="95%" >-->
-    <!--      <EditDrill/>-->
-    <!--    </el-dialog>-->
   </div>
 </template>
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
-// import editDrill from '@/views/emergency/drill/editDrill'
 export default {
-  components: { Pagination
-    // , 'EditDrill': editDrill
-  },
+  components: { Pagination },
   directives: { waves },
   data() {
     return {
diff --git a/src/views/emergency/plan/components/info.vue b/src/views/emergency/plan/components/info.vue
index 61e9ca2..414c587 100644
--- a/src/views/emergency/plan/components/info.vue
+++ b/src/views/emergency/plan/components/info.vue
@@ -57,7 +57,7 @@
         <tr v-if="pd.PLAN_ATTACH_IDS">
           <td class="tbg">相关附件</td>
           <td colspan="2">{{ pd.PLAN_ATTACH_NAME }}</td>
-          <td><el-button type="primary" @click="downloadFile(pd.EMERGENCYPLAN_ID)">下载</el-button></td>
+          <td><el-button type="primary" @click="downloadFile(pd)">下载</el-button></td>
         </tr>
       </table>
     </div>
@@ -112,14 +112,14 @@ export default {
 
       })
     },
-    downloadFile(EMERGENCYPLAN_ID) {
+    downloadFile(row) {
       this.$confirm('确定要下载此文件吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.listLoading = false
-        window.location.href = config.httpurl + 'emergencyplan/download?EMERGENCYPLAN_ID=' + EMERGENCYPLAN_ID
+        window.open(config.fileUrl + row.PLAN_ATTACH_IDS)
       }).catch(() => {
         this.listLoading = false
       })