搜索调整

src/views/Login/components/QrCodeForm.vue

@@ -27,7 +27,7 @@ const { t } = useI18n()
 const { handleBackLogin, getLoginState } = useLoginState()
 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.QR_CODE)
 
-const appId = 'dingik345qmyhtysvs2x'
+const appId = 'dingmr9ez0ecgbmscfeb'
 const dingRedirectUrl = 'http://1.94.244.160:70/login?loginType=dingding&type=20'
 
 onMounted(() => {
@@ -89,7 +89,7 @@ const initDingLogin = () => {
       var loginTmpCode = event.data
       console.log(loginTmpCode)
       window.location.href =
-        'https://oapi.dingtalk.com/connect/oauth2/sns_authorize?appid=dingik345qmyhtysvs2x&response_type=code&scope=snsapi_login&state=' +
+        'https://oapi.dingtalk.com/connect/oauth2/sns_authorize?appid=dingmr9ez0ecgbmscfeb&response_type=code&scope=snsapi_login&state=' +
         state +
         '&redirect_uri=' +
         url +

src/views/pms/device/index.vue

@@ -45,7 +45,7 @@
           </el-form-item>
 
 
-          <el-form-item v-show="ifShow" label="设备状态" prop="deviceStatus">
+          <el-form-item v-show="ifShow" label="设备状态" label-width="85px"  prop="deviceStatus">
             <el-select
               v-model="queryParams.deviceStatus"
               placeholder="设备状态"
@@ -53,8 +53,8 @@
               class="!w-240px"
             >
               <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.PMS_DEVICE_STATUS)"
-                :key="dict.id"
+                v-for="dict in getStrDictOptions(DICT_TYPE.PMS_DEVICE_STATUS)"
+                :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
               />
@@ -62,13 +62,19 @@
           </el-form-item>
 
           <el-form-item v-show="ifShow" label="资产性质" prop="assetProperty">
-            <el-input
+            <el-select
               v-model="queryParams.assetProperty"
-              placeholder="请输入资产性质"
+              placeholder="资产性质"
               clearable
-              @keyup.enter="handleQuery"
-              class="!w-200px"
-            />
+              class="!w-240px"
+            >
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.PMS_ASSET_PROPERTY)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
 
 
@@ -187,7 +193,7 @@
 import download from '@/utils/download'
 import { IotDeviceApi, IotDeviceVO } from '@/api/pms/device'
 import IotDeviceForm from './IotDeviceForm.vue'
-import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
+import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
 import {dateFormatter} from "@/utils/formatTime";
 import PmsTree from "@/views/system/tree/PmsTree.vue";
 import DeptTree from "@/views/system/user/DeptTree.vue";