From f04d2f45d0e077d30ca1bb75c41d4bb12bc2a439 Mon Sep 17 00:00:00 2001
From: dawnwinterLiu <1737801684@qq.com>
Date: Wed, 10 Aug 2022 18:21:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(equipmentCloud):=20=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.EN.md                               |   1 +
 CHANGELOG.ZH.md                               |   1 +
 CHANGELOG.md                                  |   1 +
 .../CloudFunction/engine/createchannel.vue    |  75 ++++++----
 src/views/DeviceCloud/manage/product.vue      | 139 ------------------
 5 files changed, 53 insertions(+), 164 deletions(-)

diff --git a/CHANGELOG.EN.md b/CHANGELOG.EN.md
index b9dd5084b5..bf453af124 100644
--- a/CHANGELOG.EN.md
+++ b/CHANGELOG.EN.md
@@ -6,6 +6,7 @@
 * 物模型延时缓存 ([c8dd9d4](https://github.com/dgiot/dgiot-dashboard/commit/c8dd9d4713fb9f36129fb660ecc68c55c73df775))
 * **cloudTest:** evidence ([e8d0510](https://github.com/dgiot/dgiot-dashboard/commit/e8d051073aee73634a11fe3d31f0a7c4f54f67be))
 * **dashboard): build(发布版本:** dgiot-dashboard@v4.5.6 ([1d4302c](https://github.com/dgiot/dgiot-dashboard/commit/1d4302cd183474db6bbbb6dbc4fbc46163d351c8)), closes [#511](https://github.com/dgiot/dgiot-dashboard/issues/511)
+* **equipmentCloud:** 字典修复 ([24a9690](https://github.com/dgiot/dgiot-dashboard/commit/24a96904b4879da9a952c9f6bf7358048863198c))
 
 
 ### Features
diff --git a/CHANGELOG.ZH.md b/CHANGELOG.ZH.md
index b9dd5084b5..bf453af124 100644
--- a/CHANGELOG.ZH.md
+++ b/CHANGELOG.ZH.md
@@ -6,6 +6,7 @@
 * 物模型延时缓存 ([c8dd9d4](https://github.com/dgiot/dgiot-dashboard/commit/c8dd9d4713fb9f36129fb660ecc68c55c73df775))
 * **cloudTest:** evidence ([e8d0510](https://github.com/dgiot/dgiot-dashboard/commit/e8d051073aee73634a11fe3d31f0a7c4f54f67be))
 * **dashboard): build(发布版本:** dgiot-dashboard@v4.5.6 ([1d4302c](https://github.com/dgiot/dgiot-dashboard/commit/1d4302cd183474db6bbbb6dbc4fbc46163d351c8)), closes [#511](https://github.com/dgiot/dgiot-dashboard/issues/511)
+* **equipmentCloud:** 字典修复 ([24a9690](https://github.com/dgiot/dgiot-dashboard/commit/24a96904b4879da9a952c9f6bf7358048863198c))
 
 
 ### Features
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9dd5084b5..bf453af124 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * 物模型延时缓存 ([c8dd9d4](https://github.com/dgiot/dgiot-dashboard/commit/c8dd9d4713fb9f36129fb660ecc68c55c73df775))
 * **cloudTest:** evidence ([e8d0510](https://github.com/dgiot/dgiot-dashboard/commit/e8d051073aee73634a11fe3d31f0a7c4f54f67be))
 * **dashboard): build(发布版本:** dgiot-dashboard@v4.5.6 ([1d4302c](https://github.com/dgiot/dgiot-dashboard/commit/1d4302cd183474db6bbbb6dbc4fbc46163d351c8)), closes [#511](https://github.com/dgiot/dgiot-dashboard/issues/511)
+* **equipmentCloud:** 字典修复 ([24a9690](https://github.com/dgiot/dgiot-dashboard/commit/24a96904b4879da9a952c9f6bf7358048863198c))
 
 
 ### Features
diff --git a/src/views/CloudFunction/engine/createchannel.vue b/src/views/CloudFunction/engine/createchannel.vue
index a5197b935a..17dd667c6b 100644
--- a/src/views/CloudFunction/engine/createchannel.vue
+++ b/src/views/CloudFunction/engine/createchannel.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="createResourcechannel">
-    <dgiot-input ref="uploadFinish" @fileInfo="fileInfo" />
-
+    <dgiot-input
+      ref="uploadFinish"
+      accept=".csv"
+      :params="inputParams"
+      @fileInfo="fileInfo"
+      @files="files"
+    />
     <el-form
       ref="addchannel"
       label-width="auto"
@@ -61,20 +66,6 @@
                     addchannel.region == item.cType ? '#00bad0' : '#c0c4cc',
                 }"
               >
-                <!--                <div slot="header" class="clearfix">-->
-                <!--                  <el-button-->
-                <!--                    :disabled="resourceid != ''"-->
-                <!--                    :type="-->
-                <!--                      addchannel.region == item.cType ? 'success' : 'primary'-->
-                <!--                    "-->
-                <!--                    size="mini"-->
-                <!--                    style="text-align: center"-->
-                <!--                    @click="setCard(item.cType)"-->
-                <!--                  >-->
-                <!--                    {{ addchannel.region == item.cType ? '已选' : '选择' }}-->
-                <!--                  </el-button>-->
-                <!--                  <p>{{ item.title.zh }}</p>-->
-                <!--                </div>-->
                 <div class="text item" @click="setCard(item.cType)">
                   <el-row :gutter="24">
                     <el-col :span="6">
@@ -234,6 +225,13 @@
                 :value="item1.enum[index1]"
               />
             </el-select>
+            <div v-else-if="item.type == 'upload'">
+              <el-button type="primary" @click.native="uploadCkick(item)">
+                {{ $translateTitle('application.uploadfile') }}
+              </el-button>
+              &nbsp;
+              <span>{{ addchannel[item.filename] }}</span>
+            </div>
             <div v-else-if="item.allowCreate">
               <el-button
                 @click.native="dybaneucForms[item.showname].unshift({})"
@@ -388,6 +386,8 @@
             },
           ],
         },
+        inputParams: {},
+        listLoading: false,
         addchannel: {
           codes: '{}',
           name: '',
@@ -435,20 +435,45 @@
         this.$refs['addchannel'].resetFields()
         this.resourceid = ''
       },
-      uploadCkick(type, index) {
-        console.log(type, index)
-        this.channeindex = index
+      uploadCkick(item) {
+        // 触发子组件的点击事件
         this.$refs['uploadFinish'].$refs.uploader.dispatchEvent(
           new MouseEvent('click')
         )
+        this.inputParams = {
+          item: item,
+          file: '',
+          scene: 'app',
+          path: 'product/csv/',
+        }
       },
       async fileInfo(info) {
-        console.log('uploadFinish', info)
-        console.log(this.channelregion)
-        this.channelregion[this.channeindex].params.ico.default = info.url
-        console.log(this.channelregion[this.channeindex].params.ico.default)
-        const res = await putResourceTypes(this.channelregion)
-        console.log(res)
+        this.$set(this.addchannel, this.inputParams.item.showname, info.path)
+        this.$set(
+          this.addchannel,
+          this.inputParams.item.filename,
+          this.inputParams.filename
+        )
+        this.inputParams = {}
+        if (info.url) {
+          this.$message({
+            showClose: true,
+            duration: 2000,
+            type: 'success',
+            message: '上传成功',
+          })
+        } else {
+          this.$message({
+            showClose: true,
+            duration: 2000,
+            type: 'error',
+            message: '上传失败',
+          })
+        }
+      },
+      files(file) {
+        this.inputParams.filename = file.name
+        this.inputParams.file = file
       },
       // 关闭本页面
       handleClose() {
diff --git a/src/views/DeviceCloud/manage/product.vue b/src/views/DeviceCloud/manage/product.vue
index 23803d5a5e..1b870932eb 100644
--- a/src/views/DeviceCloud/manage/product.vue
+++ b/src/views/DeviceCloud/manage/product.vue
@@ -288,133 +288,6 @@
           </a-card>
         </el-col>
       </el-row>
-      <!--        </el-tab-pane>-->
-      <!--        <el-tab-pane label="列表模式" name="table">-->
-      <!--          <el-table-->
-      <!--            v-loading="listLoading"-->
-      <!--            :cell-style="{ 'text-align': 'center' }"-->
-      <!--            :data="proTableData"-->
-      <!--            :header-cell-style="{ 'text-align': 'center' }"-->
-      <!--            :height="height"-->
-      <!--            border-->
-      <!--            size="mini"-->
-      <!--            style="width: 100%"-->
-      <!--          >-->
-      <!--            <el-table-column-->
-      <!--              label="ProductID"-->
-      <!--              prop="objectId"-->
-      <!--              width="auto"-->
-      <!--              show-overflow-tooltip-->
-      <!--              sortable-->
-      <!--            />-->
-      <!--            <el-table-column-->
-      <!--              width="auto"-->
-      <!--              show-overflow-tooltip-->
-      <!--              sortable-->
-      <!--              prop="name"-->
-      <!--              :label="$translateTitle('product.productname')"-->
-      <!--            />-->
-      <!--            <el-table-column-->
-      <!--              show-overflow-tooltip-->
-      <!--              sortable-->
-      <!--              prop="nodeType"-->
-      <!--              width="auto"-->
-      <!--              :label="$translateTitle('product.nodetype')"-->
-      <!--            >-->
-      <!--              <template #default="{ row }">-->
-      <!--            <span v-if="row.nodeType == 3">-->
-      <!--              {{ $translateTitle("product.direct") }}-->
-      <!--            </span>-->
-      <!--                <span v-if="row.nodeType == 1">-->
-      <!--              {{ $translateTitle("product.gateway") }}-->
-      <!--            </span>-->
-      <!--                <span v-if="row.nodeType == 2">-->
-      <!--              {{ $translateTitle("product.groupgateway") }}-->
-      <!--            </span>-->
-      <!--                <span v-else-if="row.nodeType == 0">-->
-      <!--              {{ $translateTitle("product.equipment") }}-->
-      <!--            </span>-->
-      <!--              </template>-->
-      <!--            </el-table-column>-->
-      <!--            <el-table-column-->
-      <!--              show-overflow-tooltip-->
-      <!--              sortable-->
-      <!--              prop="nodeType"-->
-      <!--              width="auto"-->
-      <!--              :label="$translateTitle('product.classification')"-->
-      <!--            >-->
-      <!--              <template #default="{ row }">-->
-      <!--            <span>-->
-      <!--              {{ row.category ? row.category.name : "" }}-->
-      <!--            </span>-->
-      <!--              </template>-->
-      <!--            </el-table-column>-->
-      <!--            &lt;!&ndash;          <el-table-column :label="$translateTitle('product.producttemplet')">&ndash;&gt;-->
-      <!--            &lt;!&ndash;            <template #default="{ row }">&ndash;&gt;-->
-      <!--            &lt;!&ndash;              <span>&ndash;&gt;-->
-      <!--            &lt;!&ndash;                {{ row.producttemplet ? row.producttemplet.name : '' }}&ndash;&gt;-->
-      <!--            &lt;!&ndash;              </span>&ndash;&gt;-->
-      <!--            &lt;!&ndash;            </template>&ndash;&gt;-->
-      <!--            &lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-      <!--            <el-table-column-->
-      <!--              show-overflow-tooltip-->
-      <!--              sortable-->
-      <!--              prop="createdAt"-->
-      <!--              width="auto"-->
-      <!--              :label="$translateTitle('product.addingtime')"-->
-      <!--            >-->
-      <!--              <template #default="{ row }">-->
-      <!--                <span>{{ utc2beijing(row.createdAt) }}</span>-->
-      <!--              </template>-->
-      <!--            </el-table-column>-->
-      <!--            <el-table-column-->
-      <!--              ref="rightCol"-->
-      <!--              :label="$translateTitle('developer.operation')"-->
-      <!--              fixed="right"-->
-      <!--              width="auto"-->
-      <!--              min-width="280"-->
-      <!--            >-->
-      <!--              <template #default="{ row, $index }">-->
-      <!--                <el-button-->
-      <!--                  :underline="false"-->
-      <!--                  size="mini"-->
-      <!--                  type="primary"-->
-      <!--                  style="margin-left: 10px"-->
-      <!--                  @click="deviceToDetail(row)"-->
-      <!--                >-->
-      <!--                  {{ $translateTitle("product.config") }}-->
-      <!--                </el-button>-->
-      <!--                <el-button-->
-      <!--                  :underline="false"-->
-      <!--                  size="mini"-->
-      <!--                  type="warning"-->
-      <!--                  @click="editorDict(row.objectId)"-->
-      <!--                >-->
-      <!--                  {{ $translateTitle("product.dict") }}-->
-      <!--                </el-button>-->
-
-      <!--                <el-button size="mini" @click="goKonva(row.objectId)">-->
-      <!--                  {{ $translateTitle("concentrator.konva") }}-->
-      <!--                </el-button>-->
-
-      <!--                <el-button-->
-      <!--                  :underline="false"-->
-      <!--                  size="mini"-->
-      <!--                  type="success"-->
-      <!--                  @click="editorProduct(row.objectId)"-->
-      <!--                >-->
-      <!--                  {{ $translateTitle("concentrator.edit") }}-->
-      <!--                </el-button>-->
-
-      <!--                <el-button size="mini" type="danger" @click="makeSure(row, $index)">-->
-      <!--                  {{ $translateTitle("task.Delete") }}-->
-      <!--                </el-button>-->
-      <!--              </template>-->
-      <!--            </el-table-column>-->
-      <!--          </el-table>-->
-      <!--        </el-tab-pane>-->
-      <!--      </el-tabs>-->
-
       <el-pagination
         background
         :key="paginationKey + 'forensics'"
@@ -426,16 +299,6 @@
         @current-change="handleCurrentChange"
         @size-change="handleSizeChange"
       />
-      <!--      <div class="elpagination" style="margin-top: 20px">-->
-      <!--        <el-pagination-->
-      <!--          :page-size="length"-->
-      <!--          :page-sizes="[8, 16, 24, 48]"-->
-      <!--          :total="total"-->
-      <!--          layout="total, sizes, prev, pager, next, jumper"-->
-      <!--          @current-change="productCurrentChange"-->
-      <!--          @size-change="productSizeChange"-->
-      <!--        />-->
-      <!--      </div>-->
     </div>
     <div class="devproduct-prodialog">
       <!-- 创建产品对话框 ###-->
@@ -1514,8 +1377,6 @@
               选泽文件
             </el-button>
           </el-upload>
-
-          <!-- </el-row> -->
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button