Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/main.js

@@ -3,7 +3,7 @@ import ElementPlus from "element-plus";
 import "element-plus/dist/index.css";
 import "element-plus/theme-chalk/display.css";
 import scui from "./scui";
-import xui from "./xui";
+import xtui from "./xtui";
 import i18n from "./locales";
 import router from "./router";
 import store from "./store";
@@ -26,7 +26,7 @@ app.use(ElementPlus);
 app.use(Cesium);
 app.use(i18n);
 app.use(scui);
-app.use(xui);
+app.use(xtui);
 app.use(preventReClick);
 app.use(Print);
 app.use(Xlsx);

src/views/wpm/mlog_dept10.vue

@@ -399,7 +399,7 @@
 													:loading="mlogHandleLoading"
 													>撤回
 												</el-button>
-												<el-button
+												<!-- <el-button
 													link
 													type="success"
 													@click="
@@ -407,7 +407,7 @@
 													"
 												>
 													日志记录
-												</el-button>
+												</el-button> -->
 											</template>
 										</el-table-column>
 									</scTable>

src/views/wpm/mlog_dept6_detail.vue

@@ -223,13 +223,13 @@
 										:loading="mlogHandleLoading"
 										>撤回
 									</el-button>
-									<el-button
+									<!-- <el-button
 										link
 										type="success"
 										@click="table_show(scope.row)"
 									>
 										日志记录
-									</el-button>
+									</el-button> -->
 								</template>
 							</el-table-column>
 						</scTable>

src/views/wpm/mlog_dept7.vue

@@ -369,7 +369,7 @@
 													:loading="mlogHandleLoading"
 													>撤回
 												</el-button>
-												<el-button
+												<!-- <el-button
 													link
 													type="success"
 													@click="
@@ -377,7 +377,7 @@
 													"
 												>
 													日志记录
-												</el-button>
+												</el-button> -->
 											</template>
 										</el-table-column>
 									</scTable>