计算选型优化及部分新功能

src/HManagement/serviceDataScreen/modules/salesFunnel.vue

@@ -242,6 +242,10 @@ export default {
 
       console.log(this.chartMapData,'chartMapData')
       if (init){
+        if (!this.$refs.chartRef) {
+          this.$nextTick(() => this.chartData(init, data))
+          return
+        }
         this.chartMap = new Column(this.$refs.chartRef,{
           color:['#3685FC','#6CD2A1'],
           data:this.chartMapData,
@@ -311,7 +315,9 @@ export default {
         })
         this.chartMap.render()
       }else {
-        this.chartMap.changeData(this.chartMapData)
+        if (this.chartMap) {
+          this.chartMap.changeData(this.chartMapData)
+        }
       }
     },
     dataChange(val){

src/HManagement/siteManage/securityConfig/components/applicationRuleSet/index.vue

@@ -123,6 +123,19 @@
           </template>
         </setTemplate>
       </el-col>
+      <el-col :span="12">
+        <setTemplate title="班管家质保卡年限设置" :setResult="(bgj_warranty_period || 10) + '年'" :is_tip="true">
+          <template slot="svgIcon">
+            <svg t="1747022400000" style="margin-top: 6px" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12093" width="20" height="20"><path d="M512 0C229.222 0 0 229.222 0 512s229.222 512 512 512 512-229.222 512-512S794.778 0 512 0z m0 938.667c-235.648 0-426.667-191.019-426.667-426.667S276.352 85.333 512 85.333 938.667 276.352 938.667 512 747.648 938.667 512 938.667z" fill="#3874F6" p-id="12094"></path><path d="M682.667 469.333H554.667V341.333c0-23.573-19.093-42.667-42.667-42.667s-42.667 19.094-42.667 42.667v170.667c0 23.573 19.093 42.667 42.667 42.667h170.667c23.573 0 42.667-19.094 42.667-42.667s-19.094-42.667-42.667-42.667z" fill="#3874F6" p-id="12095"></path></svg>
+          </template>
+          <template slot="tipContent">
+            {{ $t('设置班管家质保卡年限，默认年限10年') }}
+          </template>
+          <template slot="setContent">
+            <bgjWarrantyPeriod @queryRule="onSuccess" :data="setInfo"></bgjWarrantyPeriod>
+          </template>
+        </setTemplate>
+      </el-col>
       <el-col :span="12" v-if="tool.checkAuth($route.name,'filterOutCustomerContacts')">
         <setTemplate title="客户/联系人跟进查询排除非自建非下级数据" :setResult="isqueryfollow == 1 ? '开启' : '关闭'" :is_tip="true">
           <template slot="svgIcon">
@@ -206,6 +219,7 @@ import projectReportRule from "@/HManagement/siteManage/securityConfig/modules/p
 import projectTarget from '../projectTarget/index'
 import workOrderAutoCreateRule from '../../modules/workOrderAutoCreateRule'
 import serviceImprovementRule from '../../modules/serviceImprovementRule'
+import bgjWarrantyPeriod from '../../modules/bgjWarrantyPeriod'
 export default {
   name: "index",
   data(){
@@ -224,11 +238,12 @@ export default {
       isquerytarget:'',
       workData:'',
       serviceData:'',
+      bgj_warranty_period:10,
       setInfo:''
     }
   },
   components:{setTemplate,setContentTemplate,customerCheckRule,projectCheckRule,projectReportRule,projectTarget,
-    workOrderAutoCreateRule,serviceImprovementRule},
+    workOrderAutoCreateRule,serviceImprovementRule,bgjWarrantyPeriod},
   methods:{
     setApplication(data){
       console.log(data,'应用规则设置')
@@ -242,6 +257,7 @@ export default {
       this.isqueryfollow = data.isqueryfollow || ''
       this.ischeckcontract = data.ischeckcontract || ''
       this.isquerytarget = data.isquerytarget || ''
+      this.bgj_warranty_period = data.bgj_warranty_period || 10
       this.queryRule()
       this.queryWorker()
       this.queryService()