资产信息新增处理

.env.development

@@ -5,5 +5,5 @@ VITE_APP_TITLE = 联美运营系统
 VITE_APP_ENV = 'development'
 
 # 联美运营系统/开发环境
-VITE_APP_BASE_API = 'http://localhost:9010'
+VITE_APP_BASE_API = 'http://10.10.10.56:9010'
 VITE_APP_BASE_API_IMAGE = 'http://localhost:9010'

src/api/model/asset/params.js

@@ -1,53 +1,62 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询资产参数列表
 export function listParams(query) {
   return request({
-    url: '/model/dcBaseAssetParams/list',
+    url: "/model/dcBaseAssetParams/list",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
 }
 
 // 查询资产参数详细
 export function getParams(id) {
   return request({
-    url: '/model/dcBaseAssetParams/' + id,
+    url: "/model/dcBaseAssetParams/" + id,
-    method: 'get'
+    method: "get",
-  })
+  });
 }
 
 // 新增资产参数
 export function addParams(data) {
   return request({
-    url: '/model/dcBaseAssetParams',
+    url: "/model/dcBaseAssetParams",
-    method: 'post',
+    method: "post",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 修改资产参数
 export function updateParams(data) {
   return request({
-    url: '/model/dcBaseAssetParams',
+    url: "/model/dcBaseAssetParams",
-    method: 'put',
+    method: "put",
-    data: data
+    data: data,
-  })
+  });
 }
 
 // 删除资产参数
 export function delParams(id) {
   return request({
-    url: '/model/dcBaseAssetParams/' + id,
+    url: "/model/dcBaseAssetParams/" + id,
-    method: 'delete'
+    method: "delete",
-  })
+  });
 }
 
 // 导出资产参数
 export function exportParams(query) {
   return request({
-    url: '/${baseUrl}/export',
+    url: "/${baseUrl}/export",
-    method: 'get',
+    method: "get",
-    params: query
+    params: query,
-  })
+  });
-}
+}
+
+// 根据设备查询设备参数列表
+export function listByDeviceUuids(data) {
+  return request({
+    url: "/model/dcBaseDeviceParam/listByDeviceUuids",
+    method: "post",
+    data: data,
+  });
+}

src/views/model/asset/addParams.vue

@@ -1,22 +1,83 @@
 <template>
   <div class="app-container">
+    <div class="submitBtn">
+      <el-button
+        type="primary"
+        :icon="Check"
+        @click="paramSubmit(paramsFormRef)"
+      >
+        提交
+      </el-button>
+    </div>
     <el-collapse class="paramsCollapse" v-model="activeNames">
       <el-collapse-item title="基本信息" name="1">
-        <el-form :inline="true" :model="addForm" class="demo-form-inline">
+        <el-form
-          <el-form-item label="资产编号">
+          ref="paramsFormRef"
+          class="paramsForm"
+          :rules="paramsRules"
+          :inline="true"
+          :model="paramsForm"
+        >
+          <el-form-item label="组织" prop="orgName">
+            <el-tree-select
+              v-model="paramsForm.orgName"
+              :data="deptOptions"
+              :props="{
+                value: 'label',
+                label: 'label',
+                children: 'children',
+              }"
+              value-key="id"
+              placeholder="请选择"
+              check-strictly
+              :default-expand-all="true"
+              @node-click="selectDept"
+            />
+          </el-form-item>
+          <el-form-item label="编码">
             <el-input
-              v-model="addForm.num"
+              v-model="paramsForm.assetCode"
-              placeholder="资产编号"
+              placeholder="编码"
               clearable
-              readonly
             />
           </el-form-item>
-          <el-form-item label="资产名称">
+          <el-form-item label="是否可用" prop="flagEnabled">
-            <el-input v-model="addForm.name" placeholder="资产名称" clearable />
+            <el-select
+              v-model="paramsForm.flagEnabled"
+              placeholder="请选择是否可用"
+            >
+              <el-option
+                v-for="dict in enabledFlag"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="名称" prop="assetName">
+            <el-input
+              v-model="paramsForm.assetName"
+              placeholder="名称"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="类别" prop="assetType">
+            <el-select
+              v-model="paramsForm.assetType"
+              placeholder="请选择类别"
+              clearable
+            >
+              <el-option
+                v-for="dict in dc_asset_attr"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="组成设备">
             <el-select
-              v-model="addForm.device"
+              v-model="paramsDevice"
               multiple
               filterable
               allow-create
@@ -26,10 +87,10 @@
               style="width: 240px"
             >
               <el-option
-                v-for="item in options"
+                v-for="item in deviceOption"
-                :key="item.value"
+                :key="item.id"
-                :label="item.label"
+                :label="item.deviceName"
-                :value="item.value"
+                :value="item.centerDeviceCode"
               />
             </el-select>
           </el-form-item>
@@ -42,16 +103,16 @@
         <vxe-table
           class="tableCollapse"
           border
-          ref="tableRef"
+          ref="paramsTableRef"
           max-height="400"
           :row-config="{ isHover: true }"
           :loading="loading"
-          :data="tableListData"
+          :data="paramsList"
         >
           <vxe-column type="checkbox" width="60"></vxe-column>
-          <vxe-column field="role" title="参数编码"></vxe-column>
+          <vxe-column field="paramCode" title="参数编码"></vxe-column>
           <vxe-column
-            field="address"
+            field="paramName"
             title="参数名称"
             :filters="addressOptions"
             :filter-method="filterAddressMethod"
@@ -70,14 +131,14 @@
               ></vxe-input>
             </template>
           </vxe-column>
-          <vxe-column field="youxiao" title="是否有效">
+          <vxe-column field="flagEnabled" title="是否有效">
             <template #default="{ row }">
-              <vxe-checkbox v-model="row.youxiao"></vxe-checkbox>
+              <vxe-checkbox v-model="row.flagEnabled"></vxe-checkbox>
             </template>
           </vxe-column>
-          <vxe-column field="kekong" title="是否可控">
+          <vxe-column field="contrlFlag" title="是否可控">
             <template #default="{ row }">
-              <vxe-checkbox v-model="row.kekong"></vxe-checkbox>
+              <vxe-checkbox v-model="row.contrlFlag"></vxe-checkbox>
             </template>
           </vxe-column>
         </vxe-table>
@@ -87,23 +148,23 @@
       class="addDialog"
       v-model="dialogTableVisible"
       title="选择参数"
-      width="900"
+      width="1200"
     >
       <vxe-table
         class="tableDialog"
         border
-        ref="tableRef"
+        ref="addTableRef"
         max-height="400"
         :row-config="{ isHover: true }"
         :loading="loading"
-        :data="tableData"
+        :data="paramsData"
       >
         <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="id" title="设备编码" sortable></vxe-column>
+        <vxe-column field="deviceUuid" title="设备编码" sortable></vxe-column>
-        <vxe-column field="name" title="设备名称"></vxe-column>
+        <vxe-column field="deviceName" title="设备名称"></vxe-column>
-        <vxe-column field="role" title="参数编码"></vxe-column>
+        <vxe-column field="paramCode" title="参数编码"></vxe-column>
         <vxe-column
-          field="age"
+          field="paramModelName"
           title="参数模版名称"
           :filters="ageOptions"
           :filter-method="filterAgeMethod"
@@ -123,7 +184,7 @@
           </template>
         </vxe-column>
         <vxe-column
-          field="address"
+          field="paramName"
           title="参数名称"
           :filters="addressOptions"
           :filter-method="filterAddressMethod"
@@ -143,7 +204,7 @@
           </template>
         </vxe-column>
         <vxe-column
-          field="sex"
+          field="partion"
           title="分区"
           :filter-multiple="false"
           :filters="sexOptions"
@@ -152,9 +213,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="dialogTableVisible = false">取消</el-button>
-          <el-button type="primary" @click="dialogTableVisible = false">
+          <el-button type="primary" @click="addConfirm"> 确认 </el-button>
-            确认
-          </el-button>
         </div>
       </template>
     </el-dialog>
@@ -163,94 +222,65 @@
 <script setup>
 import { ref, reactive, onMounted } from "vue";
 import { useRoute } from "vue-router";
+import { deptTreeSelect } from "@/api/system/user";
+import { listByDeviceUuids } from "@/api/model/asset/params";
+import { listDeviceNoPage } from "@/api/model/device";
+import {
+  listInfo,
+  getInfo,
+  delInfo,
+  addInfo,
+  updateInfo,
+} from "@/api/model/asset/info";
+import { Check } from "@element-plus/icons-vue";
+
+const { proxy } = getCurrentInstance();
+const { dc_asset_attr } = proxy.useDict("dc_asset_attr");
+
 const activeNames = ref(["1", "2"]);
 const route = useRoute();
+const id = route.query.id;
+const paramsFormRef = ref();
 const dialogTableVisible = ref(false);
-const addForm = reactive({
+const deptOptions = ref([]);
-  num: route.query.assetCode,
+const paramsData = ref([]);
-  name: "",
+const paramsList = ref([]);
-  device: [],
+const paramsCode = ref([]);
+const paramsDevice = ref([]);
+const deviceOption = ref([]);
+const enabledFlag = ref([
+  { label: "可用", value: 1, elTagType: "default", elTagClass: null },
+  { label: "不可用", value: 0, elTagType: "default", elTagClass: null },
+]);
+const paramsForm = reactive({
+  assetCode: "",
+  flagEnabled: null,
+  assetName: "",
+  assetType: "",
+  orgCode: null,
+  orgName: "",
+  assetParamsDtos: [
+    {
+      paramCode: "",
+      flagEnabled: false,
+      contrlFlag: false,
+    },
+  ],
 });
-const options = [
+const paramsTableRef = ref();
-  {
+const addTableRef = ref();
-    value: "HTML",
-    label: "HTML",
-  },
-  {
-    value: "CSS",
-    label: "CSS",
-  },
-  {
-    value: "JavaScript",
-    label: "JavaScript",
-  },
-];
-const tableRef = ref();
 const loading = ref(false);
-const tableData = ref([
-  {
-    id: 10001,
-    name: "Test1",
-    role: "Develop",
-    sex: "Man",
-    age: 28,
-    address: "test",
-  },
-  {
-    id: 10002,
-    name: "Test2",
-    role: "admin",
-    sex: "Man",
-    age: 29,
-    address: "asd",
-  },
-  {
-    id: 10003,
-    name: "Test3",
-    role: "useer",
-    sex: "Man",
-    age: 22,
-    address: "qsx",
-  },
-]);
-const tableListData = ref([
-  {
-    id: 10001,
-    name: "Test1",
-    role: "Develop",
-    sex: "Man",
-    age: 28,
-    address: "test",
-    youxiao: true,
-    kekong: false,
-  },
-  {
-    id: 10002,
-    name: "Test2",
-    role: "admin",
-    sex: "Man",
-    age: 29,
-    address: "asd",
-    youxiao: false,
-    kekong: true,
-  },
-  {
-    id: 10003,
-    name: "Test3",
-    role: "useer",
-    sex: "Man",
-    age: 22,
-    address: "qsx",
-    youxiao: false,
-    kekong: false,
-  },
-]);
 const sexOptions = ref([
-  { label: "高", value: "Man" },
+  { label: "高区", value: "高区" },
-  { label: "中", value: "Women" },
+  { label: "中区", value: "中区" },
+  { label: "低区", value: "低区" },
 ]);
 const ageOptions = ref([{ data: "" }]);
 const addressOptions = ref([{ data: "" }]);
+const paramsRules = reactive({
+  assetName: [{ required: true, message: "请输入资产名称", trigger: "blur" }],
+});
+
 const filterAgeMethod = ({ option, row }) => {
   return row.age === Number(option.data);
 };
@@ -265,11 +295,95 @@ const filterAddressRecoverMethod = ({ option }) => {
   // 如果是自定义筛选模板，当为点击确认时，该选项将被恢复为默认值
   option.data = "";
 };
-onMounted(() => {});
+onMounted(() => {
+  const dsfsdf = route.query.id;
+  debugger;
+  getDeptTree();
+  getDevice();
+});
+function getDeptTree() {
+  //获取部门树
+  deptTreeSelect().then((response) => {
+    deptOptions.value = response.data;
+  });
+}
+function getDevice() {
+  //获取部门树
+  listDeviceNoPage().then((response) => {
+    deviceOption.value = response.data;
+  });
+}
+
 function selectParams() {
   //选择参数
-  dialogTableVisible.value = true;
+  if (paramsDevice.value.length != 0) {
+    const params = {
+      deviceUuids: paramsDevice.value,
+      excludeParamCodes: [],
+    };
+    listByDeviceUuids(params).then((res) => {
+      if (res.code === 200) {
+        paramsData.value = res.data;
+        dialogTableVisible.value = true;
+      }
+    });
+  }
+}
+function selectDept(val) {
+  //部门参数选择
+  paramsForm.orgCode = val.id;
 }
+function addConfirm() {
+  //选择参数确认
+  const $addTable = addTableRef.value;
+  if ($addTable) {
+    const selectRecords = $addTable.getCheckboxRecords();
+    paramsList.value = selectRecords.map((item) => {
+      return {
+        ...item,
+        flagEnabled: false,
+        contrlFlag: false,
+      };
+    });
+    paramsCode.value = selectRecords.map((item) => item.paramCode);
+    dialogTableVisible.value = false;
+  }
+}
+
+const paramSubmit = async (formEl) => {
+  //提交
+  if (!formEl) return;
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      const $submitTable = paramsTableRef.value;
+      if ($submitTable) {
+        const selectParamsList = $submitTable.getCheckboxRecords();
+        const selectParamsListArr = selectParamsList.map((item) => ({
+          paramCode: item.paramCode,
+          flagEnabled: item.flagEnabled,
+          contrlFlag: item.contrlFlag,
+        }));
+        paramsForm.assetParamsDtos = selectParamsListArr;
+        if (id.value != undefined) {
+          updateInfo(paramsForm).then((response) => {
+            proxy.$modal.msgSuccess("修改成功");
+            open.value = false;
+            getList();
+          });
+        } else {
+          addInfo(paramsForm).then((response) => {
+            proxy.$modal.msgSuccess("新增成功");
+            open.value = false;
+            getList();
+          });
+        }
+        console.log(paramsForm);
+      }
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
 </script>
 <style scoped>
 .paramsCollapse {

src/views/model/asset/index.vue

@@ -3,52 +3,110 @@
     <el-row>
       <el-col :span="4" class="card-box">
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            prefix-icon="Search"
+            style="margin-bottom: 20px"
+          />
         </div>
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false"
+          <el-tree
-            :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all
+            :data="deptOptions"
-            @node-click="handleNodeClick" />
+            :props="{ label: 'label', children: 'children' }"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="deptTreeRef"
+            node-key="id"
+            highlight-current
+            default-expand-all
+            @node-click="handleNodeClick"
+          />
         </div>
       </el-col>
       <el-col :span="20" class="card-box">
-        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form
+          :model="queryParams"
+          ref="queryRef"
+          :inline="true"
+          v-show="showSearch"
+          label-width="100px"
+        >
           <el-form-item label="编码" prop="assetCode">
-            <el-input v-model="queryParams.assetCode" placeholder="请输入编码" clearable @keyup.enter="handleQuery" />
+            <el-input
+              v-model="queryParams.assetCode"
+              placeholder="请输入编码"
+              clearable
+              @keyup.enter="handleQuery"
+            />
           </el-form-item>
           <!-- <el-form-item label="是否有效" prop="flagEnabled">
             <el-input v-model="queryParams.flagEnabled" placeholder="请输入是否有效" clearable @keyup.enter="handleQuery" />
           </el-form-item> -->
           <el-form-item label="名称" prop="assetName">
-            <el-input v-model="queryParams.assetName" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
+            <el-input
+              v-model="queryParams.assetName"
+              placeholder="请输入名称"
+              clearable
+              @keyup.enter="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="类别" prop="assetType">
-            <el-select v-model="queryParams.assetType" placeholder="请选择类别" clearable>
+            <el-select
-              <el-option v-for="dict in dc_asset_attr" :key="dict.value" :label="dict.label" :value="dict.value" />
+              v-model="queryParams.assetType"
+              placeholder="请选择类别"
+              clearable
+            >
+              <el-option
+                v-for="dict in dc_asset_attr"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button type="primary" icon="Search" @click="handleQuery"
-            <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
+              >搜索</el-button
+            >
+            <el-button type="info" plain icon="Refresh" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="success" icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button type="success" icon="Plus" @click="handleAdd"
+              >新增</el-button
+            >
           </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="success" icon="Edit" @click="handleUpdate"
+              >修改</el-button
+            >
+          </el-col> -->
           <el-col :span="1.5">
-            <el-button type="success" icon="Edit" @click="handleUpdate">修改</el-button>
+            <el-button type="success" icon="Delete" @click="handleDelete"
+              >删除</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" icon="Delete" @click="handleDelete">删除</el-button>
+            <el-button type="warning" icon="Download" @click="handleExport"
+              >导出</el-button
+            >
           </el-col>
-          <el-col :span="1.5">
+          <right-toolbar
-            <el-button type="warning" icon="Download" @click="handleExport">导出</el-button>
+            v-model:showSearch="showSearch"
-          </el-col>
+            @queryTable="getList"
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          ></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          :data="infoList"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column type="selection" width="55" align="center" />
           <!-- <el-table-column label="主键" align="center" prop="id" /> -->
           <el-table-column label="编码" align="center" prop="assetCode" />
@@ -59,19 +117,43 @@
             </template>
           </el-table-column>
           <el-table-column label="组织" align="center" prop="orgName" />
-          <el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width">
+          <el-table-column
+            label="操作"
+            align="center"
+            width="350"
+            class-name="small-padding fixed-width"
+          >
             <template #default="scope">
-              <el-button type="text" icon="Edit" @click="handleParams(scope.row)">参数</el-button>
+              <el-button
+                type="text"
+                icon="Edit"
+                @click="handleParams(scope.row)"
+                >参数</el-button
+              >
               <!-- <el-button type="text" icon="Edit" @click="handleDevices(scope.row)">关联设备</el-button> -->
-              <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+              <el-button
-              <el-button type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+                type="text"
+                icon="Edit"
+                @click="handleUpdate(scope.row)"
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        <pagination
-          v-model:limit="queryParams.pageSize" @pagination="getList" />
+          v-show="total > 0"
-
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
@@ -81,14 +163,29 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="组织" prop="orgName">
-              <el-tree-select v-model="form.orgName" :data="deptOptions"
+              <el-tree-select
-                :props="{ value: 'label', label: 'label', children: 'children' }" value-key="id" placeholder="请选择"
+                v-model="form.orgName"
-                check-strictly :default-expand-all="true" @node-click="selectDept" />
+                :data="deptOptions"
+                :props="{
+                  value: 'label',
+                  label: 'label',
+                  children: 'children',
+                }"
+                value-key="id"
+                placeholder="请选择"
+                check-strictly
+                :default-expand-all="true"
+                @node-click="selectDept"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-show="false">
             <el-form-item label="所属组织编码" prop="orgCode">
-              <el-input v-model="form.orgCode" placeholder="请选择组织名称" disabled />
+              <el-input
+                v-model="form.orgCode"
+                placeholder="请选择组织名称"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -98,8 +195,16 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否可用" prop="flagEnabled">
-              <el-select v-model="form.flagEnabled" placeholder="请选择是否可用">
+              <el-select
-                <el-option v-for="dict in enabledFlag" :key="dict.value" :label="dict.label" :value="dict.value" />
+                v-model="form.flagEnabled"
+                placeholder="请选择是否可用"
+              >
+                <el-option
+                  v-for="dict in enabledFlag"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -111,12 +216,15 @@
           <el-col :span="12">
             <el-form-item label="类别" prop="assetType">
               <el-select v-model="form.assetType" placeholder="请选择类别">
-                <el-option v-for="dict in dc_asset_attr" :key="dict.value" :label="dict.label"
+                <el-option
-                  :value="dict.value"></el-option>
+                  v-for="dict in dc_asset_attr"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <template #footer>
@@ -130,11 +238,17 @@
 </template>
 
 <script setup name="AssetInfo">
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/model/asset/info";
+import {
+  listInfo,
+  getInfo,
+  delInfo,
+  addInfo,
+  updateInfo,
+} from "@/api/model/asset/info";
 import { deptTreeSelect } from "@/api/system/user";
 
 const { proxy } = getCurrentInstance();
-const { dc_asset_attr } = proxy.useDict('dc_asset_attr');
+const { dc_asset_attr } = proxy.useDict("dc_asset_attr");
 const router = useRouter();
 const infoList = ref([]);
 const open = ref(false);
@@ -147,8 +261,8 @@ const total = ref(0);
 const title = ref("");
 
 const enabledFlag = ref([
-  { label: '可用', value: 1, elTagType: 'default', elTagClass: null },
+  { label: "可用", value: 1, elTagType: "default", elTagClass: null },
-  { label: '不可用', value: 0, elTagType: 'default', elTagClass: null }
+  { label: "不可用", value: 0, elTagType: "default", elTagClass: null },
 ]);
 
 const data = reactive({
@@ -162,10 +276,9 @@ const data = reactive({
     assetName: null,
     assetType: null,
     orgCode: null,
-    orgName: null
+    orgName: null,
   },
-  rules: {
+  rules: {},
-  }
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -173,7 +286,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询资产信息列表 */
 function getList() {
   loading.value = true;
-  listInfo(queryParams.value).then(response => {
+  listInfo(queryParams.value).then((response) => {
     infoList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -205,12 +318,11 @@ function reset() {
     assetName: null,
     assetType: null,
     orgCode: null,
-    orgName: null
+    orgName: null,
   };
   proxy.resetForm("infoRef");
 }
 
-
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
@@ -225,20 +337,19 @@ function resetQuery() {
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 
-
 /** 跳转参数 */
 function handleParams(row) {
   router.push({
     path: "AssetParams",
     query: {
       id: row.id,
-      assetCode: row.assetCode
+      assetCode: row.assetCode,
-    }
+    },
   });
 }
 /** 跳转关联设备 */
@@ -247,41 +358,51 @@ function handleDevice(row) {
     path: "params",
     query: {
       id: row.id,
-      assetCode: row.assetCode
+      assetCode: row.assetCode,
-    }
+    },
   });
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset();
+  router.push({
-  open.value = true;
+    path: "AddParams",
-  title.value = "添加资产信息";
+  });
+  // reset();
+  // open.value = true;
+  // title.value = "添加资产信息";
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset();
+  // reset();
-  const _id = row.id || ids.value
+  const id = row.id || ids.value;
-  getInfo(_id).then(response => {
+  debugger;
-    form.value = response.data;
+  router.push({
-    open.value = true;
+    path: "AddParams",
-    title.value = "修改资产信息";
+    query: {
+      id,
+    },
   });
+  // getInfo(_id).then((response) => {
+  //   form.value = response.data;
+  //   open.value = true;
+  //   title.value = "修改资产信息";
+  // });
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["infoRef"].validate(valid => {
+  proxy.$refs["infoRef"].validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateInfo(form.value).then(response => {
+        updateInfo(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
           getList();
         });
       } else {
-        addInfo(form.value).then(response => {
+        addInfo(form.value).then((response) => {
           proxy.$modal.msgSuccess("新增成功");
           open.value = false;
           getList();
@@ -294,19 +415,27 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除资产信息编号为"' + _ids + '"的数据项？').then(function () {
+  proxy.$modal
-    return delInfo(_ids);
+    .confirm('是否确认删除资产信息编号为"' + _ids + '"的数据项？')
-  }).then(() => {
+    .then(function () {
-    getList();
+      return delInfo(_ids);
-    proxy.$modal.msgSuccess("删除成功");
+    })
-  }).catch(() => { });
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('model.asset/info/export', {
+  proxy.download(
-    ...queryParams.value
+    "model.asset/info/export",
-  }, `info_${new Date().getTime()}.xlsx`)
+    {
+      ...queryParams.value,
+    },
+    `info_${new Date().getTime()}.xlsx`
+  );
 }
 
 getList();
@@ -316,10 +445,10 @@ getDeptTree();
 const deptOptions = ref([]);
 const deptName = ref(null);
 function getDeptTree() {
-  deptTreeSelect().then(response => {
+  deptTreeSelect().then((response) => {
     deptOptions.value = response.data;
   });
-};
+}
 /** 通过条件过滤节点  */
 const filterNode = (value, data) => {
   if (!value) return true;
@@ -329,13 +458,13 @@ const filterNode = (value, data) => {
 function handleNodeClick(data) {
   queryParams.value.orgCode = data.id;
   handleQuery();
-};
+}
 
 function selectDept(val) {
   form.value.orgCode = val.id;
 }
 /** 根据名称筛选部门树 */
-watch(deptName, val => {
+watch(deptName, (val) => {
   proxy.$refs["deptTreeRef"].filter(val);
 });
 </script>

src/views/model/asset/params.vue

@@ -300,16 +300,16 @@ function handleSelectionChange(selection) {
 
 /** 新增按钮操作 */
 function handleAdd() {
-  router.push({
+  // router.push({
-    path: "AddParams",
+  //   path: "AddParams",
-    query: {
+  //   query: {
-      assetCode,
+  //     assetCode,
-    },
+  //   },
-  });
+  // });
-  // reset();
+  reset();
-  // form.value.assetCode = assetCode
+  form.value.assetCode = assetCode;
-  // open.value = true;
+  open.value = true;
-  // title.value = "添加资产参数";
+  title.value = "添加资产参数";
 }
 
 /** 修改按钮操作 */