Merge branch 'dev' into dongming

src/views/modules/shequzhili/videomonitoring/index.vue

@@ -22,16 +22,16 @@
     <div class="m-table">
       <div class="resi-row-btn">
         <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
-        <el-button style="" class="diy-button--add" size="small" @click="downloadTem">下载模板</el-button>
+<!--        <el-button style="" class="diy-button&#45;&#45;add" size="small" @click="downloadTem">下载模板</el-button>-->
 <!--        <el-button style="" class="diy-button--add" size="small" @click="exportData">导入</el-button>-->
-        <el-button class="diy-button--white" size="small">
+<!--        <el-button class="diy-button&#45;&#45;white" size="small">-->
-          <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"
+<!--          <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"-->
-                     :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
+<!--                     :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"-->
-                     :on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
+<!--                     :on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"-->
-                     :http-request="uploadHttpRequest">
+<!--                     :http-request="uploadHttpRequest">-->
-            导入
+<!--            导入-->
-          </el-upload>
+<!--          </el-upload>-->
-        </el-button>
+<!--        </el-button>-->
 
       </div>
       <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">