Former-commit-id: f172144192a2631a02257c6ca45f0de75be27c64
TangShanKaiPing
wanggang 5 years ago
parent 8e78c31a6c
commit 65c8fd83a3

@ -5,8 +5,10 @@ using Infrastructure.Data;
using Infrastructure.Extensions; using Infrastructure.Extensions;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
namespace IoT.Shared.Areas.Admin.Controlls namespace IoT.Shared.Areas.Admin.Controlls
{ {
@ -31,7 +33,7 @@ namespace IoT.Shared.Areas.Admin.Controlls
{ {
try try
{ {
this.Repo.Delete(this.Repo.FindBy(id)); this.Repo.Delete(this.Repo.Table().Include(o => o.Scenes).FirstOrDefault(o => o.Id == id));
this.Repo.SaveChanges(); this.Repo.SaveChanges();
} }
catch (Exception ex) catch (Exception ex)

@ -183,6 +183,11 @@
"destination": "wwwroot/lib/jqcron", "destination": "wwwroot/lib/jqcron",
"files": [ "jqCron.css", "jqCron.js", "jqCron.cn.js" ] "files": [ "jqCron.css", "jqCron.js", "jqCron.cn.js" ]
}, },
{
"library": "../lib/local/jswebrtc/dist/",
"destination": "wwwroot/lib/jswebrtc/",
"files": [ "jswebrtc.min.js" ]
},
{ {
"library": "../lib/local/fonts/", "library": "../lib/local/fonts/",
"destination": "wwwroot/fonts/" "destination": "wwwroot/fonts/"

@ -1,5 +1,5 @@
var time = '1d'; var time = '1d';
if (WXInlinePlayer.isSupport()) { if(window.WXInlinePlayer&&WXInlinePlayer.isSupport()) {
WXInlinePlayer.init({ WXInlinePlayer.init({
asmUrl: baseUrl+'/lib/WXInlinePlayer/prod.all.asm.combine.js', asmUrl: baseUrl+'/lib/WXInlinePlayer/prod.all.asm.combine.js',
wasmUrl: baseUrl +'/lib/WXInlinePlayer/prod.all.wasm.combine.js' wasmUrl: baseUrl +'/lib/WXInlinePlayer/prod.all.wasm.combine.js'

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0.526")] [assembly: AssemblyInformationalVersion("1.0.0.527")]
Loading…
Cancel
Save