Home Explore Help
Register Sign In
zhangqi
/
yos_web
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

2022-9-22 16:00

codeMan 2 years ago
parent
b01c40d3c6
commit
826382b084
4 changed files with 5 additions and 7 deletions
Split View Show Diff Stats
  1. 1 1
      src/SManagement/personal_target/components/table.vue
  2. 3 1
      src/SManagement/project_target/components/table.vue
  3. 0 4
      src/router/HDrpManagement.js
  4. 1 1
      yos/index.html

+ 1 - 1
src/SManagement/personal_target/components/table.vue
View File 

@@ -454,7 +454,7 @@
 
         label="操作"
 
         width="120"
 
         :fixed="Object.keys(tableData).length != 0 ? 'right' : ''">
 
-        <template slot-scope="scope">
 
+        <template slot-scope="scope" v-if="scope.row.hrid">
 
             <slot :data="{data:scope.row,year:year}" name="edit"/>
 
             <slot :data="{data:scope.row,year:year}" name="detail"/>
 
         </template>

+ 3 - 1
src/SManagement/project_target/components/table.vue
View File 

@@ -473,7 +473,7 @@
 
         label="操作"
 
         width="120"
 
         :fixed="Object.keys(tableData).length != 0 ? 'right' : ''">
 
-        <template slot-scope="scope">
 
+        <template slot-scope="scope" v-if="scope.row.hrid">
 
             <slot :data="{data:scope.row,year:year}" name="edit"/>
 
             <slot :data="{data:scope.row,year:year}" name="detail"/>
 
         </template>
 
@@ -515,6 +515,8 @@ export default {
 
       this.params.content.year = this.year
 
       let res = await this.$api.requested(this.params)
 
       this.tableData = res.data
 
+      console.log(this.tableData);
 
+      
     },
 
     /* 清空指标 */
 
     clearTarget() {

+ 0 - 4
src/router/HDrpManagement.js
View File 

@@ -1,7 +1,4 @@
 
 const HDrpManagement = [
 
-<<<<<<< HEAD
 
-  
-=======
 
   {
 
     path: '/sm_unit',
 
     name: 'unit',
 
@@ -12,6 +9,5 @@ const HDrpManagement = [
 
     },
 
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/unit/index')
 
   }
 
->>>>>>> xiaoqin
 
 ]
 
 export default HDrpManagement

+ 1 - 1
yos/index.html
View File 

@@ -1 +1 @@
 
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.1497085c.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.0169833a.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.a721bc7e.js"></script><link href="css/app.1831ed6a.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.9a0c4174.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>