Bladeren bron

修复功能

tianyabing 2 jaren geleden
bovenliggende
commit
ae75bf48f5

File diff suppressed because it is too large
+ 777 - 146
package-lock.json


+ 3 - 0
src/components/dataManage/dataDetail/IotDataDetail.vue

@@ -194,6 +194,9 @@ export default {
     if (this.formData.modelUrls && this.formData.modelUrls!='') {
       this.formData.modelUrls = JSON.parse(this.formData.modelUrls)
     }
+    if (this.formData.modelData && this.formData.modelData!='') {
+      this.formData.modelData = JSON.parse(this.formData.modelData)
+    }
     this.oriFormData = JSON.parse(JSON.stringify(this.formData))
   },
   components: {

+ 3 - 3
src/components/dataManage/dataDetail/ModelDataDetail.vue

@@ -18,9 +18,6 @@
         <el-form-item label="描述:" prop="content" style="width: 100%">
           <el-input v-model="formData.content" placeholder="请输入描述" :disabled="formData.isDataView"/>
         </el-form-item>
-        <el-form-item label="类型:" prop="modelType" style="width: 100%">
-          <el-input v-model="formData.modelType" placeholder="请输入类型" :disabled="formData.isDataView"/>
-        </el-form-item>
         <el-form-item label="类别:" prop="menuId">
           <el-select v-model="formData.menuId" placeholder="请选择类别" @change="handleMenuIdSelect" :disabled="true">
             <el-option
@@ -185,6 +182,9 @@ export default {
     if (this.formData.modelUrls && this.formData.modelUrls!='') {
       this.formData.modelUrls = JSON.parse(this.formData.modelUrls)
     }
+    if (this.formData.modelData && this.formData.modelData!='') {
+      this.formData.modelData = JSON.parse(this.formData.modelData)
+    }
     this.oriFormData = JSON.parse(JSON.stringify(this.formData))
   },
   components: {

+ 1 - 0
src/components/dataManage/dataDetail/components/TableInput.vue

@@ -68,6 +68,7 @@ export default {
   },
   methods: {
     initData() {
+      console.log(this.urls)
       if (this.urls) {
         this.tableData = this.urls.map(item=>{return {url: item}})
       }

+ 9 - 1
src/components/dataManage/dataShow/ModelData.vue

@@ -40,7 +40,13 @@
         </el-table-column>
         <el-table-column prop="title" label="标题" width="200"/>
         <el-table-column prop="content" label="描述" width="250"/>
-        <el-table-column prop="modelType" label="类型" width="120"/>
+        <el-table-column prop="modelType" label="类型" width="120">
+          <template #default="scope">
+            <template v-for="(item,key) in modelType" :key="item">
+              <span v-if="scope.row.modelType==Number(item)">{{ key }}</span>
+            </template>
+          </template>
+        </el-table-column>
         <el-table-column prop="menuNameTwo" label="类别" width="120"/>
         <el-table-column prop="lon" label="位置" width="180">
           <template #default="scope">
@@ -105,10 +111,12 @@
 import api from '@/api/data/ModelData'
 import ModelDataDetail from "@/components/dataManage/dataDetail/ModelDataDetail";
 import CategoryMenu from "@/components/dataManage/CategoryMenu";
+import ModelType from "@/static/datas/ModelType.json";
 
 export default {
   data() {
     return {
+      modelType: ModelType,
       dialogTitle: '',
       auth: false,
       loading: false,

+ 1 - 1
vue.config.js

@@ -2,7 +2,7 @@ const {defineConfig} = require('@vue/cli-service')
 const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
 
 module.exports = defineConfig({
-    transpileDependencies: true,
+    transpileDependencies: [/node_modules/],
     lintOnSave: false,
     configureWebpack: {
         module: {

Some files were not shown because too many files changed in this diff