diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue index 29de49f1..294d63c3 100644 --- a/ruoyi-ui/src/App.vue +++ b/ruoyi-ui/src/App.vue @@ -26,3 +26,31 @@ export default { display: none; } + \ No newline at end of file diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/layout/components/Sidebar/Item.vue index be3285df..6ec1daf8 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Item.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Item.vue @@ -26,6 +26,20 @@ export default { } else { vnodes.push({(title)}) } + let name=context?.parent?.item?.name; + if(['Todo','Task'].includes(name)){ + vnodes.push(h('span',{ + class:"todo_num_tips tips_"+name, + on:{ + click:function(e){ + context?.parent.$bus.$emit("todo_tips_click",name) + e.preventDefault(); + e.stopPropagation(); + } + } + },1 + )) + } } return vnodes } diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index fea78779..464b366b 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -49,8 +49,8 @@ filters(Vue); BorderBox(Vue) Vue.prototype.$api=Api; - -// 全局方法挂载 +Vue.prototype.$bus=new Vue(); +// 全局方法挂 Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey Vue.prototype.parseTime = parseTime diff --git a/ruoyi-ui/src/styles/index.scss b/ruoyi-ui/src/styles/index.scss index 8b7102a9..e7250dbf 100644 --- a/ruoyi-ui/src/styles/index.scss +++ b/ruoyi-ui/src/styles/index.scss @@ -140,3 +140,4 @@ input, textarea{ line-height: 1.2; } + diff --git a/ruoyi-ui/src/views/project/surProject/myIndex.vue b/ruoyi-ui/src/views/project/surProject/myIndex.vue index 51858aca..2047b327 100644 --- a/ruoyi-ui/src/views/project/surProject/myIndex.vue +++ b/ruoyi-ui/src/views/project/surProject/myIndex.vue @@ -150,6 +150,8 @@ icon="el-icon-s-check">今日出勤 项目成本产值管理 + + @@ -198,9 +200,24 @@ export default { mounted() { this.loadData(); + this.$bus.$on("todo_tips_click",name=>{ + console.log("----todo点击----",name) + }); + //this.test(); }, methods: { + test(){ + setInterval(() => { + let els=document.querySelectorAll(".todo_num_tips"); + if(els.length>0){ + els.forEach(el=>{ + el.innerHTML=Math.random().toString().substring(4,6); + el.style.display="inline"; + }); + } + }, 1000); + }, doPrjCostOutput(){ this.$refs.costOutput.show(this.prj); }, diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 8e9aa86a..f348640d 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -41,8 +41,8 @@ module.exports = { } }, '/jhapi':{ - //target: `http://62.234.3.186/jhapi/`, - target: `http://127.0.0.1:8090/jhapi/`, + target: `http://62.234.3.186/jhapi/`, + //target: `http://127.0.0.1:8090/jhapi/`, changeOrigin: true, pathRewrite: { '^/jhapi':'/'