合并冲突

2022-10-19 13:55:49 +08:00 · 2022-10-19 13:55:49 +08:00 · 4e271b6aa7
parent 4d59133942 1a23d64064
commit 4e271b6aa7
14 changed files with 265 additions and 83 deletions
--- a/back/src/utils/location.js
+++ b/back/src/utils/location.js
@ -1,12 +1,12 @@
 /*
 * @Author: hisense.guoyue
 * @Date: 2022-08-23 10:30:11
- * @LastEditors: hisense.guoyue
- * @LastEditTime: 2022-10-02 14:47:05
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-10-18 17:44:33
 * @Description: 判断当前环境是西海岸还是青岛市局
 */
 const returnLocationStr = () => {
-  return CONFIGITEM.version
+  return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao'
 }

 export default returnLocationStr
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@ -44,7 +44,12 @@
        <!--部门-->
        <el-form-item>
          <span>部门名称：</span>
-          <el-select v-model="abilityDepartment" placeholder="请选择部门" clearable>
+          <el-select
+            v-model="abilityDepartment"
+            placeholder="请选择部门"
+            filterable
+            clearable
+          >
            <el-option label="全部" value=""></el-option>
            <el-option v-for="item in departmentSelects" :key="item.label" v-bind="item"></el-option>
          </el-select>
@ -55,7 +60,7 @@
          <span>类型：</span>
          <el-select v-model="abilityType" placeholder="请选择类型" clearable>
            <el-option label="全部" value=""></el-option>
-            <el-option v-for="item in typeOptions" :key="item.name" :label="item.name" :value="item.name" v-bind="item">
+            <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
            </el-option>
          </el-select>
        </el-form-item>
@ -108,9 +113,12 @@
           <span v-if='this.choseId===0' :class="[departmentId===4?'departmentStyle':'']"  @click="handleChose(4)">
                能力使用明细
            </span> -->
-            <span v-if="detailFlag" class="detail-button" @click="goToDetail()">
+            <template v-if="detailFlag">
+              <el-checkbox v-model="checked" @change='chagneCheckbox' style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
+              <span class="detail-button" @click="goToDetail()">
                明细
              </span>
+            </template>
            <span v-else class="detail-button" @click="goToBack()"> 返回 </span>
          </div>
          <div class="line-style"></div>
@ -157,7 +165,13 @@
          </el-table>
          <!--明细表-->

-          <el-table :data="tableData" style="width: 100%" v-show="this.departmentId === 3 || this.departmentId === 4">
+          <el-table
+            :data="tableData"
+            :header-cell-style="{ textAlign: 'center',height:'96px' }"
+            :cell-style="{ textAlign: 'center' }"
+            style="width: 100%"
+            v-show="this.departmentId === 3 || this.departmentId === 4"
+          >
          <el-table-column v-if="this.departmentId === 3" prop="deptName" label="上架部门" min-width="100%">
            </el-table-column>
            <el-table-column v-if="this.departmentId === 4" prop="deptName" label="申请部门" min-width="100%">
@ -204,7 +218,8 @@ import AbilityDetail from './components/abilityDetails'
 import applicationResources from './applicationResources.vue'
 import ComponentUsed from './componentUsed.vue'
 import qs from 'qs'
-import { mapState } from 'vuex'
+import Template from '../devtools/template.vue'
+// import { mapState } from 'vuex'
 // const props = defineProps({
 //   processDefinitionName: { type: String, default: null },
 //   businessKey: { type: String, default: null },
@ -214,9 +229,11 @@ import { mapState } from 'vuex'
 //   showType: { type: String, default: null },
 // })
 export default {
-  components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
+  components: { componentServices, applicationResources, ComponentUsed, AbilityDetail, Template },
  data () {
    return {
+      checked: false,
+      departmentSelects: [],
      exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
      exportExcelCondition: '',
      exportExcelType: '',
@ -308,6 +325,7 @@ export default {
        { name: '会议室', value: 6 }
      ],
      tableData: [],
+      tableDataClone: [],
      tableData2: [
        {
          approveStatus: '',
@ -338,6 +356,13 @@ export default {
    }
  },
  created () {
+    this.$http.get('/sys/dept/all').then(res => {
+      console.log('获取部门=========>', res)
+      this.departmentSelects = []
+      res.data.data.map(val => {
+        this.departmentSelects.push({ label: val.name, value: val.name })
+      })
+    })
    // 当前设定的日期时间
    // const d = new Date()
    // let year1, month1, day1
@ -363,9 +388,18 @@ export default {
    }
  },
  computed: {
-    ...mapState(['departmentSelects'])
+    // ...mapState(['departmentSelects'])
  },
  methods: {
+    chagneCheckbox () {
+      if (this.checked) {
+        this.tableData = this.tableDataClone.filter(val => val.count !== 0)
+        this.total = this.tableData.length
+      } else {
+        this.tableData = this.tableDataClone
+        this.total = this.tableData.length 
+      }
+    },
    closeModal () {
      this.detailsVisible = false
    },
@ -470,6 +504,7 @@ export default {
              parseInt(result[i].hys)
          }
          this.tableData = res.data.data
+          this.tableDataClone = res.data.data
          this.total = res.data.data.total
          this.exportExcelCondition = qs.stringify({
            approveStatus: this.status,
@ -534,6 +569,7 @@ export default {
              parseInt(result[i].hys)
          }
          this.tableData = res.data.data
+          this.tableDataClone = res.data.data
          this.total = res.data.data.total
          this.exportExcelCondition = qs.stringify({
            approveStatus: this.status,
@ -614,6 +650,7 @@ export default {
        .then((res) => {
          console.log('111111', this.tableData, res.data.data)
          this.tableData = res.data.data.list
+          this.tableDataClone = res.data.data.list
          this.total = res.data.data.total
          this.exportExcelCondition = qs.stringify({
            approveStatus: this.status,
@ -651,6 +688,7 @@ export default {
        })
        .then((res) => {
          this.tableData = res.data.data.list
+          this.tableDataClone = res.data.data.list
          this.total = res.data.data.total
          this.exportExcelCondition = qs.stringify({
            approveStatus: this.status,
@ -758,7 +796,7 @@ export default {
    //   },
    // 选择发布or使用表格
    handleChose (index) {
-      this.currentPage = 1;
+      this.checked = false
      this.departmentId = index
      if (index === 1) {
        if (this.choseId === 0) {
@ -831,6 +869,7 @@ export default {
    },
    // 返回按钮
    goToBack () {
+      this.checked = false
      // departmentId 1，3  2，4 两个值共同判断
      this.detailFlag = !this.detailFlag
      if (this.departmentId === 3) {
--- a/front/public/static/css/modal.css
+++ b/front/public/static/css/modal.css
@ -13,14 +13,13 @@
 }

 .model-container {
-    width: 360px;
-    height: 150px;
+    width: 446px;
+    height: 194px;
    background: #fff;
-    border-radius: 10px;
-    /* box-shadow: 0px 0px 12px 4px #ff3; */
    text-align: center;
    font-size: 18px;
-    color: #333;
+    color: #707070;
+    font-family: 'Alibaba PuHuiTi';
    position: absolute;
    top: 50%;
    left: 50%;
@ -33,7 +32,32 @@
 }

 .model-container .model-title {
-    font-size: 16px;
+    height: 40px;
+    padding-left: 24px;
+    padding-right: 24px;
+    padding-top: 10px;
+    background: #007fff;
+    text-align: left;
+}
+
+.model-container .title-span {
+    font-family: 'Alibaba PuHuiTi';
+    font-size: 18px !important;
+    color: #ffffff;
+}
+
+.model-container .model-close {
+    position: absolute;
+    right: 20px;
+    top: 10px;
+    width: 18px;
+    height: 18px;
+    cursor: pointer;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABHNCSVQICAgIfAhkiAAAALZJREFUOE9jZACC////ZwIpcyBOZGRk/A8SIwSAehqAatiB6itBahmBAhVAuh2qcRGQTiBkGNSQeqie6UA6G2QQyGSYIEgOr2E41UO9RpRh+CxlhIUFIZcRkocbhM9lUK/j9T6KQTgMuwgU10eKRaxhiGEQDsNg5uCMCKwGQQ07AKTtkVxyF8hWxZU0aOciLLFDehjhimKSYo1QOiEkDw4jQoqISbTUy2tUy/1Qr1FeHiElOIqYAKkPngur14nOAAAAAElFTkSuQmCC);
+}
+
+.model-container .model-content {
+    margin-top: 24px;
 }

 .model-container .controls {
@ -51,25 +75,32 @@
    cursor: pointer;
 }

-.model-container .confirm {
-    width: 60px;
-    height: 30px;
+.model-container .confirmChrome {
+    width: 140px;
+    height: 36px;
    background: #0087ff;
    border-radius: 0.04rem !important;
-    font-size: 14px;
-    font-weight: 400;
+    font-size: 16px;
+    font-family: 'Alibaba PuHuiTi';
    color: #fff;
-    line-height: 30px;
+    line-height: 36px;
+    border-radius: 6px;
 }

-.model-container .cancel {
-    width: 60px;
-    height: 30px;
+.model-container .confirm360 {
+    width: 140px;
+    height: 36px;
    background: #0087ff;
    border-radius: 0.04rem !important;
-    font-size: 14px;
-    font-weight: 400;
+    font-size: 16px;
+    font-family: 'Alibaba PuHuiTi';
    color: #fff;
-    line-height: 30px;
-    margin-left: 100px;
+    line-height: 36px;
+    margin-left: 50px;
+    border-radius: 6px;
+}
+
+@font-face {
+    font-family: 'Alibaba PuHuiTi';
+    src: url('~@/assets/home/font/Alibaba-PuHuiTi-Light.otf');
 }
--- a/front/public/static/download/360se13.1.6110.0.exe
+++ b/front/public/static/download/360se13.1.6110.0.exe
--- a/front/public/static/download/360se13.1.6260.0.exe
+++ b/front/public/static/download/360se13.1.6260.0.exe
--- a/front/public/static/js/modal.js
+++ b/front/public/static/js/modal.js
@ -64,17 +64,22 @@ var ModelBox = (function() {
            _this.isShow = this.option.isShow
            var html =
                '<div class="model-container">' +
-                '<h1 class="model-title">title</h1>' +
-                '<div class="model-content"></div>' +
+                '<div class="model-title">' +
+                '<span class="title-span">title</span>' +
+                '<div class="model-close"></div>' +
+                '</div>' +
+                '<div class="model-content">content</div>' +
                '<div class="controls">' +
-                '<a class="confirm">下载</a>' +
-                '<a class="cancel">取消</a>' +
+                '<a class="confirmChrome">下载谷歌浏览器</a>' +
+                '<a class="confirm360">下载360浏览器</a>' +
                '</div>' +
                '</div>'
            var ModelBoxCon = document.createElement('div')
            ModelBoxCon.setAttribute('class', 'mask-layer')
            ModelBoxCon.innerHTML = html
-            ModelBoxCon.querySelector('.model-title').innerHTML =
+                // ModelBoxCon.querySelector('.model-title').innerHTML =
+                //     _this.option.title
+            ModelBoxCon.querySelector('.title-span').innerHTML =
                _this.option.title
            ModelBoxCon.querySelector('.model-content').innerHTML =
                _this.option.content
@ -82,8 +87,9 @@ var ModelBox = (function() {
            if (!_this.isShow) {
                ModelBoxCon.style.display = 'none'
            }
-            ModelBoxCon.querySelector('.cancel').onclick =
-                ModelBoxCon.querySelector('.confirm').onclick =
+            ModelBoxCon.querySelector('.model-close').onclick =
+                ModelBoxCon.querySelector('.confirmChrome').onclick =
+                ModelBoxCon.querySelector('.confirm360').onclick =
                _this.eventsFn.bind('', this, ModelBoxCon)
        },
        show: function() {
@ -95,9 +101,13 @@ var ModelBox = (function() {
            this.isShow = false
        },
        eventsFn: function(e, doc, target) {
+            debugger
            var _thisEvent = target.target
-            if (_thisEvent.classList.contains('confirm')) {
-                e.option.confirmCallBack()
+            if (_thisEvent.classList.contains('confirmChrome')) {
+                e.option.confirmCallBack('Chrome')
+
+            } else if (_thisEvent.classList.contains('confirm360')) {
+                e.option.confirmCallBack('360')
            }
            doc.style.display = 'none'
            e.isShow = false
@ -108,13 +118,16 @@ var ModelBox = (function() {
 })()

 var opt = new ModelBox({
-    title: '当前系统不支持IE内核，建议使用Chrome浏览器或360浏览器极速模式',
-    content: '',
+    title: '提示信息',
+    content: '平台暂不支持IE内核浏览器访问，建议使用谷歌(Chrome)或360浏览器极速模式登录！',
    isShow: false,
-    confirmCallBack: function() {
+    confirmCallBack: function(data) {
+        debugger
        // 获取当前系统的方法
        const agent = getPCNum()
-        console.log('agent------------>', agent)
+            //console.log('agent------------>', agent)
+            //console.log('datadatadatadata----------->', data)
+        if (data === 'Chrome') {
            if (agent == 64) {
                // 64位操作系统
                downloadFile(
@ -128,6 +141,22 @@ var opt = new ModelBox({
                    '/static/download/standalonesetup32.exe'
                )
            }
+        } else {
+            if (agent == 64) {
+                // 64位操作系统
+                downloadFile(
+                    '360se13.1.6260.0.exe',
+                    '/static/download/360se13.1.6260.0.exe'
+                )
+            } else {
+                // 32位操作系统
+                downloadFile(
+                    '360se13.1.6110.0.exe',
+                    '/static/download/360se13.1.6110.0.exe'
+                )
+            }
+        }
+
    },
 })

--- a/front/src/assets/index/close-button-remind.png
+++ b/front/src/assets/index/close-button-remind.png
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -262,7 +262,7 @@
        </div>
      </div>
      <div class="top-content-father">
-        <infrastructurePage ref="camera" :searchValue="searchValue" />
+        <infrastructurePage ref="camera" :searchValue="searchValue" :searchType="searchType"  />
      </div>
    </div>
    <div class="top" v-else>
@ -494,8 +494,11 @@ export default defineComponent({
    const router = useRouter()
    let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
    const select2 = router.currentRoute.value.query.select
+    const type2 = router.currentRoute.value.query.type
+    const queryName=ref('')
    const str = router.currentRoute.value.query.str
    const searchValue = ref(str)
+    const searchType= ref(str)
    let tecHnosphere = router.currentRoute.value.query.tecHnosphere
    let appLiCation = router.currentRoute.value.query.appLiCation
    const Cardsname = ref(select)
@ -682,6 +685,7 @@ export default defineComponent({
      }

      ListContent.records.forEach((val) => {
+       
        if (!val) {
          return
        }
@ -689,6 +693,7 @@ export default defineComponent({
          paramsGetResources.infoList = paramsGetResources.infoList.filter(
            (item) => item.attrType !== name
          )
+      
          if (
            val.selectedTags &&
            val.selectedTags.indexOf(tag.dict_label) == -1
@ -798,7 +803,34 @@ export default defineComponent({
        ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
        ListContent.records = []
        ListContent.records = JSON.parse(JSON.stringify(dataCopy))
+        if(select2=='组件服务'){
+            queryName.value='组件类型'
+           }else if(select2=='应用资源'){
+            queryName.value='应用领域'
+           }else{
+            queryName.value=''
+           }
+        ListContent.records.forEach((val) => {
           
+           if (!val) {
+             return
+           }
+           if (val.name === queryName.value ) {
+             if (
+               val.selectedTags &&
+               val.selectedTags.indexOf(type2) == -1
+             ) {
+               val.selectedTags = [type2]
+             } else {
+               val.selectedTags &&
+                 val.selectedTags.splice(
+                   val.selectedTags.indexOf(type2),
+                   1
+                 )
+             }
+   
+           }
+         })
        // 智能算法-特殊处理
        if (whoShow1.value.itShowXiHaiAn) {
          if (!storageSearchInfo) {
@ -859,6 +891,7 @@ export default defineComponent({
    // 校验
    const re = /^[0-9\u4E00-\u9FA5]*$/
    const getAppResources2 = () => {
+ 
      globalFlag.value = false
      if (
        whoShow1.value.itShowQingDao &&
@ -1236,7 +1269,24 @@ export default defineComponent({
        if (searchValue.value && !select2) {
          globalSearch()
        } else {
+           paramsGetResources.infoList=[]
+           if(select2=='组件服务'){
+            queryName.value='组件类型'
+           }else if(select2=='应用资源'){
+            queryName.value='应用领域'
+           }else if(select2=='基础设施'){
+            searchType.value=type2
+          }else{
+            queryName.value=type2
+            searchType.value=''
+           }
+           let info={attrType:queryName.value, attrValue: type2}
+          paramsGetResources.infoList.push(info)
+          paramsGetResources.type=select2
          getAppResources2()
+         
+         
+      listKey.value++
        }
      }
    })
--- a/front/src/views/home/components/integrationServiceOrder.vue
+++ b/front/src/views/home/components/integrationServiceOrder.vue
@ -47,6 +47,7 @@ const integrationOrder = reactive({

 // 融合服务--排序
 const changeOrder = (i, val, type) => {
+  
  console.log('i, val, type------------>', i, val, type);
  integrationOrder.orderField = val
  integrationOrder.orderType = type;
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@ -230,6 +230,21 @@
                  </span>
                </template>
              </div>
+              <div
+                v-if="
+                  selectCardsname === '打包模式'
+                "
+                class="label-content1"
+              >
+              发布时间：
+                <template v-if="item.createDate">
+                  <span>
+                    {{ item.createDate.substring(0, 10) + ' ' }}
+                  </span>
+                  <span>{{ item.createDate.substring(11, 19) }}</span>
+                </template>
+                <template v-else>--</template>
+              </div>
              <div v-else>
                发布时间：
                <template v-if="item.createDate">
@ -989,7 +1004,7 @@
          margin: 0 10px 0 0;

          .header-right {
-            display: flex;
+           // display: flex;
            font-size: 14px;
            color: #212121;

--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -493,6 +493,7 @@ import moment from 'moment'
 const props = defineProps({
  // 模糊查
  searchValue: { type: String, default: '' },
+  searchType: { type: String, default: '' },
 })
 const current = ref(1)
 const videoTotal = ref(0)
@ -634,6 +635,9 @@ const lookData = ref({})
 if (props.searchValue) {
  mapSearchParam.value.cameraName = props.searchValue
 }
+if (props.searchType) {
+  tabClick(0, props.searchType.value)
+}
 // 消息列表页面
 let formPage = router.currentRoute.value.query.formPage || ''
 // 设施类型--无人机和单兵设备
@ -848,6 +852,7 @@ const look = (row) => {
 }
 //   搜索
 const onSearch = (searchValue) => {
+  debugger
  searchData()
  chengguoSearch()
 }
@ -1141,14 +1146,6 @@ const selectType = ref('政务云资源')
 let tableHeight = ref('600')
 //tab切换点击事件
 const tabClick = (indexFather, name) => {
-  console.log(
-    '点击tab================>',
-    indexFather,
-    name,
-    clickList.value,
-    clickList.value[indexFather]
-  )
-
  selectedRowKeys.value = []
  selectedList.value = []
  if (clickList.value[indexFather].content.indexOf(name) != -1) {
--- a/front/src/views/newHome/components/CapabilityConvergence.vue
+++ b/front/src/views/newHome/components/CapabilityConvergence.vue
@ -146,17 +146,18 @@ const getAppResources = (type, obj) => {
                num: res.data.data[key],
              })
            }
-          } else if(key !== '云资源') {  //云资源--暂时隐藏
+          } 
+          else  {  
            jcList.value.push({
              name: key,
              num: res.data.data[key],
            })
          }
        }
-         jcList.value.push({
-              name: '会客厅',
-              num: 4,
-            })
+        //  jcList.value.push({
+        //       name: '会客厅',
+        //       num: 4,
+        //     })
        // 西海岸-单兵设备、无人机 获取数量
        if (whoShow1.value.itShowXiHaiAn) {
          getSoldierData('无人机')
@ -328,11 +329,18 @@ const selectOne11 = (name) => {
  })
 }
 const selectOne2 = (name) => {
-  console.log('点击===============》', name)
+  let names=''
+  if(name ==='云资源'){
+    names='政务云资源'
+  } else if(name ==='会客厅'){
+    names='城市云脑会客厅'
+  }else{
+    names=name
+  }
  router.push({
    path: '/DetailsPageconetent',
    query: {
-      type: name,
+      type: names,
      select: '基础设施',
    },
  })
--- a/front/src/views/personalCenter/components/AbilityApplication.vue
+++ b/front/src/views/personalCenter/components/AbilityApplication.vue
@ -62,7 +62,7 @@
            <a-button type="primary" @click="modify(props.refObj.id, item)" v-if="item.backToFirst">
              修改
            </a-button>
-            <a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="是" cancel-text="否"
+            <a-popconfirm class="aaa"  v-if="!item.ended" title="是否撤回此流程?" ok-text="是" cancel-text="否"
              @confirm="endThis(item.instanceId)" @cancel="cancel">
              <a-button type="primary" danger style="margin-left: 10px">
                撤回申请
@ -463,7 +463,19 @@ const openView = (url) => {
 }

 </script>
+
 <style lang="less" scoped>
+.aaa{
+  margin-right: 30px;
+}
+ :deep(.ant-popover-inner) {
+    position: fixed !important;
+  
+    margin-right: 100px;
+  
+    
+    
+  }
 .title {
  font-size: 0.18rem;
  color: #000;
--- a/front/src/views/personalCenter/components/PutOnTheShelf
+++ b/front/src/views/personalCenter/components/PutOnTheShelf
@ -13,7 +13,7 @@
      <div class="title">基本信息</div>
      <a-popconfirm
        v-if="!props.refObj.ended"
-        title="是否终止此流程?"
+        title="是否撤回此流程?"
        ok-text="是"
        cancel-text="否"
        @confirm="endThis"