lishuangjiang@potevio.com 2 年 前
コミット
75f8a4b7d5

+ 19 - 19
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>

+ 1 - 1
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="{

+ 1 - 1
src/views/iot/equipment/products/index.vue

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

+ 11 - 11
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>

+ 11 - 11
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>

+ 11 - 11
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>

+ 11 - 11
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>

+ 1 - 1
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">

+ 5 - 5
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']">
               删除

+ 22 - 22
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>

+ 11 - 11
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>

+ 11 - 11
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>
@@ -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>