数据看板调整

src/HDrpManagement/customerPortrait/index.vue

@@ -49,8 +49,8 @@
           </div>
 
         </div>
-        <div style="width: 79%;float: right;">
-          <mindmap v-if="flag" ref="custom" class="inline-16" style="width:calc(150vh - 130px);height:calc(100vh - 300px) " :id="sa_customersid" name="custom"></mindmap>
+        <div style="width: 79%;float: right;" v-if="flag">
+          <mindmap  ref="custom" class="inline-16" style="width:calc(150vh - 130px);height:calc(100vh - 300px) " :id="sa_customersid" ></mindmap>
         </div>
       </div>
       </el-scrollbar>
@@ -125,14 +125,15 @@ export default {
 
     },
     rowClick(val){
-      console.log(val)
-      this.sa_customersid = val.sa_customersid
-
-      this.$nextTick(()=>{
-        this.$refs.custom.getData()
-        this.flag = true
-      })
 
+      this.flag = false
+      this.sa_customersid = val.sa_customersid
+      console.log(this.sa_customersid,'客户id')
+      setTimeout(function (){
+        let that= this
+        that.flag = true
+        that.$refs.custom.getData()
+      },500)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/dataanalysis/modules/performanceData.vue

@@ -47,7 +47,7 @@
                        ¥ {{listby.amount>10000 ?tool.formatAmount(listby.amount/10000,2) + '万':listby.amount>100000000?tool.formatAmount(listby.amount/100000000,2)+ '亿':tool.formatAmount(listby.amount,2)}}
                       </span>
                       <span>
-                        /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}
+                         /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '万':listby.target_l>100000000?tool.formatAmount(listby.target_l/100000000,2)+ '亿':tool.formatAmount(listby.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -73,11 +73,9 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listby.unoutamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listby.unoutamount,2)}}-->
                              ¥{{listby.unamount<-10000 ?tool.formatAmount(listby.unoutamount/10000,2)+'万':listby.unoutamount<-100000000?tool.formatAmount(listby.unoutamount/100000000,2)+'亿':tool.formatAmount(listby.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listby.unoutamount,2)}}-->
                              ¥{{listby.unamount>10000 ?tool.formatAmount(listby.unoutamount/10000,2)+'万':listby.unoutamount>100000000?tool.formatAmount(listby.unoutamount/100000000,2) +'亿':tool.formatAmount(listby.unoutamount,2)}}
                           </span>
                         </span>
@@ -94,7 +92,7 @@
                        ¥ {{listby.outamount>10000 ?tool.formatAmount(listby.outamount/10000,2) + '万':listby.outamount>100000000?tool.formatAmount(listby.outamount/100000000,2)+ '亿':tool.formatAmount(listby.outamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}
+                         /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '万':listby.target_l>100000000?tool.formatAmount(listby.target_l/100000000,2)+ '亿':tool.formatAmount(listby.target_l,2)}}
                       </span>
 <!--                      {{'¥'+tool.formatAmount(listby.amount,2) + '/'+ '¥'+ tool.formatAmount(listby.target_l,2)}}-->
                     </span>
@@ -122,11 +120,9 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listby.uninvoiceamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}-->
                              ¥{{listby.uninvoiceamount<-10000 ?tool.formatAmount(listby.uninvoiceamount/10000,2)+'万':listby.uninvoiceamount<-100000000?tool.formatAmount(listby.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listby.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}-->
                              ¥{{listby.uninvoiceamount>10000 ?tool.formatAmount(listby.uninvoiceamount/10000,2)+'万':listby.uninvoiceamount>100000000?tool.formatAmount(listby.uninvoiceamount/100000000,2) +'亿':tool.formatAmount(listby.uninvoiceamount,2)}}
                           </span>
                         </span>
@@ -139,14 +135,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{'¥'+tool.formatAmount(listby.amount,2) + '/'+ '¥'+ tool.formatAmount(listby.target_l,2)}}-->
-<!--                       {{'¥'+listby.amount>10000 ?tool.formatAmount(listby.amount/10000,2) + '万':listby.amount>100000000?tool.formatAmount(listby.amount/100000000,2)+ '亿':tool.formatAmount(listby.amount,2)
-                    +'/'+ '¥'+listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}-->
                       <span>
                        ¥ {{listby.invoiceamount>10000 ?tool.formatAmount(listby.invoiceamount/10000,2) + '万':listby.invoiceamount>100000000?tool.formatAmount(listby.invoiceamount/100000000,2)+ '亿':tool.formatAmount(listby.invoiceamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '亿':tool.formatAmount(listby.target_l,2) + '万'}}
+                         /¥ {{listby.target_l>10000 ?tool.formatAmount(listby.target_l/10000,2) + '万':listby.target_l>100000000?tool.formatAmount(listby.target_l/100000000,2)+ '亿':tool.formatAmount(listby.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -184,11 +177,9 @@
                       <div style="float: right">
                          <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listbj.unamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listbj.unamount,2)}}-->
                               ¥{{listbj.unamount<-10000 ?tool.formatAmount(listbj.unamount/10000,2)+'万':listbj.unamount<-100000000?tool.formatAmount(listbj.unamount/100000000,2)+'亿':tool.formatAmount(listbj.unamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listbj.unamount,2)}}-->
                              ¥{{listbj.unamount>10000 ?tool.formatAmount(listbj.unamount/10000,2)+'万':listbj.unamount>100000000?tool.formatAmount(listbj.unamount/100000000,2) +'亿':tool.formatAmount(listbj.unamount,2)}}
                           </span>
                         </span>
@@ -202,14 +193,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{tool.formatAmount(listbj.amount,2) + '/'+ tool.formatAmount(listbj.target_l,2)}}-->
-<!--                       {{'¥'+listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) + '万':listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)
-                    +'/'+ '¥'+listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}-->
                        <span>
                        ¥ {{listbj.amount>10000 ?tool.formatAmount(listbj.amount/10000,2) + '万':listbj.amount>100000000?tool.formatAmount(listbj.amount/100000000,2)+ '亿':tool.formatAmount(listbj.amount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                         /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '万':listbj.target_l>100000000?tool.formatAmount(listbj.target_l/100000000,2)+ '亿':tool.formatAmount(listbj.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -260,7 +248,7 @@
                        ¥ {{listbj.outamount>10000 ?tool.formatAmount(listbj.outamount/10000,2) + '万':listbj.outamount>100000000?tool.formatAmount(listbj.outamount/100000000,2)+ '亿':tool.formatAmount(listbj.outamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                       /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '万':listbj.target_l>100000000?tool.formatAmount(listbj.target_l/100000000,2)+ '亿':tool.formatAmount(listbj.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -311,7 +299,7 @@
                        ¥ {{listbj.invoiceamount>10000 ?tool.formatAmount(listbj.invoiceamount/10000,2) + '万':listbj.invoiceamount>100000000?tool.formatAmount(listbj.invoiceamount/100000000,2)+ '亿':tool.formatAmount(listbj.invoiceamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '亿':tool.formatAmount(listbj.target_l,2) + '万'}}
+                       /¥ {{listbj.target_l>10000 ?tool.formatAmount(listbj.target_l/10000,2) + '万':listbj.target_l>100000000?tool.formatAmount(listbj.target_l/100000000,2)+ '亿':tool.formatAmount(listbj.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -350,11 +338,9 @@
                       <div style="float: right">
                          <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listbn.unamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listbn.unamount,2)}}-->
                              ¥{{listbn.unamount<-10000 ?tool.formatAmount(listbn.unamount/10000,2)+'万':listbn.unamount<-100000000?tool.formatAmount(listbn.unamount/100000000,2)+'亿':tool.formatAmount(listbn.unamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listbn.unamount,2)}}-->
                              ¥{{listbn.unamount>10000 ?tool.formatAmount(listbn.unamount/10000,2)+'万':listbn.unamount>100000000?tool.formatAmount(listbn.unamount/100000000,2) +'亿':tool.formatAmount(listbn.unamount,2)}}
                           </span>
                         </span>
@@ -367,14 +353,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}-->
-<!--                       {{'¥'+listbn.amount>10000 ?tool.formatAmount(listbn.amount/10000,2) + '万':listbn.amount>100000000?tool.formatAmount(listbn.amount/100000000,2)+ '亿':tool.formatAmount(listbn.amount,2)
-                    +'/'+ '¥'+listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}-->
                        <span>
                        ¥ {{listbn.amount>10000 ?tool.formatAmount(listbn.amount/10000,2) + '万':listbn.amount>100000000?tool.formatAmount(listbn.amount/100000000,2)+ '亿':tool.formatAmount(listbn.amount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                      /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '万':listbn.target_l>100000000?tool.formatAmount(listbn.target_l/100000000,2)+ '亿':tool.formatAmount(listbn.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -400,11 +383,9 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listbn.unoutamount < 0" style="color: #E13333">
-<!--                            ¥{{tool.formatAmount(listbn.unoutamount,2)}}-->
                             ¥{{listbn.unamount<-10000 ?tool.formatAmount(listbn.unoutamount/10000,2)+'万':listbn.unoutamount<-100000000?tool.formatAmount(listbn.unoutamount/100000000,2)+'亿':tool.formatAmount(listbn.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listbn.unoutamount,2)}}-->
                             ¥{{listbn.unamount>10000 ?tool.formatAmount(listbn.unoutamount/10000,2)+'万':listbn.unoutamount>100000000?tool.formatAmount(listbn.unoutamount/100000000,2)+'亿':tool.formatAmount(listbn.unoutamount,2)}}
                           </span>
                        </span>
@@ -418,14 +399,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}-->
-<!--                        {{'¥'+listbn.amount>10000 ?tool.formatAmount(listbn.amount/10000,2) + '万':listbn.amount>100000000?tool.formatAmount(listbn.amount/100000000,2)+ '亿':tool.formatAmount(listbn.amount,2)
-                    +'/'+ '¥'+listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}-->
                        <span>
                        ¥ {{listbn.outamount>10000 ?tool.formatAmount(listbn.outamount/10000,2) + '万':listbn.outamount>100000000?tool.formatAmount(listbn.outamount/100000000,2)+ '亿':tool.formatAmount(listbn.outamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '万':listbn.target_l>100000000?tool.formatAmount(listbn.target_l/100000000,2)+ '亿':tool.formatAmount(listbn.target_l,2)}}
                       </span>
                     </span>
                     </el-col>
@@ -452,11 +430,9 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                          <span v-if="listbn.uninvoiceamount < 0" style="color: #E13333">
-<!--                          ¥{{tool.formatAmount(listbn.uninvoiceamount,2)}}-->
                            ¥{{listbn.uninvoiceamount<-10000 ?tool.formatAmount(listbn.uninvoiceamount/10000,2)+'万':listbn.uninvoiceamount<-100000000?tool.formatAmount(listbn.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listbn.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-<!--                            ¥{{tool.formatAmount(listbn.uninvoiceamount,2)}}-->
                               ¥{{listbn.uninvoiceamount>10000 ?tool.formatAmount(listbn.uninvoiceamount/10000,2)+'万':listbn.uninvoiceamount>100000000?tool.formatAmount(listbn.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listbn.uninvoiceamount,2)}}
                           </span>
                          </span>
@@ -470,14 +446,11 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-<!--                      {{tool.formatAmount(listbn.amount,2) + '/'+ tool.formatAmount(listbn.target_l,2)}}-->
-<!--                         {{'¥'+listbn.amount>10000 ?tool.formatAmount(listbn.amount/10000,2) + '万':listbn.amount>100000000?tool.formatAmount(listbn.amount/100000000,2)+ '亿':tool.formatAmount(listbn.amount,2)
-                    +'/'+ '¥'+listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}-->
                        <span>
                        ¥ {{listbn.invoiceamount>10000 ?tool.formatAmount(listbn.invoiceamount/10000,2) + '万':listbn.invoiceamount>100000000?tool.formatAmount(listbn.invoiceamount/100000000,2)+ '亿':tool.formatAmount(listbn.invoiceamount,2)}}
                       </span>
                       <span>
-                        /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '亿':tool.formatAmount(listbn.target_l,2) + '万'}}
+                         /¥ {{listbn.target_l>10000 ?tool.formatAmount(listbn.target_l/10000,2) + '万':listbn.target_l>100000000?tool.formatAmount(listbn.target_l/100000000,2)+ '亿':tool.formatAmount(listbn.target_l,2)}}
                       </span>
                     </span>
                     </el-col>

src/SManagement/archives_admag/index.vue

@@ -12,7 +12,7 @@
               <p style="font-size:14px;margin-right:10px;width:50px">范围:</p>
               <el-select v-model="params.content.where.type" placeholder="请选择素材范围" size="small" @change="getFileList">
                 <el-option
-                  label="全部"
+                  label="总部"
                   :value="0">
                 </el-option>
                 <el-option
@@ -28,7 +28,7 @@
               </span> -->
             </filterList>
           </div>
-          
+
           <!--素材列表-->
           <list :fileData="fileData" @listItemClick="listItemClick"
             v-if="tool.checkAuth($route.name, 'read')">
@@ -123,7 +123,7 @@ export default {
       currentFile: ''
     };
   },
-  
+
   computed: {
     ...mapGetters({
       DrawerShow:'DrawerShow'
@@ -173,7 +173,7 @@ export default {
       this.total = res.total
       this.fileData = res.data
       console.log(this.fileData);
-      
+
       this.fileData.forEach((item) => {
         item.attinfos = matchingFileType.fileList(item.attinfos)
       })
@@ -281,4 +281,4 @@ export default {
   bottom: 0;
   margin-top: 16px;
 }
-</style>
+</style>

src/SManagement/archives_upload/index.vue

@@ -5,7 +5,7 @@
       <save type="save" @click.native="save()"></save>
     </Header>-->
     <el-row>
-      <el-col :span="14">
+      <el-col :span="24">
         <!--标题 分类-->
         <Set ref="set" @setSelectChange="selectChange" @setTitleChange="titleChange" />
         <!--文件列表-->
@@ -29,7 +29,7 @@
         </file-text>
       </el-col>
       <!-- 授权范围 -->
-      <el-col :span="10">
+<!--      <el-col :span="10">
         <scopeOfauth
           style="margin-left:10px;"
           :defaultData="defaultData"
@@ -38,7 +38,7 @@
           obiectName="sat_sharematerialid"
           @onChecked="onChecked"
         />
-      </el-col>
+      </el-col>-->
     </el-row>
     <div class="fixed__btn__panel">
       <el-button size="small" @click="$store.dispatch('DrawerShowChange',false)" class="normal-btn-width">取 消</el-button>
@@ -77,6 +77,7 @@ export default {
           "sat_sharematerial_classid": 9999,
           "notes": "",
           "tag": [],
+          "isonlymanager_dept":0,
           "canfiledownload": 1,
           "content": "",
           "sat_sharematerialid": 0,
@@ -127,7 +128,7 @@ export default {
       setTimeout(() => {
         let data = JSON.parse(window.sessionStorage.getItem("newMaterial"))
         console.log(data);
-        
+
         this.cacheInfo.content.sat_sharematerialid = data.sat_sharematerialid
         this.cacheInfo.content.title = data.title
         this.cacheInfo.content.sat_sharematerial_classid = data.sat_sharematerial_classid
@@ -138,7 +139,7 @@ export default {
         this.uploadCacheData.sat_sharematerialid = data.sat_sharematerialid
         this.uploadCacheData.attinfos = data.attinfos
         this.authId = this.$route.query.id
-        
+
         setTimeout(this.randerData, 100)
         if (data.title != '') this.uploadCacheData.status = "完成"
         this.query_auth()
@@ -166,13 +167,13 @@ export default {
           }
           this.cacheInfo.content.type = this.uploadType
           console.log(this.cacheInfo);
-          
+
           //判断所属ID是否为初始ID
           if (this.cacheInfo.content.sat_sharematerial_classid == '9999' + JSON.parse(window.sessionStorage.getItem("active_account")).userid) return this.$message.error('请选择素材分类')
           this.$api.requested(this.cacheInfo).then(res => {
             this.tool.showMessage(res, () => {
               this.uploadCacheData.status = '完成'
-              this.insertCoursewareauth()
+             /* this.insertCoursewareauth()*/
               this.$store.dispatch('DrawerShowChange',false)
               this.$router.back()
               this.$emit('onSuccess')

src/components/mindmap/custom.vue

@@ -429,6 +429,7 @@ export default {
     },
     async getData () {
       var that = this
+      console.log(this.id,'8888')
       const res = await this.$api.requested({
         "id": 20230620143204,
         "content": {
@@ -441,6 +442,7 @@ export default {
       const height = container.scrollHeight -50  || 500;
       const graph = new G6.TreeGraph({
         container: 'container',
+        animate: false,
         width,
         height,
         linkCenter: true,

src/components/mindmap/project.vue

@@ -439,6 +439,7 @@ export default {
       const height = container.scrollHeight - 50 || 500;
       const graph = new G6.TreeGraph({
         container: 'container',
+        animate: false,
         width,
         height,
         linkCenter: true,

src/components/mindmap/saler.vue

@@ -440,6 +440,7 @@ export default {
       const height = container.scrollHeight -50 || 500;
       const graph = new G6.TreeGraph({
         container: 'container',
+        animate: false,
         width,
         height,
         linkCenter: true,