暂存

src/HDrpManagement/projectChange/modules/modules/reportingProgress/index.vue

@@ -5,7 +5,8 @@
           v-for="(activity, index) in list"
           :key="index"
           :timestamp="activity.createDate">
-        {{activity.positionName + activity.actionName + activity.activityName + activity.msg}}
+        {{activity.activityName + ':' + activity.actionName }}<br>
+        {{activity.msg?'留言：' + activity.msg:'留言：' + '-'}}
       </el-timeline-item>
     </el-timeline>
     <el-empty v-if="list.length === 0" description="暂无报备进度" :image-size="40"></el-empty>

src/HDrpManagement/salerPortrait/index.vue

@@ -4,7 +4,7 @@
       <div style="padding: 20px 20px 5px 20px;">
         <div class="mt-10">
           <label  class="search__label" >范围:</label>
-            <el-cascader size="small" ref="selectdep" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
+            <el-cascader  size="small" ref="selectdep" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
         </div>
       </div>
       <el-scrollbar >
@@ -12,33 +12,27 @@
         <div style="width: 20%;float: left" >
           <el-table border :data="list" ref="table" highlight-current-row  @row-click="rowClick">
             <el-table-column
-                prop="projectname"
-                label="项目名称"
+                prop="name"
+                label="人员"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="projecttype"
-                label="项目类型"
+                prop="depname"
+                label="部门"
                 width="180">
             </el-table-column>
             <el-table-column
                 prop="tradefield"
-                label="领域"
+                label="区域"
                 width="180">
             </el-table-column>
-            <el-table-column
-                label="负责人">
-              <template slot-scope="scope">
-                {{scope.row.leader[0].name}}
-              </template>
-            </el-table-column>
           </el-table>
           <div style="width: 100%">
             <el-pagination
                 background
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
-                :current-page="param.content.pageNumber"
+                :current-page="personParam.content.pageNumber"
                 :page-sizes="[20, 50, 100, 200]"
                 :page-size="20"
                 layout="total, prev, pager, next, jumper"
@@ -48,7 +42,7 @@
 
         </div>
         <div style="width: 79%;float: right;">
-          <mindmap v-if="flag" ref="project" class="inline-16" style="width:calc(150vh - 130px);height:calc(100vh - 300px) " :id="sa_projectid" ></mindmap>
+          <mindmap v-if="flag" ref="saler" class="inline-16" style="width:calc(150vh - 130px);height:calc(100vh - 300px) " :id="hrid" ></mindmap>
         </div>
       </div>
       </el-scrollbar>
@@ -57,32 +51,31 @@
 </template>
 
 <script>
-import mindmap from "@/components/mindmap/project.vue";
+import mindmap from "@/components/mindmap/saler.vue";
 export default {
   name: "index",
   components:{mindmap},
   data() {
     return {
-      value:1,
+      value:[],
       list:[],
       total:0,
       flag:false,
-      sa_projectid:'',
+      hrid:'',
       depmentParam:{
         "id": 20230620102004,
         "content": {
         }
       },
       deplist:[],
-      param:{
-        "id":20221020143502,
-        "content":{
+      personParam:{
+        "id": 20221102090303,
+        "content": {
+          "containssub":1,
+          "departmentids":[],
           "pageNumber": 1,
           "pageSize": 20,
-          "type":'',
-          "deleted": 0,
-          "isExport": false,
-          "isend": 0
+          "isExport":0
         }
       }
     }
@@ -94,6 +87,11 @@ export default {
     async departmentrtment() {
       const res = await this.$api.requested(this.depmentParam)
       this.deplist = this.createMenu(res.data.dep)
+      console.log(this.deplist,'部门列表')
+      this.personParam.content.departmentids = [this.deplist[0].departmentid]
+      this.value = this.deplist[0].label
+      console.log(this.value,'项目选择')
+      this.listData()
       /*this.range = JSON.parse(window.sessionStorage.getItem('active_account')).name*/
     },
     createMenu (array) {
@@ -150,44 +148,44 @@ export default {
       return arr
     },
     selectDep(val) {
-      console.log(val,'val')
       let dataDep = this.$refs.selectdep.getCheckedNodes(true)[0].data
-      this.range = dataDep.label
+      this.value = dataDep.label
+      this.personParam.content.departmentids = [val[val.length-1]]
+      this.listData()
     },
     async listData(){
-      this.param.content.type = this.value
-      const res = await this.$api.requested(this.param)
+      const res = await this.$api.requested(this.personParam)
       this.list = res.data
       this.total = res.total
-      this.sa_projectid = res.data[0].sa_projectid
+      this.hrid = res.data[0].hrid
       this.flag = true
       this.$nextTick(()=>{
-        this.$refs.project.getData()
+        this.$refs.saler.getData()
         this.$refs.table.setCurrentRow(this.list[0])
       })
     },
     rowClick(val){
       console.log(val)
-      this.sa_projectid = val.sa_projectid
+      this.hrid = val.hrid
       this.$nextTick(()=>{
-        this.$refs.project.getData()
+        this.$refs.saler.getData()
         this.flag = true
       })
 
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val
+      this.personParam.content.pageSize = val
       this.listData()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.param.content.pageNumber = val
+      this.personParam.content.pageNumber = val
       this.listData()
     },
   },
   mounted() {
-    this.listData()
+   /* this.listData()*/
     this.departmentrtment()
   }
 }

src/components/mindmap/custom.vue

@@ -1,8 +1,8 @@
 <template>
-  <div style="background:#f1f2f3;" id="full">
+  <div style="background:#f1f2f3;" id="full" :style="contentStyle">
     <img style="width: 25px; height: 25px;float: right" v-if="!fullscreen" @click="enterFullscreen" src="@/assets/icons/amplify.svg" title="全屏">
     <img style="width: 25px; height: 25px;float: right" @click="backFullscreen" v-if="fullscreen" src="@/assets/icons/reduce.svg" title="还原">
-    <div :style="contentStyle" id="container">
+    <div  id="container">
     </div>
   </div>
 </template>
@@ -335,7 +335,7 @@ G6.registerNode('card-node', {
         });
       });
     }
-    
+
     if (nodeUrl) {
       group.addShape('text', {
         attrs: {
@@ -386,6 +386,7 @@ export default {
           info:node['info']?node['info']:{},
           infoSize:node['infoSize']?node['infoSize']:1,
           value:node['labor']?node['labor'] !== node['name']?node['labor']:'-':'-',
+          data:node['data'],
           children: [],
           nodeUrl:HASLINKS.includes(node['name'])?'123':null
         }
@@ -449,11 +450,11 @@ export default {
       graph.data(this.createMenu([res.data])[0]);
       graph.render();
       graph.fitView();
-      
-      
+
+
       graph.on('node:click', evt => {
         const item = evt.item;
-        console.log(item)
+        console.log(item,'点击列表')
       })
       if (typeof window !== 'undefined')
         window.onresize = () => {

src/components/mindmap/index.vue

@@ -4,9 +4,9 @@
     <el-drawer
       :visible.sync="drawer"
       append-to-body
-      size="60%"
+      size="90%"
       :with-header="false">
-      <custom :contentStyle="{height:'100vh',width:'60vw'}" ref="custom" v-if="name === 'custom'" :id="id"/>
+      <custom :contentStyle="{height:'100vh',width:'100vw'}" ref="custom" v-if="name === 'custom'" :id="id"/>
       <project :contentStyle="{height:'100vh',width:'60vw'}" ref="project" v-else-if="name === 'project'" :id="id"/>
       <saler :contentStyle="{height:'100vh',width:'60vw'}" ref="saler" v-else :id="id"/>
     </el-drawer>
@@ -40,7 +40,7 @@ export default {
             this.$nextTick(()=>{
               this.$refs.custom.getData()
             })
-            
+
             break;
           case 'project':
             console.log(this.$refs.project)