diff --git a/public/favicon.ico b/public/favicon.ico index 68e3d2ee..e665c867 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon1.ico b/public/favicon1.ico new file mode 100644 index 00000000..68e3d2ee Binary files /dev/null and b/public/favicon1.ico differ diff --git a/public/img/gz_logo.png b/public/img/gz_logo.png index e665c867..cb0296f6 100644 Binary files a/public/img/gz_logo.png and b/public/img/gz_logo.png differ diff --git a/src/api/model/pm.js b/src/api/model/pm.js index 1e07a0cf..26085002 100644 --- a/src/api/model/pm.js +++ b/src/api/model/pm.js @@ -70,9 +70,9 @@ export default { }, submitSameDay:{ name: "提交同一天的该部门下的所有兄弟小任务", - req: async function(data){ + req: async function(id,data){ return await http.post( - `${config.API_URL}/pm/mtask/submit_related_same_day/`, + `${config.API_URL}/pm/mtask/${id}/submit_related_same_day/`, data ); } diff --git a/src/config/route.js b/src/config/route.js index 3bad0a4d..2d5436ac 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1854,7 +1854,7 @@ const routes = [ "name": "bigScreenP", "meta": { "title": "数据看板", - "icon": "el-icon-position", + "icon": "el-icon-platform", "perms": ["bigScreenP"], "fullpage": true, }, @@ -1866,7 +1866,7 @@ const routes = [ "name": "bigScreenP", "meta": { "title": "车间看板", - "icon": "el-icon-position", + "icon": "el-icon-trend-charts", "perms": ["bigScreenP"], "fullpage": true, }, @@ -1878,7 +1878,7 @@ const routes = [ "name": "bigScreenP", "meta": { "title": "统计分析", - "icon": "el-icon-position", + "icon": "el-icon-histogram", "perms": ["bigScreenP"], "fullpage": true, }, diff --git a/src/style/app.scss b/src/style/app.scss index 0268754b..06ae5118 100644 --- a/src/style/app.scss +++ b/src/style/app.scss @@ -28,7 +28,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo .adminui-header-left {display: flex;align-items: center;padding-left:4px;} .adminui-header-right {display: flex;align-items: center;} .adminui-header .logo-bar {font-size: 20px;font-weight: bold;display: flex;align-items: center;} -.adminui-header .logo-bar .logo {margin-right: 10px;height: 52px;background: #ffffff;display: inline-block;padding: 4px 10px;border-radius: 5px;margin:auto} +.adminui-header .logo-bar .logo {margin-right: 10px;height: 52px;display: inline-block;padding: 4px;border-radius: 5px;margin:auto} .adminui-header .nav {display: flex;height: 100%;margin-left: 40px;} .adminui-header .nav li {padding:0 10px;margin: 0 10px 0 0;font-size: 14px;color: rgba(255, 255, 255, 0.6);list-style: none;height: 100%;display: flex;align-items: center;cursor: pointer;} .adminui-header .nav li i {margin-right: 5px;} diff --git a/src/views/wpm/worktaskFlog.vue b/src/views/wpm/worktaskFlog.vue index ae4d8861..c9707f46 100644 --- a/src/views/wpm/worktaskFlog.vue +++ b/src/views/wpm/worktaskFlog.vue @@ -170,6 +170,11 @@ resetQuery() { this.query = {}; }, + submitForm(){ + this.$API.pm.mtask.submitSameDay.req(this.orderObj.id).then(re=>{ + console.log(res) + }) + }, }, };