代码上传

src/HDrpManagement/dataanalysis/modules/performanceData.vue

@@ -28,10 +28,10 @@
                       <div style="float: right">
                         <span style="font-size: 12px;padding: 0 0 0 5px">
                           <span v-if="listby.unamount < 0" style="color: #E13333">
-                            ¥{{listby.unamount>10000 ?tool.formatAmount(listby.unamount/10000,2):listby.unamount>100000000?tool.formatAmount(listby.unamount/100000000,2):tool.formatAmount(listby.unamount,2)}}
+                            ¥{{listby.unamount>10000 ?tool.formatAmount(listby.unamount/10000,2)+'万':listby.unamount>100000000?tool.formatAmount(listby.unamount/100000000,2)+'亿':tool.formatAmount(listby.unamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-                             ¥{{listby.unamount>10000 ?tool.formatAmount(listby.unamount/10000,2):listby.unamount>100000000?tool.formatAmount(listby.unamount/100000000,2):tool.formatAmount(listby.unamount,2)}}
+                             ¥{{listby.unamount>10000 ?tool.formatAmount(listby.unamount/10000,2)+'万':listby.unamount>100000000?tool.formatAmount(listby.unamount/100000000,2) +'亿':tool.formatAmount(listby.unamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -43,8 +43,8 @@
                   <el-row>
                     <el-col>
                     <span style="font-size: 12px;padding: 0 0 0 5px">
-                      {{'¥'+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):listby.target_l>100000000?tool.formatAmount(listby.target_l/100000000,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>
                     </el-col>
                   </el-row>
@@ -69,10 +69,12 @@
                       <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)}}
+<!--                            ¥{{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)}}
+<!--                            ¥{{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>
                       </div>
@@ -84,7 +86,9 @@
                   <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)}}
+<!--                      {{'¥'+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>
                     </el-col>
                   </el-row>
@@ -110,10 +114,12 @@
                       <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)}}
+<!--                            ¥{{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)}}
+<!--                            ¥{{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>
                       </div>
@@ -125,7 +131,9 @@
                   <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)}}
+<!--                      {{'¥'+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>
                     </el-col>
                   </el-row>
@@ -161,11 +169,13 @@
                     <el-col :span="12">
                       <div style="float: right">
                          <span style="font-size: 12px;padding: 0 0 0 5px">
-                          <span v-if="listby.unamount < 0" style="color: #E13333">
-                            ¥{{tool.formatAmount(listby.unamount,2)}}
+                          <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(listby.unamount,2)}}
+<!--                            ¥{{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>
                       </div>
@@ -178,7 +188,9 @@
                   <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)}}
+<!--                      {{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>
                     </el-col>
                   </el-row>
@@ -203,11 +215,13 @@
                     <el-col :span="12">
                       <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)}}
+                           <span v-if="listbj.unoutamount < 0" style="color: #E13333">
+<!--                            ¥{{tool.formatAmount(listbj.unoutamount,2)}}-->
+                              ¥{{listbj.unamount>10000 ?tool.formatAmount(listbj.unoutamount/10000,2)+'万':listbj.unoutamount>100000000?tool.formatAmount(listbj.unoutamount/100000000,2)+'亿':tool.formatAmount(listbj.unoutamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-                            ¥{{tool.formatAmount(listby.unoutamount,2)}}
+<!--                            ¥{{tool.formatAmount(listbj.unoutamount,2)}}-->
+                              ¥{{listbj.unamount>10000 ?tool.formatAmount(listbj.unoutamount/10000,2)+'万':listbj.unoutamount>100000000?tool.formatAmount(listbj.unoutamount/100000000,2) +'亿':tool.formatAmount(listbj.unoutamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -219,7 +233,9 @@
                   <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)}}
+<!--                      {{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>
                     </el-col>
                   </el-row>
@@ -244,11 +260,13 @@
                     <el-col :span="12">
                       <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)}}
+                           <span v-if="listbj.uninvoiceamount < 0" style="color: #E13333">
+<!--                            ¥{{tool.formatAmount(listbj.uninvoiceamount,2)}}-->
+                              ¥{{listbj.uninvoiceamount>10000 ?tool.formatAmount(listbj.uninvoiceamount/10000,2)+'万':listbj.uninvoiceamount>100000000?tool.formatAmount(listbj.uninvoiceamount/100000000,2)+'亿':tool.formatAmount(listbj.uninvoiceamount,2)}}
                           </span>
                           <span v-else style="color: #009270">
-                            ¥{{tool.formatAmount(listby.uninvoiceamount,2)}}
+<!--                            ¥{{tool.formatAmount(listbj.uninvoiceamount,2)}}-->
+                              ¥{{listbj.uninvoiceamount>10000 ?tool.formatAmount(listbj.uninvoiceamount/10000,2)+'万':listbj.uninvoiceamount>100000000?tool.formatAmount(listbj.uninvoiceamount/100000000,2) +'亿':tool.formatAmount(listbj.uninvoiceamount,2)}}
                           </span>
                         </span>
                       </div>
@@ -260,7 +278,9 @@
                   <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)}}
+<!--                      {{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>
                     </el-col>
                   </el-row>
@@ -297,11 +317,13 @@
                     <el-col :span="12">
                       <div style="float: right">
                          <span style="font-size: 12px;padding: 0 0 0 5px">
-                          <span v-if="listby.unamount < 0" style="color: #E13333">
-                            ¥{{tool.formatAmount(listby.unamount,2)}}
+                          <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(listby.unamount,2)}}
+<!--                            ¥{{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>
                       </div>
@@ -313,7 +335,9 @@
                   <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)}}
+<!--                      {{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>
                     </el-col>
                   </el-row>
@@ -337,11 +361,13 @@
                     <el-col :span="12">
                       <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)}}
+                          <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(listby.unoutamount,2)}}
+<!--                            ¥{{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>
                       </div>
@@ -354,7 +380,9 @@
                   <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)}}
+<!--                      {{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>
                     </el-col>
                   </el-row>
@@ -379,11 +407,13 @@
                     <el-col :span="12">
                       <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)}}
+                         <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(listby.uninvoiceamount,2)}}
+<!--                            ¥{{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>
                       </div>
@@ -396,7 +426,9 @@
                   <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)}}
+<!--                      {{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>
                     </el-col>
                   </el-row>

src/HDrpManagement/projectChange/components/putPeople.vue

@@ -62,8 +62,7 @@ export default {
       });
     },
     async onCheck(){
-      console.log()
-      if (JSON.parse(sessionStorage.getItem('active_account')).siteid == 'NB'){
+      if (JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'){
         const res = await this.$api.requested({
           "id": 20230628155602,
           "content": {
@@ -161,7 +160,10 @@ export default {
       console.log(this.flag,'报备状态')
     },
     onClose(){
+      this.flag = 2
+      this.$emit('putSuccess',this.flag)
       this.$emit('onClose')
+
     }
   },
   mounted() {

src/components/mindmap/custom.vue

@@ -359,7 +359,7 @@ G6.registerNode('card-node', {
           x: 191,
           y: 62,
           text: '⇢',
-          fill: '#fff',
+          fill: config.fontColor,
           fontSize: 18,
         },
         // must be assigned in G6 3.3 and later versions. it can be any string you want, but should be unique in a custom item type