Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-front

src/views/basicInformation/components/configurationRelationship/processAndMaterial.vue

@@ -159,14 +159,6 @@
                                 v-privilege="activeMenu + 'QUERY'"
                                 @click="getTableData(1)"
                             >查询</el-button>
-                            <el-button
-                                class="button"
-                                type="primary"
-                                size="mini"
-                                icon="el-icon-refresh"
-                                v-privilege="activeMenu + 'QUERY'"
-                                @click="tableDataCancel();"
-                            >重置</el-button>
                             <el-button
                                 size="mini"
                                 :icon="filterForm.show ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"

src/views/energyOperationSupport/components/accidentPlan/APDocument.vue

@@ -592,6 +592,7 @@ export default {
                                 let fileData = new FormData();
                                 fileData.append('file', that.dialog.editorBox.form.file);
                                 fileData.append('path', that.dialog.editorBox.form.data.parentcode);
+                                console.log(fileData)
                                 that.axios.post('pass/ems/v1/multipart/upload/', fileData, {
                                     headers: {
                                         'Content-Type': 'multipart/form-data'

src/views/energyOperationSupport/router/index.js

@@ -42,8 +42,9 @@ import punishmentQuery from '@/views/energyOperationSupport/components/rectifica
 import tubeCompile from '@/views/energyOperationSupport/components/rectificationPunishmentTube/tubeCompile.vue'
 // 能源介质管网变更查询
 import tubeQuery from '@/views/energyOperationSupport/components/rectificationPunishmentTube/tubeQuery.vue'
-// 分类信息维护
-import securitys from '@/views/energyOperationSupport/components/securitys/Securitys.vue'
+// 安全文件管理
+import SecurityFile from '@/views/energyOperationSupport/components/securitys/SecurityFile.vue'
+
 Vue.use(Router)
 
 export default new Router({
@@ -151,9 +152,9 @@ export default new Router({
                 component: tubeQuery
             },
             {
-                path: 'securitys',
-                name: 'securitys',
-                component: securitys
+                path: 'SecurityFile',
+                name: 'SecurityFile',
+                component: SecurityFile
             }
         ]
     }]