-
-
-
-
-
-
-
@@ -213,7 +194,6 @@
-
@@ -224,7 +204,6 @@
-
@@ -278,7 +257,12 @@
-
+
+
+
+
+
+
@@ -288,7 +272,15 @@
-
+
+
+
@@ -421,7 +413,7 @@
import { getUuid, listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/model/device";
import { deptTreeSelect } from "@/api/system/user";
const { proxy } = getCurrentInstance();
-const { dc_device_type } = proxy.useDict('dc_device_type');
+const { dc_device_type, dc_device_source } = proxy.useDict('dc_device_type','dc_device_source');
const router = useRouter();
const deviceList = ref([]);
@@ -436,6 +428,7 @@ const title = ref("");
const collapseVisible = ref(false);
const editName = ref("更多筛选项");
const deptOptions = ref([]);
+const disabled = ref(false);
const enabledFlag = ref([
{label: '可用', value: true, elTagType: 'default', elTagClass: null},
{label: '不可用', value: false, elTagType: 'default', elTagClass: null}
@@ -585,6 +578,7 @@ function handleAdd() {
loading.value = true;
getUuid().then(response=>{
form.value.centerDeviceCode = response.msg;
+ form.value.uuid = response.msg;
form.value.enabledFlag = true;
loading.value = false;
});
@@ -644,22 +638,22 @@ function handleExport() {
}, `device_${new Date().getTime()}.xlsx`)
}
-onMounted(() => {
- // debugger
- console.log("-------------"+queryParams.deviceType);
- queryParams.deviceType = queryParams.deviceType;
- // 在组件首次加载完成后执行的逻辑
- // 可以在这里给组件复制
- // form.value.pid=tempPid;
- });
+// onMounted(() => {
+// // debugger
+// // console.log("-------------"+queryParams.deviceType);
+// // queryParams.deviceType = queryParams.deviceType;
+// // 在组件首次加载完成后执行的逻辑
+// // 可以在这里给组件复制
+// // form.value.pid=tempPid;
+// });
function handleParams(row){
- const path = "params";
router.push({
- path: path,
+ path: "params",
query: {
deviceUuid: row.uuid,
- deviceCode: row.centerDeviceCode
+ deviceCode: row.centerDeviceCode,
+ uuidDisabled: false,
}
});
}
@@ -676,8 +670,6 @@ function toggleCollapse() {
function getDeptTree() {
deptTreeSelect().then(response => {
deptOptions.value = response.data;
- console.log("deptOptions");
- console.log(deptOptions.value);
});
};
@@ -685,6 +677,10 @@ function selectDept(val){
form.value.orgCode=val.id;
}
+function deviceSourceChange(val){
+ form.value.deviceSourceId=val.deviceSourceId;
+}
+
getDeptTree();
getList();
diff --git a/src/views/model/devicemodel/index.vue b/src/views/model/devicemodel/index.vue
index ed69342..cc2917c 100644
--- a/src/views/model/devicemodel/index.vue
+++ b/src/views/model/devicemodel/index.vue
@@ -237,7 +237,6 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询设备模型信息列表 */
function getList() {
- debugger
loading.value = true;
listDevicemodel(queryParams.value).then(response => {
devicemodelList.value = proxy.handleTree(response.data, "id", "pid");
diff --git a/src/views/model/params/index.vue b/src/views/model/params/index.vue
index 3b83cfb..fa6d2bc 100644
--- a/src/views/model/params/index.vue
+++ b/src/views/model/params/index.vue
@@ -5,7 +5,7 @@
@@ -150,8 +150,8 @@
-
-
+
@@ -183,7 +183,11 @@
{{ getParamModelName(scope.row.paramModelId) }}
-
+
+
+
+
+
@@ -356,6 +360,7 @@ const total = ref(0);
const title = ref("");
const paramClassList = ref([]);
const collapseVisible = ref(false);
+const uuidDisabled = (router.currentRoute._value.query.deviceUuid !== undefined&&router.currentRoute._value.query.deviceUuid !== null&&router.currentRoute._value.query.deviceUuid !=="")?router.currentRoute._value.query.deviceUuid:false;
const editName = ref("更多筛选项");
const deviceUuid = router.currentRoute._value.query.deviceUuid;
const deviceCode = router.currentRoute._value.query.deviceCode;