From 786ca5438b6e85031e5674e4ba6a4e82e0401ed4 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 14 Nov 2022 13:52:39 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/personalCenter/components/MyApply.vue        | 4 ++--
 front/src/views/personalCenter/components/cloudResources.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue
index ddfe4210..26ab9c86 100644
--- 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)
diff --git a/front/src/views/personalCenter/components/cloudResources.vue b/front/src/views/personalCenter/components/cloudResources.vue
index c12cfab3..915b7298 100644
--- 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>

From eb4bc778943aa20b6f0a37edb7e42f295ce85bb9 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 14 Nov 2022 14:48:30 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=9F=9F=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E5=AD=97=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/region-add-or-update.vue      | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/back/src/views/modules/sys/region-add-or-update.vue b/back/src/views/modules/sys/region-add-or-update.vue
index fcaa50b8..c76a35f1 100644
--- 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>

From d04e42ffff9480dfd8fc953653fdfc0122fba078 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 14 Nov 2022 16:45:20 +0800
Subject: [PATCH 3/7] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/abilityStatistics/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue
index 85387266..a911413b 100644
--- 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>

From 5290ea7de2139b4d1951fb8443256ce77044a02b Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 14 Nov 2022 16:46:06 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/pages/login.vue  | 4 ++--
 front/src/views/login/index.vue | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/back/src/views/pages/login.vue b/back/src/views/pages/login.vue
index a06333dc..1acbe06f 100644
--- 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(() => {})
       })
diff --git a/front/src/views/login/index.vue b/front/src/views/login/index.vue
index 7440960f..45c5a99f 100644
--- 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) {

From 16214e4cb2507993e71b9ed4ba9e7fff02e04314 Mon Sep 17 00:00:00 2001
From: huangweixiong <huangweixiong@hisense.com>
Date: Mon, 14 Nov 2022 17:27:41 +0800
Subject: [PATCH 5/7] =?UTF-8?q?baseUrl=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/public/index.html b/front/public/index.html
index 35f655e3..38e6f589 100644
--- 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>

From cccea9db0bbc03e48f8f0da78b53eb5d76eec964 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Mon, 14 Nov 2022 17:48:35 +0800
Subject: [PATCH 6/7] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/home/DetailsPageconetent.vue | 30 ++++++++++----------
 front/src/views/home/infrastructurePage.vue  | 18 +++++++-----
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue
index 1947a3ba..fbf52dd8 100644
--- 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
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 5031c4f4..85d16d64 100644
--- 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 = () => {

From 3003da8c030166eee1ab2aa248ba531132ed44f8 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 15 Nov 2022 09:40:20 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/basicConfig.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js
index 09d7f9c7..1659fe20 100644
--- a/front/public/static/config/basicConfig.js
+++ b/front/public/static/config/basicConfig.js
@@ -1,15 +1,15 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-11-11 19:21:42
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-14 18:00:12
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
   // version: 'xihaian', // 西海岸
-  version: 'qingdao', // 开发
+  version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透
@@ -87,6 +87,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: