研报后台6.1

src/views/report_manage/reportEn/reportlist.vue

@@ -18,6 +18,17 @@
               @click="handlePullReport"
             >同步策略报告</el-button>
           </el-form-item>
+          <el-form-item label="">
+            <el-select
+              v-model="searchform.timeType"
+              placeholder="选择时间类型"
+              size="medium"
+              style="width:110px"
+            >
+              <el-option label="发布时间" value="发布时间"></el-option>
+              <el-option label="更新时间" value="更新时间"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="">
             <el-date-picker
               v-model="searchform.dateValue"
@@ -51,10 +62,22 @@
               size="medium"
             ></el-cascader>
           </el-form-item>
+          <el-form-item label="">
+            <el-select
+              v-model.number="searchform.publishState"
+              placeholder="发布状态筛选"
+              size="medium"
+              clearable
+              style="width: 140px"
+            >
+              <el-option label="已发布" :value="1"></el-option>
+              <el-option label="未发布" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="">
             <el-select
               v-model.number="searchform.EmailState"
-              placeholder="状态筛选"
+              placeholder="群发状态筛选"
               size="medium"
               clearable
               style="width: 140px"
@@ -65,7 +88,7 @@
           </el-form-item>
           <el-form-item>
             <el-input
-              placeholder="标题 / 作者"
+              placeholder="标题 / 创建人"
               v-model="searchform.key_word"
               clearable
               size="medium"
@@ -317,12 +340,14 @@ export default {
   data() {
     return {
       searchform: {
+        timeType:'发布时间',
         dateValue:[],
         frequency:'',
         classifynameArr:'',
         state:'',
         key_word:'',
-        EmailState:''
+        EmailState:'',
+        publishState:''
       },
       optionsArr:[],
       frequencyArr: [ '年度','半年度','季度','月度','双周度','周度','日度','不定时' ],

src/views/semantics_manage/semanticsPage.vue

@@ -124,10 +124,15 @@
             <li>{{semanticInfo.Title}}</li>
             <li style="margin-left:auto;">作者：{{semanticInfo.SysAdminName}}</li>
             <li>创建时间：{{semanticInfo.CreateTime}}</li>
+            <li>
+              <span @click="handleDownLoadImg">下载</span>
+              <span @click="handleCopyImg">复制到微信</span>
+              <span @click="handleCopyImg">复制到Office</span>
+            </li>
             <li style="min-width: auto;"><el-button type="primary" @click="handleEdit('file',selectNode)">编辑</el-button></li>
           </ul>
           <div class="pic-wrap">
-            <img class="pic" :src="semanticInfo.ResultImg" v-if="semanticInfo.ResultImg">
+            <img class="pic" id="copy-img" :src="semanticInfo.ResultImg" v-if="semanticInfo.ResultImg">
             <div class="empty" v-if="!semanticInfo.ResultImg">
               <img src="~@/assets/img/document_m/default-img.png" style="
                 display: block;
@@ -211,6 +216,58 @@ export default {
     }
   },
   methods: {
+    // 下载图片
+    handleDownLoadImg(){
+      let img=new Image()
+      img.setAttribute('crossOrigin', 'anonymous');
+      img.src=this.semanticInfo.ResultImg
+      img.onload=()=>{
+          let canvas = document.createElement("canvas");
+          canvas.width = img.width;
+          canvas.height = img.height;
+          let context = canvas.getContext('2d');
+          context.drawImage(img, 0, 0, img.width, img.height);
+          let dataURL = canvas.toDataURL("image/png", 1);
+          const a=document.createElement('a')
+          a.setAttribute("download",this.semanticInfo.Title)
+          a.style.display = "none"
+          a.href=dataURL
+          document.body.appendChild(a);
+          a.click()
+      }
+    },
+    //复制图片
+    handleCopyImg(){
+      let img=new Image()
+      img.setAttribute('crossOrigin', 'anonymous');
+      img.src=this.semanticInfo.ResultImg
+      img.onload=()=>{
+          let canvas = document.createElement("canvas");
+          canvas.width = img.width;
+          canvas.height = img.height;
+          let context = canvas.getContext('2d');
+          context.drawImage(img, 0, 0, img.width, img.height);
+          
+          if(window.ClipboardItem) {
+            canvas.toBlob(async (blob) => {
+              const data = [new ClipboardItem({ [blob.type]: blob })]; 
+              await navigator.clipboard.write(data).then(
+                () => {
+                this.$message.success('复制成功！')
+                },
+                () => {
+                  this.$message.warning('复制失败,稍后再试')
+                }
+              );
+            });
+          }else {
+            this.$message.warning('浏览器暂不支持')
+          }
+
+      }
+    },
+
+
     //搜索语义分析
     searchHandle(keyword){
       semanticInterface.getSemanticList({

src/views/system_manage/departManage.vue

@@ -3,7 +3,7 @@
 		<div class="left_cont">
 			<div class="company_top" @click="initDepart">
 				<img src="~@/assets/img/set_m/home_ico.png" alt="" style="width:30px;height:30px;">
-				<span :class="!defaultGroup&&!defaultDepart?'act':''">弘则研究</span>
+				<span :class="!defaultGroup&&!defaultDepart?'act':''">部门信息</span>
 			</div>
 			<el-tree
 				ref="departTree"
@@ -12,7 +12,6 @@
 				:data="departArr"
 				node-key="unicodeKey"
 				:props="defaultProp"
-				default-expand-all
 				draggable 
 				:allow-drag="checkAllowDrag"
 				:allow-drop="checkAllowDrop"
@@ -80,6 +79,11 @@
 							<span style="position: relative;">{{scope.row.RealName}}</span>
 						</template>
 					</el-table-column>
+					<el-table-column 
+						prop="AdminName"
+						label="账号"
+						align="center"
+					/>
 					<el-table-column
 					prop="Mobile"
 					label="手机号"
@@ -452,6 +456,9 @@
 		>
 			<div class="dialog-container">
 				<el-form ref="resetForm" :model="resetForm" :rules="resetRules" label-width="100px">
+					<el-form-item label="账号">
+						<span>{{modifyAdminName}}</span>
+					</el-form-item>
 					<el-form-item label="新密码" prop="password">
 						<el-input v-model="resetForm.password" style="width:100%" :show-password="true"></el-input>
 					</el-form-item>
@@ -474,6 +481,10 @@
 			@close="isMoveDepartShow=false" center width="460px" v-dialogDrag
 		>
 			<div class="dialog-cotainer">
+				<div class="form-item" style="display: flex;align-items: center;margin-bottom:20px">
+					<p style="width:90px">账号</p>
+					<span>{{modifyAdminName}}</span>
+				</div>
 				<div class="form-item" style="display: flex;align-items: center;">
 					<p style="width:90px">选择分组</p>
 					<el-cascader :options="departArr" v-model="resetDepart" :props="form_departProp" style="width:100%"
@@ -1306,7 +1317,7 @@ export default {
 		},
 		/* 删除用户 */
 		delUser(item) {
-			this.$confirm('是否确认删除该用户?','提示',{
+			this.$confirm(`是否确认删除用户【${item.AdminName}】`,'提示',{
 				type:'warning'
 			}).then(() => {
 				departInterence.delUser({

src/views/system_manage/mixin/departManageMixin.js

@@ -53,7 +53,8 @@ export default {
                 check:''
             },
             resetDepart:'',
-            modifyAdminId:0
+            modifyAdminId:0,
+            modifyAdminName:'',
 
         }
     },
@@ -175,6 +176,7 @@ export default {
             if(type==='show'){
                 this.$refs.resetForm&&this.$refs.resetForm.clearValidate()
                 this.modifyAdminId = data.AdminId
+                this.modifyAdminName=data.AdminName
                 this.isResetPasswordShow = true
             }else{
                 this.$refs.resetForm.validate((valid)=>{
@@ -208,6 +210,7 @@ export default {
                 data.TeamId ?departArr.push(data.TeamId):''
                 this.resetDepart = departArr
                 this.modifyAdminId = data.AdminId
+                this.modifyAdminName=data.AdminName
                 this.isMoveDepartShow = true
             }else{
                 //选择分组接口