diff --git a/index.html b/index.html
index f6bd535..3713627 100644
--- a/index.html
+++ b/index.html
@@ -11,7 +11,7 @@
- 江西心诚药业有限公司
+ 工业互联网平台
diff --git a/src/api/yxkAPI.js b/src/api/yxkAPI.js
index b8c9b36..65e9623 100644
--- a/src/api/yxkAPI.js
+++ b/src/api/yxkAPI.js
@@ -1,24 +1,27 @@
-/**
- * 工序报工接口
- */
-import base from "./base"; // 导入接口域名列表
-import axiosFormData from "@/request";
-import axiosJson from "@/request/index_new";
-const yxkAPI = {
- yxkPostFormData(url, param) {
- return axiosFormData.post(`${base.url}${url}`, param);
- },
- yxkPost(url, param) {
- return axiosJson.post(`${base.url}${url}`, param);
- },
- yxkGet(url, param) {
- return axiosJson.get(`${base.url}${url}`, { params: param });
- },
- yxkExport(url, param) {
- return axiosJson.get(`${base.url}${url}`, {
- params: param,
- responseType: "blob"
- });
- }
-};
-export default yxkAPI;
+/**
+ * 工序报工接口
+ */
+import base from "./base"; // 导入接口域名列表
+import axiosFormData from "@/request";
+import axiosJson from "@/request/index_new";
+const yxkAPI = {
+ yxkPostFormData(url, param) {
+ return axiosFormData.post(`${base.url}${url}`, param);
+ },
+ yxkPost(url, param) {
+ return axiosJson.post(`${base.url}${url}`, param);
+ },
+ yxkGet(url, param) {
+ return axiosJson.get(`${base.url}${url}`, { params: param });
+ },
+ yxkExport(url, param) {
+ return axiosJson.get(`${base.url}${url}`, {
+ params: param,
+ responseType: "blob"
+ });
+ },
+ autoGenerate(param) {
+ return axiosJson.get(`${base.url}/apis/deviceOperation/autoGenerate`, { params: param });
+ },
+};
+export default yxkAPI;
diff --git a/src/components/Layout/index.vue b/src/components/Layout/index.vue
index 78a95c2..0f9d28c 100644
--- a/src/components/Layout/index.vue
+++ b/src/components/Layout/index.vue
@@ -111,6 +111,17 @@ export default {
imgShow: 0
};
},
+ async created() {
+ // 确保 companyInfo 已经加载
+ await this.ensureCompanyInfo();
+ const info = this.$store.state.common.companyInfo;
+ if (info && info.name) {
+ document.title = info.name;
+ }
+ if (info && info.favicon) {
+ this.setFavicon(info.logoUrl);
+ }
+ },
computed: {
//重要。相同路由页面跳转时，query不同，可以刷新页面
key() {
@@ -151,8 +162,21 @@ export default {
},
methods: {
...mapActions({
- getLogoUrl: "common/getLogoUrl"
+ getLogoUrl: "common/getLogoUrl",
}),
+ async ensureCompanyInfo() {
+ if (!this.$store.state.common.companyInfo ||
+ !this.$store.state.common.companyInfo.name) {
+ for (let i = 0; i < 10; i++) {
+ await new Promise(resolve => setTimeout(resolve, 100));
+ if (this.$store.state.common.companyInfo &&
+ this.$store.state.common.companyInfo.name) {
+
+ break;
+ }
+ }
+ }
+ },
// 切换侧边在线客服菜单
changeMenu() {
this.isShow = true;
@@ -206,7 +230,16 @@ export default {
},
notreadnum(newv) {
this.thisNotRedNum = newv;
+ },
+ '$store.state.common.companyInfo': {
+ handler(newVal) {
+ if (newVal && newVal.name) {
+ document.title = newVal.name;
+ }
+ },
+ immediate: true
}
+
}
};
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index b7babd1..1d6f209 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -55,6 +55,9 @@ export default {
companyInfo: state => state.common.companyInfo
}),
},
+ created() {
+ document.title = '登录'
+ },
methods: {
...mapActions({
login: "auth/loginByUser",
diff --git a/src/pages/nygl/nhfx/index.vue b/src/pages/nygl/nhfx/index.vue
index 89842bf..04dfa14 100644
--- a/src/pages/nygl/nhfx/index.vue
+++ b/src/pages/nygl/nhfx/index.vue
@@ -1,746 +1,815 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 导入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+