文件预览优化；文档管理优化；

@@ -104,16 +104,17 @@
 
 
                     <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="true"
                     <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="true"
                                    :showBorder="false" :showSelection="false" :showTools="isEditName"
                                    :showBorder="false" :showSelection="false" :showTools="isEditName"
-                                   :showPage="false" :height="height - 54">
+                                   :showPage="false" :height="height - 84">
                         <template #default="{row,prop,column}">
                         <template #default="{row,prop,column}">
-                            <div class="fileName-div" style="display: flex; align-items: center;" v-if="isEditName && prop == 'fileName'" @click="getFile(row)">
+                            <!--<div class="fileName-div" style="display: flex; align-items: center;" v-if="isEditName && prop == 'fileName'" @click="getFile(row)">
                                 <i :class="['iconfont', iconclass[row.type] == undefined ? 'icon-wenjian' : iconclass[row.type]]" style="font-size: 22px;margin-right: 10px;"></i>
                                 <i :class="['iconfont', iconclass[row.type] == undefined ? 'icon-wenjian' : iconclass[row.type]]" style="font-size: 22px;margin-right: 10px;"></i>
                                 <div>
                                 <div>
                                     <span @click.stop="editFileName(row,index)" v-if="isInput!=row.id">{{row.fileName}}</span>
                                     <span @click.stop="editFileName(row,index)" v-if="isInput!=row.id">{{row.fileName}}</span>
                                 </div>
                                 </div>
 
 
                                 <el-input @click.stop="" @blur="reNameFile(row,true)" v-if="isInput==row.id" type="text" v-model="row.fileName"></el-input>
                                 <el-input @click.stop="" @blur="reNameFile(row,true)" v-if="isInput==row.id" type="text" v-model="row.fileName"></el-input>
-                            </div>
+                            </div>-->
+
                         </template>
                         </template>
 
 
                         <template #tools="{scope}" >
                         <template #tools="{scope}" >
@@ -134,9 +135,7 @@
                                             </el-button>
                                             </el-button>
                                         </li>
                                         </li>
                                     </ul>
                                     </ul>
-
                                 </div>
                                 </div>
-
                             </div>
                             </div>
                         </template>
                         </template>
                     </cm-table-page>
                     </cm-table-page>

@@ -181,9 +181,7 @@ export default {
             },
             },
             render: function (row) {
             render: function (row) {
                 let cls = iconclass[row.type] == undefined ? 'icon-wenjian' : iconclass[row.type];
                 let cls = iconclass[row.type] == undefined ? 'icon-wenjian' : iconclass[row.type];
-                // let inputFileName=row.fileName;
-                // return `<i class="iconfont ${cls}" style="font-size: 22px;margin-right: 10px;"></i><input value="${inputFileName}"></input>`
-                return `<i class="iconfont ${cls}" style="font-size: 22px;margin-right: 10px;"></i><span>${row.fileName}</span>`
+                return `<div style="cursor: pointer"><i class="iconfont ${cls}" style="font-size: 22px;margin-right: 10px;"></i><span>${row.fileName}</span></div>`
             }
             }
         },
         },
         {
         {

@@ -135,7 +135,7 @@ global.openBlankWindow = (url, width, height) => {
         let lyaui = global.layui;
         let lyaui = global.layui;
         lyaui.layer.open({
         lyaui.layer.open({
             type: 2,
             type: 2,
-            title:'',
+            title: '',
             area: [width, height],
             area: [width, height],
             content: url //这里content是一个URL，如果你不想让iframe出现滚动条，你还可以content: ['http://sentsin.com', 'no']
             content: url //这里content是一个URL，如果你不想让iframe出现滚动条，你还可以content: ['http://sentsin.com', 'no']
         });
         });
@@ -151,7 +151,18 @@ global.viewer = (path, proxy) => {
         if (res && res.success) {
         if (res && res.success) {
             global.openBlankWindow("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(res.str));
             global.openBlankWindow("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(res.str));
         } else {
         } else {
-            global.showMsg((res.msg == undefined || res.msg == '' || res.msg == null) ? "该文档不支持预览！" : res.msg, "error")
+            var access_token = 'access_token=' + proxy.$http.getToken();
+            let viewUrl =`/api-web/openoffice/downloadByPath?path=${encodeURIComponent(path)}&${access_token}`;
+            let mimeType = res.object;
+            // TODO 浏览器不能播放视频
+            // 图片视频
+            // if (mimeType.indexOf("image") != -1 || mimeType.indexOf("video") != -1) {
+            //     global.openBlankWindow( sessionStorage.getItem('domainName') + viewUrl);
+            //     return;
+            // }
+            global.confirm("文档不支持预览，是否下载！", function () {
+                proxy.$http.downloadFile(viewUrl, {});
+            });
         }
         }
     })
     })
 }
 }
@@ -161,13 +172,7 @@ global.viewer = (path, proxy) => {
  * @param path
  * @param path
  */
  */
 global.viewResTopo = (resId) => {
 global.viewResTopo = (resId) => {
-    // let url = `${sessionStorage.getItem('graphEditorOrigin')}/jgraph/grapheditor/index.html?access_token=${localStorage.getItem('access_token')}&id=${topoId}`;
-    // let height = window.innerHeight;
-    // let width = window.innerWidth;
-    // global.openBlankWindow(url, width, height);
-
     let lyaui = global.layui;
     let lyaui = global.layui;
-
     lyaui.common.viewResTopo(resId)
     lyaui.common.viewResTopo(resId)
 }
 }
 
 
@@ -202,18 +207,18 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
 }
 }
 
 
 global.openDetail = (resId, resType, proxy) => {
 global.openDetail = (resId, resType, proxy) => {
-   let lyaui = global.layui;
+    let lyaui = global.layui;
 
 
     let editFlag = false;
     let editFlag = false;
     let provider = '';
     let provider = '';
-    let name= '';
+    let name = '';
     let ip = '';
     let ip = '';
     let resTypeName = '';
     let resTypeName = '';
     let adminName = '';
     let adminName = '';
     let manageIp = '';
     let manageIp = '';
     let collProtocol = '';
     let collProtocol = '';
 
 
-   // 获取资源详情
+    // 获取资源详情
     proxy.$http.get(`/api-web/v32/res/detail/${resId}`, {}, function (res) {
     proxy.$http.get(`/api-web/v32/res/detail/${resId}`, {}, function (res) {
         if (res && res.map) {
         if (res && res.map) {
             let data = res.map;
             let data = res.map;
@@ -226,14 +231,11 @@ global.openDetail = (resId, resType, proxy) => {
             collProtocol = data.collProtocol;
             collProtocol = data.collProtocol;
             name = data.resName;
             name = data.resName;
 
 
-            lyaui.commonCols.detailPage(resId, resType,editFlag,provider,name,ip,resTypeName,adminName,manageIp,collProtocol);
+            lyaui.commonCols.detailPage(resId, resType, editFlag, provider, name, ip, resTypeName, adminName, manageIp, collProtocol);
         }
         }
     });
     });
 
 
 
 
-
-
-
 }
 }
 
 
 /**
 /**

-<title>资源视图</title>
+<title>资产视图</title>
 <iframe src="/vue3/index.html#/res/list" class="layadmin-iframe"  style="height: 99.5%!important;"/>
 <iframe src="/vue3/index.html#/res/list" class="layadmin-iframe"  style="height: 99.5%!important;"/>

@@ -97,9 +97,17 @@ const assets = (props, {attrs, slots, emit}) => {
      */
      */
     let addAssets = () => {
     let addAssets = () => {
         let data = btnType.value.data
         let data = btnType.value.data
-        data.map(function (v){
+        let arr = data.map(function (v){
             v.extend = JSON.stringify(v.extend);
             v.extend = JSON.stringify(v.extend);
+            if( !v.value || v.value == '' || v.value == null){
+                return v;
+            }
         })
         })
+
+        if(arr.length == data.length ){
+            proxy.$global.showMsg(`请填写资产信息，不能全部为空！`,'warning');
+            return;
+        }
         proxy.$http.post(`/api-web/person/assets/add/${props.parentNode.id}`,data , function (res) {
         proxy.$http.post(`/api-web/person/assets/add/${props.parentNode.id}`,data , function (res) {
             if (res && res.success) {
             if (res && res.success) {
                 proxy.$global.showMsg("添加成功");
                 proxy.$global.showMsg("添加成功");
@@ -118,9 +126,17 @@ const assets = (props, {attrs, slots, emit}) => {
      */
      */
     let saveAssets = () => {
     let saveAssets = () => {
         let data = btnType.value.data
         let data = btnType.value.data
-        data.map(function (v){
+        let arr = data.map(function (v){
             v.extend = JSON.stringify(v.extend);
             v.extend = JSON.stringify(v.extend);
+            if( !v.value || v.value == '' || v.value == null){
+                return v;
+            }
         })
         })
+
+        if(arr.length == data.length ){
+            proxy.$global.showMsg(`请填写资产信息，不能全部为空！`,'warning');
+            return;
+        }
         proxy.$http.post(`/api-web/person/assets/edit/${props.parentNode.id}`, data, function (res) {
         proxy.$http.post(`/api-web/person/assets/edit/${props.parentNode.id}`, data, function (res) {
             if (res && res.success) {
             if (res && res.success) {
                 proxy.$global.showMsg("编辑成功");
                 proxy.$global.showMsg("编辑成功");
@@ -452,4 +468,4 @@ export default {
             rules,
             rules,
         }
         }
     }
     }
-}
+}

@@ -16,7 +16,7 @@ export default {
     },
     },
     setup() {
     setup() {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
-        let height = Vue.ref(window.innerHeight -10);
+        let height = Vue.ref(window.innerHeight -20);
         const treeData =  Vue.ref([]);
         const treeData =  Vue.ref([]);
         const tableData = Vue.ref([]);
         const tableData = Vue.ref([]);