Merge branch 'hi-ucs-dev' into release

# Conflicts: # front/public/static/config/basicConfig.js
2022-11-15 10:30:15 +08:00 · 2022-11-15 10:30:15 +08:00 · 1d41742942
parent b420643982 3003da8c03
commit 1d41742942
10 changed files with 64 additions and 41 deletions
--- a/back/src/views/modules/abilityStatistics/index.vue
+++ b/back/src/views/modules/abilityStatistics/index.vue
@ -180,7 +180,7 @@
            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%">
+            <el-table-column v-else-if="this.departmentId === 4" prop="deptName" label="申请部门" min-width="100%">
            </el-table-column>
            <el-table-column prop="resourceName" label="资源名称" min-width="100%">
            </el-table-column>
--- a/back/src/views/modules/sys/region-add-or-update.vue
+++ b/back/src/views/modules/sys/region-add-or-update.vue
@ -8,7 +8,7 @@
        <el-input v-model="dataForm.name" :placeholder="$t('region.name')"></el-input>
      </el-form-item>
      <el-form-item prop="id" :label="$t('region.id')">
-        <el-input v-model="dataForm.id" :disabled="!insert" :placeholder="$t('region.id')"></el-input>
+        <el-input v-model="dataForm.id" :disabled="!insert" :placeholder="$t('region.id')" @change="changeId"></el-input>
      </el-form-item>
      <el-form-item prop="sort" :label="$t('region.sort')">
        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('region.sort')"></el-input-number>
@ -26,6 +26,7 @@ import debounce from 'lodash/debounce'
 export default {
  data () {
    return {
+      flag: true,
      visible: false,
      insert: true,
      regionList: [],
@ -60,7 +61,7 @@ export default {
      this.visible = true
      this.dataForm.pid = '0'
      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+        this.$refs.dataForm.resetFields()
        this.dataForm.id = id
        if (this.dataForm.id) {
          this.insert = false
@ -68,6 +69,13 @@ export default {
        }
      })
    },
+    changeId (val) {
+      if (val == parseInt(val)) {
+        this.flag = true
+      } else {
+        this.flag = false
+      }
+    },
    // 获取信息
    getInfo () {
      this.$http.get(`/sys/region/${this.dataForm.id}`).then(({ data: res }) => {
@ -83,10 +91,17 @@ export default {
    },
    // 表单提交
    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+      this.$refs.dataForm.validate((valid) => {
        if (!valid) {
          return false
        }
+        if (!this.flag) {
+          this.$message({
+            message: '区域标识只能为数字！',
+            type: 'warning'
+          })
+          return false
+        }
        this.$http[this.insert ? 'post' : 'put']('/sys/region', this.dataForm).then(({ data: res }) => {
          if (res.code !== 0) {
            return this.$message.error(res.msg)
@ -102,7 +117,7 @@ export default {
          })
        }).catch(() => {})
      })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { leading: true, trailing: false })
  }
 }
 </script>
--- a/back/src/views/pages/login.vue
+++ b/back/src/views/pages/login.vue
@ -110,12 +110,12 @@ export default {
          this.$message.error('登陆失败，用户名或密码错误！')
          return
        }
-        this.$http.get('/login', { params: { username: this.dataForm.username, password: Encrypt(this.dataForm.password) } }).then(({ data: res }) => {
+        this.$http.get('/login', { params: { username: Encrypt(this.dataForm.username), password: Encrypt(this.dataForm.password) } }).then(({ data: res }) => {
          if (res.code !== 0) {
            this.getCaptcha()
            return this.$message.error(res.msg)
          }
-          Cookies.set('ucsToken', res.data.token, { expires: 'session' })
+          Cookies.set('ucsToken', res.data.token)
          this.$router.replace({ path: '/home' })
        }).catch(() => {})
      })
--- a/front/public/index.html
+++ b/front/public/index.html
@ -71,7 +71,7 @@
        window.SITE_CONFIG['previewUrl'] = _global.config.previewUrl
        window.SITE_CONFIG['frontUrl'] =
            _global.config.previewUrl + 'document/#/devModelFile/'
-        window.SITE_CONFIG['apiURL'] = 'http://' + _global.config.websocketURL
+        window.SITE_CONFIG['apiURL'] = _global.config.apiURL
        window.SITE_CONFIG['websocketURL'] = _global.config.websocketURL
        window.SITE_CONFIG['POI_URL'] = _global.config.POI_URL
    </script>
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@ -1,8 +1,13 @@
 /*
 * @Author: hisense.wuhongjian
 * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-14 10:00:17
+<<<<<<< HEAD
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-15 10:30:01
+=======
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-14 18:00:12
+>>>>>>> hi-ucs-dev
 * @Description: 系统静态参数配置
 */
 var _global = {}
@ -11,6 +16,7 @@ var CONFIGITEM = {
  //version: 'xihaian', // 西海岸
  //version: 'dev', // 开发
  version: 'test', // 测试
+  // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
  //version: 'frp', // 内网穿透
  vNum: 'v0.8.15.2',
  configData: {
@ -86,6 +92,7 @@ var CONFIGITEM = {
      },
      backUrl: 'http://localhost:8001',
      previewUrl: 'http://192.168.124.243:9796/',
+      apiURL: 'http://192.168.124.243:8888/ucs-admin',
      websocketURL: '192.168.124.243:8888/ucs-admin',
      // websocketURL: '10.18.1.99:8889/ucs-admin',
      POI_URL:
@ -102,6 +109,7 @@ var CONFIGITEM = {
      },
      backUrl: 'http://192.168.124.243:9797',
      previewUrl: 'http://192.168.124.243:9796/',
+      apiURL: 'http://192.168.124.243:8888/ucs-admin',
      websocketURL: '192.168.124.243:8888/ucs-admin',
      POI_URL:
        'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
--- a/front/src/views/home/DetailsPageconetent.vue
+++ b/front/src/views/home/DetailsPageconetent.vue
@ -904,6 +904,9 @@
          searchValue.value = ''
          globalFlag.value = false
          globalData.data = []
+          if (Cardsname.value == '基础设施') {
+            camera.value.reSetSearch()
+          }
        }
        paramsGetResources.name = searchValue.value
        // 重置筛选条件
@ -932,8 +935,10 @@
        mybus.emit('chongzhi')
        console.log(
          'paramsGetResources---chongzhi-重置-------->',
-          paramsGetResources
+          paramsGetResources,
+          flag
        )
+
        getAppResources()
      }
      //跳转链接
@ -1196,25 +1201,20 @@
              return sortArr.indexOf(a) - sortArr.indexOf(b)
            })
            console.log('arr', arr, Cardsname.value)
-            // if (Cardsname.value === arr[0]) {
-            // getAppResources2()
-            // } else {
-            // changeCards(arr[0])
-            // }
-            if (arr[0]) {
-              changeCards(arr[0])
+            if (Cardsname.value === arr[0] && arr[0] == '基础设施') {
+              getAppResources2()
            } else {
-              changeCards('应用资源')
+              changeCards(arr[0])
            }
            if (!mapFlag) {
              return
            }
-            if (paramsGetResources.type == '基础设施') {
-              console.log('camera1', camera.value)
-              camera.value.getCamera(true, searchValue.value)
-            } else {
-              getAppResources()
-            }
+            // if (paramsGetResources.type == '基础设施') {
+            //   console.log('camera1', camera.value)
+            //   camera.value.getCamera(true, searchValue.value)
+            // } else {
+            //   getAppResources()
+            // }
            console.log(
              'paramsGetResources--globalSearch---------->',
              paramsGetResources
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@ -55,12 +55,12 @@
            size="large"
            @search="onSearch"
          />
-          <a-button
+          <!-- <a-button
            style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem"
            @click="reSetSearch"
          >
            重置
-          </a-button>
+          </a-button> -->
        </div>
      </div>
      <div v-if="roomYuyue">
@ -945,10 +945,6 @@
  const fileList = ref([])
  const useForm = Form.useForm
  const roomInput = ref('')
-  let roomStr = router.currentRoute.value.query.str
-  if (roomStr) {
-    roomInput.value = roomStr
-  }
  const rulesRef = reactive({
    bookDate: [
      {
@ -1028,6 +1024,12 @@
  // 设施类型--无人机和单兵设备
  let facilitiesType = router.currentRoute.value.query.facilitiesType || ''
  onMounted(() => {
+    console.log('基础设施初始化')
+    let roomStr = router.currentRoute.value.query.str
+    if (roomStr) {
+      roomInput.value = roomStr
+      getCamera()
+    }
    // 获取用户信息
    handleUser()
    if (jcssType.value) {
@ -1264,6 +1266,7 @@
  }
  //重置
  const reSetSearch = () => {
+    console.log('重置')
    roomInput.value = ''
    searchData()
    chengguoSearch()
@ -2025,7 +2028,7 @@
    if (flag) {
      mapSearchParam.value.cameraName = str
    }
-    console.log('初始化调用')
+    console.log('初始化调用', flag)
    console.log(
      '不选左侧树的时候不调用接口',
      mapSearchParam.value,
@ -2098,6 +2101,7 @@
  }
  defineExpose({
    getCamera,
+    reSetSearch,
  })
  //加入申购车
  const addShoppingCart = () => {
--- a/front/src/views/login/index.vue
+++ b/front/src/views/login/index.vue
@ -155,14 +155,10 @@
          }
          await this.login({
            password: Encrypt(this.form.password),
-            username: this.form.username,
+            username: Encrypt(this.form.username),
          })
          // window.localStorage.setItem('tokenStartTime', new Date().getTime())
          window.sessionStorage.setItem('visits', JSON.stringify([]))
-          console.log(
-            '添加visits========================================>',
-            Cookies.get('ucsToken')
-          )
          // console.log(this.handleRoute())
          // 西海岸特殊处理
          if (isXiHaiAn) {
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/front/src/views/personalCenter/components/MyApply.vue
@ -488,7 +488,7 @@
          refObj.value.title = item.title // 需求标题
          refObj.value.ywlxr = item.ywlxr // 业务联系人
          refObj.value.ywlxrdh = item.ywlxrdh // 业务联系人电话
-          refObj.value.jslxr = item.jslxr // 技术联系人
+          refObj.value.jslxr = item.jslxr // 技术联系人X
          refObj.value.jslxrdh = item.jslxrdh // 技术联系人电话
          refObj.value.miaoshu = item.miaoshu // 共享数据必要性法分析
          refObj.value.zt = item.zt // 办结结果
@ -527,7 +527,7 @@
      refObj.value.ORG_CODE = item.ORG_CODE // 部门名称编码
      refObj.value.AGENT_NAME = item.AGENT_NAME // 处室名称
      refObj.value.AGENT_CODE = item.AGENT_CODE // 处室编码
-      refObj.value.CREATOR_NAME = item.CREATOR_NAME // 申请人
+      refObj.value.USE_CASE = item.USE_CASE // 使用场景
      detailsVisible.value = true
    } else if (typeName.value == '设备申请') {
      getDeviceDetailInfo(item.deviceId)
--- a/front/src/views/personalCenter/components/cloudResources.vue
+++ b/front/src/views/personalCenter/components/cloudResources.vue
@ -2,7 +2,7 @@
 * @Author: hisense.liangjunhua
 * @Date: 2022-07-12 09:42:44
 * @LastEditors: Light
- * @LastEditTime: 2022-11-11 18:48:42
+ * @LastEditTime: 2022-11-14 10:53:30
 * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@ -35,7 +35,7 @@
          <span>处室编码：{{ props.refObj.AGENT_CODE || '--' }}</span>
        </p>
        <p class="item">
-          <span>申请人：{{ props.refObj.CREATOR_NAME || '--' }}</span>
+          <span>使用场景；{{ props.refObj.USE_CASE || '--' }}</span>
        </p>
      </div>
    </div>