Merge branch 'hi-ucs-dev' of http://10.16.3.230:8011/wuhongjian/hi-ucs-web into hi-ucs-dev

back/src/views/modules/ability/knowledgeBase.vue

@@ -0,0 +1,565 @@
+<!-- 知识库 -->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-ability__bsabilityai">
+      <el-form :inline="true" :model="dataForm">
+        <el-form-item>
+          <el-input v-model="dataForm.name" placeholder="名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getDataList2(dataForm.name)">{{
+              $t('query')
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="info" @click="exportHandle()">{{
+              $t('export')
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="showPutOnTheShelf()">上架</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('ability:knowledgeBase:delete')" type="danger" @click="deleteHandle2()">{{
+              $t('deleteBatch')
+          }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="reset">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        :key="Math.random()" style="width: 100%" height="650px">
+        <el-table-column type="selection" header-align="center" align="center" width="50">
+        </el-table-column>
+        <af-table-column :show-overflow-tooltip="true" width="280" prop="name" label="名称" header-align="center"
+          align="center"></af-table-column>
+        <af-table-column :show-overflow-tooltip="true" width="500" prop="description" label="描述" header-align="center"
+          align="center"></af-table-column>
+        <template v-if="dataList[0] && dataList[0].infoList2">
+          <af-table-column :show-overflow-tooltip="true"  v-for="(item, index) in dataList[0].infoList2"
+            :key="index" :label="item.attrType" header-align="center" align="center">
+            <template slot-scope="scope">
+              {{ findValue(scope.row.infoList2, item.attrType) }}
+            </template>
+          </af-table-column>
+        </template>
+
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('ability:knowledgeBase:update')" type="text" size="small"
+              @click="UpdateData(scope.row)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('ability:knowledgeBase:delete')" type="text" size="small"
+              @click="deleteHandle2(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="showDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="Number(total)"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+    </div>
+
+    <!-- 选择类型 -->
+    <el-dialog title="选择类型" :visible.sync="showPutOnTheShelfFlag" :close-on-click-modal="false"
+      :close-on-press-escape="false" :before-close="clear" width="30%">
+      <el-radio v-model="radio" v-for="(data, i) in insertList.children" :label="data.name" :key="i">
+      </el-radio>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="clear">取 消</el-button>
+        <el-button type="primary" @click="showPutOnTheShelfVue">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+    <el-dialog :title="submitFrom.id ? '修改' + radio : '上架' + radio" :visible.sync="showPutOnTheShelfFlag2"
+      :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :before-close="clear"
+      width="50%">
+      <putOnTheShelf ref="putOnTheShelf" :putOnTheShelfList="putOnTheShelfList" @changeInfoList="changeInfoList"
+        :type="radio" :typeInput="typeInput" :required="required" :notFilled="notFilled" @submitData="submitData">
+      </putOnTheShelf>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="clear">取 消</el-button>
+        <el-button type="primary" @click="submitData">确 定</el-button>
+      </span>
+    </el-dialog>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import dictionaries from '@/utils/dictionaries'
+import qs from 'qs'
+import { pinyin } from 'pinyin-pro'
+import putOnTheShelf from '@/views/modules/putOnTheShelf'
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      required: [],
+      // required: ['归属部门', '部门联系人', '部门联系人电话', '应用领域', '共享条件', '算法名称', '算法描述', '图层名称', '图层描述', '组件名称', '组件描述', '组件地址', '服务地址', '服务接口', '接口请求方式', '算法类别'],
+      notFilled: [],
+      insertList: [],
+      putOnTheShelfList: [],
+      radio: '',
+      showPutOnTheShelfFlag: false,
+      showPutOnTheShelfFlag2: false,
+      submitFrom: {
+        type: '知识库',
+        deptId: '',
+        delFlag: 0,
+        infoList: [
+          {
+            attrType: '知识库类型',
+            attrValue: '',
+            delFlag: 0
+          }
+        ]
+      },
+      mixinViewModuleOptions: {
+        getDataListURL: '/resource/page',
+        getDataListIsPage: true,
+        exportURL: '/ability/bsabilityai/export',
+        deleteURL: '/resource/delete',
+        deleteIsBatch: true
+      },
+      disabled: false,
+      dataForm: {
+        name: '',
+        creator: '',
+        delFlag: 0,
+        selectType: 0,
+        type: '知识库'
+      },
+      typeInput: '知识库',
+      uuidOne: '',
+      uuidTwo: '',
+      uuidSnum: ''
+    }
+  },
+  watch: {},
+  components: {
+    putOnTheShelf
+  },
+  created() {
+    this.dataForm.name = ''
+    this.dataForm.type = '知识库'
+  },
+  mounted() {
+    // window.addEventListener('resize', this.a)
+    // this.fullScreen()
+    this.reset()
+  },
+  methods: {
+    reset() {
+      this.$http
+        .get(
+          this.mixinViewModuleOptions.getDataListURL +
+          '?' +
+          qs.stringify({
+            page: 1,
+            limit: 10,
+            creator: '',
+            selectType: 0,
+            delFlag: 0,
+            type: '知识库',
+            name: ''
+          })
+        )
+        .then(({ data: res }) => {
+          this.dataForm.name = ''
+          if (res.code !== 0) {
+            this.dataList = []
+            this.total = 0
+            return this.$message.error(res.msg)
+          }
+          this.dataList = this.mixinViewModuleOptions.getDataListIsPage
+            ? res.data.list
+            : res.data
+          this.dataList.map((item, index) => {
+            const dataListSinforList = []
+            item.infoList.map((itemson, indexson) => {
+              if (
+                itemson.attrType === '知识库类型'
+              ) {
+                dataListSinforList.push(itemson)
+              }
+            })
+            this.dataList[index].infoList2 = dataListSinforList
+          })
+          console.log('this.dataList', this.dataList)
+          this.total = this.mixinViewModuleOptions.getDataListIsPage
+            ? res.data.total
+            : 0
+          if (this.mixinViewModuleOptions.requestCallback) {
+            this.mixinViewModuleOptions.requestCallback(res.data)
+          }
+          this.dataListLoading = false
+        })
+        .catch(() => {
+          this.dataListLoading = false
+        })
+    },
+    findValue(list, type) {
+      const found = list.find((item) => item.attrType === type)
+      if (found) {
+        return found.attrValue
+      } else {
+        return '暂无数据'
+      }
+    },
+    showDetail(val) {
+      console.log(val)
+      window.open(window.SITE_CONFIG.previewUrl + '#/details?id=' + val.id)
+    },
+    getDataList2(names) {
+      if (names != null) {
+        this.$http
+          .get(
+            this.mixinViewModuleOptions.getDataListURL +
+            '?' +
+            qs.stringify({
+              pageNum: 1,
+              pageSize: this.limit,
+              type: '知识库',
+              creator: '',
+              selectType: 0,
+              delFlag: 0,
+              name: names
+            })
+          )
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.dataList = []
+              this.total = 0
+              return this.$message.error(res.msg)
+            }
+            if (res.data.list.length !== 0) {
+              this.dataList = res.data.list
+              this.total = this.mixinViewModuleOptions.getDataListIsPage
+                ? res.data.total
+                : 0
+              if (this.mixinViewModuleOptions.requestCallback) {
+                this.mixinViewModuleOptions.requestCallback(res.data)
+              }
+              this.dataListLoading = false
+              this.dataList.map((item, index) => {
+                const dataListSinforList = []
+                item.infoList.map((itemson, indexson) => {
+                  if (
+                    itemson.attrType === '知识库类型'
+                  ) {
+                    dataListSinforList.push(itemson)
+                  }
+                })
+                this.dataList[index].infoList2 = dataListSinforList
+              })
+            } else {
+              this.$message.error('未查询到相关信息')
+              this.reset()
+            }
+          })
+          .catch(() => {
+            this.dataListLoading = false
+          })
+      } else {
+        this.$message.error('查询信息不能为空')
+      }
+    },
+    // 新上架
+    clear() {
+      console.log('清空----------------------------------------')
+      this.notFilled = []
+      this.showPutOnTheShelfFlag = false
+      this.showPutOnTheShelfFlag2 = false
+      this.insertList = []
+      this.putOnTheShelfList = []
+      this.radio = ''
+      this.submitFrom = {
+        type: '知识库',
+        deptId: '',
+        delFlag: 0,
+        infoList: [
+          {
+            attrType: '知识库类型',
+            attrValue: '',
+            delFlag: 0
+          }
+        ]
+      }
+      this.reset()
+    },
+    showPutOnTheShelf() {
+      this.showPutOnTheShelfFlag = true
+      this.$http.get('/category/getCategoryTree').then((res) => {
+        console.log('res------获取知识库类型------>', res);
+        this.insertList = res.data.data.filter(
+          (item) => item.name === '知识库'
+        )[0]
+      })
+    },
+    showPutOnTheShelfVue() {
+      this.showPutOnTheShelfFlag = false
+      this.showPutOnTheShelfFlag2 = true
+      if (this.submitFrom.infoList[0]) {
+        this.submitFrom.infoList[0].attrValue = this.radio
+      }
+      this.putOnTheShelfList = this.insertList.children.filter(
+        (item) => item.name === this.radio
+      )[0].children
+      if (this.putOnTheShelfList[0] && this.putOnTheShelfList[0].children && this.putOnTheShelfList[0].children && this.putOnTheShelfList[0].children[0].children) {
+        this.putOnTheShelfList[0].children[0].children.forEach(v => {
+          if (v.name == '发布日期') {
+            // 日期格式
+            v.type = 'date'
+          }
+        })
+      }
+      console.log('this.putOnTheShelfList------------>', this.putOnTheShelfList[0].children[0].children);
+    },
+    changeInfoList(obj) {
+      console.log(obj, this.submitFrom)
+      this.submitFrom.infoList = this.submitFrom.infoList.filter(
+        (item) => item.attrType !== obj.attrType
+      )
+      this.submitFrom.infoList.push(obj)
+    },
+
+    submitData() {
+      console.log('提交11111111111===============>', this.putOnTheShelfList, this.submitFrom)
+      const arr = []
+      this.putOnTheShelfList.map((item) => {
+        item.children.map((child) => {
+          if (child.children) {
+            child.children.map((val) => {
+              arr.push(val.name)
+              if (
+                val.type === 'input' ||
+                val.type === 'textArea' ||
+                val.type === 'select' ||
+                val.type === 'checkBox' ||
+                val.type === 'radio'
+              ) {
+                this.submitFrom.infoList = this.submitFrom.infoList.filter(
+                  (item) => item.attrType !== val.name
+                )
+              }
+              switch (val.name) {
+                case '标准名称':
+                case '模型名称':
+                  this.submitFrom.name = val.note1
+                  break;
+                case '标准简介':
+                case '模型描述':
+                  this.submitFrom.description = val.note1
+                  break;
+                case '联系方式':
+                  this.submitFrom.deptPhone = val.note1
+                  break;
+                default:
+                  if (
+                    val.type !== 'image' &&
+                    val.type !== 'file' &&
+                    val.type !== 'video'
+                  ) {
+                    this.submitFrom.infoList.push({
+                      attrType: val.name,
+                      attrValue: val.note1,
+                      delFlag: 0
+                    })
+                  } else {
+                    if (
+                      this.submitFrom.infoList.filter(
+                        (value) => value.attrType === val.name
+                      ).length === 0
+                    ) {
+                      this.submitFrom.infoList.push({
+                        attrType: val.name,
+                        attrValue: val.note1,
+                        delFlag: 0,
+                        note2: val.note2 || null
+                      })
+                    }
+                  }
+                  break;
+              }
+            })
+          }
+        })
+      })
+      this.submitFrom.infoList = this.submitFrom.infoList.sort(
+        (a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType)
+      )
+      if (this.submitFrom.id) {
+        // 解决编辑无组件类型
+        this.submitFrom.infoList.map((val) => {
+          if (val.attrType === '知识库类型') {
+            val.attrValue = this.radio
+          }
+        })
+      }
+      // 去重
+      const newArr = this.submitFrom.infoList.filter(
+        (element, index, self) => {
+          return (
+            self.findIndex((x) => x.attrType === element.attrType) === index
+          )
+        }
+      )
+      this.submitFrom.infoList = newArr
+      this.notFilled = []
+      if (!this.submitFrom.name) {
+        this.notFilled.push('标准名称')
+        this.notFilled.push('模型名称')
+      }
+      if (this.notFilled.length > 0) {
+        this.$message({
+          message: '请填写必填字段！',
+          type: 'warning'
+        })
+      } else {
+        // 表单提交
+        console.log('this.submitFrom.infoList----表单提交-------->', this.submitFrom);
+        let _url = this.submitFrom.id ? '/resource/update' : '/resource/insert?source= b';
+        let _method = this.submitFrom.id ? 'put' : 'post';
+        let _msg = this.submitFrom.id ? '修改' : '上架';
+        this.$http[_method](_url, this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error(_msg + '失败!')
+            } else {
+              this.$message.success(_msg + '成功！')
+              this.clear()
+            }
+          })
+          .catch(() => { })
+      }
+    },
+    // 新修改
+    UpdateData(item) {
+      this.$http.get('/category/getCategoryTree').then((res) => {
+        this.insertList = res.data.data.filter(
+          (item) => item.name === '知识库'
+        )[0]
+        console.log('this.insertList-------www----->', this.insertList);
+        let _knowType = item.infoList.find((val) => val.attrType === '知识库类型') || {};
+        console.log('_knowType------------>', _knowType);
+
+        this.radio = item.infoList.find(
+          (val) => val.attrType === '知识库类型'
+        ).attrValue
+        console.log('item.infoList------------>', item.infoList);
+        console.log('this.radio---www--------->', this.radio);
+        this.putOnTheShelfList = this.insertList.children.filter(
+          (item) => item.name === this.radio
+        )[0].children;
+        if (this.putOnTheShelfList[0] && this.putOnTheShelfList[0].children && this.putOnTheShelfList[0].children && this.putOnTheShelfList[0].children[0].children) {
+          this.putOnTheShelfList[0].children[0].children.forEach(v => {
+            if (v.name == '发布日期') {
+              // 日期格式
+              v.type = 'date'
+            }
+          })
+        }
+        this.putOnTheShelfList.map((parent) => {
+          console.log('parent-------ssss----->', parent);
+          parent.children.map((child) => {
+            if (child.children) {
+              child.children.map((data) => {
+                switch (data.name) {
+                  case '模型名称':
+                  case '标准名称':
+                    data.note1 = item.name
+                    break
+                  case '标准简介':
+                  case '模型描述':
+                    data.note1 = item.description
+                    break
+                  case '联系方式':
+                    data.note1 = item.deptPhone
+                    break
+                  // case '归属部门':
+                  //   data.note1 = item.deptId
+                  //   break
+                  default:
+                    // eslint-disable-next-line no-case-declarations
+                    const obj1 = item.infoList.filter(
+                      (val) => val.attrType === data.name
+                    )[0]
+                    if (obj1) {
+                      data.note1 = obj1.attrValue
+                    }
+                    break
+                }
+                if (
+                  data.type === 'image' ||
+                  data.type === 'file' ||
+                  data.type === 'video'
+                ) {
+                  const obj1 = item.infoList.filter(
+                    (val) => val.attrType === data.name
+                  )[0]
+                  if (obj1) {
+                    data.note2 = obj1.note2
+                  }
+                }
+              })
+            }
+          })
+        })
+        this.submitFrom.id = item.id
+        this.showPutOnTheShelfFlag2 = true
+      })
+    },
+
+    // 新删除
+    deleteHandle2(id) {
+      if (id == undefined && this.dataListSelections.length < 1) {
+        this.$message({
+          type: 'info',
+          message: '请选择要删除的数据'
+        })
+      } else {
+        this.$confirm('确认是否删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const ids = []
+          if (id) {
+            ids.push(id)
+          } else {
+            if (this.dataListSelections.length > 0) {
+              this.dataListSelections.forEach(item => {
+                ids.push(item.id)
+              })
+            }
+          }
+          this.$http.post('/resource/delete', { ids: ids }).then(res => {
+            console.log('删除成功', res)
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            })
+            this.reset()
+          })
+        }).catch(() => {
+        })
+      }
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.el-tooltip__popper {
+  max-width: 50%;
+}
+
+// ::v-deep .el-table .cell {
+//   width: 200px;
+// }
+::v-deep .el-upload-list__item-name {
+  width: 400px;
+}
+</style>

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-11-24 20:45:45
+ * @LastEditTime: 2022-11-28 11:28:43
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -531,7 +531,7 @@ export default {
     // 任务处理出错回调
     taskHandleErrorCallback (data) { },
     download (data) {
-      this.downloadFile(data.attachment, '附件')
+      this.downloadFile(data.attachment, '感知资源申请表')
       // const alink = document.createElement('a')
       // alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容
       // // alink.href = data.attachment // 创建 url地址

back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue

@@ -82,6 +82,11 @@ js:
         <el-radio v-for="item in options" :label="item.dictLabel" :key="item.dictLabel">{{item.dictLabel}}</el-radio>
       </el-radio-group> -->
     <a-textarea v-else-if="type == 'textArea'" @change="changeIiem(name,data.note1)" v-model:value="data.note1" :showCount="true" :maxlength="200" :placeholder="'请填写' + name" />
+    <div class="block" v-else-if="type == 'date'">  
+      <el-date-picker v-model="data.note1" type="date" :placeholder="'选择' + name" value-format="yyyy-MM-dd">
+      </el-date-picker>
+    </div>
+    
     </div>
 </template>
 <script>

back/src/views/modules/putOnTheShelf/index.vue

@@ -47,7 +47,8 @@
               <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'checkBox'" type="checkBox" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
               <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'radio'" type="radio" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
               <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'textArea'" type="textArea" :data="item" :name="item.name"></input-select-checkbox>
-              </div>
+              <input-select-checkbox :changeField='changeField' :list="[]" v-else-if="item.type == 'date'" type="date" :data="item" :name="item.name"></input-select-checkbox>
+            </div>
               <div class="requiredTips" v-show="notFilled.indexOf(item.name) > -1 && (item.type=='input' || item.type=='textArea') && changeField.indexOf(item.name) == -1">请填写{{item.name}}！</div>
               <div class="requiredTips" v-show="notFilled.indexOf(item.name) > -1 && (item.type=='select' || item.type=='checkBox' || item.type=='radio') && changeField.indexOf(item.name) == -1">请选择{{item.name}}！</div>
             </div>

back/src/views/modules/sys/check.vue

@@ -0,0 +1,170 @@
+<template>
+    <el-dialog
+      :visible.sync="visible"
+      title="审核权限配置检查"
+      :footer="false"
+      @close="onClose"
+
+    >
+    <el-tabs v-model="tab" type="card" >
+    <el-tab-pane label="未配置部门管理员权限部门" name="first">
+      <div style="float: left;margin-bottom: 8px;font-size: 16px;">检测结果：共{{deptTotal}}个</div>
+        <el-table
+        :data="deptData"
+        :header-cell-style="{ textAlign: 'center', height: '40px' }"
+        :cell-style="{ textAlign: 'center' }"
+        style="width: 100%"
+      >
+      <el-table-column   width="80px" label="序号" align="center">
+        <template slot-scope="scop">
+          {{scop.$index+1}}
+        </template>
+      </el-table-column>
+        <el-table-column
+          prop="name"
+          label="部门名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="type"
+          label="类型"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+      </el-table>
+      <div class="block" >
+      <el-pagination
+        @current-change="handleCurrentChange1"
+        layout=" prev, pager, next"
+         :total="deptTotal"
+        :page-size="pageSize"
+        :current-page="currentPageDept"
+      >
+      </el-pagination>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane label="未配置区市审核人权限区市" name="second">
+      <div style="float: left;margin-bottom: 8px;font-size: 16px;">检测结果：共{{districtTotal}}个</div>
+        <el-table
+        :data="districtData"
+        :header-cell-style="{ textAlign: 'center', height: '40px' }"
+        :cell-style="{ textAlign: 'center' }"
+        style="width: 100%"
+      >
+      <el-table-column   width="80px" label="序号" align="center">
+        <template slot-scope="scop">
+          {{scop.$index+1}}
+        </template>
+      </el-table-column>
+        <el-table-column
+          prop="NAME"
+          label="区市名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!-- <el-table-column
+          prop="type"
+          label="类型"
+          header-align="center"
+          align="center"
+        ></el-table-column> -->
+        
+      </el-table>
+      <div class="block" >
+      <el-pagination
+        @current-change="handleCurrentChange2"
+        layout="prev, pager, next"
+         :total="deptTotal"
+        :page-size="pageSize"
+        :current-page="currentPageDistrict"
+      >
+      </el-pagination>
+      </div>
+    </el-tab-pane>
+    </el-tabs>
+    </el-dialog>
+  </template>
+  
+  <script>
+
+  export default {
+    data () {
+      return {
+        visible:false,
+        tab:'first',
+        deptTotal:0,
+        districtTotal:0,
+        deptData:[],
+        districtData:[],
+        currentPageDistrict:1,
+        currentPageDept:1,
+        pageSize:10,
+      }
+    },
+ watch:{
+
+},
+    methods: {
+      handleCurrentChange1 (val) {
+      this.currentPageDept = val
+      this.getDeptList()
+    },
+    handleCurrentChange2 (val) {
+      this.currentPageDistrict = val
+      this.getDistrinctList()
+    },
+      getDeptList(){
+        let params = {
+          pageNum:this.currentPageDept,
+          pageSize:this.pageSize
+
+        }
+        this.$http
+        .get('/sys/user/getApproverUnconfiguredDepartment/', {params
+         
+        })
+        .then((res) => {
+          this.deptData = res.data.data.list
+          this.deptTotal = Number(res.data.data.total)
+        })
+      },
+      getDistrinctList(){
+        let params = {
+          pageNum:this.currentPageDistrict,
+          pageSize:this.pageSize
+
+        }
+        this.$http
+        .get('/sys/user/getApproverUnconfiguredRegion', {params
+         
+        })
+        .then((res) => {
+          this.districtData = res.data.data
+          this.districtTotal = Number(res.data.data.length)
+        })
+      },
+        onClose(){
+    this.visible=false;
+    this.$emit("refreshCheck",false)
+        },
+      init(){
+        this.visible = true   
+        this.getDeptList()
+        this.getDistrinctList()
+      }
+    }
+    
+}
+     
+ 
+  
+  </script>
+  
+  <style lang="scss" scoped>
+
+  ::v-deep .aui-content   .el-tabs__header {
+    left: 0px;
+  }
+  </style>
+  

back/src/views/modules/sys/user.vue

@@ -41,6 +41,9 @@
         <el-form-item>
           <el-button type="primary"  @click="reset()">重置</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary"  @click="check()">审核权限配置检查</el-button>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
         @sort-change="dataListSortChangeHandle" style="width: 100%">
@@ -87,6 +90,8 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        <!-- 审核权限配置检查 -->
+        <check v-if="checkVisible" ref="check" @refreshCheck="refreshCheck"></check>
     </div>
   </el-card>
 </template>
@@ -94,11 +99,14 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './user-add-or-update'
+import Check from './check'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
+      //审核权限配置检查
+      checkVisible:false,
       mixinViewModuleOptions: {
         getDataListURL: '/sys/user/page',
         getDataListIsPage: true,
@@ -116,12 +124,22 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    Check
   },
   created () {
     this.getDeptList()
   },
   methods: {
+    check(){
+      this.checkVisible=true
+      this.$nextTick(() => {    
+        this.$refs.check.init()
+      })
+    },
+    refreshCheck(val){
+      this.checkVisible=val
+    },
     reset () {
       this.dataForm.username = ''
       this.dataForm.real_name = ''

front/public/static/config/basicConfig.js

@@ -2,13 +2,13 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-27 23:42:04
+ * @LastEditTime: 2022-11-29 11:21:41
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
-  // version: 'qingdao', //青岛
+  version: 'qingdao', //青岛
-  version: 'xihaian', // 西海岸
+  // version: 'xihaian', // 西海岸
   // version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试

front/src/App.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-06 11:12:00
  * @LastEditors: Light
- * @LastEditTime: 2022-11-24 10:53:41
+ * @LastEditTime: 2022-11-29 17:28:20
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -19,13 +19,14 @@
   import { getCategoryTreePage } from '@/api/personalCenter'
   import zhCN from 'ant-design-vue/es/locale/zh_CN'
   import Cookies from 'js-cookie'
-  import { onBeforeUnmount, onMounted, watch, nextTick } from 'vue'
+  import { onBeforeUnmount, onMounted, watch, ref } from 'vue'
   import { useRouter } from 'vue-router'
   import mybus from '@/myplugins/mybus'
   const router = useRouter()
 
   const locale = zhCN
   const token = Cookies.get('ucsToken')
+  const whoShow1 = ref(whoShow)
   console.log('token=================>', token)
   let ws = new WebSocket(
     `ws://${window.SITE_CONFIG['websocketURL']}/websocket?token=${token}`
@@ -39,6 +40,13 @@
     if (router.currentRoute.value.name === 'mynoticeView') {
       mybus.emit('noticeListInit')
     }
+    // 判断当前路由是否是待办列表
+    if (
+      router.currentRoute.value.name === 'DetailsPageconetent' &&
+      whoShow1.value.itShowXiHaiAn
+    ) {
+      mybus.emit('initDetailsPageconetent')
+    }
   }
   ws.onerror = function (e) {
     console.log('WebSocket连接异常============================>', e)

front/src/api/assertReport.js

@@ -0,0 +1,79 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-11-28 16:43:10
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-29 11:35:36
+ * @Description: 告诉大家这是什么
+ */
+import request from '@/utils/request'
+//获取中间地图
+export function getDistrictFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getDistrictFundStatement',
+    method: 'get',
+  })
+}
+//左侧获取组件资源节约资金列表
+export function getComponentFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getComponentFundStatement',
+    method: 'get',
+  })
+}
+//左侧获取应用资源列表
+export function getResourceFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getResourceFundStatement',
+    method: 'get',
+  })
+}
+//左侧基础设施
+export function getInfrastructureFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getInfrastructureFundStatement',
+    method: 'get',
+  })
+}
+//右侧市级部门共享排行
+export function getProvideDeptFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getProvideDeptFundStatement',
+    method: 'get',
+  })
+}
+//右侧市级部门申请排行
+export function getApplyDeptFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getApplyDeptFundStatement',
+    method: 'get',
+  })
+}
+//右侧区市提供排行
+export function getProvideDistrictFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getProvideDistrictFundStatement',
+    method: 'get',
+  })
+}
+//右侧区市申请排行
+export function getApplyDistrictFundStatement() {
+  return request({
+    url: '/processForm/tabilityapplication/getApplyDistrictFundStatement',
+    method: 'get',
+  })
+}
+//右侧资源汇聚总量
+export function selectTotal() {
+  return request({
+    url: '/resource/selectTotal',
+    method: 'get',
+  })
+}
+//首页 获取总节省资金
+//右侧资源汇聚总量
+export function getApplyPriceCount() {
+  return request({
+    url: '/processForm/tabilityapplication/getApplyPriceCount',
+    method: 'get',
+  })
+}

front/src/store/modules/user.js

@@ -2,7 +2,7 @@
  * @author chuzhixin 1204505056@qq.com
  * @description 登录、获取用户信息、退出登录、清除accessToken逻辑，不建议修改
  */
-import { getUserInfo, login, logout } from '@/api/user'
+import { getUserInfo, login, logout, getRole } from '@/api/user'
 import {
   getAccessToken,
   removeAccessToken,
@@ -20,6 +20,7 @@ const state = () => ({
   userId: '',
   avatar: '',
   role: 0, // 用户管理员权限
+  roleList: [], // 用户管理员权限
 })
 const getters = {
   accessToken: (state) => state.accessToken,
@@ -27,6 +28,7 @@ const getters = {
   realName: (state) => state.realName,
   avatar: (state) => state.avatar,
   role: (state) => state.role,
+  roleList: (state) => state.roleList,
   userId: (state) => state.userId,
   deptName: (state) => state.deptName,
   deptId: (state) => state.deptId,
@@ -64,6 +66,9 @@ const mutations = {
   setRole(state, role) {
     state.role = role
   },
+  setRoleList(state, role) {
+    state.roleList = role
+  },
   // 设置用户userId
   setUserId(state, id) {
     state.userId = id
@@ -146,6 +151,14 @@ const actions = {
     commit('setUsername', res.data.data.username)
     commit('setRealname', res.data.data.realName)
     commit('setRole', res.data.data.roleIdList.length)
+    // 获取角色数据
+    const roleArr = []
+    res.data.data.roleIdList.map((val) => {
+      getRole(val).then((role) => {
+        roleArr.push(role.data.data.name)
+      })
+    })
+    commit('setRoleList', roleArr)
     commit('setUserId', res.data.data.id)
     commit('setDeptName', res.data.data.deptName)
     commit('setDeptId', res.data.data.deptId)
@@ -181,7 +194,6 @@ const actions = {
    * @param {*} { commit, dispatch }
    */
   async resetAll({ dispatch }) {
- 
     await dispatch('setAccessToken', '')
     await dispatch('acl/setFull', false, {
       root: true,

front/src/utils/arrayMethod.js

@@ -0,0 +1,150 @@
+/*
+ * @Author: hisense.wuhongjian
+ * @Date: 2021-08-12 10:50:17
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2021-08-12 14:20:07
+ * @Description: 数组公共方法
+ */
+/**
+ * @description: 根据属性名过滤数组，支持一维属性及二维属性
+ * @param {*} arr 待过滤的数组
+ * @param {*} param 一维属性 'param' 二维属性 'param1[param2]'
+ * @return {*} 过滤之后的数组
+ */
+export function arrFilterByParam(arr, param) {
+  const res = new Map();
+  const paramArr = param.split('[');
+  if (paramArr.length > 1) {
+    const first = paramArr[0];
+    const second = paramArr[1].split(']')[0];
+    return arr.filter(
+      (list) => !res.has(list[first][second]) && res.set(list[first][second], 1));
+  } else {
+    return arr.filter(
+      (list) => !res.has(list[param]) && res.set(list[param], 1));
+  }
+}
+//获取时间戳转换为日期格式 或者 2021-09-24 19:53:01:765 转化为正常时间。
+// filters: {
+//     formatDate(time) {
+//         var date = new Date(time);
+//         return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+//     }
+// },
+//{{ 输入时间 | formatDate }}
+export function formatDate (date, fmt) {
+    if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+    let o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds()
+    };
+    for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+            let str = o[k] + '';
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+        }
+    }
+    return fmt;
+};
+
+function padLeftZero (str) {
+    return ('00' + str).substr(str.length);
+};
+
+// 把数字改成数组。
+export function NumbersConvertedToArrays(inNum) {
+    const str = inNum.toString();
+    const arr = str.split("");
+    const arrlenght = arr.length;
+    if (arrlenght == 2) {
+        arr.unshift(0);
+    }
+    if (arrlenght == 1) {
+        arr.unshift(0);
+        arr.unshift(0);
+    }
+    return arr;
+};
+// var lon = 107.631131;
+// var lat = 29.2331231;
+// var lonDMS = transformDMS(lon, "lon");
+// var latDMS = transformDMS(lat, "lat");
+
+// console.log(lonDMS); // 107°44′35″E
+// console.log(latDMS); // 29°14′17″N
+ // 经纬度转度分秒
+ export function transformDMS(degree, direction) {
+    var D = plusZeroAtHead(Math.floor(degree));
+  var M = plusZeroAtHead(Math.floor((degree - D) * 60));
+  var S = plusZeroAtHead(Math.floor(((degree - D) * 60 - M) * 60));
+  var result = D + "°" + M + "′" + S + "″";
+
+  // 如果是个位数， 则在首位加 0
+  function plusZeroAtHead(num) {
+      if (num > -10 && num < 0) {
+          num = "-0" + Math.abs(num)
+      }
+      if (num > 0 && num < 10) {
+          return "0" + num
+      }
+      return num;
+  }
+
+  if (direction === "lon") {
+      D > 0 ? result += "E" : result += "W";
+      return result;
+  }
+  if (direction === "lat") {
+      D > 0 ? result += "N" : result += "S";
+      return result;
+  }
+  return result;
+};
+export function getBlob(url,cb) {
+    var xhr = new XMLHttpRequest();
+    let that=this;
+    xhr.open('GET', url, true);
+    xhr.responseType = 'blob';
+    xhr.onload = function() {
+        if (xhr.status === 200) {
+            cb(xhr.response);
+        }
+    };
+    xhr.send();
+};
+/**
+ * 保存
+ * @param  {Blob} blob
+ * @param  {String} filename 想要保存的文件名称
+ */
+export function saveAs(blob, filename) {
+    if (window.navigator.msSaveOrOpenBlob) {
+        navigator.msSaveBlob(blob, filename);
+    } else {
+        var link = document.createElement('a');
+        var body = document.querySelector('body');
+
+        link.href = window.URL.createObjectURL(blob);
+        link.download = filename;
+
+        // fix Firefox
+        link.style.display = 'none';
+        body.appendChild(link);
+
+        link.click();
+        body.removeChild(link);
+
+        window.URL.revokeObjectURL(link.href);
+    }
+};
+
+//获取天气图标logo  公共部分
+
+
+
+

front/src/views/assertReport/components/ReservoirBottom.vue

@@ -0,0 +1,167 @@
+<template>
+  <div class="right-survey">
+
+    <div class="platform-overview-bottom">
+      <div class="top"><span class="title">资源汇聚总量</span></div>
+      <div class="jiesheng"> <img src="../image/xing2.png" /><span style="padding-left:2px;">共{{total}}项 </span><img src="../image/xing2.png" /></div>
+      <div class="bottom">
+       
+        <div
+          v-for="(item, index) in servicesNum"
+          :key="index"
+          class="component-services-content-right-left-content-son"
+        >
+          <p>{{ item.type }}</p>
+          <p class="num">{{ item.count }}</p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    selectTotal
+  } from '@/api/assertReport'
+export default {
+ 
+  components: {},
+
+  mounted() {
+    this.selectAllTotal()
+  },
+  data() {
+    //这里存放数据
+    return {
+     total:'',
+      servicesNum: [],
+    }
+  },
+
+  methods: {
+
+    selectAllTotal(){
+      selectTotal().then((res) => {
+        let result=res.data.data.total
+        let now=[]
+        let num=0;  
+        for(let i=0;i<result.length;i++){
+          if(result[i].type!=='知识库'){
+            now.push(result[i])
+            num=num+Number(result[i].count)
+          }
+        } 
+       this.servicesNum=now
+       this.total=num
+      })
+    }
+}
+}
+</script>
+<style lang='less' scoped>
+  @keyframes turn {
+  0% {
+    border-image: linear-gradient(to right, #003194, #00ffea) 1;
+  }
+  25% {
+    border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+  }
+  50% {
+    border-image: linear-gradient(to left, #003194, #00ffea) 1;
+  }
+  75% {
+    border-image: linear-gradient(to top, #003194, #00ffea) 1;
+  }
+  100% {
+    border-image: linear-gradient(to right, #003194, #00ffea) 1;
+  }
+}
+.jiesheng{
+  margin:8px 8px;
+    text-align: center;
+  color: #f4fcfe; border-color: #107bb0;
+    box-shadow: 1px 1px 5px 1px RGB(16, 123, 176, 0.8) inset
+    }
+.top5-content::-webkit-scrollbar {
+  width: 6px;
+  /*height: 4px;*/
+}
+
+.top5-content::-webkit-scrollbar-thumb {
+  background-color: #00deff;
+}
+.map-search-result::-webkit-scrollbar-track,
+.top5-content::-webkit-scrollbar-track {
+  background-color: #424748;
+}
+@keyframes topup50 {
+  from {
+    top: 50%;
+  }
+  to {
+    top: -100%;
+  }
+}
+.right-survey {
+
+  height: 100%;
+  color: #f0fafa;
+  font-size: 18px;
+  display: flex;
+  flex-direction: column;
+
+
+  .platform-overview-bottom {
+    margin-top: 5px;
+    width: 100%;
+    height: 1.78rem;
+    background: rgba(0, 108, 188, 0.2);
+    border-radius: 2px;
+    border: 1px solid rgba(0, 108, 188, 0.7);
+    text-decoration: none;
+    outline: none;
+    -webkit-transition: all 100ms ease-out;
+    -moz-transition: all 100ms ease-out;
+    transition: all 100ms ease-out;
+    .top {
+      font-size: 24px;
+      background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
+      background-size: 100% 100%;
+      text-align: center;
+
+    }
+    .bottom {
+      margin-top: 20px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0px 10px;
+      .component-services-content-right-left-content-son {
+        background: url('~@/assets/capabilityCloud/Component_services_snum.png')
+          no-repeat;
+        background-size: 1.1rem 0.59rem;
+        background-position: center;
+        text-align: center;
+     
+        & > p:first-child {
+          color: #ffffff;
+          font-size: 0.16rem;
+          line-height: 0.16rem;
+          margin-bottom: 0.12rem;
+        }
+        & > p:last-child {
+          color: #1ef6f5;
+          font-size: 0.28rem;
+          line-height: 0.28rem;
+          padding-bottom: 0.24rem;
+          margin: 10px 45px;
+        }
+      }
+    }
+  }
+  .platform-overview-bottom:hover {
+  border: 2px solid;
+  animation: turn 5s linear infinite;
+}
+}
+</style>

front/src/views/assertReport/components/ReservoirLeft.vue

@@ -6,78 +6,24 @@
     <div class="platform-overview-top">
     <div class="top"><span class="title">组件资源</span></div>
     <div class="bottom">
-      <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省XX万元 </span><img src="../image/xing1.png" /></div>
+      <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省{{componetsData.total}}万元 </span><img src="../image/xing1.png" /></div>
       <div class="left">
-        <div class="item">
+        <div class="item" v-for="item in componetsData.list">
           <div class="content1">
           <div class="img"> </div>
-            <div class="num">智能算法</div> 
+            <div class="num">{{item.resourceType}}</div> 
         </div>
           <div class="content">
             <div class="name">节省</div>
-            <div claSS="num">123万元</div>
+            <div claSS="num">{{item.applyPrice }}万元</div>
           </div>
           <div class="content">
             <div class="name">数量</div>
-            <div claSS="num">123个</div>
+            <div claSS="num">{{item.resourceAmount}}个</div>
           </div>
           <div class="content">
             <div class="name">共申请</div>
-            <div claSS="num">123次</div>
+            <div claSS="num">{{item.applyCount}}次</div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="content1">
-          <div class="img"> </div>
-            <div class="num">图层服务</div> 
-        </div>
-          <div class="content">
-            <div class="name">节省</div>
-            <div claSS="num">123万元</div>
-          </div>
-          <div class="content">
-            <div class="name">数量</div>
-            <div claSS="num">123个</div>
-          </div>
-          <div class="content">
-            <div class="name">共申请</div>
-            <div claSS="num">123次</div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="content1">
-          <div class="img"> </div>
-            <div class="num">开发组件</div> 
-        </div>
-          <div class="content">
-            <div class="name">节省</div>
-            <div claSS="num">123万元</div>
-          </div>
-          <div class="content">
-            <div class="name">数量</div>
-            <div claSS="num">123个</div>
-          </div>
-          <div class="content">
-            <div class="name">共申请</div>
-            <div claSS="num">123次</div>
-          </div>
-        </div>
-        <div class="item">
-          <div class="content1">
-          <div class="img"> </div>
-            <div class="num">业务组件</div> 
-        </div>
-          <div class="content">
-            <div class="name">节省</div>
-            <div claSS="num">123万元</div>
-          </div>
-          <div class="content">
-            <div class="name">数量</div>
-            <div claSS="num">123个</div>
-          </div>
-          <div class="content">
-            <div class="name">共申请</div>
-            <div claSS="num">123次</div>
           </div>
         </div>
       </div>
@@ -89,7 +35,7 @@
     <div class="platform-overview-mid">
     <div class="top"><span class="title">应用资源</span></div>
     <div class="bottom">
-    <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省XX万元 </span><img src="../image/xing1.png" /></div>
+    <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省{{resoureData.total}}万元 </span><img src="../image/xing1.png" /></div>
     <div class="component-services-content-right-right-bottom-right">
               <div>
                 <span>排行</span>
@@ -98,15 +44,18 @@
                 <span >次数</span>
                 <span >贡献金额</span>
               </div>
-              <div v-for="(item, index) in dataList" :key="index">
+              <div v-for="(item, index) in resoureData.list" :key="index">
                 <span>{{ index + 1 }}</span>
                 <a-tooltip>
-                  <template #title>{{ item.name }}</template>
+                  <template #title>{{ item.resourceName }}</template>
-                  <span>{{ item.name }}</span>
+                  <span>{{ item.resourceName }}</span>
                 </a-tooltip>
-                <span>{{ item.count || 0 }}</span>
+                <a-tooltip>
-                <span>{{ item.count || 0 }}</span>
+                  <template #title>{{ item.deptName}}</template>
-                <span>{{ item.count || 0 }}</span>
+                  <span>{{ item.deptName  }}</span>
+                </a-tooltip>
+                <span>{{ item.applyCount || 0 }}</span>
+                <span>{{ item.applyPrice || 0 }}</span>
               </div>
             </div>
     </div>
@@ -116,15 +65,15 @@
     <div class="platform-overview-bottom">
     <div class="top"><span class="title">基础设施</span></div>
     <div class="bottom">
-      <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省XX万元 </span><img src="../image/xing1.png" /></div>
+      <div class="jiesheng"> <img src="../image/xing1.png" /><span style="padding-left:2px;">共节省{{infrastructureData.total}}万元 </span><img src="../image/xing1.png" /></div>
     <div class="huiketing">
       <div style="float:left;width:30%">
       <img :src="leftImg" alt="" /> 
     </div>
-    <div style="float:left;width:70%;margin-top: 30px;">
+    <div style="float:left;width:70%;margin-top: 30px;" v-for="item in infrastructureData.list">
-      <span style="font-size:22x">会客厅</span> 
+      <span style="font-size:22x">{{item.resourceName}}</span> 
       <span style="font-size:22px">节省 </span>
-      <span style="margin-right:10px;font-size:24px;  color: #1ef6f5;"> 453</span>
+      <span style="margin-right:10px;font-size:24px;  color: #1ef6f5;">{{item.applyPrice}}</span>
         <span style="font-size:20px"> 万元</span>
       </div>
     </div>
@@ -137,12 +86,13 @@
 </template>
 
 <script>
-//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+  import {
-//例如：import 《组件名称》 from '《组件路径》';
+    getComponentFundStatement,
-
+    getResourceFundStatement,
+    getInfrastructureFundStatement
+  } from '@/api/assertReport'
 import ResourceOverviewAnimation from "@/views/assertReport/components/ResourceOverviewAnimation.vue";
 export default {
-  //import引入的组件需要注入到对象中才能使用
   components: {
     ResourceOverviewAnimation
   },
@@ -151,11 +101,28 @@ export default {
   },
 
   mounted() {
-
+//组件资源
+  this.getComponent()
+  //应用资源
+  this.getResource()
+  //基础设施
+  this.getInfrastructure()
   },
   data() {
 
     return {
+      componetsData:{
+        total:'',
+        list:[]
+    },
+    resoureData:{
+      total:'',
+        list:[]  
+    },
+    infrastructureData:{
+       total:'',
+        list:'',
+    },
       leftImg:require('@/assets/capabilityCloud/resources-left.png'),
       dataList:[{name:'第一个',count:43},{name:'第二个',count:43},
       {name:'第三个',count:43},{name:'第四个',count:43},{name:'第五个',count:43}]
@@ -164,7 +131,24 @@ export default {
   },
 
   methods: {
- 
+    getComponent(){
+      getComponentFundStatement().then((res) => {
+       this.componetsData.total=res.data.data.total
+       this.componetsData.list=res.data.data.list
+      })
+    },
+    getResource(){
+      getResourceFundStatement().then((res) => {
+       this.resoureData.total=res.data.data.total
+       this.resoureData.list=res.data.data.list
+      })
+    },
+    getInfrastructure(){
+      getInfrastructureFundStatement().then((res) => {
+      this.infrastructureData.total=res.data.data.total
+       this.infrastructureData.list=res.data.data.list
+      })
+    }
 
   },
 
@@ -187,6 +171,24 @@ export default {
     color: #f4fcfe; border-color: #107bb0;
       box-shadow: 1px 1px 5px 1px RGB(16, 123, 176, 0.8) inset
       }
+
+  @keyframes turn {
+    0% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+    25% {
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
 .reservoir-survey {
 
 
@@ -211,7 +213,7 @@ export default {
     transition: all 100ms ease-out;
     .top {
       font-size: 24px;
-      background: url(~@/assets/capabilityCloud/top_bg.png) no-repeat;
+      background:  url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
       background-size: 100% 100%;
       text-align: center;
     }
@@ -277,6 +279,13 @@ export default {
             }
           }
         }
+        .item:hover {
+         background: linear-gradient(
+            to bottom,
+            rgba(33, 54, 88, 0.7),
+            rgba(33, 54, 88, 0.9)
+          );
+        }
         .item:nth-of-type(1) {
           margin-top: 10px;
           .img {
@@ -299,10 +308,14 @@ export default {
       }
     }
   }
+  .platform-overview-top:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
   .platform-overview-mid {
     margin-top:20px;
     width: 100%;
-    height: 2.8rem;
+    height: 3.9rem;
     background: rgba(0, 108, 188, 0.2);
     border-radius: 2px;
     border: 1px solid rgba(0, 108, 188, 0.7);
@@ -313,7 +326,7 @@ export default {
     transition: all 100ms ease-out;
     .top {
       font-size: 24px;
-      background: url(~@/assets/capabilityCloud/top_bg.png) no-repeat;
+      background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
       background-size: 100% 100%;
       text-align: center;
       margin-bottom: 8px;
@@ -328,6 +341,8 @@ export default {
               font-size: 0.16rem;
               border: 0.01rem rgba(0, 108, 188, 0.7) solid;
               color: rgba(255, 255, 255, 0.8);
+              height: 2.9rem;
+               overflow-y: auto;
               & > div {
                 height: 0.32rem;
                 & > span {
@@ -348,22 +363,26 @@ export default {
                   text-align: center;
                 }
                 & > span:nth-child(2) {
-                  width: 1.47rem;
+                  width: 1.57rem;
                   padding-left: 0.05rem;
+                  //text-align: center;
                 }
                 & > span:nth-child(3) {
-                  width: 0.8rem;
+                  width: 1.47rem;
                   padding-left: 0.05rem;
+                 // text-align: center;
                 }
                 & > span:nth-child(4) {
-                  width: 1rem;
+                  width: 0.5rem;
                   padding-left: 0.05rem;
+                  text-align: center;
                 }
                 & > span:last-child {
-                  width: 0.8rem;
+                  width: 0.7rem;
                   color: #1ffefd;
                   text-align: center;
                   border-right: 0;
+                  text-align: center;
                 }
               }
               & > div:first-child {
@@ -374,6 +393,10 @@ export default {
     }
   }
 
+  .platform-overview-mid:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
   .platform-overview-bottom {
     margin-top:20px;
     width: 100%;
@@ -388,7 +411,7 @@ export default {
     transition: all 100ms ease-out;
     .top {
       font-size: 24px;
-      background: url(~@/assets/capabilityCloud/top_bg.png) no-repeat;
+      background: url('~@/assets/capabilityCloud/infrastructure_title.png') no-repeat;
       background-size: 100% 100%;
       text-align: center;
     }
@@ -421,6 +444,10 @@ export default {
    
     }
   }
+  .platform-overview-bottom:hover {
+    border: 2px solid;
+    animation: turn 5s linear infinite;
+  }
 }
 
 </style>

front/src/views/assertReport/components/ReservoirRight.vue

@@ -1,251 +1,372 @@
-
 <template>
   <div class="right-survey">
     <!--最上面 部门排行榜-->
     <div class="platform-overview-top">
       <div class="top"><span class="title">部门排行榜</span></div>
-      <div class="bottom">
+      <div class="bottom1">
         <div class="bottom-item">
           <div class="inner-title">
-            <p style="width: 220px">市级部门共享贡献资金排行</p>
+            <p style="width: 220px">市级部门共享节省资金排行</p>
           </div>
           <div class="left-list">
             <div class="left-list1">排行</div>
             <div class="left-list2">部门名称</div>
-            <div class="left-list1">提供资源</div>
+            <div class="left-list1">应用数</div>
-            <div class="left-list1">贡献总量</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
           </div>
-          <div class="left-list" v-for="item in top5AreaList">
+         <div style="    height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;">
+          <div class="left-list" v-for="(item, index) in top5DistrictList">
             <div class="left-list1" v-if="item.img">
               <img :src="item.img" />
             </div>
-            <div class="left-list1" v-else>{{ item.name }}</div>
+            <div class="left-list1" v-else>{{ index + 1 }}</div>
-            <div
+            <a-tooltip>
-              :class="selectArea === item.areaId ? 'active-item' : 'left-list2'"
+              <template #title>{{ item.deptName }}</template>
-              @click="chooseSelectArea(item)"
+              <div class="left-list2">{{ item.deptName }}</div>
-            >
+            </a-tooltip>
-              {{ item.areaName }}
+
+            <div class="left-list1">{{ item.resourceCount }}</div>
+            <div class="left-list1" style="color: #1ffefd">
+              {{ item.applyPrice }}
             </div>
-            <div class="left-list1">{{ item.num }}</div>
+          </div>
-            <div class="left-list1">{{ item.num }}</div>
           </div>
         </div>
+       
+      </div>
+      <div class="bottom1">
+     
         <div class="bottom-item">
           <div class="inner-title">
-            <p style="width: 220px">市级部门审评节省资金排行</p>
+            <p style="width: 220px">市级部门申请节省资金排行</p>
           </div>
           <div class="left-list">
             <div class="left-list1">排行</div>
             <div class="left-list2">部门名称</div>
-            <div class="left-list1">提供资源</div>
+            <div class="left-list1">应用数</div>
-            <div class="left-list1">贡献总量</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
           </div>
-          <div class="left-list" v-for="item in top5AreaList">
+          <div style="    height: 1.7rem; overflow-y: auto;overflow-x: hidden;width: 100%;">
+          <div class="left-list" v-for="(item, index) in top5DeptFundList">
             <div class="left-list1" v-if="item.img">
               <img :src="item.img" />
             </div>
-            <div class="left-list1" v-else>{{ item.name }}</div>
+            <div class="left-list1" v-else>{{ index + 1 }}</div>
-            <div
+            <a-tooltip>
-              :class="selectArea === item.areaId ? 'active-item' : 'left-list2'"
+              <template #title>{{ item.deptName }}</template>
-              @click="chooseSelectArea(item)"
+              <div class="left-list2">{{ item.deptName }}</div>
-            >
+            </a-tooltip>
-              {{ item.areaName }}
+
+            <div class="left-list1">{{ item.applyCount }}</div>
+            <div class="left-list1" style="color: #1ffefd">
+              {{ item.applyPrice }}
+            </div>
             </div>
-            <div class="left-list1">{{ item.num }}</div>
-            <div class="left-list1">{{ item.num }}</div>
           </div>
         </div>
       </div>
-      <div class="bottom">
+      <div class="bottom2">
         <div class="bottom-item">
           <div class="inner-title">
-            <p style="width: 220px">区市部门共享贡献资金排行</p>
+            <p style="width: 220px">区市部门共享节省资金</p>
           </div>
           <div class="left-list">
-            <div class="left-list1">排行</div>
+            <div class="left-list1">序号</div>
             <div class="left-list2">部门名称</div>
-            <div class="left-list1">提供资源</div>
+            <div class="left-list1">应用数</div>
-            <div class="left-list1">贡献总量</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
           </div>
-          <div class="left-list" v-for="item in top5AreaList">
+          <div style="height: 300px; overfolw-y: auto">
-            <div class="left-list1" v-if="item.img">
-              <img :src="item.img" />
-            </div>
-            <div class="left-list1" v-else>{{ item.name }}</div>
             <div
-              :class="selectArea === item.areaId ? 'active-item' : 'left-list2'"
+              class="left-list"
-              @click="chooseSelectArea(item)"
+              v-for="(item, index) in top5eDistrictFundList"
             >
-              {{ item.areaName }}
+              <div class="left-list1" v-if="item.img">
+                <img :src="item.img" />
+              </div>
+              <div class="left-list1" v-else>{{ index + 1 }}</div>
+              <a-tooltip>
+                <template #title>{{ item.districtName }}</template>
+                <div class="left-list2">{{ item.districtName }}</div>
+              </a-tooltip>
+
+              <div class="left-list1">{{ item.applyCount }}</div>
+              <div class="left-list1" style="color: #1ffefd">
+                {{ item.applyPrice }}
+              </div>
             </div>
-            <div class="left-list1">{{ item.num }}</div>
-            <div class="left-list1">{{ item.num }}</div>
           </div>
         </div>
         <div class="bottom-item">
           <div class="inner-title">
-            <p style="width: 220px">区市部门申请节省资金排行</p>
+            <p style="width: 220px">区市部门申请节省资金</p>
           </div>
           <div class="left-list">
-            <div class="left-list1">排行</div>
+            <div class="left-list1">序号</div>
             <div class="left-list2">部门名称</div>
-            <div class="left-list1">提供资源</div>
+            <div class="left-list1">应用数</div>
-            <div class="left-list1">贡献总量</div>
+            <div class="left-list1" style="color: #1ffefd">贡献金额</div>
           </div>
-          <div class="left-list" v-for="item in top5AreaList">
+          <div style="height: 200px; overfolw-y: auto">
-            <div class="left-list1" v-if="item.img">
-              <img :src="item.img" />
-            </div>
-            <div class="left-list1" v-else>{{ item.name }}</div>
             <div
-              :class="selectArea === item.areaId ? 'active-item' : 'left-list2'"
+              class="left-list"
-              @click="chooseSelectArea(item)"
+              v-for="(item, index) in top5ApplyDistrictList"
             >
-              {{ item.areaName }}
+              <div class="left-list1" v-if="item.img">
+                <img :src="item.img" />
+              </div>
+              <div class="left-list1" v-else>{{ index + 1 }}</div>
+              <a-tooltip>
+                <template #title>{{ item.districtName }}</template>
+                <div class="left-list2">{{ item.districtName }}</div>
+              </a-tooltip>
+
+              <div class="left-list1">{{ item.applyCount }}</div>
+              <div class="left-list1" style="color: #1ffefd">
+                {{ item.applyPrice }}
+              </div>
             </div>
-            <div class="left-list1">{{ item.num }}</div>
-            <div class="left-list1">{{ item.num }}</div>
           </div>
         </div>
       </div>
     </div>
 
-    <div class="platform-overview-bottom">
+    <!-- <div class="platform-overview-bottom">
       <div class="top"><span class="title">资源汇聚总量</span></div>
       <div class="bottom">
         <div
-          v-for="(item, index) in servicesSnum"
+          v-for="(item, index) in servicesNum"
           :key="index"
           class="component-services-content-right-left-content-son"
         >
           <p>{{ item.type }}</p>
-          <p class="num">{{ item.amount }}</p>
+          <p class="num">{{ item.count }}</p>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script>
-export default {
+  import {
-  //import引入的组件需要注入到对象中才能使用
+    getProvideDeptFundStatement,
-  components: {},
+    getApplyDeptFundStatement,
-  created() {},
+    getProvideDistrictFundStatement,
-  destroyed() {},
+    getApplyDistrictFundStatement,
+    selectTotal,
+  } from '@/api/assertReport'
+  export default {
+    components: {},
+    created() {},
+    unmounted() {},
 
-  mounted() {},
+    mounted() {
-  data() {
+      this.getgetProvideDeptFund()
-    //这里存放数据
+      this.getApplyDeptFund()
-    return {
+      this.getProvideDistrict()
-      top5AreaList: [
+      this.getApplyDistrictFund()
-        {
+      this.selectAllTotal()
-          title: 'TOP1',
+    },
-          img: require('../image/one.png'),
+    data() {
-          areaName: '台东商圈',
+      //这里存放数据
-          areaId: '1',
+      return {
-          num: '12',
+        //市级部门共享排行
-        },
+        top5DistrictList: [],
-        {
+        //市级部门申请排行
-          title: 'TOP2',
+        top5DeptFundList: [],
-          img: require('../image/two.png'),
+        //区市提供排行
-          areaName: '李村商圈',
+        top5eDistrictFundList: [],
-          areaId: '2',
+        //区市申请排行
-          num: '8',
+        top5ApplyDistrictList: [],
-        },
+        servicesNum: [],
-        {
+      }
-          title: 'TOP3',
+    },
-          img: require('../image/three.png'),
-          areaName: '五四广场',
-          areaId: '3',
-          num: '7',
-        },
-        {
-          title: '4',
-          img: require('../image/four.png'),
-          areaName: '第一海水浴场',
-          areaId: '4',
-          num: '5',
-        },
-        {
-          title: '5',
-          img: require('../image/five.png'),
-          areaName: '石老人海水浴场',
-          areaId: '5',
-          num: '4',
-        },
-      ],
-      servicesSnum: [
-        { type: '组件服务', amount: 124 },
-        { type: '应用资源', amount: 34244 },
-        { type: '基础设施', amount: 125555 },
-        { type: '数据资源', amount: 5555 },
-      ],
-    }
-  },
 
-  methods: {},
+    methods: {
-}
+      getgetProvideDeptFund() {
+        getProvideDeptFundStatement().then((res) => {
+          let result = res.data.data
+          if (result.length > 0) {
+            for (let i = 0; i < result.length; i++) {
+              if (i === 0) {
+                result[i].img = require('../image/one.png')
+              }
+              if (i === 1) {
+                result[i].img = require('../image/two.png')
+              }
+              if (i === 2) {
+                result[i].img = require('../image/three.png')
+              }
+            }
+          }
+          this.top5DistrictList = result
+        })
+      },
+      getApplyDeptFund() {
+        getApplyDeptFundStatement().then((res) => {
+          let result = res.data.data
+          if (result.length > 0) {
+            for (let i = 0; i < result.length; i++) {
+              if (i === 0) {
+                result[i].img = require('../image/one.png')
+              }
+              if (i === 1) {
+                result[i].img = require('../image/two.png')
+              }
+              if (i === 2) {
+                result[i].img = require('../image/three.png')
+              }
+            }
+          }
+          this.top5DeptFundList = result
+        })
+      },
+      getProvideDistrict() {
+        getProvideDistrictFundStatement().then((res) => {
+          let result = res.data.data
+          // if(result.length>0){
+          //  for(let i=0;i<result.length;i++){
+          //    if(i===0){
+          //     result[i].img=require('../image/one.png')
+          //    }
+          //     if(i===1){
+          //      result[i].img=require('../image/two.png')
+          //    }
+          //  if(i===2){
+          //      result[i].img= require('../image/three.png')
+          //    }
+          //  }
+          // }
+          this.top5eDistrictFundList = result
+        })
+      },
+      getApplyDistrictFund() {
+        getApplyDistrictFundStatement().then((res) => {
+          let result = res.data.data
+          // if(result.length>0){
+          //  for(let i=0;i<result.length;i++){
+          //    if(i===0){
+          //     result[i].img=require('../image/one.png')
+          //    }
+          //     if(i===1){
+          //      result[i].img=require('../image/two.png')
+          //    }
+          //  if(i===2){
+          //      result[i].img= require('../image/three.png')
+          //    }
+          //  }
+          // }
+          this.top5ApplyDistrictList = result
+        })
+      },
+      selectAllTotal() {
+        selectTotal().then((res) => {
+          this.servicesNum = res.data.data.total
+        })
+      },
+    },
+  }
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
-.top5-content::-webkit-scrollbar {
+  @keyframes turn {
-  width: 6px;
+    0% {
-  /*height: 4px;*/
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
-}
-
-.top5-content::-webkit-scrollbar-thumb {
-  background-color: #00deff;
-}
-.map-search-result::-webkit-scrollbar-track,
-.top5-content::-webkit-scrollbar-track {
-  background-color: #424748;
-}
-@keyframes topup50 {
-  from {
-    top: 50%;
-  }
-  to {
-    top: -100%;
-  }
-}
-.right-survey {
-  width: 620px;
-  height: 100%;
-  color: #f0fafa;
-  font-size: 18px;
-  display: flex;
-  flex-direction: column;
-
-  .platform-overview-top {
-    width: 100%;
-    height: 6.8rem;
-    background: rgba(0, 108, 188, 0.2);
-    border-radius: 2px;
-    border: 1px solid rgba(0, 108, 188, 0.7);
-    text-decoration: none;
-    outline: none;
-    -webkit-transition: all 100ms ease-out;
-    -moz-transition: all 100ms ease-out;
-    transition: all 100ms ease-out;
-    .top {
-      font-size: 24px;
-      background: url(~@/assets/capabilityCloud/top_bg.png) no-repeat;
-      background-size: 100% 100%;
-      text-align: center;
     }
-    .bottom {
+    25% {
-      margin-top: 4px;
+      border-image: linear-gradient(to bottom, #003194, #00ffea) 1;
-      // margin-top:10px;
+    }
+    50% {
+      border-image: linear-gradient(to left, #003194, #00ffea) 1;
+    }
+    75% {
+      border-image: linear-gradient(to top, #003194, #00ffea) 1;
+    }
+    100% {
+      border-image: linear-gradient(to right, #003194, #00ffea) 1;
+    }
+  }
+  .top5-content::-webkit-scrollbar {
+    width: 6px;
+    /*height: 4px;*/
+  }
+
+  .top5-content::-webkit-scrollbar-thumb {
+    background-color: #00deff;
+  }
+  .map-search-result::-webkit-scrollbar-track,
+  .top5-content::-webkit-scrollbar-track {
+    background-color: #424748;
+  }
+  @keyframes topup50 {
+    from {
+      top: 50%;
+    }
+    to {
+      top: -100%;
+    }
+  }
+  .right-survey {
+    width: 620px;
+    height: 100%;
+    color: #f0fafa;
+    font-size: 18px;
+    display: flex;
+    flex-direction: column;
+
+    .platform-overview-top {
       width: 100%;
-      display: table;
+      height: 9.9rem;
-      justify-content: space-between;
+      background: rgba(0, 108, 188, 0.2);
-      align-items: center;
+      border-radius: 2px;
-      :hover.bottom-item{
+      border: 1px solid rgba(0, 108, 188, 0.7);
+      text-decoration: none;
+      outline: none;
+      -webkit-transition: all 100ms ease-out;
+      -moz-transition: all 100ms ease-out;
+      transition: all 100ms ease-out;
+      .top {
+        font-size: 24px;
+        background: url('~@/assets/capabilityCloud/infrastructure_title.png')
+          no-repeat;
+        background-size: 100% 100%;
+        text-align: center;
+      }
+      .bottom1 {
+        margin-top: 10px;
+        width: 100%;
+        // display: flex;
+        justify-content: space-between;
+        align-items: center;
+        height: 2.5rem;
+        // overflow-y: auto;
+        .bottom-item {
+          width: 98%;
+        }
+      }
+      .bottom2 {
+        margin-top: 10px;
+        // margin-top:10px;
+        width: 100%;
+        display: table;
+        justify-content: space-between;
+        align-items: center;
+        height: 4rem;
+        .bottom-item {
+          width: 48%;
+        }
+      }
+
+      :hover.bottom-item {
         background: rgba(0, 108, 188, 0.5);
       }
       .bottom-item {
-        background: rgba(0, 108, 188, 0.4);
+        height: 100%;
-    border-radius: 3px;
+        // overflow-y: auto;
-        margin: 4px 5px;
+        background: rgba(0, 108, 188, 0.2);
+        border-radius: 2px;
+        margin: 2px 5px;
+        border: 1px solid #10496f;
+
         .inner-title {
           margin-top: 10px;
           margin-bottom: 10px;
@@ -259,7 +380,7 @@ export default {
             background: linear-gradient(
               90deg,
               #041d2f 0,
-              rgba(8, 115, 193, 0)  90%
+              rgba(8, 115, 193, 0) 90%
             );
             color: #1ffefd;
             width: auto;
@@ -268,26 +389,41 @@ export default {
         }
 
         display: inline-table;
-        width: 48%;
+
-        height: 3rem;
         .left-list {
           text-align: center;
           color: #fff;
           width: 100%;
-          height: 24px;
+          height: 26px;
           margin-right: 10px;
           margin-top: 5px;
-          font-size: 14px;
+          font-size: 16px;
           .left-list1 {
-            font-size: 14x;
+            font-size: 16x;
             float: left;
-            width: 20%;
+            width: 22%;
+            height: 0.32rem;
+            line-height: 0.32rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all;
           }
           .left-list2 {
+            height: 0.32rem;
+            line-height: 0.32rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all;
             cursor: pointer;
-            font-size: 14px;
+            font-size: 16px;
             float: left;
-            width: 40%;
+            width: 30%;
             &:hover {
               color: rgb(0 255 255);
             }
@@ -304,53 +440,60 @@ export default {
         }
       }
     }
-  }
+    .platform-overview-top:hover {
-  .platform-overview-bottom {
+      border: 2px solid;
-    margin-top: 20px;
+      animation: turn 5s linear infinite;
-    width: 100%;
-    height: 1.8rem;
-    background: rgba(0, 108, 188, 0.2);
-    border-radius: 2px;
-    border: 1px solid rgba(0, 108, 188, 0.7);
-    text-decoration: none;
-    outline: none;
-    -webkit-transition: all 100ms ease-out;
-    -moz-transition: all 100ms ease-out;
-    transition: all 100ms ease-out;
-    .top {
-      font-size: 24px;
-      background: url(~@/assets/capabilityCloud/top_bg.png) no-repeat;
-      background-size: 100% 100%;
-      text-align: center;
-      margin-bottom: 20px;
     }
-    .bottom {
+    .platform-overview-bottom {
       margin-top: 20px;
-      display: flex;
+      width: 100%;
-      justify-content: space-between;
+      height: 1.7rem;
-      align-items: center;
+      background: rgba(0, 108, 188, 0.2);
-      padding: 0.2rem;
+      border-radius: 2px;
-      .component-services-content-right-left-content-son {
+      border: 1px solid rgba(0, 108, 188, 0.7);
-        background: url('~@/assets/capabilityCloud/Component_services_snum.png')
+      text-decoration: none;
+      outline: none;
+      -webkit-transition: all 100ms ease-out;
+      -moz-transition: all 100ms ease-out;
+      transition: all 100ms ease-out;
+      .top {
+        font-size: 24px;
+        background: url('~@/assets/capabilityCloud/infrastructure_title.png')
           no-repeat;
-        background-size: 1.1rem 0.59rem;
+        background-size: 100% 100%;
-        background-position: center;
         text-align: center;
-        & > p:first-child {
+      }
-          color: #ffffff;
+      .bottom {
-          font-size: 0.16rem;
+        margin-top: 20px;
-          line-height: 0.16rem;
+        display: flex;
-          margin-bottom: 0.12rem;
+        justify-content: space-between;
-        }
+        align-items: center;
-        & > p:last-child {
+        padding: 0rem 0.2rem;
-          color: #1ef6f5;
+        .component-services-content-right-left-content-son {
-          font-size: 0.28rem;
+          background: url('~@/assets/capabilityCloud/Component_services_snum.png')
-          line-height: 0.28rem;
+            no-repeat;
-          padding-bottom: 0.24rem;
+          background-size: 1.1rem 0.59rem;
-          margin: 0;
+          background-position: center;
+          text-align: center;
+          & > p:first-child {
+            color: #ffffff;
+            font-size: 0.16rem;
+            line-height: 0.16rem;
+            margin-bottom: 0.12rem;
+          }
+          & > p:last-child {
+            color: #1ef6f5;
+            font-size: 0.28rem;
+            line-height: 0.28rem;
+            padding-bottom: 0.24rem;
+            margin: 0;
+          }
         }
       }
     }
+    .platform-overview-bottom:hover {
+      border: 2px solid;
+      animation: turn 5s linear infinite;
+    }
   }
-}
 </style>

front/src/views/assertReport/index.vue

@@ -1,177 +1,103 @@
 <!--  -->
 <template>
-
+  <div class="capability-cloud">
-
- <div class="capability-cloud">
-
     <div class="header">
       <span class="title" @click="goHome">城市云脑通用能力服务平台</span>
     </div>
     <div class="header1">
-      <div style=" color:#fff; font-size: 24px">累计节省财政资金</div>
+      <div style="color: #bed1df; font-size: 32px">累计节省财政资金</div>
-      <div style=" color:#fff; font-size: 24px">2451.0万元</div>
+      <div class="area-right">
-      <div style=" color:#fff; font-size: 18px">注：资源参考价格由部门提供或参考市场价格设定</div>
+        <!-- <div class="mianJi">累计节省财政资金</div> -->
+        <template v-for="(item, index) in saveMonmy">
+          <p v-if="item == '.'" :key="index">
+            {{ item }}
+          </p>
+          <span v-else>{{ item }}</span>
+        </template>
+        <div class="mianJi">万元</div>
       </div>
+      <div style="color: #bed1df; font-size: 16px">
+        注：资源参考价格由部门提供或参考市场价格设定
+      </div>
+    </div>
     <!--左侧-->
     <div class="reservoir-left">
       <!-- 左侧内容 -->
-    <reservoir-left />
+      <reservoir-left />
     </div>
-     <!--右侧-->
+    <!--右侧-->
     <div class="reservoir-right">
       <reservoir-right />
     </div>
+    <!--中间地图-->
     <div class="reservoir-map">
-      <!-- 中间地图 -->
       <reservoir-thumbnail
-                           @changeThumbnailMap="changeThumbnailMap"
+        @changeThumbnailMap="changeThumbnailMap"
-                           @jumpIntoMap="jumpIntoMap"
+        @jumpIntoMap="jumpIntoMap"
       />
     </div>
-
+    <!--下方-->
+    <div class="bottom">
+      <reservoir-bottom />
+    </div>
   </div>
-
 </template>
 
 <script>
-
+  import { getApplyPriceCount } from '@/api/assertReport'
-
+  import ReservoirThumbnail from './components/ReservoirThumbnail.vue'
-import ReservoirThumbnail from "./components/ReservoirThumbnail.vue";
+  import ReservoirLeft from './components/ReservoirLeft'
-
+  import ReservoirRight from './components/ReservoirRight'
-import ReservoirLeft from "./components/ReservoirLeft";
+  import ReservoirBottom from './components/ReservoirBottom'
-  import ReservoirRight from "./components/ReservoirRight";
+  import { NumbersConvertedToArrays } from '@/utils/arrayMethod.js'
-export default {
+  export default {
-  //import引入的组件需要注入到对象中才能使用
+    //import引入的组件需要注入到对象中才能使用
-  components: {
+    components: {
-    ReservoirThumbnail,
+      ReservoirThumbnail,
-    ReservoirLeft,
+      ReservoirLeft,
-    ReservoirRight
+      ReservoirRight,
-
+      ReservoirBottom,
-  },
+    },
-  data() {
+    data() {
-    //这里存放数据
+      //这里存放数据
-    return {
+      return {
-      model: "common",
+        saveMonmy: [],
-      dialogTitle: "周边视频",
+        model: 'common',
-      videoAnalysisDialogVisible: false, //视频分析弹窗显示标志位
+        dialogTitle: '周边视频',
-      riverCourseHistoryDialogVisible: false, //河道历史弹窗
+        videoAnalysisDialogVisible: false, //视频分析弹窗显示标志位
-      riverDetailInfo: {}, //河道具体信息用于历史弹窗显示数据
+        riverCourseHistoryDialogVisible: false, //河道历史弹窗
-      dialogType: "add",
+        riverDetailInfo: {}, //河道具体信息用于历史弹窗显示数据
-      dialogData: {},
+        dialogType: 'add',
-      dangerReportDialogVisible: false,
+        dialogData: {},
-      positionInfo: null,
+        dangerReportDialogVisible: false,
-      reservoirDialogVisible: false, //新增修改积水点弹窗显示标志位
+        positionInfo: null,
-      districtOptions: [], //区划数组
+        reservoirDialogVisible: false, //新增修改积水点弹窗显示标志位
-      isThumbnail:true,    //是否为地图缩略图
+        districtOptions: [], //区划数组
-      tabindex:0,      //3d地图选中的tab。
+        isThumbnail: true, //是否为地图缩略图
-      listType:"",//水库列表的类型，普通列表 “”，预警列表 warnig
+        tabindex: 0, //3d地图选中的tab。
-      basicInfo: {},  //水库详情信息
+        listType: '', //水库列表的类型，普通列表 “”，预警列表 warnig
-      type: '',
+        basicInfo: {}, //水库详情信息
-      callSource:"indexPage",
+        type: '',
-    };
+        callSource: 'indexPage',
-  },
-  //监听属性 类似于data概念
-  computed: {},
-  //监控data中的数据变化
-  watch: {},
-  //方法集合
-  methods: {
-    changeModel(model, waterPointInfo) {
-      this.model = model;
-      if(model == 'common') {
-        this.basicInfo = {};
       }
-      this.listType ="";
+    },
-      // if (this.model == "common") {
+    //监听属性 类似于data概念
-      //   this.$refs.riverCourseMap.isMapMenu = true;
+    computed: {},
-      //   this.$refs.riverCourseMap.choseTab(1);
+    //监控data中的数据变化
-      // }
+    watch: {},
-      //点击水库险情时
+    //方法集合
-      if(this.model == "dangerlist") {
+    methods: {
-        this.isThumbnail=false;
+      getSaveMoney() {
-        //水库险情上图。
+        getApplyPriceCount().then((res) => {
-        this.$nextTick(() => {
+          this.saveMonmy = NumbersConvertedToArrays(res.data.data)
-          bus.$emit('reservoirMapDangerList');
         })
-      }
+      },
-      //点击水库险情时
-      // if(this.model == "dangerlist") {
-      //   this.isThumbnail=false;
-      //   //水库险情上图。
-      //   this.$nextTick(() => {
-      //     bus.$emit('reservoirMapDangerList');
-      //   })
-      // }
     },
-    //从缩略图下沉跳转至三维地图
-    jumpIntoMap(data) {
-      this.isThumbnail = false;
-      //地图到具体的区划
-      this.$nextTick(() => {
-        bus.$emit('reservoirMapLonLat',data);
-      })
-    },
-    //点击所有水库上图。
-    listOnMap(data){
-      this.isThumbnail = false;
-      console.log("所有水库列表",data);
-      //地图到具体的区划
-      this.$nextTick(() => {
-        bus.$emit('reservoirMapList',data);
-      })
 
+    mounted() {
+      this.getSaveMoney()
     },
-    // 获取区市单位数据
+  }
-    async getDistrict() {
-      const res = await selectByType("districtType");
-      this.districtOptions = res.data;
-    },
-    //视频弹窗显示。
-    openVideoAnalysisAndData(item, isShow) {
-      console.log("为啥不显示", item);
-      this.positionInfo = item;
-      this.videoAnalysisDialogVisible = isShow;
-    },
-    //新增险情
-    addNewDanger(type, data){
-      console.log("type",type);
-      if (type == "add") {
-        this.dialogData = {};
-        this.dialogType = "add";
-      } else {
-        this.dialogData = data;
-        this.dialogType = "edit";
-      }
-      this.reservoirDialogVisible = true;
-    },
-    //3d 跳转缩略图
-    changeMap(isshow){
-      this.isThumbnail=isshow;
-    },
-    // 缩略图跳转3d
-    changeThumbnailMap(isshow,index){
-      console.log('isshow',isshow);
-      console.log('index',index);
-      this.isThumbnail=isshow;
-      this.tabindex=index;
-    }
-  },
-  //生命周期 - 创建完成（可以访问当前this实例）
-  created() {},
-  //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
-
-
-
-  },
-  beforeCreate() {}, //生命周期 - 创建之前
-  beforeMount() {}, //生命周期 - 挂载之前
-  beforeUpdate() {}, //生命周期 - 更新之前
-  updated() {}, //生命周期 - 更新之后
-  beforeDestroy() {}, //生命周期 - 销毁之前
-  destroyed() {}, //生命周期 - 销毁完成
-  activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
-};
 </script>
 <style lang="less">
   @font-face {
@@ -200,107 +126,153 @@ export default {
     }
   }
 </style>
-<style lang='less' scoped>
+<style lang="less" scoped>
-// 此处去掉scoped为修改date-picker背景色，所以业务样式都应放在reservoir层级中，避免影响
+  // 此处去掉scoped为修改date-picker背景色，所以业务样式都应放在reservoir层级中，避免影响
-//@import url(); 引入公共css类
+  //@import url(); 引入公共css类
-.module-header-container {
+  .module-header-container {
-  position: absolute;
+    position: absolute;
-  z-index: 1000;
+    z-index: 1000;
-  top: 0px;
+    top: 0px;
-  width: 100%;
+    width: 100%;
-  pointer-events: none;
+    pointer-events: none;
-}
+  }
-.capability-cloud {
+  .capability-cloud {
     height: 10.8rem;
     background: url('~@/assets/capabilityCloud/bg.png') no-repeat;
     background-size: 100% 100%;
     overflow: hidden;
+
     & > .header {
       height: 1.04rem;
       text-align: center;
       background: url('~@/assets/capabilityCloud/header.png') no-repeat;
       font-size: 0.46rem;
     }
+    .bottom {
+      bottom: 12px;
+      position: absolute;
+      left: 545px;
+      width: 732px;
+      align-items: center;
+      z-index: 1004;
+      text-align: center;
+
+      height: 1.8rem;
+    }
     .header1 {
       top: 78px;
       position: absolute;
-    left: 795px;
+      left: 795px;
-    align-items: center;
+      align-items: center;
-    z-index: 1004;
+      z-index: 1004;
-    text-align: center;
+      text-align: center;
+      .area-right {
+        display: flex;
+        align-items: center;
+        justify-items: flex-end;
+        padding-right: 20px;
+        color: #bed1df;
+        margin-left: 100px;
+        span {
+          width: 36px;
+          // height: 45px;
+          // line-height: 45px;
+          color: #fed93f;
+          font-weight: bold;
+          background: url('~@/assets/capabilityCloud/num_bg.png') 100% 100%
+            no-repeat;
+          background-size: 100%;
+          text-align: center;
+          font-size: 34px;
+          margin-right: 3px;
+
+          font-family: DinPro-Bold;
+        }
+        .mianJi {
+          margin-top: 6px;
+          margin-right: 3px;
+          font-size: 22px;
+          float: right;
+        }
+        p {
+          height: 44px;
+          display: flex;
+          align-items: flex-end;
+          justify-items: center;
+          font-size: 34px;
+        }
+      }
     }
 
-  //position: relative;
+    //position: relative;
-  .reservoir-left {
+    .reservoir-left {
-    position: absolute;
+      position: absolute;
-    left: 0.1rem;
+      left: 0.1rem;
-    z-index: 1300;
+      z-index: 1000;
-    top: 0.8rem;
+      top: 0.8rem;
-    height: calc(100% - 0.8rem);
+      height: calc(100% - 0.8rem);
-  }
+    }
-  .reservoir-right {
+    .reservoir-right {
-    position: absolute;
+      position: absolute;
-    z-index: 1001;
+      z-index: 1001;
-    right: 0.1rem;
+      right: 0.1rem;
-    top: 0.8rem;
+      top: 0.8rem;
-    height: calc(100% - 0.8rem);
+      height: calc(100% - 0.8rem);
-  }
+    }
-  .reservoir-map {
+    .reservoir-map {
-    position: absolute;
+      position: absolute;
-    width: 100%;
+      width: 100%;
-
+      //  height: 100%;
-    height: 100%;
+      // bottom:2rem;
-  }
-}
-// 日期时间组件
-.phone-date-picker {
-  color: #fff;
-  //border: 1px solid #e4e7ed;
-  border: 1px solid #008fbb;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  //background: #000;
-  background: #123d68;
-  //background:rgba(0, 0, 0, 0);
-  line-height: 30px;
-  margin: 5px 0;
-  .el-date-table td.disabled div {
-    background: #305156 !important;
-  }
-  .el-picker-panel__footer {
-    //background-color: rgba(0, 0, 0, 0.8);
-    background: #123d68;
-    color: #fff;
-    .el-picker-panel__link-btn:first-of-type {
-      display: none;
     }
   }
-  .el-date-table td.in-range div {
+  // 日期时间组件
-    background: #009ab3;
+  .phone-date-picker {
-  }
-  .el-input__inner {
-    //background-color: rgba(0, 0, 0, 0.8);
-    background: #123d68;
     color: #fff;
-  }
+    //border: 1px solid #e4e7ed;
-  .el-date-picker__header > button,
-  span {
-    color: #fff;
-  }
-  .el-picker-panel__content > .el-date-table > tbody > tr > th {
-    color: #fff;
-  }
-  .el-button.is-plain:hover,
-  .el-button.is-plain:focus {
-    background: #009ab3;
-  }
-  .el-button--default {
-    border-radius: 0;
-    background: #009ab3;
-    //border: 1px solid #dcdfe6;
     border: 1px solid #008fbb;
-    border-color: #009ab3;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    //background: #000;
+    background: #123d68;
+    //background:rgba(0, 0, 0, 0);
+    line-height: 30px;
+    margin: 5px 0;
+    .el-date-table td.disabled div {
+      background: #305156 !important;
+    }
+    .el-picker-panel__footer {
+      //background-color: rgba(0, 0, 0, 0.8);
+      background: #123d68;
+      color: #fff;
+      .el-picker-panel__link-btn:first-of-type {
+        display: none;
+      }
+    }
+    .el-date-table td.in-range div {
+      background: #009ab3;
+    }
+    .el-input__inner {
+      //background-color: rgba(0, 0, 0, 0.8);
+      background: #123d68;
+      color: #fff;
+    }
+    .el-date-picker__header > button,
+    span {
+      color: #fff;
+    }
+    .el-picker-panel__content > .el-date-table > tbody > tr > th {
+      color: #fff;
+    }
+    .el-button.is-plain:hover,
+    .el-button.is-plain:focus {
+      background: #009ab3;
+    }
+    .el-button--default {
+      border-radius: 0;
+      background: #009ab3;
+      //border: 1px solid #dcdfe6;
+      border: 1px solid #008fbb;
+      border-color: #009ab3;
+    }
   }
-}
-
-
 </style>

front/src/views/capabilityCloud/components/ComponentServices.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-06 16:21:24
+ * @LastEditTime: 2022-11-29 17:39:20
  * @Description: 能力云图-组件服务
 -->
 <template>
@@ -102,7 +102,7 @@
                   <template #title>{{ item.name }}</template>
                   <span>{{ item.name }}</span>
                 </a-tooltip>
-                <span>{{ item.count || 0 }}</span>
+                <span>{{ item.count || item.score || 0 }}</span>
               </div>
             </div>
           </div>
@@ -125,7 +125,7 @@
   let xinhaianIsShow = whoShow.itShowXiHaiAn //判断是否是西海岸版本
   let snum = ref([
     { title: '上架总量', num: '0000' },
-    { title: '总调用次数(API)', num: '0' },
+    { title: '总调用次数(API)', num: '1008' },
     { title: '健康度(API)', num: '100%' },
   ])
   let dataclick = ref('total')
@@ -164,12 +164,20 @@
             })
             callTheTrend(callTheTrendData.value)
           } else {
-            callTheTrendData.value.snum = ['0', '0', '0', '0', '0', '0', '0']
+            callTheTrendData.value.snum = [
+              '3',
+              '17',
+              '10',
+              '5',
+              '15',
+              '15',
+              '19',
+            ]
             callTheTrend(callTheTrendData.value)
           }
         })
       } else {
-        callTheTrendData.value.snum = ['0', '0', '0', '0', '0', '0', '0']
+        callTheTrendData.value.snum = ['3', '17', '10', '5', '15', '15', '19']
         callTheTrend(callTheTrendData.value)
       }
     } else {
@@ -214,37 +222,37 @@
         })
       } else {
         callTheTrendData.value.snum = [
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '10',
-          '0',
+          '8',
-          '0',
+          '16',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
-          '0',
+          '3',
-          '0',
+          '17',
-          '0',
+          '10',
-          '0',
+          '5',
-          '0',
+          '15',
-          '0',
+          '15',
-          '0',
+          '19',
         ]
         callTheTrend(callTheTrendData.value)
       }
@@ -259,7 +267,7 @@
     option = {
       tooltip: {
         backgroundColor: 'rgba(17,61,116,0.8)',
-        borderWidth: 0,
+        // borderWidth: 0,
         trigger: 'axis',
         formatter: function (val) {
           console.log(val)
@@ -301,11 +309,13 @@
           name: '个',
           type: 'value',
           axisTick: {
-            show: false,
+            show: true,
           },
           axisLine: {
+            show: true,
             lineStyle: {
-              color: '#57617B',
+              color: '#336EBF',
+              width: '1',
             },
           },
           axisLabel: {
@@ -316,6 +326,9 @@
           },
           splitLine: {
             show: false,
+            // lineStyle: {
+            //   color: ['#57617B'],
+            // },
           },
         },
       ],

front/src/views/capabilityCloud/components/DataResources.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-19 10:15:33
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-27 12:52:18
+ * @LastEditTime: 2022-11-28 16:23:25
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -50,10 +50,10 @@
       name: '总申请次数',
       num: '',
     },
-    {
+    // {
-      name: '满足率',
+    //   name: '满足率',
-      num: '',
+    //   num: '',
-    },
+    // },
   ])
   // 右侧数据
   const assignRankings = ref([

front/src/views/capacitySquare/components/algorithm.vue

@@ -22,7 +22,11 @@
         </div>
         <div class="bottom" v-show="selectFlag2">
           <span class="light"></span>
-          <div v-for="val in dictList" :key="val" @click="changeAreaFunction(val)">
+          <div
+            v-for="val in dictList"
+            :key="val"
+            @click="changeAreaFunction(val)"
+          >
             {{ val }}
           </div>
         </div>
@@ -30,9 +34,18 @@
     </div>
 
     <div class="algorithm-class">
-      <div v-for="(item, index) in dataList" :key="`algorithm-${index}`" class="algorithm-card">
+      <div
-        <a-image :src="algorithmCardPhoto(item)" :width="525" :height="275" :fallback="imgSrc" :preview="false">
+        v-for="(item, index) in dataList"
-        </a-image>
+        :key="`algorithm-${index}`"
+        class="algorithm-card"
+      >
+        <a-image
+          :src="algorithmCardPhoto(item)"
+          :width="525"
+          :height="275"
+          :fallback="imgSrc"
+          :preview="false"
+        ></a-image>
 
         <a-tooltip>
           <template #title>{{ item.name }}</template>
@@ -46,308 +59,324 @@
   </div>
 </template>
 <script setup>
-import { getCategoryTreePage } from '@/api/personalCenter'
+  import { getCategoryTreePage } from '@/api/personalCenter'
-import { getGisByArea } from '@/api/home'
+  import { getGisByArea } from '@/api/home'
-import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
+  import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
-
+  import { useRouter } from 'vue-router'
-
+  const router = useRouter()
-const deptType = ref(null)
+  const area = router.currentRoute.value.query.area
-const typeName = ref('全市')
+  const deptType = ref(null)
-const typeName2 = ref('全部')
+  const typeName = ref('全市')
-const dictList = ref([])
+  const typeName2 = ref('全部')
-const dataList = ref([])
+  if (area) {
-const selectFlag2 = ref(false)
+    typeName2.value = area
-const selectFlag = ref(false)
-getCategoryTreePage({
-  page: 1,
-  limit: 99,
-  dictTypeId: '1513712507692818433',
-}).then((res) => {
-  dictList.value = ['全部']
-  res.data.data.list.map((val) => {
-    // if (val.dictLabel !== '其他') {
-    dictList.value.push(val.dictLabel)
-    // }
-  })
-})
-const params = {
-  pageNum: 1,
-  type: '智能算法',
-  area: typeName2.value == '全部' ? '' : typeName2.value,
-  pageSize: 9 // 固定9
-}
-
-// 切换领域
-const changeAreaFunction = (val) => {
-  params.pageNum = 1;
-  typeName2.value = val
-  params.area = typeName2.value == '全部' ? '' : typeName2.value;
-  selectFlag2.value = false
-  pageWithAttrsFunction()
-}
-let algorithmclassDom = null
-const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo.jpg'))
-const dataLength = ref(true)
-const isNoMore = ref(false)
-let url = ref('')
-const pageWithAttrsFunction = () => {
-  getGisByArea(params).then((res) => {
-    dataList.value = res.data.data.list
-    if (res.data.data.list.length < 9) {
-      dataLength.value = false
-    }
-  })
-}
-pageWithAttrsFunction()
-
-//图片显示
-const algorithmCardPhoto = (item) => {
-  let _arr = []
-  if(item.pic && typeof item.pic == 'string') {
-    _arr = JSON.parse(item.pic)
   }
-  let _img = _arr[0] && _arr[0].img || imgSrc.value;
+  const dictList = ref([])
-  console.log('_img------------>', _img);
+  const dataList = ref([])
-  return _img
+  const selectFlag2 = ref(false)
-}
+  const selectFlag = ref(false)
-//跳转详情页
+  getCategoryTreePage({
-const detailFunction = (id) => {
+    page: 1,
-  window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
+    limit: 99,
-}
+    dictTypeId: '1513712507692818433',
-const algorithmFunction = (e) => {
+  }).then((res) => {
-  var scrollTop = e.currentTarget.scrollTop
+    dictList.value = ['全部']
-  var windowHeight = e.currentTarget.clientHeight
+    res.data.data.list.map((val) => {
-  var scrollHeight = e.currentTarget.scrollHeight
+      // if (val.dictLabel !== '其他') {
-  console.log(scrollTop, windowHeight, scrollHeight, '123')
+      dictList.value.push(val.dictLabel)
-  if (
+      // }
-    scrollTop + windowHeight <= scrollHeight + 1 &&
+    })
-    scrollTop + windowHeight >= scrollHeight - 1
+  })
-  ) {
+  const params = {
-    // 当前滚动条已经触底
+    pageNum: 1,
-    isNoMore.value = true
+    type: '智能算法',
-    params.pageNum++
+    area: typeName2.value == '全部' ? '' : typeName2.value,
+    pageSize: 9, // 固定9
+  }
+
+  // 切换领域
+  const changeAreaFunction = (val) => {
+    params.pageNum = 1
+    typeName2.value = val
+    params.area = typeName2.value == '全部' ? '' : typeName2.value
+    selectFlag2.value = false
+    pageWithAttrsFunction()
+  }
+  let algorithmclassDom = null
+  const imgSrc = ref(require('@/assets/capacitySquare/algorithm-photo.jpg'))
+  const dataLength = ref(true)
+  const isNoMore = ref(false)
+  let url = ref('')
+  const pageWithAttrsFunction = () => {
     getGisByArea(params).then((res) => {
-      dataList.value.push(...res.data.data.list)
+      dataList.value = res.data.data.list
       if (res.data.data.list.length < 9) {
         dataLength.value = false
       }
     })
-  } else {
-    isNoMore.value = false
   }
-}
+  pageWithAttrsFunction()
 
-// 切换区市
+  //图片显示
-const changeDeptType = (str) => {
+  const algorithmCardPhoto = (item) => {
-  if (str) {
+    let _arr = []
-    if (algorithmclassDom) {
+    if (item.pic && typeof item.pic == 'string') {
-      algorithmclassDom.scrollTop = 0;
+      _arr = JSON.parse(item.pic)
     }
-    switch (str) {
+    let _img = (_arr[0] && _arr[0].img) || imgSrc.value
-      case '全市':
+    console.log('_img------------>', _img)
-        deptType.value = null
+    return _img
-        typeName.value = '全 市'
+  }
-        break
+  //跳转详情页
-      case '市级':
+  const detailFunction = (id) => {
-        deptType.value = 2
+    window.open(window.SITE_CONFIG.previewUrl + `#/details?id=${id}`)
-        typeName.value = '市 级'
+  }
-        break
+  const algorithmFunction = (e) => {
-      case '区级':
+    var scrollTop = e.currentTarget.scrollTop
-        deptType.value = 3
+    var windowHeight = e.currentTarget.clientHeight
-        typeName.value = '区 级'
+    var scrollHeight = e.currentTarget.scrollHeight
-        break
+    console.log(scrollTop, windowHeight, scrollHeight, '123')
-      case '企业':
+    if (
-        deptType.value = 4
+      scrollTop + windowHeight <= scrollHeight + 1 &&
-        typeName.value = '企 业'
+      scrollTop + windowHeight >= scrollHeight - 1
-        break
+    ) {
+      // 当前滚动条已经触底
+      isNoMore.value = true
+      params.pageNum++
+      getGisByArea(params).then((res) => {
+        dataList.value.push(...res.data.data.list)
+        if (res.data.data.list.length < 9) {
+          dataLength.value = false
+        }
+      })
+    } else {
+      isNoMore.value = false
     }
-    params.pageNum = 1;
+  }
-    if(deptType.value !== null && deptType.value !== undefined) {
+
-      params.deptType = deptType.value;
+  // 切换区市
-    }else {
+  const changeDeptType = (str) => {
-      if(Object.keys(params).includes('deptType')) {
+    if (str) {
-        delete params.deptType
+      if (algorithmclassDom) {
+        algorithmclassDom.scrollTop = 0
+      }
+      switch (str) {
+        case '全市':
+          deptType.value = null
+          typeName.value = '全 市'
+          break
+        case '市级':
+          deptType.value = 2
+          typeName.value = '市 级'
+          break
+        case '区级':
+          deptType.value = 3
+          typeName.value = '区 级'
+          break
+        case '企业':
+          deptType.value = 4
+          typeName.value = '企 业'
+          break
+      }
+      params.pageNum = 1
+      if (deptType.value !== null && deptType.value !== undefined) {
+        params.deptType = deptType.value
+      } else {
+        if (Object.keys(params).includes('deptType')) {
+          delete params.deptType
+        }
       }
     }
+    selectFlag.value = false
+    getData(str)
   }
-  selectFlag.value = false
-  getData(str)
-}
 
-const getData = (str) => {
+  const getData = (str) => {
-  getGisByArea(params).then((res) => {
+    getGisByArea(params).then((res) => {
-    const resData = res.data.data || {}
+      const resData = res.data.data || {}
-    if (resData.list.length > 0 && resData.list.length < 9 && algorithmclassDom) {
+      if (
-      algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+        resData.list.length > 0 &&
-    }
+        resData.list.length < 9 &&
-    dataList.value = resData.list || []
+        algorithmclassDom
-    nextTick(() => {
+      ) {
-      algorithmclassDom = document.querySelector('.algorithm-box')
-      if (str && algorithmclassDom) {
         algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
-        algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
       }
+      dataList.value = resData.list || []
+      nextTick(() => {
+        algorithmclassDom = document.querySelector('.algorithm-box')
+        if (str && algorithmclassDom) {
+          algorithmclassDom.removeEventListener(
+            'scroll',
+            algorithmFunction,
+            true
+          )
+          algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
+        }
+      })
     })
-  })
-}
-
-onMounted(() => {
-  algorithmclassDom = document.querySelector('.algorithm-class')
-  if (dataLength.value) {
-    //监听滚动事件
-    algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
   }
-})
+
-onBeforeUnmount(() => {
+  onMounted(() => {
-  algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+    algorithmclassDom = document.querySelector('.algorithm-class')
-})
+    if (dataLength.value) {
+      //监听滚动事件
+      algorithmclassDom.addEventListener('scroll', algorithmFunction, true)
+    }
+  })
+  onBeforeUnmount(() => {
+    algorithmclassDom.removeEventListener('scroll', algorithmFunction, true)
+  })
 </script>
 
 <style lang="less" scoped>
-.algorithm {
+  .algorithm {
-  .select {
+    .select {
-    margin: 0.1rem 0 0.1rem 0.2rem;
+      margin: 0.1rem 0 0.1rem 0.2rem;
-    color: #fff;
+      color: #fff;
-    font-size: 0.2rem;
+      font-size: 0.2rem;
-    font-family: webfont;
+      font-family: webfont;
-    position: relative;
-
-    .top {
-      cursor: pointer;
-      width: 3.61rem;
-      height: 0.85rem;
-      font-weight: 600;
-      text-align: center;
-      padding-top: 0.1rem;
-      background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
-      background-size: 100%;
       position: relative;
 
-      .light {
+      .top {
-        width: 0.56rem;
+        cursor: pointer;
-        height: 3px;
+        width: 3.61rem;
-        position: absolute;
+        height: 0.85rem;
-        top: 0.4rem;
+        font-weight: 600;
-        left: 1.52rem;
-        background: url('~@/assets/capacitySquare/select-light1.png') no-repeat;
-        background-size: 100%;
-      }
-    }
-
-    .bottom {
-      cursor: pointer;
-      position: absolute;
-      top: 0.5rem;
-      left: 0.9rem;
-      z-index: 1000;
-      background: rgba(57, 134, 239, 0.68);
-      border: 1px solid #aed5ff;
-
-      .light {
-        display: inline-block;
-        width: 2.39rem;
-        height: 5px;
-        position: absolute;
-        top: -0.08rem;
-        left: -0.3rem;
-        background: url('~@/assets/capacitySquare/select-light2.png') no-repeat;
-        background-size: 100%;
-      }
-
-      &>div {
-        width: 1.8rem;
-        height: 0.4rem;
-        line-height: 0.4rem;
         text-align: center;
-        border-top: 1px solid #aed5ff;
+        padding-top: 0.1rem;
-      }
+        background: url('~@/assets/capacitySquare/select-bg.png') no-repeat;
+        background-size: 100%;
+        position: relative;
 
-      &>div:nth-of-type(1) {
+        .light {
-        border: none;
+          width: 0.56rem;
-      }
+          height: 3px;
-    }
+          position: absolute;
-  }
+          top: 0.4rem;
-
+          left: 1.52rem;
-  .algorithm-class {
+          background: url('~@/assets/capacitySquare/select-light1.png')
-    // margin-top: 0.6rem;
+            no-repeat;
-    margin-bottom: 0.18rem;
+          background-size: 100%;
-    display: grid;
-    grid-template-columns: repeat(3, 33%);
-    height: 8.8rem;
-    overflow: auto;
-    margin-left: 1.15rem;
-    margin-right: 0.15rem;
-
-    .algorithm-card {
-      height: 2.75rem;
-      width: 5.25rem;
-      background: url('~@/assets/capacitySquare/algorithm-bg.png') no-repeat;
-      background-size: 100% 100%;
-      margin-bottom: 0.4rem;
-      margin-right: 0.65rem;
-      position: relative;
-
-      :deep(.ant-image) {
-        img {
-          margin-top: 0.15rem;
-          height: 2.45rem;
-          width: 5.05rem;
-          margin-left: 0.1rem;
         }
       }
 
-      .algorithm-card-photo {
+      .bottom {
-        height: 100%;
+        cursor: pointer;
-        width: 100%;
-        background: url('~@/assets/capacitySquare/algorithm-photo.jpg') no-repeat;
-        background-size: 100%;
-      }
-
-      .algorithm-card-title {
         position: absolute;
-        height: 0.6rem;
+        top: 0.5rem;
-        margin-left: 0.08rem;
+        left: 0.9rem;
-        width: 97%;
+        z-index: 1000;
-        color: #ffffff;
+        background: rgba(57, 134, 239, 0.68);
-        font-size: 0.22rem;
+        border: 1px solid #aed5ff;
-        font-family: alibaba;
-        bottom: 0.15rem;
-        padding-left: 0.22rem;
-        background: url('~@/assets/capacitySquare/algorithm-title-bg.png') no-repeat;
-        background-size: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
 
-        span {
+        .light {
-          line-height: 0.24rem;
+          display: inline-block;
-          overflow: hidden;
+          width: 2.39rem;
-          text-overflow: ellipsis;
+          height: 5px;
-          white-space: nowrap;
+          position: absolute;
-          cursor: pointer;
+          top: -0.08rem;
+          left: -0.3rem;
+          background: url('~@/assets/capacitySquare/select-light2.png')
+            no-repeat;
+          background-size: 100%;
         }
 
-        span:last-child {
+        & > div {
-          font-size: 0.14rem;
+          width: 1.8rem;
+          height: 0.4rem;
+          line-height: 0.4rem;
+          text-align: center;
+          border-top: 1px solid #aed5ff;
+        }
+
+        & > div:nth-of-type(1) {
+          border: none;
         }
       }
     }
-  }
 
-  .algorithm-class::-webkit-scrollbar-track-piece {
+    .algorithm-class {
-    background: #a5bcdb;
+      // margin-top: 0.6rem;
-    border-radius: 0.08rem;
+      margin-bottom: 0.18rem;
-  }
+      display: grid;
+      grid-template-columns: repeat(3, 33%);
+      height: 8.8rem;
+      overflow: auto;
+      margin-left: 1.15rem;
+      margin-right: 0.15rem;
 
-  .algorithm-class::-webkit-scrollbar-thumb {
+      .algorithm-card {
-    height: 3.2rem;
+        height: 2.75rem;
-    background: linear-gradient(to bottom, #47d7f5, #3dc6e3);
+        width: 5.25rem;
-  }
+        background: url('~@/assets/capacitySquare/algorithm-bg.png') no-repeat;
+        background-size: 100% 100%;
+        margin-bottom: 0.4rem;
+        margin-right: 0.65rem;
+        position: relative;
 
-  .algorithm-class::-webkit-scrollbar {
+        :deep(.ant-image) {
-    height: 8.8rem;
+          img {
-    width: 0.08rem;
+            margin-top: 0.15rem;
-    border-radius: 0.08rem;
+            height: 2.45rem;
+            width: 5.05rem;
+            margin-left: 0.1rem;
+          }
+        }
+
+        .algorithm-card-photo {
+          height: 100%;
+          width: 100%;
+          background: url('~@/assets/capacitySquare/algorithm-photo.jpg')
+            no-repeat;
+          background-size: 100%;
+        }
+
+        .algorithm-card-title {
+          position: absolute;
+          height: 0.6rem;
+          margin-left: 0.08rem;
+          width: 97%;
+          color: #ffffff;
+          font-size: 0.22rem;
+          font-family: alibaba;
+          bottom: 0.15rem;
+          padding-left: 0.22rem;
+          background: url('~@/assets/capacitySquare/algorithm-title-bg.png')
+            no-repeat;
+          background-size: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+
+          span {
+            line-height: 0.24rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            cursor: pointer;
+          }
+
+          span:last-child {
+            font-size: 0.14rem;
+          }
+        }
+      }
+    }
+
+    .algorithm-class::-webkit-scrollbar-track-piece {
+      background: #a5bcdb;
+      border-radius: 0.08rem;
+    }
+
+    .algorithm-class::-webkit-scrollbar-thumb {
+      height: 3.2rem;
+      background: linear-gradient(to bottom, #47d7f5, #3dc6e3);
+    }
+
+    .algorithm-class::-webkit-scrollbar {
+      height: 8.8rem;
+      width: 0.08rem;
+      border-radius: 0.08rem;
+    }
   }
-}
 </style>

front/src/views/capacitySquare/components/application.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-08-09 09:31:25
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: Light
- * @LastEditTime: 2022-10-24 10:44:50
+ * @LastEditTime: 2022-11-29 14:41:49
  * @Description: 应用资源
 -->
 <template>
@@ -57,12 +57,17 @@
   import { selectAppList } from '@/api/home'
   import { useRouter } from 'vue-router'
   const router = useRouter()
+  const selectArea = router.currentRoute.value.query.area
   const pageNum = ref(1)
   const flag = ref(true)
   const type = ref(null)
   const area = ref(null)
   const typeName = ref('全市')
   const typeName2 = ref('全部')
+  if (selectArea && selectArea !== '全部') {
+    typeName2.value = selectArea
+    area.value = selectArea
+  }
   const dictList = ref([])
   const data = reactive({ list: [] })
   const selectFlag = ref(false)
@@ -121,7 +126,7 @@
       type: type.value,
       area: area.value,
     }).then((res) => {
-      console.log('res---应用广场--------->', res);
+      console.log('res---应用广场--------->', res)
 
       if (res.data.data.total.length < 9) {
         dom.removeEventListener('scroll', viewMonitor, true)

front/src/views/capacitySquare/components/layer.vue

@@ -60,9 +60,15 @@
   import { getCategoryTreePage } from '@/api/personalCenter'
   import { getGisByArea } from '@/api/home'
   import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  const area = router.currentRoute.value.query.area
   const deptType = ref(null)
   const typeName = ref('全市')
   const typeName2 = ref('全部')
+  if (area) {
+    typeName2.value = area
+  }
   const dictList = ref([])
   const dataList = ref([])
   const selectFlag2 = ref(false)

front/src/views/components/upload/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-09 15:41:19
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: Light
- * @LastEditTime: 2022-08-02 11:30:50
+ * @LastEditTime: 2022-11-28 17:05:33
  * @Description: 上传组件
 -->
 <template>
@@ -92,6 +92,7 @@
     }
     if (!isLt10M) {
       message.error(`${file.name} 超出100M的大小`)
+      flag = false
     }
     return flag || Upload.LIST_IGNORE
   }

front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue

@@ -8,8 +8,7 @@
       ></DetalsTitle>
     </div>
     <!-- 青岛市局 -->
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left" v-if="item.titleType === '调用接口'">
           <div class="left">
@@ -97,12 +96,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.people.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.people.value }}
                   </span>
                 </a-tooltip>
@@ -112,12 +113,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.phone.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.phone.value }}
                   </span>
                 </a-tooltip>
@@ -169,7 +172,15 @@
   import { ref, defineProps, watch } from 'vue'
   import { message } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
 
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)

front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue

@@ -8,8 +8,7 @@
       ></DetalsTitle>
     </div>
     <!-- 青岛市局 -->
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content">
         <div
           v-for="(item, index) in dataFrom.content"
@@ -24,6 +23,7 @@
                 <a-tooltip
                   v-if="
                     approveStatus !== '通过' &&
+                    !role &&
                     (carditem.attrType === '联系人' ||
                       carditem.attrType === '联系人电话')
                   "
@@ -55,7 +55,15 @@
   import DetalsTitle from '@/views/detailsAll/components/DetalsTitle'
   import { ref, defineProps, watch } from 'vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)
   let dataFrom = ref({

front/src/views/detailsAll/components/Business/BusinessUsageMode.vue

@@ -7,8 +7,7 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left">
           <div class="left">
@@ -52,12 +51,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.people.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.people.value }}
                   </span>
                 </a-tooltip>
@@ -67,12 +68,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.phone.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.phone.value }}
                   </span>
                 </a-tooltip>
@@ -124,7 +127,15 @@
   import { ref, defineProps, watch } from 'vue'
   import { message } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)
   let dataFrom = ref({

front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue

@@ -7,8 +7,7 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content">
         <div class="content-card">
           <div class="left">
@@ -40,6 +39,7 @@
                     <template #title>
                       {{
                         approveStatus !== '通过' &&
+                        !role &&
                         (carditem.attrType === '部门联系人' ||
                           carditem.attrType === '联系人电话')
                           ? '请申请后查看'
@@ -50,6 +50,7 @@
                       :class="{
                         'blur-word':
                           approveStatus !== '通过' &&
+                          !role &&
                           (carditem.attrType === '部门联系人' ||
                             carditem.attrType === '联系人电话'),
                       }"
@@ -80,7 +81,15 @@
   import { pinyin } from 'pinyin-pro'
   import { message } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)
   let flag = ref(true)

front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue

@@ -7,8 +7,7 @@
         :type="dataFrom.englishTitle"
       ></DetalsTitle>
     </div>
-    <div style="width: 100%; display: flex; justify-content: center"
+    <div style="width: 100%; display: flex; justify-content: center">
-    >
       <div class="content" v-for="item in dataFrom.content" :key="item.title">
         <div class="content-left">
           <div class="left">
@@ -63,12 +62,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.people.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.people.value }}
                   </span>
                 </a-tooltip>
@@ -78,12 +79,14 @@
                 <a-tooltip>
                   <template #title>
                     {{
-                      approveStatus === '通过'
+                      approveStatus === '通过' || role
                         ? item.phone.value
                         : '请申请后查看'
                     }}
                   </template>
-                  <span :class="{ 'blur-word': approveStatus !== '通过' }">
+                  <span
+                    :class="{ 'blur-word': approveStatus !== '通过' && !role }"
+                  >
                     {{ item.phone.value }}
                   </span>
                 </a-tooltip>
@@ -135,7 +138,15 @@
   import { pinyin } from 'pinyin-pro'
   import { ref, defineProps, watch } from 'vue'
   import { useRouter } from 'vue-router'
+  import { useStore } from 'vuex'
   const router = useRouter()
+  const store = useStore()
+  const role = ref(false)
+  store.getters['user/roleList'].map((val) => {
+    if (val === '运维管理员') {
+      role.value = true
+    }
+  })
   const approveStatus = ref('通过')
   const whoShow1 = ref(whoShow)
   let dataFrom = ref({

front/src/views/home/DetailsPageconetent.vue

@@ -1615,19 +1615,24 @@
       }
       // 青岛-西海岸处理
       const getXiHaiAn = (res) => {
-        ;((res.data && res.data.data && res.data.data.list) || []).forEach(
+        debugger
-          (val) => {
+        const data = (res.data && res.data.data && res.data.data.list) || []
-            val.id = val.serviceId // id
+        const total = (res.data && res.data.data && res.data.data.total) || 0
-            val.name = val.serviceName // 名字
+        data.forEach((val) => {
-            val.sjlCount = val.requestQuantity // 数据量
+          val.id = val.serviceId // id
-            val.applyCount = val.requestCount // 申请量
+          val.name = val.serviceName // 名字
-            val.deptName = val.departmentName // 部门
+          val.sjlCount = val.requestQuantity // 数据量
-            val.createTime = val.createTime.split('.')[0]
+          val.applyCount = val.requestCount // 申请量
-            val.createDate = val.createTime // 发布时间
+          val.deptName = val.departmentName // 部门
-          }
+          val.createTime = val.createTime.split('.')[0]
-        )
+          val.createDate = val.createTime // 发布时间
-        resourceList.data = res.data.data.list || []
+        })
-        resourceTotal.value = res.data.data.total || ''
+
+        console.log('接口数据', data)
+        resourceList.data = data || []
+        console.log('接口数据2', resourceList.data)
+        resourceTotal.value = total
+        console.log()
       }
       let shoppingCartList = ref([])
       // 获取申购车列表

front/src/views/home/apply.vue

@@ -812,7 +812,7 @@
         console.log('res=====>', res.data.data)
         if (res.data.code == 0) {
           if (res.data.data.length == 0) {
-            message.warning('该关键词，暂无应用资源！')
+            // message.warning('该关键词，暂无应用资源！')
           } else {
             // 过滤本单位的应用系统
             res.data.data.map((val) => {

front/src/views/home/components/H5Player.vue

@@ -2,7 +2,7 @@
 海康H5Player
 -->
 <template>
-  <div :id="videoId" style="width: 800px; height: 600px; z-index: 9999"></div>
+  <div :id="videoId" ref="video333" style="width: 800px; height: 600px"></div>
 </template>
 <script>
   // const IS_MOVE_DEVICE = document.body.clientWidth < 992 // 是否移动设备
@@ -41,6 +41,7 @@
         mseSupport: MSE_IS_SUPPORT,
         // tabActive: MSE_IS_SUPPORT ? 'mse' : 'decoder',
         tabActive: 'decoder',
+        videoDom: {},
         urls: {
           realplay: 'ws://10.19.147.22:559/EUrl/q2jQie4',
           talk: 'wss://10.41.163.126:6014/proxy/10.41.163.126:559/EUrl/6gFx47S',
@@ -70,18 +71,13 @@
     },
     created() {},
     mounted() {
-      this.init()
+      // this.init()
       mybus.emit('closeLoading', true)
       this.createPlayer()
-      this.arrangeWindow()
+      // this.arrangeWindow()
       if (this.unStopable) {
-        this.videoPlay(this.videoUrl, 0)
-      } else {
         this.realplay(this.videoUrl, 0)
       }
-      //videoUrl this.realplay(this.videoUrl,0);//循环传过来的数组进行播放，index根据选中的个数
-
-      //this.realplay('wss://10.134.135.44:6014/proxy/10.10.20.14:559/openUrl/y3mFfcA',0);
     },
     watch: {
       videoUrl: {
@@ -120,15 +116,18 @@
           //szId: 'player'+this.index,
           szId: this.videoId,
           szBasePath: '/util/', //引入静态资源地址，我这里静态资源在public/js文件存放，所以设置为js
-          iMaxSplit: 4,
+          // iMaxSplit: 4,
-          iWidth: '800px',
+          // iWidth: '800px',
-          iCurrentSplit: 4,
+          // iCurrentSplit: 4,
-          openDebug: true,
+          // openDebug: true,
-          oStyle: {
+          // oStyle: {
-            borderSelect: '#FFCC00',
+          //   borderSelect: '#FFCC00',
-          },
+          // },
         })
         let that = this
+        that.videoDom = that.$refs.video333.querySelector('video') || {}
+        // that.videoDom.autoplay = false
+
         // 事件回调绑定
         this.player.JS_SetWindowControlCallback({
           windowEventSelect: function (iWndIndex) {
@@ -138,8 +137,8 @@
           pluginErrorHandler: function (iWndIndex, iErrorCode, oError) {
             //插件错误回调
             console.log('pluginError callback: ', iWndIndex, iErrorCode, oError)
-            message.error('取流异常,请稍后尝试')
+            // message.error('取流异常,请稍后尝试')
-            mybus.emit('closeLoading', false)
+            // mybus.emit('closeLoading', false)
           },
           windowEventOver: function (iWndIndex) {
             //鼠标移过回调
@@ -159,15 +158,19 @@
           },
           firstFrameDisplay: function (iWndIndex, iWidth, iHeight) {
             //首帧显示回调
-            console.log(
+            // console.log(
-              'firstFrame loaded callback: ',
+            //   'firstFrame loaded callback: ',
-              iWndIndex,
+            //   iWndIndex,
-              iWidth,
+            //   iWidth,
-              iHeight
+            //   iHeight
-            )
+            // )
-            // 如果是录像播放，首帧绘制完成后停止
+            // // 如果是录像播放，首帧绘制完成后停止
-            if (!that.realTime) {
+            // if (!that.realTime) {
-              that.pausePlay(iWndIndex)
+            // that.pausePlay(iWndIndex)
+            if (!that.unStopable) {
+              setTimeout(() => {
+                that.videoDom.pause()
+              }, 0)
             }
             mybus.emit('closeLoading', false)
           },
@@ -191,67 +194,23 @@
       // 初始化结束
       // 视频预览
       realplay(playURL, index1) {
+        let that = this
         this.realTime = false
         mybus.emit('closeLoading', true)
         setTimeout(() => {
           mybus.emit('closeLoading', false)
         }, 3000)
+        this.player.JS_Stop(0)
         this.mode = 0 //解码方式：0普通模式 1高级模式
         const { player, mode, urls } = this
-        // playURL = this.realplay
-        console.log('视频播放地址', playURL)
-        // const startTime = {
-        //   startTime: ,
-        // }
-        // const endTime = {
-        //   endTime: ,
-        // }
-        player
-          .JS_Play(
-            playURL,
-            { playURL, mode },
-            index1,
-            '2022-11-22T10:00:00Z',
-            '2022-11-22T11:00:00Z'
-          )
-          .then(
-            () => {
-              console.log('realplay success')
-            },
-            (e) => {
-              console.error(e)
-              // message.error('错误代码:' + e)
-            }
-          )
-      },
-      // 实时播放
-      videoPlay(playURL, index1) {
-        let that = this
-        this.realTime = true
-        mybus.emit('closeLoading', true)
-        setTimeout(() => {
-          mybus.emit('closeLoading', false)
-        }, 3000)
-        if (!that.unStopable) {
-          message.warning('预览将在约6s后停止')
-          setTimeout(() => {
-            that.stopAllPlay()
-          }, 6000)
-        }
-        this.mode = 0 //解码方式：0普通模式 1高级模式
-        const { player, mode, urls } = this
-        // playURL = this.realplay
-        console.log('视频播放地址', playURL)
-        // const startTime = {
-        //   startTime: ,
-        // }
-        // const endTime = {
-        //   endTime: ,
-        // }
         player.JS_Play(playURL, { playURL, mode }, index1).then(
           () => {
-            console.log('realplay success')
+            mybus.emit('closeLoading', false)
-            // 预览时6s停止播放
+            if (!that.unStopable) {
+              setTimeout(() => {
+                that.videoDom.pause()
+              }, 0)
+            }
           },
           (e) => {
             console.error(e)
@@ -272,20 +231,6 @@
           }
         )
       },
-      // 暂停单个视频
-      pausePlay(index) {
-        let that = this
-        this.player.JS_Pause(index).then(
-          () => {
-            console.log('暂停成功')
-          },
-          (e) => {
-            console.error(e)
-            // 暂停失败切换为实时播放
-            that.videoPlay(that.videoUrl, 0)
-          }
-        )
-      },
     },
     beforeUnmount() {
       console.log('关闭所有视频')

front/src/views/home/components/header.vue

@@ -17,9 +17,17 @@
     <div
       v-for="item in navList"
       :key="item.key"
-      @click="jumpPage(item,'headerClick')"
+      @click="jumpPage(item, 'headerClick')"
       class="nav"
-      :class="[{'select':item.key == select},{'select-inner':(item.key == 'DetailsPageconetent' && item.innerKey && props.targetFlag)}]"
+      :class="[
+        { select: item.key == select },
+        {
+          'select-inner':
+            item.key == 'DetailsPageconetent' &&
+            item.innerKey &&
+            props.targetFlag,
+        },
+      ]"
     >
       {{ item.name }}
     </div>
@@ -54,6 +62,7 @@
         p-id="2187"
         width="0.35rem"
         height="0.35rem"
+        @click="goToView()"
       >
         <path
           d="M544 161.536a330.666667 330.666667 0 0 1 298.666667 329.130667h-0.341334c0.213333 1.493333 0.341333 2.986667 0.341334 4.565333v219.434667h39.68a32 32 0 0 1 0 64h-212.053334a160 160 0 0 1-316.586666 0H141.909333a32 32 0 1 1 0-64h39.424v-219.434667c0-1.578667 0.128-3.072 0.341334-4.565333H181.333333a330.666667 330.666667 0 0 1 298.666667-329.130667V128a32 32 0 1 1 64 0v33.536z m-298.666667 553.130667h533.333334v-219.434667c0-1.578667 0.128-3.072 0.341333-4.565333h-0.341333a266.666667 266.666667 0 1 0-533.333334 0h-0.341333c0.213333 1.493333 0.341333 2.986667 0.341333 4.565333v219.434667z m359.765334 64H418.901333a96 96 0 0 0 186.197334 0z"
@@ -90,14 +99,18 @@
         </template>
         <span
           class="name"
-          @click="jumpPage({ name: '个人中心', key: 'personalCenter' },'headerClick')"
+          @click="
+            jumpPage({ name: '个人中心', key: 'personalCenter' }, 'headerClick')
+          "
         >
           {{ user.realName }}
         </span>
       </a-tooltip>
       <span @click="logout" class="out">退出</span>
       <i
-        @click="jumpPage({ name: '后台管理', key: 'houtaiguanli' },'headerClick')"
+        @click="
+          jumpPage({ name: '后台管理', key: 'houtaiguanli' }, 'headerClick')
+        "
         class="iconTo"
         v-show="backFlag"
       ></i>
@@ -135,19 +148,19 @@
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
   const navList = ref(navListManagement.navList)
-  const targetRouter= ref('')
+  const targetRouter = ref('')
   const backFlag = ref(false)
   getUserInfo().then((res) => {
-    if(res.data.data.superAdmin =='1'){
+    if (res.data.data.superAdmin == '1') {
       backFlag.value = true
     } else {
-    res.data.data.roleIdList.map((val) => {
+      res.data.data.roleIdList.map((val) => {
-      getRole(val).then((role) => {
+        getRole(val).then((role) => {
-        if (role.data.data.name === '后台管理员') {
+          if (role.data.data.name === '后台管理员') {
-          backFlag.value = true
+            backFlag.value = true
-        }
+          }
+        })
       })
-    })
     }
   })
   console.log('navList------------>', navList)
@@ -188,140 +201,145 @@
     window.open('http://15.72.177.175:18460/analystrunner/tonglan', '_blank')
   }
   // 跳转页面
-  const jumpPage = (item,type) => {
+  const jumpPage = (item, type) => {
-    if(type == 'headerClick'){
+    if (type == 'headerClick') {
-       // 西海岸
+      // 西海岸
-    if (itShowXiHaiAn.value) {
+      if (itShowXiHaiAn.value) {
-      let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
+        let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例']
-      if (
+        if (
-        _arr.includes(item.name) &&
+          _arr.includes(item.name) &&
-        !xhaHasPermissionUser.list.includes(user.value.username)
+          !xhaHasPermissionUser.list.includes(user.value.username)
-      ) {
+        ) {
-        return message.warn('暂无权限')
+          return message.warn('暂无权限')
+        }
+      }
+      select.value = item.key
+      switch (item.name) {
+        case '个人中心':
+          window.sessionStorage.setItem(
+            'type',
+            JSON.stringify('PurchaseVehicle')
+          )
+          router.push({
+            path: '/personalCenter',
+          })
+          break
+        case '能力统计':
+          router.push({
+            path: '/abilityStatistics',
+          })
+          break
+        case '能力集市':
+          router.push({
+            path: '/DetailsPageconetent',
+            query: {
+              select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
+            },
+          })
+          break
+        case '能力云图':
+          router.push({
+            path: '/capabilityCloud',
+          })
+          break
+        // case '技术文档':
+        //   router.push({
+        //     path: '/developmentGuide',
+        //   })
+        //   break
+        case '新手指南':
+          router.push({
+            path: '/instructionManual',
+          })
+          break
+        case '需求中心':
+          router.push({
+            path: '/demandCenter',
+          })
+          break
+        case '区市站点':
+          router.push({
+            path: '/mapTest',
+          })
+          break
+        case '后台管理':
+          Cookies.remove('JSESSIONID')
+          window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
+          // window.reload('http://15.2.21.238:9797')
+          break
+        case '赋能案例':
+          router.push({
+            path: '/assignCase',
+          })
+          break
+        case '典型赋能案例':
+          router.push({
+            path: '/assignCase',
+          })
+          break
+        case '融合服务':
+          router.push({
+            path: '/integrationServices',
+          })
+          break
+        case 'CIM专区':
+          router.push({
+            path: '/cimSpecialArea',
+          })
+          break
+        default:
+          router.push('/home')
+          break
+      }
+    } else if (type == 'innerClick') {
+      //select.value = item.key
+      switch (item.name) {
+        case '个人中心':
+          window.sessionStorage.setItem(
+            'type',
+            JSON.stringify('PurchaseVehicle')
+          )
+          router.push({
+            path: '/personalCenter',
+          })
+          break
+        case '能力统计':
+          router.push({
+            path: '/abilityStatistics',
+          })
+          break
+        case '能力集市':
+          router.push({
+            path: targetRouter.value.path,
+            query: {
+              id: targetRouter.value.id,
+            },
+          })
+          break
+        case '能力云图':
+          router.push({
+            path: '/capabilityCloud',
+          })
+          break
+        case '后台管理':
+          Cookies.remove('JSESSIONID')
+          window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
+          // window.reload('http://15.2.21.238:9797')
+          break
+        case '融合服务':
+          router.push({
+            path: '/integrationServices',
+          })
+          break
+        case 'CIM专区':
+          router.push({
+            path: '/cimSpecialArea',
+          })
+          break
+        default:
+          router.push('/home')
+          break
       }
-    }
-    select.value = item.key
-    switch (item.name) {
-      case '个人中心':
-        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-        router.push({
-          path: '/personalCenter',
-        })
-        break
-      case '能力统计':
-        router.push({
-          path: '/abilityStatistics',
-        })
-        break
-      case '能力集市':
-        router.push({
-          path: '/DetailsPageconetent',
-          query: {
-            select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
-          },
-        })
-        break
-      case '能力云图':
-        router.push({
-          path: '/capabilityCloud',
-        })
-        break
-      // case '技术文档':
-      //   router.push({
-      //     path: '/developmentGuide',
-      //   })
-      //   break
-      case '新手指南':
-        router.push({
-          path: '/instructionManual',
-        })
-        break
-      case '需求中心':
-        router.push({
-          path: '/demandCenter',
-        })
-        break
-      case '区市站点':
-        router.push({
-          path: '/mapTest',
-        })
-        break
-      case '后台管理':
-        Cookies.remove('JSESSIONID')
-        window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
-        // window.reload('http://15.2.21.238:9797')
-        break
-      case '赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '典型赋能案例':
-        router.push({
-          path: '/assignCase',
-        })
-        break
-      case '融合服务':
-        router.push({
-          path: '/integrationServices',
-        })
-        break
-      case 'CIM专区':
-        router.push({
-          path: '/cimSpecialArea',
-        })
-        break
-      default:
-        router.push('/home')
-        break
-    }
-    }else if(type == 'innerClick'){
-    //select.value = item.key
-    switch (item.name) {
-      case '个人中心':
-        window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle'))
-        router.push({
-          path: '/personalCenter',
-        })
-        break
-      case '能力统计':
-        router.push({
-          path: '/abilityStatistics',
-        })
-        break
-      case '能力集市':
-         router.push({
-           path: targetRouter.value.path,
-           query: {
-             id: targetRouter.value.id,
-           },
-         });
-        break
-      case '能力云图':
-        router.push({
-          path: '/capabilityCloud',
-        })
-        break
-      case '后台管理':
-        Cookies.remove('JSESSIONID')
-        window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench')
-        // window.reload('http://15.2.21.238:9797')
-        break
-      case '融合服务':
-        router.push({
-          path: '/integrationServices',
-        })
-        break
-      case 'CIM专区':
-        router.push({
-          path: '/cimSpecialArea',
-        })
-        break
-      default:
-        router.push('/home')
-        break
-    }
-    
     }
   }
   const scrollTop = ref(0)
@@ -403,24 +421,32 @@
 
     mybus.on('changeMenuStyle', (data) => {
       debugger
-      targetRouter.value = data;
+      targetRouter.value = data
-      if(data.path=='/algorithmCompare'){
+      if (data.path == '/algorithmCompare') {
-        jumpPage({
+        jumpPage(
-        "name": "能力集市",
+          {
-        "key": "DetailsPageconetent",
+            name: '能力集市',
-        "innerKey":"algorithmCompare"
+            key: 'DetailsPageconetent',
-       },'innerClick');
+            innerKey: 'algorithmCompare',
-      } else if(data.path =='/DetailsPageconetent'){
+          },
-        jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick')
+          'innerClick'
-      } else if(data.path =='/details'){
+        )
-         jumpPage({
+      } else if (data.path == '/DetailsPageconetent') {
-        "name": "能力集市",
+        jumpPage(
-        "key": "DetailsPageconetent",
+          { name: '能力集市', key: 'DetailsPageconetent' },
-        "innerKey":"details"
+          'headerClick'
-       },'innerClick');
+        )
+      } else if (data.path == '/details') {
+        jumpPage(
+          {
+            name: '能力集市',
+            key: 'DetailsPageconetent',
+            innerKey: 'details',
+          },
+          'innerClick'
+        )
       }
     })
-
   })
   onBeforeUnmount(() => {
     mybus.off('getSgcNum')
@@ -507,7 +533,7 @@
       background: #0058e1;
       color: #fff !important;
     }
-      .select-inner {
+    .select-inner {
       background: #0058e1;
       color: #fff !important;
     }

front/src/views/home/components/searchResultList.vue

@@ -72,7 +72,8 @@
             (item.type === '组件服务' &&
               item.infoList &&
               item.infoList.filter((val) => val.attrType == '图层缩略图')[0]) ||
-            item.infoList.filter((val) => val.attrType == '组件图片')[0]
+            item.infoList.filter((val) => val.attrType == '组件图片')[0] ||
+            item.infoList.filter((val) => val.attrType == '算法效果图片')[0]
           "
         >
           <a-image
@@ -99,6 +100,18 @@
             "
             :fallback="item.type == '开发组件' ? imgSrcKfzj : imgSrcYwzj"
           />
+          <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="imgSrcZnsf"
+          />
         </div>
         <div
           class="left"
@@ -830,6 +843,7 @@
       })
       const imgSrcYyzy = ref(require('@/assets/home/yyzy_square.png'))
       const imgSrcTcfw = ref(require('@/assets/home/tcfw_square.png'))
+      const imgSrcZnsf = ref(require('@/assets/home/znsf_square.png'))
       const imgSrcKfzj = ref(require('@/assets/home/kfzj_square.png'))
       const imgSrcYwzj = ref(require('@/assets/home/ywzj_square.png'))
       let videoUrl = ref('')
@@ -914,6 +928,7 @@
         getTagList,
         imgSrcYyzy,
         imgSrcTcfw,
+        imgSrcZnsf,
         imgSrcKfzj,
         imgSrcYwzj,
         downLoad

front/src/views/home/infrastructureApplication.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: Light
- * @LastEditTime: 2022-11-26 16:30:51
+ * @LastEditTime: 2022-11-29 17:28:02
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -28,10 +28,30 @@
           </a-list-item>
         </template>
         <template #header>
-          <div class="title">待申请列表</div>
+          <div class="title">
+            待申请列表
+            <a
+              style="
+                display: inline-block;
+                width: 60px;
+                height: 18px;
+                line-height: 18px;
+                text-align: center;
+                background: #1890ff;
+                border-radius: 3px;
+                font-size: 12px;
+                color: rgb(255, 255, 255);
+                cursor: pointer;
+                margin-left: 10px;
+              "
+              href="/static/download/InstallRootCert.exe"
+            >
+              证书下载
+            </a>
+          </div>
         </template>
         <template #footer>
-          <a-button type="primary" @click="apply">一键申请</a-button>
+          <a-button type="primary" @click="showApply">一键申请</a-button>
         </template>
       </a-list>
     </div>
@@ -134,6 +154,28 @@
       ></h5-player>
     </div>
   </a-modal>
+  <a-modal
+    :width="800"
+    v-model:visible="visibleApply"
+    title="视频监控申请"
+    @ok="apply"
+    @cancel="clear"
+  >
+    <p>本次申请的视频监控包含以下{{ showArrApply.length }}个，是否提交申请？</p>
+    <a-table
+      :columns="columns"
+      :data-source="showArrApply"
+      :pagination="{
+        pageSize: 5,
+      }"
+    >
+      <template #bodyCell="{ column, text }">
+        <template v-if="column.dataIndex === 'name'">
+          <a>{{ text }}</a>
+        </template>
+      </template>
+    </a-table>
+  </a-modal>
 </template>
 <script setup>
   import {
@@ -158,8 +200,10 @@
   const delWacFlag = ref(true)
   const delApply = ref(true)
   const visible = ref(false)
+  const visibleApply = ref(false)
   const instanceId = ref('')
-  const showArr = ref({})
+  const showArr = ref([])
+  const showArrApply = ref([])
   const columns = [
     {
       title: '名称',
@@ -193,6 +237,18 @@
       })
     }
   })
+  const showApply = () => {
+    if (dataList.toBeApplied.length === 0) {
+      message.warning('待申请列表为空!')
+      return
+    }
+    if (dataList.toBeApplied.length + dataList.requested.length > 10) {
+      message.warning('最多只能申请10个视频监控!')
+      return
+    }
+    visibleApply.value = true
+    showArrApply.value = dataList.toBeApplied
+  }
   const delWillApplyCamera = (id) => {
     console.log('撤销===>', id)
     if (delWacFlag.value) {
@@ -209,10 +265,6 @@
     }
   }
   const apply = () => {
-    if (dataList.toBeApplied.length === 0) {
-      message.warning('待申请列表为空!')
-      return
-    }
     let obj = {
       arr: [
         {
@@ -311,10 +363,13 @@
     console.log('清空')
     instanceId.value = ''
     showArr.value = []
+    showArrApply.value = []
     visible.value = false
+    visibleApply.value = false
     delApply.value = true
     dataList.selectItem = {}
     showVisible.value = false
+    showVisible.value = false
   }
   const init = () => {
     willApplyCameraSelect().then((res) => {
@@ -359,8 +414,8 @@
     })
   }
   mybus.on('selectCamera', (obj) => {
-    // 判断最多10条
+    // 判断最多10条 + dataList.requested.length
-    if (dataList.toBeApplied.length + dataList.requested.length >= 10) {
+    if (dataList.toBeApplied.length >= 10) {
       message.warning('最多只能申请10个视频监控！')
       return
     }
@@ -392,8 +447,12 @@
       }
     }
   })
+  mybus.on('initDetailsPageconetent', () => {
+    initApply()
+  })
   onBeforeUnmount(() => {
     mybus.off('selectCamera')
+    mybus.off('initDetailsPageconetent')
   })
 </script>
 <style lang="less" scoped>

front/src/views/home/infrastructurePage.vue

@@ -1443,7 +1443,7 @@
     }
   }
   //分页
-  const onRoomChange = () => {
+  const onRoomChange = (pageNumber) => {
     roomPage.value = pageNumber
     searchData()
   }

front/src/views/home/infrastructurePageXha.vue

@@ -409,7 +409,8 @@
         v-loading="spinningHome"
         element-loading-text="Loading..."
         element-loading-svg-view-box="-10, -10, 50, 50"
-        element-loading-background="rgba(122, 122, 122, 0.8)"
+        element-loading-background="rgba(122, 122, 122, 0.9)"
+        :element-loading-svg="svg"
       >
         <video-surveillance></video-surveillance>
       </div>
@@ -714,6 +715,16 @@
   const spinning = ref(true)
   const whoShow1 = ref(whoShow)
   const isXiHaiAn = whoShow1.value.itShowXiHaiAn
+  const svg = `
+        <path class="path" d="
+          M 30 15
+          L 28 17
+          M 25.61 25.61
+          A 15 15, 0, 0, 1, 15 30
+          A 15 15, 0, 1, 1, 27.99 7.5
+          L 15 15
+        " style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"/>
+      `
   const options = reactive({
     width: '912px', //播放器宽度
     height: '513px', //播放器高度

front/src/views/newHome/components/CapabilityConvergence.vue

@@ -38,7 +38,7 @@
             class="name"
             v-for="(item, index) in jcList.slice(0, 5)"
             :key="item.name"
-            :class="index == 2 ? 'name-last' : ''"
+            :class="index == 3 ? 'name-last' : ''"
             @click="selectOne2(item.name)"
           >
             {{

front/src/views/personalCenter/components/MyApply.vue

@@ -484,6 +484,10 @@
       yaweiApproveDetails({ applyGuid: item.GUID })
         .then((res) => {
           console.log('详情===========>', res.data.data)
+          if (res.data.code !== 0) {
+            message.error('数据请求失败！')
+            return
+          }
           res.data.data.map((val) => {
             val.clsj = moment(val.clsj).format('YYYY-MM-DD HH:mm:ss')
           })
@@ -717,6 +721,14 @@
     } else if (typeName.value == '数据资源申请') {
       yaweiApproveStatus({ page: page.value, size: 4, title: '' }).then(
         (res) => {
+          if (res.data.code !== 0) {
+            num.value = []
+            total.value = 0
+            contentList.data = []
+            contentList2.data = []
+            showType.value = ''
+            return
+          }
           console.log('数据资源申请===============>', res.data.data)
           contentList.data = res.data.data.data
           num.value = []
@@ -727,6 +739,14 @@
     } else if (typeName.value == '云资源申请') {
       getResourceBusinessList({ userAccount: userName.value }).then((res) => {
         console.log('数据资源申请===============>', res.data.data)
+        if (res.data.code !== 0) {
+          num.value = []
+          total.value = 0
+          contentList.data = []
+          contentList2.data = []
+          showType.value = ''
+          return
+        }
         contentList.data = res.data.data
         contentList2.data = res.data.data
         num.value = []
@@ -735,6 +755,14 @@
       })
     } else if (typeName.value == '云视频申请') {
       getVideoBusinessList({ userAccount: userName.value }).then((res) => {
+        if (res.data.code !== 0) {
+          num.value = []
+          total.value = 0
+          contentList.data = []
+          contentList2.data = []
+          showType.value = ''
+          return
+        }
         console.log('数据资源申请===============>', res.data.data)
         contentList.data = res.data.data
         contentList2.data = res.data.data

front/src/views/personalCenter/components/MyPublish.vue

@@ -151,10 +151,10 @@
       destroyOnClose="true"
       :maskClosable="false"
     >
-      <publish-details
+      <!-- <publish-details
         :businessKey="businessKey"
         :processInstanceId="processInstanceId"
-      ></publish-details>
+      ></publish-details> -->
     </a-modal>
     <a-modal
       v-model:visible="increasedVisible"
@@ -232,7 +232,7 @@
   import { getUserInfo } from '@/api/user'
   // TheNewRelease
   import TheNewRelease from '@/views/personalCenter/components/TheNewRelease'
-  import PublishDetails from '@/views/personalCenter/components/PublishDetails'
+  // import PublishDetails from '@/views/personalCenter/components/PublishDetails'
   import TheShelvesAbility from '@/views/personalCenter/components/TheShelvesAbility' //能力下架申请
   const router = useRouter()
   let tabList = ref([