src/views/system/dict/data.vue

@@ -71,12 +71,12 @@
             @click="handleExport"
             v-hasPermi="['system:dict:export']"
           >导出</el-button>
-          <el-button
+<!--          <el-button
             plain
             icon="el-icon-close"
             size="mini"
             @click="handleClose"
-          >关闭</el-button>
+          >关闭</el-button>-->
         </div>
         <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />

src/views/tool/downloadFileDetail.vue

@@ -37,6 +37,10 @@
         </el-tab-pane><!--el-tab-pane-->
       </el-tabs><!--el-tabs-->
     </div><!--fl 左侧页签-->
+
+    <el-dialog :title="viewDialogTitle" :visible.sync="viewDialogOpen" fullscreen width="500px" append-to-body :before-close="handleBeforeClose">
+      <i-frame :src="previewUrl" v-if="viewDialogOpen"/>
+    </el-dialog>
   </div><!--fbox1 左右分栏-->
 </template>
 
@@ -115,6 +119,7 @@
         this.getDocList()
       },
       handlePriew(row){
+        console.info("1111111==============")
         this.previewUrl = process.env.VUE_APP_TOOL_TECH_FILE_VIEW_API + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(process.env.VUE_APP_BASE_API + row.docUrl));
         this.viewDialogTitle = '文档在线预览'
         this.viewDialogOpen = true;
@@ -297,6 +302,9 @@
         this.$set(parentItem.replyContentSon, repIndex, '');
         this.$set(parentItem.showReplyFormSon, repIndex, false);
       },
+      handleBeforeClose() {
+        this.viewDialogOpen = false
+      }
     }
   }
 </script>

src/views/tool/index.vue

@@ -29,7 +29,7 @@
                   style="width: 240px"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_normal_disable"
+                    v-for="dict in dict.type.tool_status"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -107,7 +107,11 @@
               <dict-tag :options="dict.type.tool_status" :value="scope.row.status"/>
             </template>
           </el-table-column>
-
+          <el-table-column label="审核状态" align="center" key="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tool_status" :value="scope.row.recordStatus"/>
+            </template>
+          </el-table-column>
           <el-table-column label="关联工具" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="handleRelationTool(scope.row.relationToolList)">