Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/views/event/components/dialog/addEvent.vue

@@ -249,18 +249,35 @@ export default {
     //获取客户信息
     getAdminClientList() {
       this.$api.getAdminClientList(this.client.queryParams).then(response => {
-        this.clientList.push(...response.data.records)
-        this.client.queryParams.total = response.data.total
+        if(response.code == 200){
+          if(this.clientId){
+            var index = response.data.records.findIndex(item=>{
+              return item.id == this.clientId
+            })
+            if(index!=-1){
+              this.clientList.shift()
+            }
+          }
+          this.clientList.push(...response.data.records)
+          this.client.queryParams.total = response.data.total
+        }
       }).catch(error => {
-
+        
       })
     },
     //打开弹窗，判断是编辑还是添加，同时判断是批量添加还是添加单个事件（type==1是单个，type==2是批量）
-    open(data, type) {
-      this.getAdminClientList()
+    async open(data, type) {
       this.type = type
-      if (data) {
+      if (data && data.id) {
         this.title = '编辑事件'
+        if(data.clientId){
+          this.clientList.push(
+            {
+              id:clientId,
+              name:data.clientName
+            }
+          )
+        }
         this.$set(this.formData, 0, data)
       } else {
         if (this.type == 1) {
@@ -273,21 +290,23 @@ export default {
             name: '',
             eventDate: '',
             description: '',
-            scenarioId: '',
+            clientId:'',
+            scenarioId: data.scenarioId,
           }
         ]
       }
-      console.log(this.formData);
+      this.getAdminClientList()
       this.dialogVisible = true
     },
     //关闭弹窗
     handleClose() {
       if (this.type == '1') {
-        // this.$refs.select.blur()
-        // this.$refs.select2.blur()
         this.$refs.ruleForm.resetFields()
       }
       this.files = []
+      this.client.queryParams.name = null
+      this.client.queryParams.current = 1
+      this.clientList = [];
       this.loading = false
       this.dialogVisible = false
     },

src/views/event/components/index.vue

@@ -289,7 +289,12 @@ export default {
       let params = {
         ...this.queryParams,//分页信息
         searchQuery:this.$commonJS.objectToString(this.searchOption || {}),//检索条件
-        orderDTOList:this.sort,//排序
+        orderDTOList:[
+          {
+            orderBy:this.groupingValue,
+            orderType:this.sort.orderType
+          }
+        ],//排序
         groupBy:this.groupingValue,//分组信息
       }
       this.$api.groupEvent(params).then(res => {
@@ -316,7 +321,10 @@ export default {
     handleCommand(e) {
       switch(e){
         case '1'://添加单个事件
-          this.$refs.addEvent.open(null, e)
+          var form = {
+            scenarioId : this.scenarioId
+          }
+          this.$refs.addEvent.open(form, e)
           break;
         case '3'://显示栏位管理
           this.$refs.field.open(this.columnList)

src/views/home/components/echarts/components/event.vue

@@ -42,12 +42,12 @@ export default {
           current:1,
           size:999,//分页信息
           searchQuery:'',//检索条件
-          orderDTOList: [
-            {
-              "orderBy": "createTime",
-              "orderType": 1
-            }
-          ],//排序
+          // orderDTOList: [
+          //   {
+          //     "orderBy": "scenarioNames",
+          //     "orderType": 1
+          //   }
+          // ],//排序
           groupBy:'scenarioNames',//分组信息
         }
         var data = []

src/views/home/components/echarts/components/report.vue

@@ -46,12 +46,12 @@ export default {
           current:1,
           size:999,//分页信息
           searchQuery: '',//检索条件
-          orderDTOList: [
-            {
-              "orderBy": "createTime",
-              "orderType": 1
-            }
-          ],//排序
+          // orderDTOList: [
+          //   {
+          //     "orderBy": "createTime",
+          //     "orderType": 1
+          //   }
+          // ],//排序
           groupBy: 'reportTypeName',//分组信息
         }
         var data = []

src/views/home/components/echarts/index.vue

@@ -47,7 +47,7 @@ export default {
 <style lang="scss" scoped>
 .home_echarts{
     width: 100%;
-    height: 350px;
+    height: 400px;
     display: flex;
     flex: 1;
     align-items: center;

src/views/home/index.vue

@@ -39,7 +39,7 @@
           <div>
             <el-link :underline="false" class="elLink">
               <span>
-                <i class="iconfont icon-tubiao- plus margin-right_10"></i>
+                <i class="iconfont icon-tubiao- font-size_20 margin-right_10"></i>
                 <i class="iconfont icon-youxiang"></i>
               </span>
             </el-link>
@@ -62,7 +62,7 @@
             <el-link :underline="false" class="elLink">实时动态</el-link>
           </div>
           <div class="elLink">
-            <i class="iconfont icon-xinxi plus"></i>
+            <i class="iconfont icon-xinxi font-size_20"></i>
           </div>
         </div>
       </div>
@@ -303,7 +303,7 @@ export default {
         i {
           font-size: 16px;
         }
-        .plus{
+        .font-size_20{
           font-size: 20px;
         }
       }

src/views/layout/components/guide.js

@@ -306,6 +306,7 @@ export const guide = {
                     //     localStorage.firstRoute = JSON.stringify(arr)
                     //     drivers.destroy();
                     // },
+               
                     onDestroyed:()=>{
                         if(userinfo){
                             if(arr[userinfo.id]){
@@ -313,11 +314,46 @@ export const guide = {
                                 localStorage.firstRoute = JSON.stringify(arr)  
                             }
                         }
-                        drivers.destroy();
+                        drivers.destroy(); 
+                        this.animate()
+                        
                     }
                 })
                 drivers.drive()
             })
+        },
+        animate(){
+            const guid = document.querySelector('.help-guid')
+            const PLUS_SIZE = 30;
+            const body = document.body
+            const box = document.createElement('div')
+            box.className = 'plus'
+            box.innerHTML = '<div class="plus-icon"><i class="iconfont icon-xinshouzhiyin"></i></div>'
+
+            const rect = {
+                left:body.clientWidth/2,
+                top:body.clientHeight/2
+            }
+            const left = rect.left - (PLUS_SIZE/2)
+            const top = rect.top - PLUS_SIZE
+
+            const guidRect = guid.getBoundingClientRect();
+            const x = guidRect.left - (PLUS_SIZE/2) - left
+            const y = guidRect.top - PLUS_SIZE - top
+
+            box.style.setProperty('--left',`${left}px`)
+            box.style.setProperty('--top',`${top}px`)
+            box.style.setProperty('--x',`${x}px`)
+            box.style.setProperty('--y',`${y}px`)
+
+            box.addEventListener('animationend',()=>{
+                box.remove()
+            })
+            document.body.appendChild(box)
+            // svg.onclick = (e) =>{
+            //     console.log(e)
+                
+            // }
         }
     }
   }

src/views/layout/components/help.vue

@@ -7,7 +7,7 @@
             </span>
             <span>意见反馈</span>
         </div>
-        <div @click="guide">
+        <div @click="guide" class="help-guid">
             <span>
                 <i class="iconfont icon-xinshouzhiyin"></i>
             </span>
@@ -104,6 +104,62 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+@keyframes moveX {
+  to{
+    transform: translateX(var(--x));
+  }
+}
+@keyframes moveY {
+  to{
+    transform: translateY(var(--y));
+  }
+}
+.plus{
+  position:fixed;
+  top:var(--top);
+  left: var(--left);
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  cursor: pointer;
+  z-index: 99999999;
+  animation: moveY .8s cubic-bezier(0.5,-0.5,1,1);
+}
+.plus-icon{
+  height: 100%;
+  width: 100%;
+  background-color: #5151e7;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 30px;
+  z-index: 99999999;
+  animation: moveX .8s linear;
+  
+}
+// .plus-icon::before{
+//   content: '';
+//   position: absolute;
+//   left: 50%;
+//   top: 3;
+//   width: 4px;
+//   height: 24px;
+//   margin-left: -2px;
+//   background-color: #fff;
+//   border-radius: 8px;
+// }
+// .plus-icon::after{
+//   content: '';
+//   position: absolute;
+//   left: 3px;
+//   top: 50%;
+//   width: 24px;
+//   height: 4px;
+//   margin-top: -2px;
+//   background-color: #fff;
+//   border-radius: 8px;
+// }
+</style>
 <style lang="scss" scoped>
 .help{
     background: white;

src/views/patentMining/components/dialog/addAndEditProject.vue

@@ -80,7 +80,7 @@
                   <el-form-item label="事件：">
                     <mySelectButton size='large' style="width:100%" @click="addEvent">
                       <div style="width:100%">
-                        <el-select style="width:100%" v-model="form.eventId" @change="changeEvent" filterable remote
+                        <el-select style="width:100%" v-model="form.eventId" @change="changeEvent" filterable remote :disabled="eventList.disabled"
                           clearable placeholder="请选择" :loading="eventList.loading" v-SelectLazyLoading="loadEvent"
                           :remote-method="remoteEvent">
                           <el-option v-for="item in eventList.data" :key="item.id" :label="item.name" :value="item.id">
@@ -645,6 +645,14 @@ export default {
         }
         this.title = '编辑专利挖掘项目'
       } else {
+        this.eventList.disabled = false
+        if(this.form.eventId){
+          this.eventList.disabled = true
+          this.eventList.data.push({
+            id:this.form.eventId,
+            name:this.form.eventName,
+          })
+        }
         this.title = '新增专利挖掘项目'
       }
       this.getPermissionPersonnel()

src/views/patentMining/components/viewIndex.vue

@@ -66,7 +66,8 @@ export default {
     isOperate: '',
     matterId:{},
     scenarioId:{},
-    eventName:''
+    eventName:'',
+    eventId:''
   },
   data() {
     return {
@@ -289,7 +290,12 @@ export default {
       let params = {
         ...this.queryParams,//分页信息
         searchQuery: this.$commonJS.objectToString(this.searchOption || {}),//检索条件
-        orderDTOList: this.sort,//排序
+        orderDTOList: [
+          {
+            orderBy:this.group,
+            orderType:this.sort.orderType
+          }
+        ],//排序
         groupBy: this.group,//分组的值
       }
       this.loading = true
@@ -305,6 +311,12 @@ export default {
     },
     //创建项目按钮，添加其他企业专利数据库
     handleAdd() {
+      var form = {
+        matterIds:this.matterId || [],
+        scenarioIds:this.scenarioId || [],
+        eventName:this.eventName,
+        eventId:this.eventId
+      }
       this.$refs.addAndEditProject.open()
     },
     // 创建项目按钮下拉菜单内容

src/views/project/components/TotalChart.vue

@@ -90,7 +90,7 @@ export default {
         searchQuery:this.$commonJS.objectToString(this.searchOption),
         orderDTOList: [
           {
-            "orderBy": "createTime",
+            "orderBy": item.value,
             "orderType": 1
           } 
         ],//排序

src/views/project/components/drawer/form.vue

@@ -40,7 +40,7 @@
             <el-form-item label="事件" prop="event" v-if="!ruleForm.id">
               <mySelectButton size='large' style="width:100%" @click="addEvent" >
                     <div style="width:100%">
-                      <el-select style="width:100%" v-model="ruleForm.eventId" @change="changeEvent" filterable remote clearable placeholder="请选择"
+                      <el-select style="width:100%" v-model="ruleForm.eventId" @change="changeEvent" filterable remote :disabled="eventList.disabled" clearable placeholder="请选择"
                         :loading="eventList.loading" v-SelectLazyLoading="loadEvent" :remote-method="remoteEvent">
                         <el-option v-for="item in eventList.data" :key="item.id" :label="item.name" :value="item.id">
                         </el-option>
@@ -300,6 +300,7 @@ export default {
       this.ruleForm = JSON.parse(JSON.stringify(form))
       //获取部门列表
       this.getDepartment()
+      
       if(this.ruleForm.scenarioIds && this.ruleForm.scenarioIds.length!=0){
         this.show=true
         this.onChange()
@@ -311,7 +312,17 @@ export default {
       if(!this.ruleForm.id){
         this.eventList.data = []
         this.eventList.name = ''
-        this.getEventList()
+        this.eventList.disabled = false
+        if(this.ruleForm.eventId){
+          this.eventList.disabled = true
+          this.eventList.data.push({
+            id:this.ruleForm.eventId,
+            name:this.ruleForm.eventName,
+          })
+        }else{
+          this.getEventList()
+        }
+        
       }
 
       this.personnelList.data = []

src/views/project/index.vue

@@ -93,7 +93,8 @@ export default {
     isOperate: '',
     matterId:{},
     scenarioId:{},
-    eventName:''
+    eventName:'',
+    eventId:''
   },
   data() {
     return {
@@ -274,7 +275,12 @@ export default {
       let params = {
         ...this.queryParams,//分页信息
         searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
-        orderDTOList: this.sort,//排序
+        orderDTOList: [
+          {
+            orderBy:this.group,
+            orderType:this.sort.orderType
+          }
+        ],//排序
         groupBy: this.group,//分组的值
       }
       this.loading = true
@@ -355,8 +361,10 @@ export default {
         crons: '',
         status: '0',
         sort: 1,
-        matterIds: [],
-        scenarioIds: []
+        matterIds:this.matterId || [],
+        scenarioIds:this.scenarioId || [],
+        eventName:this.eventName,
+        eventId:this.eventId
       }, '新增专利数据库')
     },
     //确认提交专利数据库信息

src/views/report/components/dialog/addAndEditReport.vue

@@ -133,7 +133,7 @@
                 <el-form-item label="事件：">
                   <mySelectButton size='large' style="width:100%" @click="addEvent">
                     <div style="width:100%">
-                      <el-select style="width:100%" v-model="form.eventId" @change="changeEvent" filterable remote
+                      <el-select style="width:100%" v-model="form.eventId" @change="changeEvent" filterable remote :disabled="eventList.disabled"
                         clearable placeholder="请选择" :loading="eventList.loading" v-SelectLazyLoading="loadEvent"
                         :remote-method="remoteEvent">
                         <el-option v-for="item in eventList.data" :key="item.id" :label="item.name" :value="item.id">
@@ -589,7 +589,6 @@ export default {
     async open(form) {
       var a = ''
       this.form = JSON.parse(JSON.stringify(form))
-      console.log(form);
       if (this.form.id) {
         if (this.$reportPermission(this.form.id, [0, 1])) {
           a = '编辑'
@@ -597,13 +596,23 @@ export default {
           a = '查看'
         }
       } else {
-        this.$set(this.form, 'matterIds', [])
+        this.$set(this.form, 'matterIds',form.matterId)
+        this.form.scenarioIds = form.scenarioId
         this.$set(this.form, 'systemFileList', [])
         this.$set(this.form, 'fileGuids', [])
+        this.eventList.disabled  =false
+        if(this.form.eventId){
+          this.eventList.disabled = true
+          this.eventList.data.push(
+            {
+              id:form.eventId,
+              name:form.eventName
+            }
+          )
+        }
         a = '创建'
-        // console.log(1);
       }
-      // console.log(2);
+
       var reportType = this.dictMessage.REPORT_TYPE.filter(item => { return item.dictChildValue == this.form.reportType })[0].dictChildLabel
       this.title = a + reportType + '报告'
       // 负责人
@@ -612,20 +621,9 @@ export default {
         await this.getPermissionPersonnel(1)
         this.personnelList.queryParams.id = null
       }
-      // console.log(3);
-      // 委托方
-      // if (this.form.entrustId) {
-      //   this.clientList.queryParams.id = this.form.entrustId
-      //   await this.getAllClientList(1)
-      //   this.clientList.queryParams.id = null
-      // }
-
       this.getPermissionPersonnel()
-      // console.log(4);
-      // this.getAllClientList()
       // this.getEventList()
       this.showDialog = true
-      // console.log(5);
     },
 
     /**
@@ -894,8 +892,9 @@ export default {
      //清空组件缓存数据
     clear() {
       // 清空事件相关
-      this.form.eventIds = []
+      this.form.eventId = []
       this.eventList.queryParams.current = 1
+      this.eventList.name = ''
       this.eventList.data = []
       // 清空负责人相关
       this.personnelList.data = []

src/views/report/components/index.vue

@@ -24,7 +24,7 @@
               <el-button type="primary" size="small">
                 创建报告<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
-              <el-dropdown-menu slot="dropdown" style="margin-top:0px" v-if="dictMessage.REPORT_TYPE">
+              <el-dropdown-menu slot="dropdown" style="margin-top:0px" v-if="dictMessage.REPORT_TYPE && dictMessage.REPORT_TYPE.length>0">
                 <!-- 遍历按钮 -->
                 <el-dropdown-item
                   v-for="item in dictMessage.REPORT_TYPE.filter(item => !['6'].includes(item.dictChildValue))"
@@ -75,7 +75,8 @@ export default {
     isOperate: '',
     matterId:{},
     scenarioId:{},
-    eventName:''
+    eventName:'',
+    eventId:'',
   },
   data() {
     return {
@@ -297,13 +298,16 @@ export default {
     handleSearchArray(obj) {
       switch (obj.label) {
         case '报告类型':
-          let dict = this.dictMessage.REPORT_TYPE.filter(item => !['6'].includes(item.dictChildValue))
-          obj.options = dict.map(item => {
-            return {
-              label: item.dictChildLabel,
-              value: item.dictChildValue,
-            }
-          })
+          if(this.dictMessage.REPORT_TYPE && this.dictMessage.REPORT_TYPE.length>0){
+            let dict = this.dictMessage.REPORT_TYPE.filter(item => !['6'].includes(item.dictChildValue))
+            obj.options = dict.map(item => {
+              return {
+                label: item.dictChildLabel,
+                value: item.dictChildValue,
+              }
+            })
+          }
+          
           break;
         case '报告状态':
           obj.options = [
@@ -371,7 +375,12 @@ export default {
       let params = {
         ...this.queryParams,//分页信息
         searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
-        orderDTOList: this.sort,//排序
+        orderDTOList: [
+          {
+            orderBy:this.groupingValue,
+            orderType:this.sort.orderType
+          }
+        ],//排序
         groupBy: this.groupingValue,//分组信息
       }
       this.$api.groupReportProject(params).then(res => {
@@ -454,7 +463,10 @@ export default {
     handleAnalyse(id) {
       var form = {
         reportType: id,
-        scenarioList: []
+        eventId:this.eventId,
+        eventName:this.eventName,
+        matterId:this.matterId || [],
+        scenarioId:this.scenarioId || [],
       }
       this.$refs.ReportForm.open(form)
     },

src/views/visual/components/drawer/titleDrawer.vue

@@ -5,7 +5,7 @@
               <el-tabs v-model="components">
                   <el-tab-pane v-for="item in menu" :key="item.components"  :label="item.name" :name="item.components"></el-tab-pane>
               </el-tabs>
-              <component :is='components' style="height:calc(100% - 50px);" :isOperate='2' :scenarioId="[params.scenarioId]" :matterId="[params.matterId]" :eventName="params.eventName"></component>
+              <component :is='components' style="height:calc(100% - 50px);" :isOperate='2' :scenarioId="[params.scenarioId]" :matterId="[params.matterId]" :eventId="params.eventId" :eventName="params.eventName"></component>
           </div>
           
       </el-drawer>

src/views/visual/components/sceneSVG.vue

@@ -80,12 +80,12 @@ export default {
           "current": 1,
           "size": 10,
           "searchQuery": this.$commonJS.objectToString(this.searchOption),
-          "orderDTOList": [
-            {
-              "orderBy": "createTime",
-              "orderType": 1
-            }
-          ],
+          // "orderDTOList": [
+          //   {
+          //     "orderBy": "createTime",
+          //     "orderType": 1
+          //   }
+          // ],
           "groupBy": "scenarioNames"
         }
       await this.$api.groupEvent(params).then(res => {

src/views/visual/title/index.vue

@@ -132,12 +132,12 @@
           "current": 1,
           "size": 10,
           "searchQuery": this.$commonJS.objectToString(obj),
-          "orderDTOList": [
-            {
-              "orderBy": "createTime",
-              "orderType": 1
-            }
-          ],
+          // "orderDTOList": [
+          //   {
+          //     "orderBy": "createTime",
+          //     "orderType": 1
+          //   }
+          // ],
           "groupBy": "scenarioNames"
         }
       await this.$api.groupEvent(params).then(res => {