BUG修改

2022-11-25 11:58:12 +08:00 · 2022-11-25 11:58:12 +08:00 · 22176cac74
parent 7538cc94d0
commit 22176cac74
10 changed files with 886 additions and 725 deletions
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@ -10,8 +10,8 @@
            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
          </el-date-picker>
        </el-form-item>
-         
-         <!--上架部门-->  
+
+         <!--上架部门-->
        <el-form-item>
          <span v-if="this.departmentId === 1 ">上架部门：</span>
          <span v-else>申请部门：</span>
@ -36,9 +36,9 @@
        <a class='export'
          :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
      </el-form>
-  
+
      <!--能力上架明细3 能力使用明细 4-->
-      <div v-else> 
+      <div v-else>
        <el-form  :inline="true"  >
          <!--日期-->
          <el-form-item>
@ -47,7 +47,7 @@
            end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
          </el-date-picker>
        </el-form-item>
-        
+
        <!--审核状态-->
        <el-form-item v-if="this.departmentId === 3 || this.departmentId === 4">
          <span>审核状态：</span>
@ -68,9 +68,9 @@
              v-bind="item"></el-option>
          </el-select>
        </el-form-item>
-  
+
         <!--能力使用统计明细--添加提供部门-->
-        
+
         <el-form-item v-if=" this.departmentId === 4">
          <span >提供部门：</span>
          <el-select v-model="provideDepartment" placeholder="请选择部门" filterable clearable>
@ -80,9 +80,7 @@
          </el-select>
        </el-form-item>
        </el-form>
-      
-      
-  
+
        <el-form :inline="true" >
        <!--资源类型-->
        <el-form-item >
@ -121,13 +119,11 @@
        <!-- 导出 -->
        <a class='export'
          :href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
-        </el-form> 
+        </el-form>
  </div>

-
      <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
        <div class="mod-demand__bsdemand">
-     

          <div class="second-title">
            <span style="margin-right: 30px" :class="[
@ -157,7 +153,7 @@
                明细
              </span>
            </template>
-            <span v-else class="detail-button" @click="goToBack()"> 返回 </span>
+            <span v-else class="detail-button" @click="goToBack()">统计</span>
          </div>
          <div class="line-style"></div>
          <!--统计表-->
@ -267,7 +263,7 @@ export default {
  data () {
    return {
      checked: false,
-      provideSelects:[],
+      provideSelects: [],
      departmentSelects: [],
      exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
      exportExcelCondition: '',
@ -374,7 +370,7 @@ export default {
      status: '',
      value1: [], // 起始时间
      abilityDepartment: '', // 上架部门或申请部门
-      provideDepartment:'',//提供部门
+      provideDepartment: '', // 提供部门
      abilityType: '', // 能力
      beginTime: '', // 开始时间
      endTime: '', // 结束时间
@ -718,7 +714,7 @@ export default {
          })
        })
    },
-    // 能力使用明细 
+    // 能力使用明细
    getTwoDetail (page) {
      var passAndReview = '' // 转变"通过"字段为通过
      if (this.examineStatus == '-1') {
@ -744,7 +740,7 @@ export default {
            startDate: this.startDate,
            endDate: this.endDate,
            resourceName: this.resourceName,
-            provideDept:this.provideDepartment
+            provideDept: this.provideDepartment

          }
        })
@ -758,7 +754,7 @@ export default {
            startDate: this.startDate,
            endDate: this.endDate,
            resourceName: this.resourceName,
-            provideDept:this.provideDepartment
+            provideDept: this.provideDepartment
          })
        })
    },
@ -873,7 +869,7 @@ export default {
          this.exportExcelType = 'SelectApplyDeptDetailTypeCountList'
          this.getSecondTree()
        } else {
- 
+
        }
      } else if (index === 3) {
        this.detailFlag = false
@ -881,7 +877,7 @@ export default {
          this.exportExcelType = 'SelectCensusResourceTable'
          this.getOneDetail()
        } else {
-     
+
        }
      } else if (index === 4) {
        this.detailFlag = false
@ -986,10 +982,10 @@ export default {
      this.endDate = ''
      this.examineStatus = ''
      this.abilityDepartment = ''
-      this.provideDepartment=''
+      this.provideDepartment = ''
      this.abilityType = ''
      this.approveStatus = ''
-      this.resourceName=''
+      this.resourceName = ''
      this.exportExcelCondition = qs.stringify({
        approveStatus: this.status,
        deptId: this.abilityDepartment,
@ -997,14 +993,13 @@ export default {
        endDate: this.endDate,
        resourceName: this.resourceName
      })
-      if (this.departmentId === 1) {//能力上架统计
+      if (this.departmentId === 1) { // 能力上架统计
        this.handleChose(1)
-      } else if (this.departmentId === 2) {//能力使用统计
+      } else if (this.departmentId === 2) { // 能力使用统计
        this.handleChose(2)
-    
-      } else if (this.departmentId === 3) {//能力上架明细
+      } else if (this.departmentId === 3) { // 能力上架明细
        this.handleChose(3)
-      } else {//能力使用明细
+      } else { // 能力使用明细
        this.handleChose(4)
      }
    },
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@ -508,45 +508,47 @@ export default {
    },
    // 删除数据
    deleteData (row) {
+      this.deleteDataArr.push(row.id)
      if (this.deleteDataArr.length < 1) {
        this.$message({
-            type: 'info',
-            message: '请选择要删除的数据'
-          })
-      }else{
-      this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(async () => {
-          let ids = []
-          if(row.id && this.deleteDataArr.length==0){
-             ids = [row.id]
-          }else{
-            ids = this.deleteDataArr
-          }
-          this.$http
-            .delete('/workdynamics/delete', {
-              data: ids
-            })
-            .then(({ data: res }) => {
-              if (res.code !== 0) {
-                return this.$message.error(res.msg)
-              }
-              this.$message({
-                type: 'success',
-                message: '删除成功!'
-              })
-              this.getTableData()
-            })
+          type: 'info',
+          message: '请选择要删除的数据'
        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
+      } else {
+        this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(async () => {
+            let ids = []
+            if (row.id && this.deleteDataArr.length == 0) {
+              ids = [row.id]
+            } else {
+              ids = this.deleteDataArr
+            }
+            this.$http
+              .delete('/workdynamics/delete', {
+                data: ids
+              })
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                }
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+                this.getTableData()
+              })
          })
-        })}
+          .catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            })
+          })
+      }
    },
    // 预览工作动态信息
    async openPreviewData (row) {
--- a/back/src/views/modules/canassigncase/index.vue
+++ b/back/src/views/modules/canassigncase/index.vue
@ -65,7 +65,8 @@
          header-align="center"
          align="center"
        ></el-table-column>
-        <el-table-column
+        <template v-if="dataList[0]">
+          <el-table-column
          v-for="(item, index) in dataList[0].infoList"
          :key="index"
          :label="item.attrType"
@ -77,6 +78,7 @@
            {{ findValue(scope.row.infoList, item.attrType) }}
          </template>
        </el-table-column>
+        </template>
        <el-table-column
          :label="$t('handle')"
          fixed="right"
@ -171,11 +173,11 @@ export default {
  },
  mounted () {
    window.addEventListener('resize', this.a)
-    this.fullScreen();
+    this.fullScreen()
    this.$nextTick(() => {
-    this.$refs.singleTable.doLayout(); // 解决表格错位
-    //:height="qp ? '810px' : '650px'"
-    });
+      this.$refs.singleTable.doLayout() // 解决表格错位
+    // :height="qp ? '810px' : '650px'"
+    })
  },
  methods: {
    reset () {
--- a/back/src/views/modules/sys/user.vue
+++ b/back/src/views/modules/sys/user.vue
@ -2,25 +2,25 @@
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-sys__user">
      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <el-form-item label="用户名">
          <el-input v-model="dataForm.username" placeholder="用户名" clearable></el-input>
        </el-form-item>
-        <el-form-item>
+        <el-form-item label="真实姓名">
          <el-input v-model="dataForm.real_name" placeholder="真实姓名" clearable></el-input>
        </el-form-item>
-        <el-form-item>
-          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
-        </el-form-item>
        <!-- <el-form-item>
-          <el-select v-model="dataForm.postId" :placeholder="$t('user.postIdList')" clearable>
-            <el-option :label="data.postName" v-for="data in postList" :key="data.id" :value="data.id">{{ data.postName
+          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
+        </el-form-item> -->
+        <el-form-item label="所属部门">
+          <el-select v-model="dataForm.deptId" :placeholder="$t('infrastructure.department')" clearable>
+            <el-option :label="data.name" v-for="data in deptList" :key="data.id" :value="data.id">{{ data.name
            }}</el-option>
          </el-select>
-        </el-form-item> -->
-        <el-form-item>
+        </el-form-item>
+        <!-- <el-form-item>
          <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true" ref="renDeptTree">
          </ren-dept-tree>
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item>
          <el-button type="primary" @click="getDataList()">{{
          $t('query')
@ -97,7 +97,7 @@ import AddOrUpdate from './user-add-or-update'
 import qs from 'qs'
 export default {
  mixins: [mixinViewModule],
-  data() {
+  data () {
    return {
      mixinViewModuleOptions: {
        getDataListURL: '/sys/user/page',
@ -106,7 +106,7 @@ export default {
        deleteIsBatch: true,
        exportURL: '/sys/user/export'
      },
-      postList: [],
+      deptList: [],
      dataForm: {
        username: '',
        deptId: '',
@ -118,18 +118,18 @@ export default {
  components: {
    AddOrUpdate
  },
-  created() {
-    this.getPostList()
+  created () {
+    this.getDeptList()
  },
  methods: {
-    reset() {
+    reset () {
      this.dataForm.username = ''
      this.dataForm.real_name = ''
      this.dataForm.deptId = ''
      this.dataForm.postId = ''
      this.dataForm.gender = ''
      if (this.$refs.renDeptTree) {
-        this.$refs.renDeptTree.showDeptName = '';
+        this.$refs.renDeptTree.showDeptName = ''
      }
      this.$http
        .get(
@ -165,16 +165,13 @@ export default {
          this.dataListLoading = false
        })
    },
-    getPostList() {
-      this.$http
-        .get('/sys/post/list')
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.postList = res.data
-        })
-        .catch(() => { })
+    getDeptList () {
+      this.$http.get('/sys/dept/list').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptList = res.data
+      }).catch(() => { })
    }
  }
 }
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -88,7 +88,7 @@
              </span>
              <div
                class="leixingsumfather"
-                :class="!item.shrinkFlag ? 'shrink' : ''"
+                :class="!item.shrinkFlag ? 'shrink' : 'shrink'"
              >
                <div
                  v-for="(item2, index2) in item.typeList"
@ -108,7 +108,7 @@
                  </a-checkable-tag>
                </div>
              </div>
-              <div
+              <!-- <div
                class="shrinkTag"
                v-if="item.showShrink"
                :key="item.shrinkFlag"
@ -121,7 +121,7 @@
                  v-show="item.shrinkFlag"
                  @click="changeShrink(item.name)"
                />
-              </div>
+              </div> -->
            </div>
          </div>
        </template>
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -62,6 +62,42 @@
              item.infoList.filter((val) => val.attrType == '应用图片')[0]
                .attrValue
            "
+            :fallback="imgSrcYyzy"
+          />
+        </div>
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-else-if="
+            (item.type === '组件服务' &&
+              item.infoList &&
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]) ||
+            item.infoList.filter((val) => val.attrType == '组件图片')[0]
+          "
+        >
+          <a-image
+            v-if="
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]
+            "
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]
+                .attrValue
+            "
+            :fallback="imgSrcTcfw"
+          />
+          <a-image
+            v-else-if="
+              item.infoList.filter((val) => val.attrType == '组件图片')[0]
+            "
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '组件图片')[0]
+                .attrValue
+            "
+            :fallback="item.type == '开发组件' ? imgSrcKfzj : imgSrcYwzj"
          />
        </div>
        <div
@ -253,6 +289,18 @@
            </div>
          </div>
          <div class="dec">
+            <div
+              v-if="
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+              "
+            >
+              <span>
+                {{
+                  item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                    .attrValue
+                }}
+              </span>
+            </div>
            <div
              v-if="
                selectCardsname !== '融合服务' &&
@ -615,12 +663,12 @@
            //     id: item.id,
            //   },
            // });
-                 //修改顶部菜单的样式
-        let pathData = {
-          path: '/details',
-          id: item.id,
-        };
-         mybus.emit('changeMenuStyle',pathData);
+            //修改顶部菜单的样式
+            let pathData = {
+              path: '/details',
+              id: item.id,
+            }
+            mybus.emit('changeMenuStyle', pathData)
          }
        }
      }
@ -766,7 +814,10 @@
            integrationServiceOrderDom.value.reset()
        }
      })
-
+      const imgSrcYyzy = ref(require('@/assets/home/yyzy_square.png'))
+      const imgSrcTcfw = ref(require('@/assets/home/tcfw_square.png'))
+      const imgSrcKfzj = ref(require('@/assets/home/kfzj_square.png'))
+      const imgSrcYwzj = ref(require('@/assets/home/ywzj_square.png'))
      let videoUrl = ref('')
      const options = reactive({
        width: '700px', //播放器宽度
@ -821,8 +872,8 @@
        let pathData = {
          path: '/algorithmCompare',
          id: item.id,
-        };
-         mybus.emit('changeMenuStyle',pathData);
+        }
+        mybus.emit('changeMenuStyle', pathData)
      }
      return {
        onSearch,
@ -847,6 +898,10 @@
        integrationServiceOrderDom,
        orderObj,
        getTagList,
+        imgSrcYyzy,
+        imgSrcTcfw,
+        imgSrcKfzj,
+        imgSrcYwzj,
      }
    },
    beforeUnmount() {
@ -857,7 +912,7 @@
 </script>
 <style scoped lang="less">
  #search-result-list-container {
-   // width: 1088px;
+    // width: 1088px;
    padding: 0 18px;
    background: #f3f5f9;

@ -1043,7 +1098,7 @@

          .header-right:last-child {
            div {
-           //   margin-right: 10px;
+              //   margin-right: 10px;
            }
          }

@ -1225,7 +1280,7 @@

  .description {
    max-width: 990px;
-   // height: 52px;
+    // height: 52px;
    font-size: 14px;
    line-height: 18px;
    display: -webkit-box;
--- a/front/src/views/home/detailBack.vue
+++ b/front/src/views/home/detailBack.vue
@ -1,77 +1,82 @@
+<!--
+ * @Author: Light
+ * @Date: 2022-11-24 09:07:50
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-25 09:56:50
+ * @Description: 告诉大家这是什么
+-->
 <template>
-  <div>
-   <div class="nav-box">
-        <a-breadcrumb>
+  <div class="detail-back" @click="goToDetailsPageconetent">
+    <!-- <div class="nav-box"> -->
+    <!-- <a-breadcrumb>
          <a-breadcrumb-item @click="goToDetailsPageconetent" class="bread-crumb-span">能力集市</a-breadcrumb-item>
          <a-breadcrumb-item>{{detailName}}</a-breadcrumb-item>
-        </a-breadcrumb>
-      </div>
+        </a-breadcrumb> -->
+    <!-- </div> -->
  </div>
 </template>

 <script setup>
-import { reactive, ref, watch, defineProps } from 'vue'
-import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
-import mybus from '@/myplugins/mybus'
-const router = useRouter()
-const oldValue1= ref('')
-const props = defineProps({
-  textColor: { type: String, default: '' },
-})
-
-const previousPage = () => {
-  if (window.history.state.back){
-    window.history.go(-1)
-  } else{
-   router.push({
-   path: '/integrationServices',
+  import { reactive, ref, watch, defineProps } from 'vue'
+  import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
+  import mybus from '@/myplugins/mybus'
+  const router = useRouter()
+  const oldValue1 = ref('')
+  const props = defineProps({
+    textColor: { type: String, default: '' },
  })
+
+  const previousPage = () => {
+    if (window.history.state.back) {
+      window.history.go(-1)
+    } else {
+      router.push({
+        path: '/integrationServices',
+      })
+    }
  }

-}
-
-const detailName = ref("应用资源")
-
-const goToDetailsPageconetent = () =>{
-   let pathData =  {
-          path: '/DetailsPageconetent',
-        };
-     mybus.emit('changeMenuStyle',pathData);
-}
+  const detailName = ref('应用资源')

+  const goToDetailsPageconetent = () => {
+    let pathData = {
+      path: '/DetailsPageconetent',
+    }
+    mybus.emit('changeMenuStyle', pathData)
+  }
 </script>

 <style scoped lang="less">
-.detail-back {
-  position: absolute;
-  top: 0.6rem;
-  left: 100px;
-  font-size:  0.18rem;
-  color: #fff;
-  cursor: pointer;
-  width: 50px;
-  height: 50px;
-  //background-image: url('~@/assets/detailsAll/back.png');
-  background-size: 100% 100%;
-}
+  .detail-back {
+    position: absolute;
+    top: 1rem;
+    left: 100px;
+    font-size: 0.18rem;
+    color: #fff;
+    cursor: pointer;
+    width: 50px;
+    height: 50px;
+    background-image: url('~@/assets/detailsAll/back.png');
+    background-size: 100% 100%;
+  }
  .nav-box {
    position: absolute;
    top: 0.6rem;
-  //left: 100px;
-  font-size:  0.18rem;
-  color: #fff;
-      height: 30px;
-      line-height:30px;
-      width: 100%;
-      font-size: 14px;
-      display: flex;
-      align-items: center;
-      background: rgba(244, 245, 248, 0.8);
-      padding-left: 145px;
-      padding-top: 5px;
-      .bread-crumb-span{
-         cursor: pointer;
-      }
+    left: 100px;
+    font-size: 0.18rem;
+    color: #fff;
+    height: 30px;
+    line-height: 30px;
+    width: 100%;
+    font-size: 14px;
+    display: flex;
+    align-items: center;
+    background: rgba(244, 245, 248, 0.8);
+    padding-left: 145px;
+    padding-top: 5px;
+    .bread-crumb-span {
+      cursor: pointer;
    }
-</style>
+  }
+</style>
--- a/front/src/views/instructionManual/components/menuBook.vue
+++ b/front/src/views/instructionManual/components/menuBook.vue
@ -257,7 +257,7 @@
        path: '/DetailsPageconetent',
        query: {
          // select: '组件服务',
-          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
        },
      })
      window.location.href = newpage.href
--- a/front/src/views/newHome/components/WorkDynamics.vue
+++ b/front/src/views/newHome/components/WorkDynamics.vue
@ -125,7 +125,7 @@
    if (abilityToTypeFunctionData.value == '组件服务') {
      if (!componentTypeValue.value || componentTypeValue.value == '') {
        message.error('请选择组件类型！')
-        componentTypeValueOld.value=''
+        componentTypeValueOld.value = ''
        return
      } else if (
        componentTypeValue.value === '智能算法' ||
--- a/front/src/views/personalCenter/components/MyPublish.vue
+++ b/front/src/views/personalCenter/components/MyPublish.vue