From 51d2b8eaf94561689e7ee5728abf70dc969825d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Tue, 28 Jun 2022 14:20:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../conv/AppDeviceConfig/AppDeviceConfig.vue  |  4 +--
 .../AppDeviceConfig/components/eyeList.vue    | 24 +++++++++---------
 .../AppDeviceConfig/components/videoList.vue  | 25 +++++++++----------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/packages/conv/AppDeviceConfig/AppDeviceConfig.vue b/packages/conv/AppDeviceConfig/AppDeviceConfig.vue
index 60ab0869..2d84d10a 100644
--- a/packages/conv/AppDeviceConfig/AppDeviceConfig.vue
+++ b/packages/conv/AppDeviceConfig/AppDeviceConfig.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list class="AppDeviceConfig">
     <template slot="title">
-      <ai-title title="设备管理" :isShowBottomBorder="false" :fullname.sync="areaName" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
+      <ai-title title="设备配置" :isShowBottomBorder="false" :fullname.sync="areaName" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
     </template>
     <template slot="tabs">
       <el-tabs v-model="currIndex">
@@ -20,7 +20,7 @@
 
   export default {
     name: 'AppDeviceConfig',
-    label: '设备管理',
+    label: '设备配置',
 
     components: {
       eyeList,
diff --git a/packages/conv/AppDeviceConfig/components/eyeList.vue b/packages/conv/AppDeviceConfig/components/eyeList.vue
index fe6f0e52..4d34f319 100644
--- a/packages/conv/AppDeviceConfig/components/eyeList.vue
+++ b/packages/conv/AppDeviceConfig/components/eyeList.vue
@@ -3,7 +3,7 @@
     <template slot="content">
       <ai-search-bar bottomBorder>
         <template #left>
-          <el-button type="primary" icon="iconfont iconAdd" size="small" @click="add('添加设备', {})">添加</el-button>
+          <el-button type="primary" icon="iconfont iconAdd" size="small" @click="add('添加设备配置', {})">添加</el-button>
           <el-button icon="el-icon-delete" class="delete-btn del-btn-list" :disabled="!ids.length" @click="remove(ids)">删除</el-button>
         </template>
       </ai-search-bar>
@@ -20,7 +20,7 @@
         <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="edit('编辑设备', row)">编辑</el-button>
+              <el-button type="text" @click="edit('编辑设备配置', row)">编辑</el-button>
               <el-button type="text" @click="refresh(row)">刷新</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
@@ -29,31 +29,31 @@
       </ai-table>
       <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="800px"  @onConfirm="addForm" @closed="dialogForm={}">
         <el-form ref="addForm" :model="dialogForm" :rules="rules" size="small"  label-width="160px">
-          <el-form-item label="租户id" prop="corpId">
+          <el-form-item label="CorpId" prop="corpId">
             <el-input v-model.trim="dialogForm.corpId" placeholder="请输入..." clearable :maxLength="50"/>
           </el-form-item>
-          <el-form-item required label="中移账号开启状态">
+          <el-form-item required label="状态">
              <el-radio-group v-model="dialogForm.flag">
               <el-radio :label="0">关闭</el-radio>
               <el-radio :label="1">开启</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="中移账号appid">
+          <el-form-item label="AppId">
             <el-input v-model.trim="dialogForm.appId" placeholder="请输入..." clearable :maxLength="50" />
           </el-form-item>
-          <el-form-item label="中移账号rsa">
+          <el-form-item label="RSA">
             <el-input v-model.trim="dialogForm.rsa" placeholder="请输入..." clearable :maxLength="500"  type="textarea" :rows="5"/>
           </el-form-item>
-          <el-form-item label="中移账号secret">
+          <el-form-item label="SECRET">
             <el-input v-model.trim="dialogForm.secret" placeholder="请输入..." clearable :maxLength="50" />
           </el-form-item>
-          <el-form-item label="TOKEN信息">
+          <el-form-item label="TOKEN">
             <el-input v-model.trim="dialogForm.token" placeholder="请输入..." clearable :maxLength="200"  type="textarea" :rows="2"/>
           </el-form-item>
-          <el-form-item label="中移组织结构结点ids">
+          <el-form-item label="结点ids">
             <el-input v-model.trim="dialogForm.orgIds" placeholder="请输入..." clearable :maxLength="50" />
           </el-form-item>
-          <el-form-item label="中移账号版本号">
+          <el-form-item label="版本号">
             <el-input v-model.trim="dialogForm.version" placeholder="请输入..." clearable :maxLength="50" />
           </el-form-item>
           <el-form-item label="大喇叭账号">
@@ -168,7 +168,7 @@
         this.dialog = true
         this.dialogTitle = title
         this.dialogForm = item
-        if(title == '添加设备') {
+        if(title == '添加设备配置') {
           this.dialogForm.flag = 1
           this.dialogForm.version = '1.0.0'
         }
@@ -191,7 +191,7 @@
       },
       refresh(row) {
         this.$confirm('确定刷新该数据token？').then(() => {
-          this.instance.post(`/app/appzyaccountconfig/refresh?id=${row.id}`).then(res => {
+          this.instance.post(`/app/appzyaccountconfig/initQlyToken?id=${row.id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('刷新成功！')
               this.getList()
diff --git a/packages/conv/AppDeviceConfig/components/videoList.vue b/packages/conv/AppDeviceConfig/components/videoList.vue
index 21e3a5af..420022bf 100644
--- a/packages/conv/AppDeviceConfig/components/videoList.vue
+++ b/packages/conv/AppDeviceConfig/components/videoList.vue
@@ -3,7 +3,7 @@
     <template slot="content">
       <ai-search-bar bottomBorder>
         <template #left>
-          <el-button type="primary" icon="iconfont iconAdd" size="small" @click="add('添加设备', {})">添加</el-button>
+          <el-button type="primary" icon="iconfont iconAdd" size="small" @click="add('添加设备配置', {})">添加</el-button>
           <el-button icon="el-icon-delete" class="delete-btn del-btn-list" :disabled="!Boolean(ids.length)" @click="remove(ids)">删除</el-button>
         </template>
       </ai-search-bar>
@@ -20,7 +20,7 @@
         <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-button type="text" @click="edit('编辑设备', row)">编辑</el-button>
+              <el-button type="text" @click="edit('编辑设备配置', row)">编辑</el-button>
               <el-button type="text" @click="refresh(row)">刷新</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
@@ -29,22 +29,22 @@
       </ai-table>
       <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="800px"  @onConfirm="addForm" @closed="dialogForm={}">
         <el-form ref="addForm" :model="dialogForm" :rules="rules" size="small"  label-width="160px">
-          <el-form-item label="租户id" prop="corpId">
+          <el-form-item label="CorpId" prop="corpId">
             <el-input v-model.trim="dialogForm.corpId" placeholder="请输入..." clearable :maxLength="50"/>
           </el-form-item>
-          <el-form-item required label="视联网账号开启状态">
+          <el-form-item required label="状态">
              <el-radio-group v-model="dialogForm.flag">
               <el-radio :label="0">关闭</el-radio>
               <el-radio :label="1">开启</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="视联网地区ID">
-            <el-input v-model.trim="dialogForm.slwAreaId" placeholder="请输入..." clearable :maxLength="50" />
-          </el-form-item>
-          <el-form-item label="视联网用户ID">
+          <el-form-item label="用户ID">
             <el-input v-model.trim="dialogForm.slwUserId" placeholder="请输入..." clearable :maxLength="50" />
           </el-form-item>
-          <el-form-item label="视联网TOKEN">
+          <el-form-item label="地区编码">
+            <el-input v-model.trim="dialogForm.slwAreaId" placeholder="请输入..." clearable :maxLength="50" />
+          </el-form-item>
+          <el-form-item label="TOKEN">
             <el-input v-model.trim="dialogForm.slwToken" placeholder="请输入..." clearable :maxLength="50" />
           </el-form-item>
           <el-form-item label="大喇叭账号">
@@ -96,7 +96,7 @@
       },
       rules() {
         return {
-          corpId: [{required: true, message: "请输入租户id"}],
+          corpId: [{required: true, message: "请输入CorpId"}],
         }
       },
       colConfigs() {
@@ -156,9 +156,8 @@
         this.dialog = true
         this.dialogTitle = title
         this.dialogForm = item
-        if(title == '添加设备') {
+        if(title == '添加设备配置') {
           this.dialogForm.flag = 1
-          this.dialogForm.version = '1.0.0'
         }
       },
       addForm() {
@@ -179,7 +178,7 @@
       },
       refresh(row) {
         this.$confirm('确定刷新该数据token？').then(() => {
-          this.instance.post(`/app/appzyaccountconfig/refresh?id=${row.id}`).then(res => {
+          this.instance.post(`/app/appzyaccountconfig/initSlwToken?id=${row.id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('刷新成功！')
               this.getList()