Merge branch 'master' of http://8.210.64.198:30000/lsj2008bj/iot-web

src/api/system/tenantPackage/types.ts

@@ -12,7 +12,7 @@ export interface TenantPkgQuery extends PageQuery {
 }
 
 export interface TenantPkgForm {
-  packageId?: string | number
+  id?: string | number
   packageName: string
   menuIds: string
   remark: string

src/views/demo/demo/index.vue

@@ -32,17 +32,17 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['demo:demo:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['demo:demo:edit']">修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['demo:demo:edit']">修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['demo:demo:remove']"
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['demo:demo:export']">导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['demo:demo:export']">导出</el-button>-->
+<!--          </el-col>-->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>

src/views/iot/equipment/devices/detail.vue

@@ -74,25 +74,25 @@
             <el-col :span="2">
               <h5>历史数据</h5>
             </el-col>
-            <el-col :span="9">
-              <el-date-picker
-                v-model="state.historyTime"
-                type="datetimerange"
-                :picker-options="state.pickerOptions"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                align="right"
-                @change="timeRangeChange"
-              >
-              </el-date-picker>
-            </el-col>
-            <el-col :span="4">
-              <el-radio-group v-model="state.dataType">
-                <el-radio-button label="">无</el-radio-button>
-                <el-radio-button label="stats">统计</el-radio-button>
-              </el-radio-group>
-            </el-col>
+<!--            <el-col :span="9">-->
+<!--              <el-date-picker-->
+<!--                v-model="state.historyTime"-->
+<!--                type="datetimerange"-->
+<!--                :picker-options="state.pickerOptions"-->
+<!--                range-separator="至"-->
+<!--                start-placeholder="开始日期"-->
+<!--                end-placeholder="结束日期"-->
+<!--                align="right"-->
+<!--                @change="timeRangeChange"-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-col>-->
+<!--            <el-col :span="4">-->
+<!--              <el-radio-group v-model="state.dataType">-->
+<!--                <el-radio-button label="">无</el-radio-button>-->
+<!--                <el-radio-button label="stats">统计</el-radio-button>-->
+<!--              </el-radio-group>-->
+<!--            </el-col>-->
           </el-row>
           <PropertyChart :name="state.propertyHistory.name" :properties="state.propertyHistory.data"></PropertyChart>
         </div>

src/views/iot/equipment/devices/list.vue

@@ -5,7 +5,7 @@
       ref="crudRef"
       @onLoad="getData"
       :fun-props="{
-        exportBtn: true,
+        exportBtn: false,
         delBtn: layoutType !== 'card',
       }"
       :table-props="{

src/views/iot/equipment/products/index.vue

@@ -17,7 +17,7 @@
         menuWidth: 300,
       }"
       :fun-props="{
-        exportBtn: true,
+        exportBtn: false,
         delBtn: false,
       }"
       @openBeforeFun="openBeforeFun"

src/views/monitor/logininfor/index.vue

@@ -14,17 +14,17 @@
               <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="登录时间" style="width: 308px">
-            <el-date-picker
-              v-model="dateRange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
+<!--          <el-form-item label="登录时间" style="width: 308px">-->
+<!--            <el-date-picker-->
+<!--              v-model="dateRange"-->
+<!--              value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--              type="daterange"-->
+<!--              range-separator="-"-->
+<!--              start-placeholder="开始日期"-->
+<!--              end-placeholder="结束日期"-->
+<!--              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -49,9 +49,9 @@
               解锁
             </el-button>
           </el-col>
-          <el-col :span="1.5" v-if="false">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:logininfor:export']" >导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5" v-if="false">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:logininfor:export']" >导出</el-button>-->
+<!--          </el-col>-->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>

src/views/monitor/operlog/index.vue

@@ -19,17 +19,17 @@
               <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="操作时间" style="width: 308px">
-            <el-date-picker
-              v-model="dateRange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
+<!--          <el-form-item label="操作时间" style="width: 308px">-->
+<!--            <el-date-picker-->
+<!--              v-model="dateRange"-->
+<!--              value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--              type="daterange"-->
+<!--              range-separator="-"-->
+<!--              start-placeholder="开始日期"-->
+<!--              end-placeholder="结束日期"-->
+<!--              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -49,9 +49,9 @@
           <el-col :span="1.5">
             <el-button type="danger" plain icon="WarnTriangleFilled" @click="handleClean" v-hasPermi="['monitor:operlog:remove']">清空</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:operlog:export']">导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:operlog:export']">导出</el-button>-->
+<!--          </el-col>-->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>

src/views/system/config/index.vue

@@ -14,17 +14,17 @@
               <el-option v-for="dict in sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间" style="width: 308px;">
-            <el-date-picker
-              v-model="dateRange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
+<!--          <el-form-item label="创建时间" style="width: 308px;">-->
+<!--            <el-date-picker-->
+<!--              v-model="dateRange"-->
+<!--              value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--              type="daterange"-->
+<!--              range-separator="-"-->
+<!--              start-placeholder="开始日期"-->
+<!--              end-placeholder="结束日期"-->
+<!--              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -38,19 +38,19 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:config:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:config:edit']">
-              修改
-            </el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:config:edit']">-->
+<!--              修改-->
+<!--            </el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:config:remove']">
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:config:export']">导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:config:export']">导出</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Refresh" @click="handleRefreshCache" v-hasPermi="['system:config:remove']">刷新缓存</el-button>
           </el-col>

src/views/system/dict/data.vue

@@ -29,17 +29,17 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:dict:edit']">修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:dict:edit']">修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:dict:remove']">
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
           </el-col>

src/views/system/dict/index.vue

@@ -14,17 +14,17 @@
               <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间" style="width: 308px">
-            <el-date-picker
-              v-model="dateRange"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
+<!--          <el-form-item label="创建时间" style="width: 308px">-->
+<!--            <el-date-picker-->
+<!--              v-model="dateRange"-->
+<!--              value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--              type="daterange"-->
+<!--              range-separator="-"-->
+<!--              start-placeholder="开始日期"-->
+<!--              end-placeholder="结束日期"-->
+<!--              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -38,17 +38,17 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:dict:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:dict:edit']">修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:dict:edit']">修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:dict:remove']">
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:dict:export']">导出</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Refresh" @click="handleRefreshCache" v-hasPermi="['system:dict:remove']">刷新缓存</el-button>
           </el-col>

src/views/system/menu/index.vue

@@ -57,7 +57,7 @@
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime">
           <template #default="scope">
-            <span>{{ scope.row.createTime }}</span>
+            <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="180">

src/views/system/notice/index.vue

@@ -28,11 +28,11 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:notice:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:notice:edit']"
-              >修改</el-button
-            >
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:notice:edit']"-->
+<!--              >修改</el-button-->
+<!--            >-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:notice:remove']">
               删除

src/views/system/oss/index.vue

@@ -12,17 +12,17 @@
           <el-form-item label="文件后缀" prop="fileSuffix">
             <el-input v-model="queryParams.fileSuffix" placeholder="请输入文件后缀" clearable style="width: 200px" @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="daterangeCreateTime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
+<!--          <el-form-item label="创建时间">-->
+<!--            <el-date-picker-->
+<!--              v-model="daterangeCreateTime"-->
+<!--              value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--              type="daterange"-->
+<!--              range-separator="-"-->
+<!--              start-placeholder="开始日期"-->
+<!--              end-placeholder="结束日期"-->
+<!--              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item label="服务商" prop="service">
             <el-input v-model="queryParams.service" placeholder="请输入服务商" clearable style="width: 200px" @keyup.enter="handleQuery" />
           </el-form-item>
@@ -48,17 +48,17 @@
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-              :type="previewListResource ? 'danger' : 'warning'"
-              plain
-              @click="handlePreviewListResource(!previewListResource)"
-              v-hasPermi="['system:oss:edit']"
-              >预览开关 :
-              {{
-                previewListResource ? "禁用" : "启用" }}</el-button
-            >
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              :type="previewListResource ? 'danger' : 'warning'"-->
+<!--              plain-->
+<!--              @click="handlePreviewListResource(!previewListResource)"-->
+<!--              v-hasPermi="['system:oss:edit']"-->
+<!--              >预览开关 :-->
+<!--              {{-->
+<!--                previewListResource ? "禁用" : "启用" }}</el-button-->
+<!--            >-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="info" plain icon="Operation" @click="handleOssConfig" v-hasPermi="['system:oss:list']">配置管理</el-button>
           </el-col>

src/views/system/post/index.vue

@@ -27,17 +27,17 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:post:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:post:edit']">修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:post:edit']">修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:post:remove']">
               删除
             </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:post:export']">导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:post:export']">导出</el-button>-->
+<!--          </el-col>-->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>

src/views/system/role/index.vue

@@ -14,17 +14,17 @@
               <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间" style="width: 308px">
-            <el-date-picker
-              v-model="dateRange"
-              value-format="YYYY-MM-DD"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
+<!--          <el-form-item label="创建时间" style="width: 308px">-->
+<!--            <el-date-picker-->
+<!--              v-model="dateRange"-->
+<!--              value-format="YYYY-MM-DD"-->
+<!--              type="daterange"-->
+<!--              range-separator="-"-->
+<!--              start-placeholder="开始日期"-->
+<!--              end-placeholder="结束日期"-->
+<!--              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"-->
+<!--            />-->
+<!--          </el-form-item>-->
 
           <el-form-item>
             <el-button type="primary" @click="handleQuery" icon="Search">搜索</el-button>
@@ -40,15 +40,15 @@
           <el-col :span="1.5">
             <el-button type="primary" plain @click="handleAdd()" icon="Plus" v-hasPermi="['system:role:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain @click="handleUpdate()" :disabled="single" icon="Edit" v-hasPermi="['system:role:edit']">修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain @click="handleUpdate()" :disabled="single" icon="Edit" v-hasPermi="['system:role:edit']">修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain :disabled="ids.length === 0" @click="handleDelete()" v-hasPermi="['system:role:delete']">删除</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:role:export']">导出</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:role:export']">导出</el-button>-->
+<!--          </el-col>-->
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>

src/views/system/tenant/index.vue

@@ -109,8 +109,8 @@
           <el-input type="password" v-model="form.password" placeholder="请输入系统用户密码" maxlength="20" />
         </el-form-item>
         <el-form-item label="租户套餐" prop="packageId">
-          <el-select v-model="form.packageId" :disabled="!!form.tenantId" placeholder="请选择租户套餐" clearable style="width: 100%">
-            <el-option v-for="item in packageList" :key="item.packageId" :label="item.packageName" :value="item.packageId" />
+          <el-select v-model="form.packageId" :disabled="!!form.tenantId" placeholder="请选择租户套餐" clearable style="width: 100%"  @change="changeSelect">
+            <el-option v-for="item in packageList" :key="item.id" :label="item.packageName" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="过期时间" prop="expireTime">
@@ -249,6 +249,10 @@ const handleStatusChange = async (row: TenantVO) => {
   }
 }
 
+const changeSelect = (value) => {
+  console.log("#######################"+JSON.stringify(value))
+}
+
 // 取消按钮
 const cancel = () => {
   reset()

src/views/system/tenantPackage/index.vue

@@ -139,7 +139,7 @@ const dialog = reactive<DialogOption>({
 
 
 const initFormData: TenantPkgForm = {
-  packageId: undefined,
+  id: undefined,
   packageName: '',
   menuIds: '',
   remark: '',

src/views/system/user/index.vue

@@ -34,16 +34,16 @@
                   <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="创建时间" style="width: 308px;">
-                <el-date-picker
-                  v-model="dateRange"
-                  value-format="YYYY-MM-DD"
-                  type="daterange"
-                  range-separator="-"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                />
-              </el-form-item>
+<!--              <el-form-item label="创建时间" style="width: 308px;">-->
+<!--                <el-date-picker-->
+<!--                  v-model="dateRange"-->
+<!--                  value-format="YYYY-MM-DD"-->
+<!--                  type="daterange"-->
+<!--                  range-separator="-"-->
+<!--                  start-placeholder="开始日期"-->
+<!--                  end-placeholder="结束日期"-->
+<!--                />-->
+<!--              </el-form-item>-->
               <el-form-item>
                 <el-button type="primary" @click="handleQuery" icon="Search">搜索</el-button>
                 <el-button @click="resetQuery" icon="Refresh">重置</el-button>
@@ -58,31 +58,31 @@
               <el-col :span="1.5">
                 <el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']" icon="Plus">新增</el-button>
               </el-col>
-              <el-col :span="1.5">
-                <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['system:user:add']" icon="Edit">
-                  修改
-                </el-button>
-              </el-col>
+<!--              <el-col :span="1.5">-->
+<!--                <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['system:user:add']" icon="Edit">-->
+<!--                  修改-->
+<!--                </el-button>-->
+<!--              </el-col>-->
               <el-col :span="1.5">
                 <el-button type="danger" plain @click="handleDelete()" :disabled="multiple" v-has-permi="['system:user:delete']" icon="Delete">
                   删除
                 </el-button>
               </el-col>
-              <el-col :span="1.5">
-                <el-dropdown class="mt-[1px]">
-                  <el-button plain type="info">
-                    更多
-                    <el-icon class="el-icon--right"><arrow-down /></el-icon
-                  ></el-button>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item @click="importTemplate" icon="Download">下载模板</el-dropdown-item>
-                      <el-dropdown-item @click="handleImport" icon="Top"> 导入数据</el-dropdown-item>
-                      <el-dropdown-item @click="handleExport" icon="Download"> 导出数据</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </el-col>
+<!--              <el-col :span="1.5">-->
+<!--                <el-dropdown class="mt-[1px]">-->
+<!--                  <el-button plain type="info">-->
+<!--                    更多-->
+<!--                    <el-icon class="el-icon&#45;&#45;right"><arrow-down /></el-icon-->
+<!--                  ></el-button>-->
+<!--                  <template #dropdown>-->
+<!--                    <el-dropdown-menu>-->
+<!--                      <el-dropdown-item @click="importTemplate" icon="Download">下载模板</el-dropdown-item>-->
+<!--                      <el-dropdown-item @click="handleImport" icon="Top"> 导入数据</el-dropdown-item>-->
+<!--                      <el-dropdown-item @click="handleExport" icon="Download"> 导出数据</el-dropdown-item>-->
+<!--                    </el-dropdown-menu>-->
+<!--                  </template>-->
+<!--                </el-dropdown>-->
+<!--              </el-col>-->
               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true" />
             </el-row>
           </template>
@@ -109,7 +109,7 @@
 
             <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
               <template #default="scope">
-                <span>{{ scope.row.createTime }}</span>
+                <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>