Merge branch 'master' of http://101.43.194.146:10111/root/supervision-ui

src/views/combatduty/info/index.vue

@@ -13,6 +13,7 @@
           placeholder="请输入文件名称"
           clearable
           size="small"
+          @input="handleQuery"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -40,6 +41,7 @@
           placeholder="请输入上传人"
           clearable
           size="small"
+          @input="handleQuery"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -98,8 +100,8 @@
         />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <!-- <el-button type="primary" icon="el-icon-search" size="btn" @click="handleQuery">搜索</el-button> -->
+        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -138,11 +140,12 @@
       </el-col>
        <el-col :span="1.5">
         <el-button
-        style="width:80px;height:36px"
+        style="width:88px;height:36px"
+        icon="el-icon-upload2"
          size="read"
               type="text"
             @click="upload"
-            >上传文件</el-button>
+            >上传</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -166,6 +169,32 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="80"/>
+      <el-table-column label="" align="center" width="90" >
+          <template slot-scope="scope">
+            <div style="display: flex; flex-warp: warp; margin-top: 10px">
+              <div style="padding-right: 12vh; width: 40px; height: 52px" class="uploadPeople">
+                <!-- 根据后缀名控制图片显示doc还是pdf形式 -->
+                <img v-if="scope.row.parentDirId == '.pdf'" src="../../../images/PDF.png" alt />
+                <img
+                  v-else-if="
+                    scope.row.parentDirId == '.doc' ||
+                    scope.row.parentDirId == '.docx'
+                  "
+                  src="../../../images/doc.png"
+                  alt
+                />
+                <img
+                  v-else-if="
+                    scope.row.parentDirId == '.ppt' ||
+                    scope.row.parentDirId == '.pptx'
+                  "
+                  src="../../../images/ppt.png"
+                  alt
+                />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="文件名称" align="center" prop="fileName" />
       <el-table-column label="阅读量" align="center" prop="readVolume" />
@@ -190,7 +219,8 @@
                 <a target="_blank">阅读</a>
               </span>
             </el-button>
-            <el-button size="read" type="text">
+            <el-button size="btu"
+            type="text">
               <span class="chakan1">
                 <a
                   :href="downurl + scope.row.parentDirName"
@@ -413,7 +443,7 @@
                 ></el-option>
               </el-select>
             </el-form-item> -->
-            <el-form-item style=" margin-top: 30px">
+            <el-form-item style=" margin-top: 10px">
               <FileUpload v-model="moreFile" />
             </el-form-item>
           </el-form>
@@ -747,7 +777,7 @@ export default {
   color: #ffffff;
   width: 50px;
   height: 30px;
-  background-color: #1d96ff;
+  background-color: #13ce66;
   border-radius: 4px;
   font-size: 14px;
   /* background-image: url("../../../images/uploads.png"); */