fix(issues): 界面管理

修复界面管理传值问题 BREAKING CHANGE: dgiot/dgiot#486 ISSUES CLOSED: dgiot/dgiot#486
dgiot · Jun 22, 2022 · 9e5e860 · 9e5e860
1 parent 771578b
commit 9e5e860
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 8 deletions.
diff --git a/.cz-config.js b/.cz-config.js
@@ -28,6 +28,7 @@ module.exports = {
     ['projects', '项目搭建'],
     ['components', '组件相关'],
     ['vuex', 'vuex 相关'],
+    ['issues', 'issues 修复'],
     ['utils', 'utils 相关'],
     ['styles', '样式相关'],
     ['deps', '项目依赖'],

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dgiot/dgiot-dashboard",
   "version": "4.5.4",
-  "author": "iotn2n",
+  "author": "h7ml",
   "license": "MPL-2.0",
   "private": false,
   "homepage": "https://github.com/dgiot/dgiot-dashboard.git",

diff --git a/src/dgiot/components/DgiotHeader/index.vue b/src/dgiot/components/DgiotHeader/index.vue
@@ -137,7 +137,7 @@
           const { js: runTimejs } = runTimeStatic
           runTimejs.forEach((_js) => {
             _runTimeStatic.js.push(`${staticUrl}js/${_js}`)
-            _runTimeStatic.js.push(`${staticUrl}css/amis/sdk/sdk.js`)
+            // _runTimeStatic.js.push(`${staticUrl}css/amis/sdk/sdk.js`)
           })
           const res = await loadScript(_runTimeStatic.js)
           this.$nextTick(async () => {

diff --git a/src/dgiot/components/DgiotNav/index.vue b/src/dgiot/components/DgiotNav/index.vue
@@ -135,7 +135,7 @@
           const { js: runTimejs } = runTimeStatic
           runTimejs.forEach((_js) => {
             _runTimeStatic.js.push(`${staticUrl}js/${_js}`)
-            _runTimeStatic.js.push(`${staticUrl}css/amis/sdk/sdk.js`)
+            // _runTimeStatic.js.push(`${staticUrl}css/amis/sdk/sdk.js`)
           })
           const res = await loadScript(_runTimeStatic.js)
           this.$nextTick(async () => {

diff --git a/src/main.js b/src/main.js
@@ -21,7 +21,7 @@ Vue.use(VuePlugin)
 window.dgiotlogger =
   process.env.NODE_ENV !== 'development' && clearConsole
     ? new Lajax({
-        url: 'https://reqres.in/api/users',
+        url: 'http://umini.shujupie.com/web_logs',
         autoLogError: true, //是否自动记录未捕获错误true
         autoLogRejection: false, //是否自动记录Promise错误true
         autoLogAjax: false, //是否自动记录 ajax 请求true

diff --git a/src/utils/request/request.js b/src/utils/request/request.js
@@ -124,6 +124,12 @@ instance.interceptors.request.use(
     }
     const { path = '/' } = router.history.current
     let { headers = {} } = config
+    _.merge(headers, {
+      departmentToken: departmentToken,
+      author: 'h7ml',
+      email: 'h7ml@qq.com',
+      platform: 'web',
+    })
     headers[`${tokenName}`] = usertoken
     if (headers['proxy'] == true) {
       console.log('src/utils/Request/request.js', config, 'config')

diff --git a/src/views/CloudFunction/doc/components/details.vue b/src/views/CloudFunction/doc/components/details.vue
@@ -321,6 +321,9 @@
           if (valid) {
             const loading = this.$baseColorfullLoading()
             const params = form
+            delete params.createdAt
+            delete params.updatedAt
+            delete params.objectId
             const { createdAt = '' } = await createArticle(params)
             loading.close()
             if (createdAt.length) this.init()

diff --git a/src/views/CloudFunction/doc/components/index.vue b/src/views/CloudFunction/doc/components/index.vue
@@ -199,6 +199,9 @@
           if (valid) {
             const loading = this.$baseColorfullLoading()
             const params = form
+            delete params.createdAt
+            delete params.updatedAt
+            delete params.objectId
             const { createdAt = '' } = await createArticle(params)
             loading.close()
             if (createdAt.length) this.init()

diff --git a/src/views/CloudFunction/doc/index.vue b/src/views/CloudFunction/doc/index.vue
@@ -117,6 +117,9 @@
                 className: 'Article',
               },
             }
+            delete Article.createdAt
+            delete Article.updatedAt
+            delete Article.objectId
             await createArticle(Article)
             this.innerVisible = false
             this.qureyTree()

diff --git a/src/views/CloudFunction/lowcode/components/ViewEdit.vue b/src/views/CloudFunction/lowcode/components/ViewEdit.vue
@@ -192,6 +192,10 @@
             value: 'content',
             label: '数据展示',
           },
+          {
+            value: 'pressureconfig',
+            label: '压测配置',
+          },
           {
             value: 'sms_template',
             label: '短信模板',

diff --git a/src/views/CloudFunction/lowcode/index.vue b/src/views/CloudFunction/lowcode/index.vue
@@ -383,6 +383,10 @@
             value: 'amis_view',
             label: '低代码预览',
           },
+          {
+            value: 'pressureconfig',
+            label: '压测配置',
+          },
           {
             value: 'topo',
             label: '组态',
@@ -596,7 +600,7 @@
       handleAdd() {
         this.$refs['edit'].type = 'add'
         // 解决子组件修改影响父组件的显示问题
-        // this.$refs['edit'].DbaTable = this.DbaTable
+        this.$refs['edit'].DbaTable = this.DbaTable
         // this.$refs['edit'].row = this.queryForm
         this.$refs['edit'].dialogFormVisible = true
         this.$refs['edit'].showEdit(this.queryForm)

diff --git a/src/views/DeviceCloud/manage/devicelist.vue b/src/views/DeviceCloud/manage/devicelist.vue
@@ -49,6 +49,7 @@
             <el-option label="设备名称" value="name" />
             <el-option label="外壳编号" value="detail.assetNum" />
             <el-option label="主板编号" value="devaddr" />
+            <el-option label="sim卡号" value="content.simserialno" />
           </el-select>
         </el-input>
       </el-form-item>
@@ -577,13 +578,14 @@
             factory: '',
           },
           name: '',
-          isEnable: false,
-          status: 'ONLINE',
+          isEnable: true,
+          status: 'OFFLINE',
           devaddr: '',
           basedata: {},
           route: {},
           product: { __type: 'Pointer', className: 'Product', objectId: '' },
         },
+        content: { simserialno: '' },
         product: '',
         createDeviceDialog: false,
         drawerAdd: false,

diff --git a/src/views/DeviceCloud/manage/home_index.vue b/src/views/DeviceCloud/manage/home_index.vue
@@ -954,7 +954,7 @@
                 },
                 profile: {},
                 route: {},
-                isEnable: false,
+                isEnable: true,
                 status: 'OFFLINE',
               }
               const { error = '', objectId = '' } = await postDevice(params)