feat(equipmentCloud): 物模型是否展示

dgiot · Jun 30, 2022 · 366a913 · 366a913
1 parent 49f716a
commit 366a913
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 7 deletions.
diff --git a/src/dgiot/components/DgiotDoc/index.vue b/src/dgiot/components/DgiotDoc/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <dgiot-icon class="el-icon-notebook-2" @click.native="click" />
+</template>
+
+<script>
+  export default {
+    name: 'DgiotDoc',
+    props: {
+      url: {
+        required: false,
+        type: String,
+        default: 'https://dgiot-web.vercel.app/',
+      },
+    },
+    methods: {
+      click() {
+        window.open(this.url, '_blank')
+      },
+    },
+  }
+</script>
diff --git a/src/dgiot/components/DgiotHeader/index.vue b/src/dgiot/components/DgiotHeader/index.vue
@@ -30,6 +30,7 @@
             />
             <dgiot-error-log :title="$translateTitle(`home.error log`)" />
             <dgiot-notice :title="$translateTitle(`home.notice`)" />
+            <dgiot-doc :title="$translateTitle(`home.full screen`)" />
             <dgiot-full-screen :title="$translateTitle(`home.full screen`)" />
             <dgiot-language
               v-show="isShow"

diff --git a/src/dgiot/components/DgiotNav/index.vue b/src/dgiot/components/DgiotNav/index.vue
@@ -37,6 +37,7 @@
           <dgiot-error-log :title="$translateTitle(`home.error log`)" />
           <dgiot-notice :title="$translateTitle(`home.notice`)" />
           <dgiot-full-screen :title="$translateTitle(`home.full screen`)" />
+          <dgiot-doc :title="$translateTitle(`home.full screen`)" />
           <dgiot-language :title="$translateTitle(`home.language`)" />
           <dgiot-theme :title="$translateTitle(`home.theme`)" />
           <dgiot-refresh :title="$translateTitle(`home.refresh`)" />

diff --git a/src/views/DeviceCloud/manage/component/wmxdetail.vue b/src/views/DeviceCloud/manage/component/wmxdetail.vue
@@ -190,7 +190,7 @@
                   prop="isshow"
                 >
                   <el-radio-group
-                    v-model="sizeForm.isshow"
+                    v-model="sizeForm.isstorage"
                     size="medium"
                     style="width: 100%"
                   >
@@ -203,6 +203,18 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="是否展示">
+                  <el-radio-group
+                    v-model="sizeForm.issshow"
+                    size="medium"
+                    style="width: 100%"
+                  >
+                    <el-radio :label="true">展示</el-radio>
+                    <el-radio :label="false">不展示</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item
                   :label="$translateTitle('product.isaccumulate')"
@@ -1226,13 +1238,20 @@
               trigger: 'change',
             },
           ],
-          isshow: [
+          isstorage: [
             {
               required: true,
               message: '请选择是否存储',
               trigger: 'change',
             },
           ],
+          issshow: [
+            {
+              required: true,
+              message: '请选择是否展示',
+              trigger: 'change',
+            },
+          ],
         },
         collapseName: ['1', '2', '3', '4'],
         wmxstart: 1,
@@ -1420,11 +1439,24 @@
               console.log(resource.params[k])
             }
             this.resource.changeData = resource
-            this.resource.arrlist = resource.arr
+            // this.resource.arrlist = resource.arr
             this.resource.addchannel = resource.obj
-            console.log(this.resource.arrlist)
+            this.resource.arrlist = _.sortBy(resource.arr, function (item) {
+              return item.order //根据code对数据进行升序排序，若是降序则改成：return -item.code
+            })
+            console.log(this.resource.arrlist, 'arrlist')
+            this.resource.data = _.sortBy(this.protocol, function (item) {
+              return item.order //根据code对数据进行升序排序，若是降序则改成：return -item.code
+            })
             this.resource.arrlist.forEach((i) => {
               console.error(i)
+              this.resource.arrlist = _.sortBy(resource.arr, function (item) {
+                return item.order //根据code对数据进行升序排序，若是降序则改成：return -item.code
+              })
+              console.log(this.resource.arrlist, 'arrlist')
+              this.resource.data = _.sortBy(this.protocol, function (item) {
+                return item.order //根据code对数据进行升序排序，若是降序则改成：return -item.code
+              })
               if (i.allowCreate) this.dynamicTable(i)
             })
             // allowCreate
@@ -1441,8 +1473,10 @@
         const { dataType = [], dataNnit = [] } = await getDlinkJson('ThingUnit')
         this.allunit = dataNnit
         this.dataType = dataType
-        this.resource.data = this.protocol
-        console.error(this.resource.data)
+        this.resource.data = _.sortBy(this.protocol, function (item) {
+          return item.order //根据code对数据进行升序排序，若是降序则改成：return -item.code
+        })
+        console.error(this.resource.data, 'data')
         this.resource.data.forEach((item, index) => {
           this.resource.data[index].arr = []
           this.resource.data[index].obj = {}
@@ -1462,7 +1496,15 @@
             this.resource.data[index].arr.push(item.params[key])
             console.log(this.resource.data[index].arr)
           }
+          this.resource.data[index].arr = _.sortBy(
+            this.resource.data[index].arr,
+            function (item) {
+              return item.order //根据code对数据进行升序排序，若是降序则改成：return -item.code
+            }
+          )
+          console.info(this.resource.data[index].arr, 'result order')
           this.resource.data[index].arr.map((_item) => {
+            console.log(_item)
             this.resource.data[index].obj[_item.showname] = _item?.default
               ?.value
               ? _item.default.value
@@ -1477,6 +1519,7 @@
               dgiotlogger.info(_item.type, _item.enum, _item, 'set select')
           })
           console.log(this.resource.data[index].arr)
+          console.info('this.resource.data', this.resource.data)
         })
         console.info('this.resource.data', this.resource.data)
       },
@@ -1952,7 +1995,10 @@
           this.resource.disabled = item.dataForm.protocol.length ? true : false
           // this.changeResource(this.resource.value)
 
-          this.resource.arrlist = item.dataSource
+          this.resource.arrlist = _.sortBy(item.dataSource, function (item) {
+            return item.order //根据code对数据进行升序排序，若是降序则改成：return -item.code
+          })
+          console.log(this.resource.arrlist, 'arrlist')
           this.$nextTick(() => {
             this.resource.data.forEach((resource, index) => {
               // resource[index].arr = []
@@ -2058,6 +2104,7 @@
               required: true,
               accessMode: sizeForm.isread,
               isshow: sizeForm.isshow,
+              isstorage: sizeForm.isshow,
               isaccumulate: sizeForm.isaccumulate,
               identifier: sizeForm.identifier,
             }

diff --git a/src/views/DeviceCloud/manage/js/proddetail.js b/src/views/DeviceCloud/manage/js/proddetail.js
@@ -695,6 +695,7 @@ export default {
         },
       ],
       isshow: true,
+      isstorage:true,
       isaccumulate: false,
       addRules: {
         name: [
@@ -961,6 +962,10 @@ export default {
       row.isshow = !row.isshow
       this.preserve('isshow')
     },
+    toggleStore(row) {
+      row.isstorage = !row.isstorage
+      this.preserve('isstorage')
+    },
     thingParameters(form, index, type) {
       this.editIndex = index
       console.log(
@@ -1171,6 +1176,7 @@ export default {
         devicetype: form.data.name,
         required: false,
         isshow: true,
+        isstorage:true,
         isaccumulate: false,
         dataForm: { order: moment(new Date()).format('x') },
         dataType: {
@@ -1322,6 +1328,7 @@ export default {
         falsevalue: 0,
         isread: 'r',
         isshow: true,
+        isstorage:true,
         isaccumulate: false,
         unit: '',
         string: '',
@@ -2415,6 +2422,7 @@ export default {
           ico: rowData.ico,
           isread: rowData.accessMode,
           isshow: rowData.isshow,
+          isstorage: rowData.isstorage,
           isaccumulate: rowData.isaccumulate,
           identifier: rowData.identifier,
           editdatatype: true,
@@ -2458,6 +2466,7 @@ export default {
           ico: rowData.ico,
           isread: rowData.accessMode,
           isshow: rowData.isshow,
+          isstorage: rowData.isstorage,
           isaccumulate: rowData.isaccumulate,
           identifier: rowData.identifier,
           collection:
@@ -2501,6 +2510,7 @@ export default {
           ico: rowData.ico,
           isread: rowData.accessMode,
           isshow: rowData.isshow,
+          isstorage: rowData.isstorage,
           isaccumulate: rowData.isaccumulate,
           identifier: rowData.identifier,
           collection:
@@ -2552,6 +2562,7 @@ export default {
           ico: rowData.ico,
           isread: rowData.accessMode,
           isshow: rowData.isshow,
+          isstorage: rowData.isstorage,
           isaccumulate: rowData.isaccumulate,
           identifier: rowData.identifier,
           collection:
@@ -2595,6 +2606,7 @@ export default {
           ico: rowData.ico,
           isread: rowData.accessMode,
           isshow: rowData.isshow,
+          isstorage: rowData.isstorage,
           isaccumulate: rowData.isaccumulate,
           collection:
             rowData.dataForm == undefined ? '' : rowData.dataForm.collection,
@@ -2642,6 +2654,7 @@ export default {
           ico: rowData.ico,
           isread: rowData.accessMode,
           isshow: rowData.isshow,
+          isstorage: rowData.isstorage,
           isaccumulate: rowData.isaccumulate,
           identifier: rowData.identifier,
           strategy:
@@ -2686,6 +2699,7 @@ export default {
           ico: rowData.ico,
           isread: rowData.accessMode,
           isshow: rowData.isshow,
+          isstorage: rowData.isstorage,
           isaccumulate: rowData.isaccumulate,
           identifier: rowData.identifier,
           editdatatype: true,
@@ -2729,6 +2743,7 @@ export default {
           ico: rowData.ico,
           isread: rowData.accessMode,
           isshow: rowData.isshow,
+          isstorage: rowData.isstorage,
           isaccumulate: rowData.isaccumulate,
           identifier: rowData.identifier,
           editdatatype: true,

diff --git a/src/views/DeviceCloud/manage/proddetail.vue b/src/views/DeviceCloud/manage/proddetail.vue
@@ -1347,6 +1347,21 @@
                         :label="$translateTitle('product.functionname')"
                         prop="name"
                       />
+                      <el-table-column
+                        align="center"
+                        label="是否展示"
+                        prop="name"
+                        width="100"
+                      >
+                        <template #default="{ row }">
+                          <a-switch
+                            :checked="row.isstorage"
+                            checked-children="展示"
+                            un-checked-children="不展示"
+                            @click="toggleStore(row)"
+                          />
+                        </template>
+                      </el-table-column>
                       <el-table-column
                         align="center"
                         label="是否存储"