Merge remote-tracking branch 'origin/master'

smsb-plus-ui/src/views/smsb/deviceChatRecord/chatCount.vue

@@ -23,15 +23,16 @@
         <el-table v-loading="loading" :data="chatRecordList" @selection-change="handleSelectionChange">
           <el-table-column label="" align="left" prop="" width="10"/>
           <el-table-column label="设备ID" align="left" prop="deviceId" width="180"/>
-          <el-table-column label="设备名称" align="left" prop="deviceName" :show-overflow-tooltip="true"/>
+          <el-table-column label="设备名称" align="left" prop="deviceName" width="250"/>
           <el-table-column label="设备SN" align="left" prop="deviceSn" width="250"/>
           <el-table-column label="设备MAC" align="left" prop="deviceMac" width="180"/>
-          <el-table-column label="总对话" align="center" prop="totalNum" width="120"/>
-          <el-table-column label="今日对话" align="center" prop="todayNum" width="120"/>
-          <el-table-column label="昨日对话" align="center" prop="yesterdayNum" width="120"/>
-          <el-table-column label="上周对话" align="center" prop="lastWeekNum" width="120"/>
-          <el-table-column label="本周对话" align="center" prop="weekNum" width="120"/>
-          <el-table-column label="本月对话" align="center" prop="monthNum" width="120"/>
+          <el-table-column label="总对话" align="center" prop="totalNum" width="100"/>
+          <el-table-column label="今日" align="center" prop="todayNum" width="80"/>
+          <el-table-column label="昨日" align="center" prop="yesterdayNum" width="80"/>
+          <el-table-column label="上周" align="center" prop="lastWeekNum" width="80"/>
+          <el-table-column label="本周" align="center" prop="weekNum" width="80"/>
+          <el-table-column label="本月" align="center" prop="monthNum" width="80"/>
+          <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-tooltip content="30天问答记录" placement="top">

smsb-plus-ui/src/views/smsb/deviceChatRecord/index.vue

@@ -23,10 +23,11 @@
         <el-table v-loading="loading" :data="chatRecordList" @selection-change="handleSelectionChange">
           <el-table-column label="" align="left" prop="" width="10"/>
           <el-table-column label="ID" align="left" prop="id" v-if="true" width="180"/>
-          <el-table-column label="会话名称" align="left" prop="name"/>
+          <el-table-column label="会话名称" align="left" prop="name" width="250"/>
           <el-table-column label="设备ID" align="left" prop="deviceId" width="180"/>
-          <el-table-column label="设备名称" align="left" prop="deviceName" width="320" :show-overflow-tooltip="true"/>
+          <el-table-column label="设备名称" align="left" prop="deviceName" width="250"/>
           <el-table-column label="对话时间" align="left" prop="createTime" width="180"/>
+          <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-tooltip content="详情" placement="top">

smsb-plus-ui/src/views/smsb/deviceGroup/index.vue

@@ -145,7 +145,7 @@
         <el-form-item label="选择设备" prop="deviceIdentifier">
           <el-select v-model="dataRel.form.deviceIdentifier" placeholder="请选择设备" clearable
                      @change="handleQueryRel">
-            <el-option v-for="item in devices" :key="item.name" :value="item.identifier"
+            <el-option v-for="item in devices" :key="item.identifier" :value="item.identifier"
                        :label="item.name"></el-option>
           </el-select>
         </el-form-item>

smsb-plus-ui/src/views/smsb/difyDatasetsProduct/index.vue

@@ -128,7 +128,7 @@
           <el-input v-model="form.note" type="textarea" :rows="5" placeholder="请输入内容" :maxlength="500"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" placeholder="请输入内容" :rows="3"/>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :rows="3"/>
         </el-form-item>
       </el-form>
       <template #footer>

smsb-plus-ui/src/views/smsb/difyDatasetsQuestion/index.vue

@@ -131,7 +131,7 @@
           <el-input v-model="form.answer" type="textarea" placeholder="请输入内容" :rows="5"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" placeholder="请输入内容" :rows="3"/>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :rows="3"/>
         </el-form-item>
       </el-form>
       <template #footer>

smsb-plus-ui/src/views/smsb/visitorsFlowRate/index.vue

@@ -23,9 +23,10 @@
           <el-table-column label="" align="center" prop="" width="10"/>
           <el-table-column label="ID" align="left" prop="id" width="220"/>
           <el-table-column label="设备ID" align="left" prop="deviceId" width="220"/>
-          <el-table-column label="设备名称" align="left" prop="deviceName"/>
-          <el-table-column label="人数" align="center" prop="personNum" width="500"/>
+          <el-table-column label="设备名称" align="left" prop="deviceName" width="250"/>
+          <el-table-column label="人数" align="center" prop="personNum" width="100"/>
           <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
+          <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-tooltip content="删除" placement="top">

smsb-plus-ui/src/views/smsb/visitorsFlowRate/rateCount.vue

@@ -22,15 +22,16 @@
         <el-table v-loading="loading" :data="flowRateList" @selection-change="handleSelectionChange">
           <el-table-column label="" align="left" prop="" width="10"/>
           <el-table-column label="设备ID" align="left" prop="deviceId" width="180"/>
-          <el-table-column label="设备名称" align="left" prop="deviceName" :show-overflow-tooltip="true"/>
+          <el-table-column label="设备名称" align="left" prop="deviceName" width="250"/>
           <el-table-column label="设备SN" align="left" prop="deviceSn" width="250"/>
           <el-table-column label="设备MAC" align="left" prop="deviceMac" width="180"/>
-          <el-table-column label="总人数" align="center" prop="totalNum" width="120"/>
-          <el-table-column label="今日人数" align="center" prop="todayNum" width="120"/>
-          <el-table-column label="昨日人数" align="center" prop="yesterdayNum" width="120"/>
-          <el-table-column label="上周人数" align="center" prop="lastWeekNum" width="120"/>
-          <el-table-column label="本周人数" align="center" prop="weekNum" width="120"/>
-          <el-table-column label="本月人数" align="center" prop="monthNum" width="120"/>
+          <el-table-column label="总人数" align="center" prop="totalNum" width="100"/>
+          <el-table-column label="今日" align="center" prop="todayNum" width="80"/>
+          <el-table-column label="昨日" align="center" prop="yesterdayNum" width="80"/>
+          <el-table-column label="上周" align="center" prop="lastWeekNum" width="80"/>
+          <el-table-column label="本周" align="center" prop="weekNum" width="80"/>
+          <el-table-column label="本月" align="center" prop="monthNum" width="80"/>
+          <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-tooltip content="30天人流记录" placement="top">