Merge branch 'dev-0420' into dev

package.json

@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "^0.4.0",
-    "@tinymce/tinymce-vue": "^4.0.4",
+    "@tinymce/tinymce-vue": "^3.2.8",
     "axios": "^0.19.0",
     "babel-eslint": "^8.0.1",
     "babel-plugin-component": "^1.1.1",

src/assets/scss/common.scss

@@ -821,3 +821,11 @@ div.el-table div.cell {
   text-overflow: ellipsis;
   word-wrap: normal;
 }
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+input[type="number"] {
+  -moz-appearance: textfield;
+}

src/assets/scss/modules/warning.scss

@@ -85,7 +85,7 @@
                         content: "";
                         width: 8px;
                         height: 8px;
-                        background: #2194fe;
+                        background: #f5f502;
                         border-radius: 50%;
                         position: absolute;
                         left: 12px;
@@ -93,6 +93,12 @@
                         transform: translate(0, -50%);
                     }
 
+                    &:nth-of-type(2) {
+                        &::after {
+                            background: #fb500d;
+                        }
+                    }
+
                     div:nth-child(1) {
                         font-size: 16px;
                         font-family: PingFang SC;

src/router/index.js

@@ -225,7 +225,7 @@ router.beforeEach((to, from, next) => {
   window.SITE_CONFIG["menuShujuList"] = [
     {
       url: "/visual/plugin/power/organization",
-      name: "组织架构",
+      name: "动力主轴",
       id: "5feawfwaefwa577",
     },
     {

src/views/components/editResi.vue

@@ -235,7 +235,7 @@
                       v-else-if="n.itemType === 'cascader'"
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
-                      :props="{ checkStrictly: true }"
+                      :props="{ checkStrictly: false }"
                       :disabled="disabled"
                       clearable
                       size="small"

src/views/components/rangeInput.vue

@@ -8,7 +8,7 @@
         size="small"
         :type="inputType"
         clearable
-        placeholder="请输入内容"
+        placeholder="请输入"
         @change="handleChange"
       />
     </el-form-item>
@@ -20,7 +20,7 @@
         size="small"
         :type="inputType"
         clearable
-        placeholder="请输入内容"
+        placeholder="请输入"
         @change="handleChange"
         @blur="handleBlur"
       />
@@ -101,14 +101,25 @@ export default {
 .flex-div {
   display: flex;
   align-items: center;
+  max-width: 200px;
 }
 // .wd50 {
 //   // width: 45%;
 // }
 .demo-form-inline {
-  ::v-deep .el-form-item {
-    width: 40%;
-    margin: 0;
+  ::v-deep {
+    .el-form-item {
+      flex: 1;
+      width: 40%;
+      margin: 0;
+    }
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+      -webkit-appearance: none;
+    }
+    input[type='number']{
+      -moz-appearance: textfield;
+    }
   }
 }
 

src/views/components/resiForm.vue

@@ -198,7 +198,7 @@
                       v-else-if="n.itemType === 'cascader'"
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
-                      :props="{ checkStrictly: true }"
+                      :props="{ checkStrictly: false }"
                       clearable
                       size="small"
                       class="resi-cell-select">

src/views/modules/base/diyInfo.vue

@@ -330,33 +330,20 @@ export default {
       await this.$http({
         method: 'POST',
         url,
-        // responseType: 'blob',
+        responseType: 'blob',
         data: params
       })
         .then(res => {
           console.log('res----dddd', res)
           // this.download(res.data, title + '.xls')
           // this.getTemplateList()
+          
           this.exportLoading = false
-          if (res.data.code && res.data.code == 9999) {
-            return this.$message.error(res.data.msg)
-          }
-          if (res.headers["content-disposition"]) {
-            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-            console.log('filename', fileName)
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            var url = window.URL.createObjectURL(blob)
-            var aLink = document.createElement('a')
-            aLink.style.display = 'none'
-            aLink.href = url
-            aLink.setAttribute('download', fileName)
-            document.body.appendChild(aLink)
-            aLink.click()
-            document.body.removeChild(aLink) //下载完成移除元素
-            window.URL.revokeObjectURL(url) //释放掉blob对象
-            this.$message.success('导出成功')
-            this.$emit('close')
-          } else this.$message.error('下载失败')
+          // if (res.data.code && res.data.code == 9999) {
+          //   return this.$message.error(res.data.msg)
+          // }
+          this.formatData(res)
+          
         })
         .catch(err => {
           console.log('err', err)
@@ -431,6 +418,40 @@ export default {
         this.$message.error(msg)
       }
     },
+    formatData(res) {
+      const fileReader = new FileReader()
+      fileReader.onloadend = () => {
+        try {
+          const jsonData = JSON.parse(fileReader.result) // 说明是普通对象数据，后台转换失败
+          // 后台信息
+          console.log('jsonData---1', jsonData)
+          return this.$message.error(jsonData.msg)
+        } catch (err) { // 解析成对象失败，说明是正常的文件流
+          // 下载文件
+          console.log('errr-----', err, this)
+          this.downloadFile(res)
+        }
+      }
+      fileReader.readAsText(res.data)
+    },
+    downloadFile(res) {
+      if (res.headers["content-disposition"]) {
+        let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+        console.log('filename', fileName)
+        let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+        var url = window.URL.createObjectURL(blob)
+        var aLink = document.createElement('a')
+        aLink.style.display = 'none'
+        aLink.href = url
+        aLink.setAttribute('download', fileName)
+        document.body.appendChild(aLink)
+        aLink.click()
+        document.body.removeChild(aLink) //下载完成移除元素
+        window.URL.revokeObjectURL(url) //释放掉blob对象
+        this.$message.success('导出成功')
+        this.$emit('close')
+      } else this.$message.error('下载失败')
+    }
   }
 }
 </script>

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -670,21 +670,36 @@ export default {
       })
     },
 
-    handleEdit (row) {
-      this.editFormTitle = "修改核酸检测关注名单"
-      this.editFormShow = true
+    async handleEdit(row) {
+      this.editFormTitle = "修改核酸检测关注名单";
+      this.editFormShow = true;
 
-      this.$nextTick(() => {
-        this.$refs.ref_form_edit.initForm('edit', row)
-      })
+      let row2 = await this.getInfo(row);
+      this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
-    handleDetail (row) {
-      this.editFormTitle = "查看核酸检测关注名单"
-      this.editFormShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form_edit.initForm('detail', row)
-      })
+    async handleDetail(row) {
+      this.editFormTitle = "查看核酸检测关注名单";
+      this.editFormShow = true;
+
+      let row2 = await this.getInfo(row);
+      this.$refs.ref_form_edit.initForm("detail", row2);
+    },
+
+    async getInfo(row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/detail";
+
+      let params = {
+        id: row.id,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        row.mobile = data.mobile;
+        row.idCard = data.idCard;
+      }
+      return row;
     },
 
     handleSendNotice () {

src/views/modules/base/resi.vue

@@ -1166,7 +1166,7 @@ export default {
               item.queryItemList.forEach(n => {
                 if (n.optionSourceType === 'remote') {
                   this.getOptionsList(n.optionSourceValue).then((res) => {
-                    n.options = res
+                    n.options = this.getTreeData(res)
                   })
                   // console.log('')
                 } else if (n.itemType == 'radio' && n.options.length == 0) {

src/views/modules/visual/plugin/power/organization.vue

@@ -4,12 +4,12 @@
       <!-- <div class="card-title">
         <img class="title-icon" src="../../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
-          组织架构
+          动力主轴
         </div>
       </div> -->
       <div class="title">
         <img src="../../../../../assets/img/shuju/title-tip.png" />
-        <span>组织架构</span>
+        <span>动力主轴</span>
         <div class="second-select cascader">
           <el-cascader  class="customer_cascader"
                         ref="myCascader"