Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/router/router.config.js

@@ -140,13 +140,13 @@ export let routers = [
         path: '/protection',
         name: 'protection',
         component: () => import('@/views/menu/protection/index'),
-        meta: { title: '防区状态', keepAlive: false }
+        meta: { title: '布撤防状态登记', keepAlive: false }
       },
       {
         path: '/protection/detail',
         name: 'protectionDetail',
         component: () => import('@/views/menu/protection/detail'),
-        meta: { title: '防区信息', keepAlive: false }
+        meta: { title: '控制器信息', keepAlive: false }
       },
       {
         path: '/monitoringCall',

src/views/menu/protection/components/item.vue

@@ -21,7 +21,7 @@
         >
         </template>
       </van-cell>
-      <van-cell title="防区状态" :value="getDictLabel(data.status, 'protection_status', '未知')" />
+      <van-cell title="布撤防状态" :value="getDictLabel(data.status, 'protection_status', '未上报')" />
       <van-cell
         v-if="data.status == '0' || data.status == '1'"
         :title="data.status == '0' ? '撤防时间' : '布防时间'"
@@ -54,7 +54,7 @@ export default {
     },
     updateStatus(data, status) {
       Dialog.confirm({
-        message: `是否更新${this.getLabel(this.statusOptions, status)}时间？`
+        message: `是否更新${this.getDictLabel(status, 'protection_status', '未上报')}时间？`
       })
         .then(() => {
           api.updateStatus(data.id, status).then(r => {

src/views/menu/protection/detail.vue

@@ -3,9 +3,9 @@
     <nav-bar></nav-bar>
     <card class="info">
       <van-cell-group>
-        <van-cell title="防区名称" :value="info.name" />
+        <van-cell title="控制器名称" :value="info.name" />
         <van-cell title="所属机构" :value="info.orgName" />
-        <van-cell title="24小时防区" :value="info.allHour ? '是' : '否'" />
+        <van-cell title="24小时控制器" :value="info.allHour ? '是' : '否'" />
       </van-cell-group>
     </card>
 
@@ -14,7 +14,7 @@
         <k-list :list="history" :params="search">
           <template v-slot:header>
             <div class="header">
-              <span>防区状态</span>
+              <span>布撤防状态</span>
               <span>布撤防时间</span>
               <span>上报人</span>
             </div>
@@ -45,7 +45,7 @@ export default {
         protectionId: this.$route.query.id
       },
       statusOptions: [
-        { value: -1, text: '防区状态' },
+        { value: -1, text: '布撤防状态' },
         { value: '0', text: '撤防' },
         { value: '1', text: '布防' },
         { value: '2', text: '未知' }

src/views/menu/protection/index.vue

@@ -100,7 +100,7 @@ export default {
     ...mapGetters(['orgName', 'orgId', 'dictionary']),
     statusOptions() {
       let r = [
-        { value: null, text: '防区状态' }
+        { value: null, text: '布撤防状态' }
       ]
 
       let dict = this.getDictItem('protection_status');

vue.config.js

@@ -52,7 +52,7 @@ module.exports = defineConfig({
     /*本地开发请求代理*/
     proxy: {
       '/online': {
-        target: "http://47.92.229.224:8081",
+        target: "http://47.92.229.224:8080",
           // ws:true,
           changOrigin:true,
           pathRewrite:{

yarn.lock

@@ -1642,6 +1642,11 @@
   resolved "https://registry.yarnpkg.com/@vant/popperjs/-/popperjs-1.3.0.tgz#e0eff017124b5b2352ef3b36a6df06277f4400f2"
   integrity sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw==
 
+"@vant/touch-emulator@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@vant/touch-emulator/-/touch-emulator-1.4.0.tgz#02420ca5f312a7eb6c36c349cbb8e80e6f29ff2f"
+  integrity sha512-Zt+zISV0+wpOew2S1siOJ3G22y+hapHAKmXM+FhpvWzsRc4qahaYXatCAITuuXt0EcDp7WvEeTO4F7p9AtX/pw==
+
 "@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz#8d53a1e21347db8edbe54d339902583176de09f2"