Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/customerData/index.vue

@@ -572,6 +572,18 @@
                       </el-option>
                     </el-select>
                   </div>
+                  <div class="mt-10 inline-16">
+                    <label  class="search__label" >分析日期:</label>
+                    <el-date-picker
+                        v-model="unfllowMapParam.content.enddate"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        type="date"
+                        size="small"
+                        placeholder="选择日期"
+                        @change="$event => {unfllowTableParam.content.enddate=unfllowMapParam.content.enddate;customerUnfllowInit();$refs.customerUnfllowTable.listData()}">
+                    </el-date-picker>
+                  </div>
                 </div>
               </div>
               <div>

src/HDrpManagement/projectData/index.vue

@@ -250,7 +250,18 @@
             <!--项目评估分析-->
             <div class="data-panel">
               <div class="panel-header">
-                <div class="title">项目评估分析</div>
+                <div class="title">
+                  项目评估分析
+                  <el-tooltip class="item" effect="dark" placement="top">
+                    <template #content>
+                      <div v-for="(item,index) in projectScoreDescript" :key="index">
+                        <span>{{ item.name }}：</span>
+                        <span>{{ item.range }}</span>
+                      </div>
+                    </template>
+                    <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
+                  </el-tooltip>
+                </div>
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
@@ -874,7 +885,7 @@
                         type="date"
                         size="small"
                         placeholder="选择日期"
-                        @change="unfllowTableParam.content.where.enddate=unfllowMapParam.content.enddate;customerUnfllowInit();$refs.customerUnfllowTable.listData()">
+                        @change="$event => {unfllowTableParam.content.enddate=unfllowMapParam.content.enddate;customerUnfllowInit();$refs.customerUnfllowTable.listData()}">
                     </el-date-picker>
                   </div>
                 </div>
@@ -1074,6 +1085,7 @@ export default {
       projectLead:[],
       tradefieldSelect:[],
       projectname:'',
+      projectScoreDescript:[],
       depment:'',
       dataAll:{
         data:{}
@@ -2028,6 +2040,15 @@ export default {
       const textStyleStr = `width:${containerWidth}px;`;
       return `<div style="${textStyleStr};font-size:${scale}em;line-height:${scale < 1 ? 1 : 'inherit'};">${text}</div>`;
     },
+    async getProjectScoreDescript () {
+      let res = await this.$api.requested({
+        "id": 20231101091904,
+        "content": {
+        }
+      })
+      this.projectScoreDescript = res.data
+      console.log(this.projectScoreDescript,'评估描述');
+    },
     createMenu (array) {
       var that = this
       let arr = []
@@ -2284,6 +2305,7 @@ export default {
     }
   },
   async mounted () {
+    this.getProjectScoreDescript()
     this.departmentrtment()
     this.getdataAll()
     this.typeInit(true)